github
/
rk_svnadmin
mirror of https://github.com/Rekoe/rk_svnadmin
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed

master
kouxian 2017-10-26 18:19:49 +08:00
parent 987ddded50
commit ab776d983b
7 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pom.xml
View File

@ -196,7 +196,11 @@
<includes>
<include>**/*.js</include>
<include>**/msg/**/*.properties</include>
<include>log4j2.xml</include>
<include>oauth_consumer.properties</include>
<include>quartz.properties</include>
<include>log4j.properties</include>
<include>shiro.ini</include>
<include>ehcache.xml</include>
</includes>
</resource>
<resource>
@ -205,6 +209,16 @@
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
@ -231,40 +245,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<configuration>
<archiveClasses>true</archiveClasses>
<packagingExcludes>WEB-INF/web.xml</packagingExcludes>
<warSourceExcludes>WEB-INF/classes/com/**</warSourceExcludes>
<webResources>
<resource>
<directory>src/main/resources</directory>
<targetPath>WEB-INF/classes</targetPath>
<includes>
<include>msg/**/*</include>
<include>ioc/**/*</include>
<include>*.properties</include>
<include>init_system_h2.sql</include>
<include>shiro.ini</include>
<include>ehcache.xml</include>
</includes>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>

5
src/main/java/com/rekoe/module/admin/AdminLoginAct.java
View File

@ -26,7 +26,6 @@ import org.nutz.mvc.view.ServerRedirectView;
import org.nutz.mvc.view.ViewWrapper;
import org.nutz.plugins.view.freemarker.FreeMarkerConfigurer;
import org.nutz.plugins.view.freemarker.FreemarkerView;
import org.nutz.web.Webs;
import com.rekoe.domain.User;
import com.rekoe.domain.Usr;
@ -69,7 +68,7 @@ public class AdminLoginAct {
break;
}
}
session.setAttribute(Webs.ME, subject.getPrincipal());
session.setAttribute("me", subject.getPrincipal());
return new ServerRedirectView("/admin/main.rk");
} catch (IncorrectCaptchaException e) {
return new ViewWrapper(new FreemarkerView(freeMarkerConfigurer, TEMPLATE_LOGIN), e.getMessage());
@ -91,7 +90,7 @@ public class AdminLoginAct {
@At
@Ok("fm:template.front.account.create_user")
@RequiresAuthentication
public Object register(@Attr(Webs.ME) User user) {
public Object register(@Attr("me") User user) {
if (Lang.isEmpty(user) || user.isSystem()) {
return new ForwardView("/admin/common/unauthorized.rk");
}

5
src/main/java/com/rekoe/module/admin/AdminUserAct.java
View File

@ -27,7 +27,6 @@ import org.nutz.mvc.annotation.Attr;
import org.nutz.mvc.annotation.Fail;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.web.Webs;
import org.nutz.web.ajax.Ajax;
import com.alibaba.druid.util.DruidWebUtils;
@ -104,7 +103,7 @@ public class AdminUserAct {
@Ok("fm:template.admin.user.edit")
@Fail("json")
@NutzRequiresPermissions(value = "system.user:edit", name = "编辑账号", tag = "账号管理", enable = true)
public User edit(@Attr(Webs.ME) User user, @Param("id") long id, HttpServletRequest req) {
public User edit(@Attr("me") User user, @Param("id") long id, HttpServletRequest req) {
User editUser = userService.view(id);
if (Lang.isEmpty(editUser) || editUser.isLocked()) {
throw new NutConfigException(String.format("先解除帐号 %s 的锁定状态", editUser.getName()));
@ -239,7 +238,7 @@ public class AdminUserAct {
@At
@Ok("json")
@RequiresUser
public Object pwd_updata(@Param("oldpwd") String oldpwd, @Param("newpwd") String newpwd, @Param("rewpwd") String rewpwd, @Attr(Webs.ME) User user) {
public Object pwd_updata(@Param("oldpwd") String oldpwd, @Param("newpwd") String newpwd, @Param("rewpwd") String rewpwd, @Attr("me") User user) {
if (StringUtils.isNotBlank(newpwd)) {
if (Lang.equals(newpwd, rewpwd)) {
String oldSalt = user.getSalt();

3
src/main/java/com/rekoe/module/admin/PermissionAct.java
View File

@ -12,7 +12,6 @@ import org.nutz.mvc.annotation.At;
import org.nutz.mvc.annotation.Attr;
import org.nutz.mvc.annotation.Ok;
import org.nutz.mvc.annotation.Param;
import org.nutz.web.Webs;
import com.rekoe.annotation.PermissionTag;
import com.rekoe.common.Message;
@ -72,7 +71,7 @@ public class PermissionAct {
@At
@Ok("json")
@NutzRequiresPermissions(value = "system.permission:delete", name = "删除权限", tag = "权限管理", enable = true)
public Message delete(@Attr(Webs.ME) User user, @Param("id") long id, HttpServletRequest req) {
public Message delete(@Attr("me") User user, @Param("id") long id, HttpServletRequest req) {
Permission permission = permissionService.fetch(id);
if (permission.isLocked() && !user.isSystem()) {
return Message.error("admin.permissionCategory.deleteLockedNotAllowed", req);

2
src/main/java/com/rekoe/shiro/realm/NutAuthoDaoRealm.java
View File

@ -43,7 +43,7 @@ public class NutAuthoDaoRealm extends AbstractNutAuthoRealm {
oauthToken.setRname(user.isSystem());
oauthToken.setUserId(openid);
SimpleAuthenticationInfo account = new SimpleAuthenticationInfo(user, credential, getName());
oauthToken.getSession().setAttribute(org.nutz.web.Webs.ME, user);
oauthToken.getSession().setAttribute("me", user);
return account;
}
}

34
src/main/java/org/nutz/web/ajax/Ajax.java Normal file
View File

@ -0,0 +1,34 @@
package org.nutz.web.ajax;
import org.nutz.lang.util.NutMap;
import org.nutz.web.ajax.AjaxReturn;
public abstract class Ajax {
public static AjaxReturn ok() {
AjaxReturn re = new AjaxReturn();
re.setOk(true);
return re;
}
public static AjaxReturn fail() {
AjaxReturn re = new AjaxReturn();
re.setOk(false);
return re;
}
public static AjaxReturn expired() {
AjaxReturn re = new AjaxReturn();
re.setOk(false);
re.setMsg("ajax.expired");
return re;
}
/**
* @return 获得一个map，用来存放返回的结果。
*/
public static NutMap one() {
return new NutMap();
}
}

6
src/main/resources/conf.properties
View File

@ -1,8 +1,6 @@
#db.url=jdbc:mysql://192.168.3.2:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8
db.url=jdbc:mysql://192.168.3.223:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8
db.url=jdbc:mysql://127.0.0.1:3306/rk_svnadmin?useUnicode=true&characterEncoding=utf-8&useSSL=false
db.username=root
#db.password=kfzx_sy!@#%
db.password=root
db.password=rekoe@5382211
db.maxActive=50
mail.HostName=smtp.mxhichina.com