Przeglądaj źródła

用户管理:支持在线维护系统用户

xuxueli 6 lat temu
rodzic
commit
dd35173512

+ 2 - 2
xxl-job-admin/src/main/resources/i18n/message.properties Wyświetl plik

@@ -71,9 +71,9 @@ login_remember_me=记住密码
71 71
 login_username_placeholder=请输入登录账号
72 72
 login_password_placeholder=请输入登录密码
73 73
 login_username_empty=请输入登录账号
74
-login_username_lt_5=登录账号不应低于5
74
+login_username_lt_4=登录账号不应低于4
75 75
 login_password_empty=请输入登录密码
76
-login_password_lt_5=登录密码不应低于5
76
+login_password_lt_4=登录密码不应低于4
77 77
 login_success=登录成功
78 78
 login_fail=登录失败
79 79
 login_param_empty=账号或密码为空

+ 2 - 2
xxl-job-admin/src/main/resources/i18n/message_en.properties Wyświetl plik

@@ -71,9 +71,9 @@ login_remember_me=Remember Me
71 71
 login_username_placeholder=Please enter username
72 72
 login_password_placeholder=Please enter password
73 73
 login_username_empty=Please enter username
74
-login_username_lt_5=Username length should not be less than 5
74
+login_username_lt_4=Username length should not be less than 4
75 75
 login_password_empty=Please enter password
76
-login_password_lt_5=Password length should not be less than 5
76
+login_password_lt_4=Password length should not be less than 4
77 77
 login_success=Login success
78 78
 login_fail=Login fail
79 79
 login_param_empty=Username or password is empty

+ 4 - 4
xxl-job-admin/src/main/resources/static/js/login.1.js Wyświetl plik

@@ -15,23 +15,23 @@ $(function(){
15 15
         rules : {  
16 16
         	userName : {  
17 17
         		required : true ,
18
-                minlength: 5,
18
+                minlength: 4,
19 19
                 maxlength: 18
20 20
             },  
21 21
             password : {  
22 22
             	required : true ,
23
-                minlength: 5,
23
+                minlength: 4,
24 24
                 maxlength: 18
25 25
             } 
26 26
         }, 
27 27
         messages : {  
28 28
         	userName : {  
29 29
                 required  : I18n.login_username_empty,
30
-                minlength : I18n.login_username_lt_5
30
+                minlength : I18n.login_username_lt_4
31 31
             },
32 32
             password : {
33 33
             	required  : I18n.login_password_empty  ,
34
-                minlength : I18n.login_password_lt_5
34
+                minlength : I18n.login_password_lt_4
35 35
                 /*,maxlength:"登录密码不应超过18位"*/
36 36
             }
37 37
         }, 

+ 1 - 1
xxl-job-admin/src/main/resources/templates/common/common.macro.ftl Wyświetl plik

@@ -137,8 +137,8 @@
137 137
                 <li class="nav-click <#if pageName == "index">active</#if>" ><a href="${request.contextPath}/"><i class="fa fa-circle-o text-aqua"></i><span>${I18n.job_dashboard_name}</span></a></li>
138 138
 				<li class="nav-click <#if pageName == "jobinfo">active</#if>" ><a href="${request.contextPath}/jobinfo"><i class="fa fa-circle-o text-yellow"></i><span>${I18n.jobinfo_name}</span></a></li>
139 139
 				<li class="nav-click <#if pageName == "joblog">active</#if>" ><a href="${request.contextPath}/joblog"><i class="fa fa-circle-o text-green"></i><span>${I18n.joblog_name}</span></a></li>
140
-                <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-red"></i><span>${I18n.jobgroup_name}</span></a></li>
141 140
 				<#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1>
141
+                    <li class="nav-click <#if pageName == "jobgroup">active</#if>" ><a href="${request.contextPath}/jobgroup"><i class="fa fa-circle-o text-red"></i><span>${I18n.jobgroup_name}</span></a></li>
142 142
                     <li class="nav-click <#if pageName == "user">active</#if>" ><a href="${request.contextPath}/user"><i class="fa fa-circle-o text-purple"></i><span>${I18n.user_manage}</span></a></li>
143 143
 				</#if>
144 144
 				<li class="nav-click <#if pageName == "help">active</#if>" ><a href="${request.contextPath}/help"><i class="fa fa-circle-o text-gray"></i><span>${I18n.job_help}</span></a></li>

+ 2 - 2
xxl-job-admin/src/main/resources/templates/login.ftl Wyświetl plik

@@ -15,11 +15,11 @@
15 15
 			<div class="login-box-body">
16 16
 				<p class="login-box-msg">${I18n.admin_name}</p>
17 17
 				<div class="form-group has-feedback">
18
-	            	<input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}" value="admin" maxlength="18" >
18
+	            	<input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}" value="admin" maxlength="20" >
19 19
 	            	<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
20 20
 				</div>
21 21
 	          	<div class="form-group has-feedback">
22
-	            	<input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}" value="123456" maxlength="18" >
22
+	            	<input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}" value="123456" maxlength="20" >
23 23
 	            	<span class="glyphicon glyphicon-lock form-control-feedback"></span>
24 24
 	          	</div>
25 25
 				<div class="row">

+ 4 - 4
xxl-job-admin/src/main/resources/templates/user/user.index.ftl Wyświetl plik

@@ -79,11 +79,11 @@
79 79
 				<form class="form-horizontal form" role="form" >
80 80
                     <div class="form-group">
81 81
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label>
82
-                        <div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="50" ></div>
82
+                        <div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="20" ></div>
83 83
                     </div>
84 84
                     <div class="form-group">
85 85
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label>
86
-                        <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input}${I18n.user_password}" maxlength="50" ></div>
86
+                        <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input}${I18n.user_password}" maxlength="20" ></div>
87 87
                     </div>
88 88
                     <div class="form-group">
89 89
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>
@@ -129,11 +129,11 @@
129 129
 				<form class="form-horizontal form" role="form" >
130 130
                     <div class="form-group">
131 131
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label>
132
-                        <div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="50" readonly ></div>
132
+                        <div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="20" readonly ></div>
133 133
                     </div>
134 134
                     <div class="form-group">
135 135
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label>
136
-                        <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.user_password_update_placeholder}" maxlength="50" ></div>
136
+                        <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.user_password_update_placeholder}" maxlength="20" ></div>
137 137
                     </div>
138 138
                     <div class="form-group">
139 139
                         <label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>