Merge branch 'fix/setConfig' into 'develop'

在服务器启动时webServer\x_desktop\res\config\config.js增加密码规则属性

See merge request o2oa/o2oa!676

o2server/configSample/person.json

@@ -10,7 +10,6 @@
   "passwordRegexHint": "6位以上,包含数字和字母.",
   "register": "disable",
   "superPermission": true,
-  "personUnitOrderByAsc": true,
   "###captchaLogin": "是否启用验证码登录,默认值:true###",
   "###codeLogin": "是否启用验证码登录,默认值:true###",
   "###bindLogin": "是否启用扫描二维码登录,默认值:false###",
@@ -33,6 +32,5 @@
   },
   "###failureInterval": "登录限制时间(分钟)###",
   "###failureCount": "尝试登录次数###",
-  "###tokenExpiredMinutes": "token时长,分钟###",
-  "###personUnitOrderByAsc": "人员组织排序是否为升序，true为升序(默认)，false为降序###"
+  "###tokenExpiredMinutes": "token时长,分钟###"
 }
\ No newline at end of file

o2server/x_console/src/main/java/com/x/server/console/server/web/WebServerTools.java

@@ -189,6 +189,11 @@ public class WebServerTools extends JettySeverTools {
 			map.put("indexPage", Config.portal().getIndexPage());
 			map.put("webSocketEnable", Config.communicate().wsEnable());
 			map.put("urlMapping", Config.portal().getUrlMapping());
+			
+			/* 密码规则 */
+		    map.put("passwordRegex",Config.person().getPasswordRegex() );
+			map.put("passwordRegexHint", Config.person().getPasswordRegexHint());
+		
 			FileUtils.writeStringToFile(file, gson.toJson(map), DefaultCharset.charset);
 		}
 	}