fix 账号管理

src/main/java/com/rekoe/module/admin/AdminSvnUserAct.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.nutz.aop.interceptor.async.Async;
 import org.nutz.dao.Chain;
@@ -14,6 +15,7 @@ import org.nutz.dao.Cnd;
 import org.nutz.ioc.loader.annotation.Inject;
 import org.nutz.ioc.loader.annotation.IocBean;
 import org.nutz.lang.Strings;
+import org.nutz.lang.random.R;
 import org.nutz.log.Log;
 import org.nutz.log.Logs;
 import org.nutz.mvc.annotation.At;
@@ -61,6 +63,14 @@ public class AdminSvnUserAct extends BaseAction {
 	public void add() {
 	}
 
+	@At
+	@Ok("fm:template.admin.svn_user.edit")
+	@RequiresPermissions({ "svn.user:edit" })
+	@PermissionTag(name = "编辑SVN账号", tag = "SVN账号管理", enable = true)
+	public Usr edit(@Param("id") String usr) {
+		return svnUserService.get(usr);
+	}
+
 	@At
 	@Ok("json")
 	@RequiresPermissions("svn.user:add")
@@ -68,6 +78,7 @@ public class AdminSvnUserAct extends BaseAction {
 	public Message o_save(@Param("::user.") Usr user, HttpServletRequest req) {
 		boolean isOk = svnUserService.nameOk(user.getUsr());
 		if (isOk) {
+			user.setPsw(EncryptUtil.encrypt(R.UU64().substring(0, 10)));
 			isOk = svnUserService.insert(user);
 		}
 		if (isOk) {
@@ -76,6 +87,25 @@ public class AdminSvnUserAct extends BaseAction {
 		return Message.error("error", req);
 	}
 
+	@At
+	@Ok("json")
+	@RequiresPermissions("svn.user:edit")
+	@PermissionTag(name = "编辑SVN账号", tag = "SVN账号管理", enable = false)
+	public Message o_update(@Param("pwd") String pwd, @Param("usr") String usr, @Param("role") String role, HttpServletRequest req) {
+		if (StringUtils.isBlank(usr)) {
+			return Message.error("error", req);
+		}
+		Chain chain = Chain.make("role", role);
+		if (StringUtils.isNotBlank(pwd)) {
+			chain.add("pwd", EncryptUtil.encrypt(pwd));
+		}
+		boolean isOk = svnUserService.update(chain, Cnd.where("usr", "=", usr)) > 0;
+		if (isOk) {
+			return Message.success("ok", req);
+		}
+		return Message.error("error", req);
+	}
+
 	@Inject
 	private EmailService emailService;
 

src/main/java/com/rekoe/service/ChangePackage.java

@@ -29,12 +29,12 @@ public class ChangePackage {
 					return;
 				System.out.println(file);
 				String origin = Files.read(file);
-				String output = origin.replaceAll("WenQuanYi Micro Hei.ttf", "FZY4JW_0.ttf");
+				String output = origin.replaceAll("FZY4JW_0.ttf", "FZY4FZ_0.ttf");
 				if (origin.equals(output))
 					return;
 				Files.write(file, output);
 			}
 		};
-		Disks.visitFile(new File("D:/sources"), fv, ff);
+		Disks.visitFile(new File("C:/Users/koux/Desktop/ui/ui"), fv, ff);
 	}
 }

src/main/java/com/rekoe/utils/EncryptUtil.java

@@ -63,6 +63,11 @@ public class EncryptUtil {
 		return ret.toString();
 	}
 
+	public static void main(String[] args) {
+		String str = "abc";
+		System.out.println(encrypt(str));
+		System.out.println(decrypt(encrypt(str)));
+	}
 	/**
 	 * 解密
 	 * 

src/main/webapp/WEB-INF/template/admin/svn_user/add.ftl

@@ -19,16 +19,15 @@ $(function() {
 	<div class="clear"></div>
 </div>
 <div class="body-box">
-<@p.form id="jvForm" action="o_update" labelWidth="12" onsubmit="return false;">
+<@p.form id="jvForm" action="o_save" labelWidth="12" onsubmit="return false;">
 <@p.text width="30" label="姓名" id="user.name" name="user.name" value="" maxlength="100" class="required" required="true"/><@p.tr/>
 <@p.text width="30" label="用户名" id="user.usr" name="user.usr" value="" maxlength="100" class="required" required="true"/><@p.tr/>
-<@p.text width="30" label="密码" id="user.psw" name="user.psw" value="" maxlength="100" class="required" required="true"/><@p.tr/>
 <@p.text width="30" label="邮箱地址" id="user.email" name="user.email" value="" maxlength="100" class="required" required="true"/><@p.tr/>
 <@p.td width="50" label="角色"  required="true">
-	<@p.select id="user.role" name="user.role" value='0' list={"guest":"选择角色","admin":"admin"} required="true"/>
+	<@p.select id="user.role" name="user.role" value='0' list={"guest":"选择角色","admin":"admin","small":"small"} required="true"/>
 </@p.td><@p.tr/>
 <@p.td colspan="2">
-<@p.submit code="global.submit" onclick="Cms.add();"/>
+<@p.submit code="global.submit" onclick="Cms.add('o_save.rk','list.rk');"/>
 </@p.td><@p.tr/>
 </@p.form>
 </div>

src/main/webapp/WEB-INF/template/admin/svn_user/edit.ftl

@@ -20,8 +20,11 @@ $(function() {
 </div>
 <div class="body-box">
 <@p.form id="jvForm" action="o_update" labelWidth="12" onsubmit="return false;">
-<@p.hidden name="user.id" value='${obj.id}' />
+<@p.hidden name="usr" value='${obj.usr}' />
-<@p.text width="30" label="名称" id="user.userName" name="user.userName" value="${obj.userName!}" maxlength="100" class="required" required="true" readonly="true"/><@p.tr/>
+<@p.text width="30" label="密码" id="pwd" name="pwd" value='' maxlength="100" class="required" required="true"/><@p.tr/>
+<@p.td width="50" label="角色"  required="true">
+	<@p.select id="user.role" name="role" value='${obj.role}' list={"guest":"选择角色","admin":"admin","small":"small"} required="true"/>
+</@p.td><@p.tr/>
 <@p.td colspan="2">
 <@p.submit code="global.submit" onclick="Cms.update();"/>
 </@p.td><@p.tr/>

src/main/webapp/res/cms/js/admin.js

@@ -90,7 +90,7 @@ Cms.addBack = function(url){
 	}); 
 	return false;
 }
-Cms.add = function(act,back){
+Cms.add = function(act,url){
 	$.dialog({
 		type: "warn",
 		content: '确定要添加此记录?',