Skip to content

caosy / fun-admin

Go to a project
Commit d922c204 by zhangchen
Options

Merge branch 'f-6.7.0' of 192.168.10.6:caosy/fun-admin into f-6.7.0

parents bc65857f 78ce89ff
Inline Side-by-side
Showing with 24 additions and 10 deletions
src/main/java/com/ctrip/fun/admin/controller/system/adminUserController.java
......@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import com.ctrip.fun.admin.service.system.UserDetailsService;
import com.ctrip.fun.common.core.util.CheckPassword;
import com.ctrip.fun.common.core.util.EncryptUtil;
import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
......@@ -102,7 +103,15 @@ public class adminUserController {
}
j_password = EncryptUtil.getMD5Str(j_password);
if (j_password.equals(adminUserBean.getPassword())) {
if (newj_password1.equals(newj_password2)) {
if(CheckPassword.checkPassword(newj_password2)==-1){ //如果密码负责度过于简单
model.put("error", "新密码长度不能低于6个字符");
return "user/admin/adminChangePassword";
}else if(CheckPassword.checkPassword(newj_password2)==1){ //如果密码负责度过于简单
model.put("error", "新密码过于简单！重新输入！");
return "user/admin/adminChangePassword";
}else if (newj_password1.equals(newj_password2)) {
newj_password1 = EncryptUtil.getMD5Str(newj_password1);
adminUserBean.setPassword(newj_password1);
userDetailsService.updatePassword("", adminUserBean);
......
src/main/webapp/WEB-INF/templates/basic/invoiceRequest/invoiceRequestForm.ftl
......@@ -104,7 +104,7 @@ $("#submitCheck").click(function(){
$("#addOrder").click(function(){
$("#rowsOfOrder").append("<tr> <td style='width:10%'><input type='checkbox'></td> <td style='width:10%'><input name='invoiceOrderInfoBeans["+index+"].orderNo'></td><td style='width:5%'><input name='invoiceOrderInfoBeans["+index+"].amount'></td><td style='width:16%'><input name='invoiceOrderInfoBeans["+index+"].courseName'></td></tr>");
$("#rowsOfOrder").append("<tr> <td style='width:10%'><input type='checkbox'></td> <td style='width:10%'><input name='invoiceOrderInfoBeans["+index+"].orderNo' title='非订单号格式:入社费(张三20190101-12:30)'></td><td style='width:5%'><input name='invoiceOrderInfoBeans["+index+"].amount'></td><td style='width:16%'><input name='invoiceOrderInfoBeans["+index+"].courseName'></td></tr>");
index++;
});
......@@ -193,7 +193,7 @@ $("#deleteOrder").click(function(){
</tr>
<tr>
<td style="width:10%">删除勾选</td>
<td style="width:10%">订单号/赛事活动</td>
<td style="width:10%">订单号/赛事活动(<font color="red">唯一</font>属性)</td>
<td style="width:5%">开票金额</td>
<td style="width:16%">球场名称</td>
</tr>
......
src/main/webapp/WEB-INF/templates/common/layout.ftl
......@@ -122,7 +122,7 @@ ${pageCss}
</li>
<li class="nav-header">系统用户</li>
<li <#if current == "admin_user_list">class="active"</#if>>
<a href="/userRole/adminUser/list">列表</a>
<a href="/userRole/adminUser/list?enable=1">列表</a>
</li>
<li <#if current == "admin_user_create">class="active"</#if>>
<a href="/userRole/adminUser/create">新建</a>
......
src/main/webapp/WEB-INF/templates/user/admin/adminChangePassword.ftl
......@@ -141,10 +141,10 @@
原 密 码:<input id="j_password" name="j_password" type="password" style="width:150px;height:20px;margin:10px;" placeholder="原密码" required="required"/>
</p>
<p style="color:black;font-weight:bold;font-size:10px">
新 密 码:<input id="j_password" name="newj_password1" type="password" style="width:150px;height:20px;margin:10px;" placeholder="新密码" required="required"/>
新 密 码:<input id="j_password" name="newj_password1" type="password" style="width:150px;height:20px;margin:10px;" placeholder="新密码" required="required" title="新密码长度大于6个字符；字符种类（字母大写、小写、数字、字符）必须包括两种以上"/>
</p>
<p style="color:black;font-weight:bold;font-size:10px">
确认密码:<input id="j_password" name="newj_password2" type="password" style="width:150px;height:20px;margin:10px;" placeholder="确认密码" required="required"/>
确认密码:<input id="j_password" name="newj_password2" type="password" style="width:150px;height:20px;margin:10px;" placeholder="确认密码" required="required" title="新密码长度大于6个字符；字符种类（字母大写、小写、数字、字符）必须包括两种以上"/>
</p>
<p> <input type="submit" value="确 认 修 改" style="width:117px;height:30px;margin:10px;font-weight:bold;margin:10px;margin-right:60px;" class="btn btn-success"/> <a href="/adminUser/adminLoginGet" style="color:blue;font-weight:bold;font-size:10px;text-decoration: none;margin:10px;margin-left:-10px;">》》去登陆</a></p>
......
src/main/webapp/WEB-INF/templates/userRole/adminUserForm.ftl
......@@ -27,7 +27,8 @@
<div class="row-fluid show-grid">
<@form.hidden "form.id"/>
<@form.textInput path="form.nickName" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="用户名称" required = true />
<@form.textInput path="form.userName" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="用户账号" required = true />
<@form.textInput path="form.userName" attributes="class=\"input-medium\" pattern=\".{1,64}\" required " label="用户账号" required = true />
<div style="margin-bottom: 20px;color:red">初始密码为：!QAZ2wsx</div>
<@form.checkbox "form.enable" "" "可用"/>
<div class="control-group">
<div class="controls">
......@@ -38,6 +39,7 @@
<input type="checkbox" name="roleIds" value="5" />财务
<input type="checkbox" name="roleIds" value="11" />管理员
<input type="checkbox" name="roleIds" value="13" />发券员
<input type="checkbox" name="roleIds" value="15" />会员档案分配
<br/>
<input type="checkbox" name="roleIds" value="7" />高秘
<input type="checkbox" name="roleIds" value="6" />财务经理
......@@ -45,6 +47,8 @@
<input type="checkbox" name="roleIds" value="9" />运营
<input type="checkbox" name="roleIds" value="10" />小胖
<input type="checkbox" name="roleIds" value="12" />超级管理员
<input type="checkbox" name="roleIds" value="14" />商城管理员
<input type="checkbox" name="roleIds" value="16" />会员销售专员
<br/>
......
src/main/webapp/WEB-INF/templates/userRole/userListAll.ftl
......@@ -3,12 +3,13 @@
<form class="form-inline" action="/userRole/adminUser/list" method="get">
<@com.textInput "form.nickName" "style=\"margin-left: 5px;\"" "用户名称" "text"/>
<@com.textInput "form.userName" "style=\"margin-left: 5px;\"" "用户账号" "text"/>
<div class="short_content_div">
<label class="control-label" for="enable" style="margin-left: 5px;">是否可以</label>
<select id="enable" name="enable">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
<option value="" <#if enable?? > selected="selected" </#if>>全部</option>
<option value="1" <#if enable?if_exists ><#if enable> selected="selected" </#if></#if> >是 </option>
<option value="0" <#if enable?if_exists ><#if !enable > selected="selected" </#if></#if> >否</option>
</select>
</div>
......
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