Skip to content

熊鹏飞 / xxljob220

Go to a project
Commit dd351735 by xuxueli
Options

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

parent 0a3542dc
Inline Side-by-side
Showing with 15 additions and 15 deletions
xxl-job-admin/src/main/resources/i18n/message.properties
...@@ -71,9 +71,9 @@ login_remember_me=记住密码 ...@@ -71,9 +71,9 @@ login_remember_me=记住密码
login_username_placeholder=请输入登录账号 login_username_placeholder=请输入登录账号
login_password_placeholder=请输入登录密码 login_password_placeholder=请输入登录密码
login_username_empty=请输入登录账号 login_username_empty=请输入登录账号
login_username_lt_5=登录账号不应低于5位 login_username_lt_4=登录账号不应低于4位
login_password_empty=请输入登录密码 login_password_empty=请输入登录密码
login_password_lt_5=登录密码不应低于5位 login_password_lt_4=登录密码不应低于4位
login_success=登录成功 login_success=登录成功
login_fail=登录失败 login_fail=登录失败
login_param_empty=账号或密码为空 login_param_empty=账号或密码为空
......
xxl-job-admin/src/main/resources/i18n/message_en.properties
...@@ -71,9 +71,9 @@ login_remember_me=Remember Me ...@@ -71,9 +71,9 @@ login_remember_me=Remember Me
login_username_placeholder=Please enter username login_username_placeholder=Please enter username
login_password_placeholder=Please enter password login_password_placeholder=Please enter password
login_username_empty=Please enter username login_username_empty=Please enter username
login_username_lt_5=Username length should not be less than 5 login_username_lt_4=Username length should not be less than 4
login_password_empty=Please enter password login_password_empty=Please enter password
login_password_lt_5=Password length should not be less than 5 login_password_lt_4=Password length should not be less than 4
login_success=Login success login_success=Login success
login_fail=Login fail login_fail=Login fail
login_param_empty=Username or password is empty login_param_empty=Username or password is empty
......
xxl-job-admin/src/main/resources/static/js/login.1.js
...@@ -15,23 +15,23 @@ $(function(){ ...@@ -15,23 +15,23 @@ $(function(){
rules : { rules : {
userName : { userName : {
required : true , required : true ,
minlength: 5, minlength: 4,
maxlength: 18 maxlength: 18
}, },
password : { password : {
required : true , required : true ,
minlength: 5, minlength: 4,
maxlength: 18 maxlength: 18
} }
}, },
messages : { messages : {
userName : { userName : {
required : I18n.login_username_empty, required : I18n.login_username_empty,
minlength : I18n.login_username_lt_5 minlength : I18n.login_username_lt_4
}, },
password : { password : {
required : I18n.login_password_empty , required : I18n.login_password_empty ,
minlength : I18n.login_password_lt_5 minlength : I18n.login_password_lt_4
/*,maxlength:"登录密码不应超过18位"*/ /*,maxlength:"登录密码不应超过18位"*/
} }
}, },
......
xxl-job-admin/src/main/resources/templates/common/common.macro.ftl
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<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> <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>
<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> <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>
<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> <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>
<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>
<#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1> <#if Request["XXL_JOB_LOGIN_IDENTITY"].role == 1>
<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>
<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> <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>
</#if> </#if>
<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> <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>
......
xxl-job-admin/src/main/resources/templates/login.ftl
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<div class="login-box-body"> <div class="login-box-body">
<p class="login-box-msg">${I18n.admin_name}</p> <p class="login-box-msg">${I18n.admin_name}</p>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}" value="admin" maxlength="18" > <input type="text" name="userName" class="form-control" placeholder="${I18n.login_username_placeholder}" value="admin" maxlength="20" >
<span class="glyphicon glyphicon-envelope form-control-feedback"></span> <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}" value="123456" maxlength="18" > <input type="password" name="password" class="form-control" placeholder="${I18n.login_password_placeholder}" value="123456" maxlength="20" >
<span class="glyphicon glyphicon-lock form-control-feedback"></span> <span class="glyphicon glyphicon-lock form-control-feedback"></span>
</div> </div>
<div class="row"> <div class="row">
......
xxl-job-admin/src/main/resources/templates/user/user.index.ftl
...@@ -79,11 +79,11 @@ ...@@ -79,11 +79,11 @@
<form class="form-horizontal form" role="form" > <form class="form-horizontal form" role="form" >
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label>
<div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="50" ></div> <div class="col-sm-8"><input type="text" class="form-control" name="username" placeholder="${I18n.system_please_input}${I18n.user_username}" maxlength="20" ></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label>
<div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input}${I18n.user_password}" maxlength="50" ></div> <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.system_please_input}${I18n.user_password}" maxlength="20" ></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>
...@@ -129,11 +129,11 @@ ...@@ -129,11 +129,11 @@
<form class="form-horizontal form" role="form" > <form class="form-horizontal form" role="form" >
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_username}<font color="red">*</font></label>
<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> <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>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_password}<font color="red">*</font></label>
<div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.user_password_update_placeholder}" maxlength="50" ></div> <div class="col-sm-8"><input type="text" class="form-control" name="password" placeholder="${I18n.user_password_update_placeholder}" maxlength="20" ></div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label> <label for="lastname" class="col-sm-2 control-label">${I18n.user_role}<font color="red">*</font></label>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment