朱兆平 / agent · 提交

转到一个项目

作者 shenhailong
提交 297223bcbc1d7b51138ae7d6107d557a1fa460ae 1 个父辈 8b6637ce

添加 用户登录 密码错误5次锁定账户 账户启用禁用 用户修改密码

内嵌 并排对比
正在显示 9 个修改的文件 包含 316 行增加 和 125 行删除
@@ -154,96 +154,124 @@ public class LoginController { @@ -154,96 +154,124 @@ public class LoginController {
154 @ResponseBody 154 @ResponseBody
155 public ResponseModel doLogin(String loginAccount, String password, String captcha) { 155 public ResponseModel doLogin(String loginAccount, String password, String captcha) {
156 156
157 - SessionUtil.putKey(Constants.CAPTCHA, "");  
158 ResponseModel rm = new ResponseModel(200, "", null); 157 ResponseModel rm = new ResponseModel(200, "", null);
  158 + // 查询该账号是否被禁用
159 159
160 - UserEntity user = new UserEntity();  
161 - user.setLoginaccount(loginAccount);  
162 - user.setPassword(password);  
163 -  
164 - if (!loginAccount.equals("admin") && "true".equals(PropertiesLoader.getLogin("openRemoteLogin"))) {  
165 - // 远程登录  
166 - // 用户数据  
167 - LoginData login = FLogin.login(user);  
168 - // 登录成功！  
169 - if (login.getCode() == 20000) {  
170 - // 往数据库中插入数据  
171 - UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());  
172 - // 用户存在  
173 - if (ue != null) {  
174 - // 修改密码  
175 - userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(password)); 160 + UserEntity userEntity = userService.findLoginaccount(loginAccount);
  161 +
  162 + if (userEntity.getStatus() != 0){
  163 +
  164 + rm.setStatus(201);
  165 + return rm;
  166 + }else {
  167 + // 等于5次 锁定账户 admin 除外
  168 + if (userEntity.getLoginerror() != 5){
  169 + SessionUtil.putKey(Constants.CAPTCHA, "");
  170 +
  171 + UserEntity user = new UserEntity();
  172 + user.setLoginaccount(loginAccount);
  173 + user.setPassword(password);
  174 +
  175 + if (!loginAccount.equals("admin") && "true".equals(PropertiesLoader.getLogin("openRemoteLogin"))) {
  176 + // 远程登录
  177 + // 用户数据
  178 + LoginData login = FLogin.login(user);
  179 + // 登录成功！
  180 + if (login.getCode() == 20000) {
  181 + // 往数据库中插入数据
  182 + UserEntity ue = userService.findByLoginaccount(user.getLoginaccount());
  183 + // 用户存在
  184 + if (ue != null) {
  185 + // 修改密码
  186 + userService.updatePassword(ue.getLoginaccount(), MD5Tools.MD5(password));
  187 + } else {
  188 + // 用户不存在，插入数据
  189 + BasicAgentEntity agent = new BasicAgentEntity();
  190 + agent.setContact(login.getInfodata().getContact());
  191 + agent.setNameCn(login.getInfodata().getCompany());
  192 + agent.setCountryCode("CN");
  193 + agent.setAddress(login.getInfodata().getAddress());
  194 + int agent_id = agentSerive.save2(agent);
  195 +
  196 + ue = new UserEntity();
  197 + ue.setLoginaccount(loginAccount);
  198 + // 设置用户名密码
  199 + ue.setPassword(MD5Tools.MD5(password));
  200 + ue.setRealName(login.getInfodata().getContact());
  201 + ue.setMobile(login.getInfodata().getMobile());
  202 + ue.setStatus(0);
  203 + ue.setAgent(new Long(agent_id));
  204 + RoleEntity re = new RoleEntity();
  205 + re.setId(new Long(1));
  206 + ue.setRole(re);
  207 + // 删除密码
  208 + userService.save(ue);
  209 + }
  210 +
  211 + // 登录用户
  212 + Subject subject = SecurityUtils.getSubject();
  213 + subject.getSession().setAttribute("user", user);
  214 + UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
  215 + try {
  216 + subject.login(token);
  217 + subject.getSession().setAttribute("permission", roleService
  218 + .findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));
  219 + subject.getSession().setAttribute("all_function", functionService.findAll());
  220 + //登录成功 请空失败次数
  221 + userService.emptyLoginerror(loginAccount);
  222 + } catch (UnknownAccountException e) {
  223 + rm.setStatus(500);
  224 + rm.setMsg("1");
  225 + } catch (IncorrectCredentialsException e) {
  226 + // 添加错误次数
  227 + userService.updateLoginError(loginAccount, userEntity.getLoginerror() + 1);
  228 + rm.setStatus(500);
  229 + rm.setMsg("1");
  230 + } catch (LockedAccountException e) {
  231 + rm.setStatus(500);
  232 + rm.setMsg("1");
  233 + }
  234 + } else {
  235 + rm.setStatus(500);
  236 + rm.setMsg("1");
  237 + }
176 } else { 238 } else {
177 - // 用户不存在，插入数据  
178 - BasicAgentEntity agent = new BasicAgentEntity();  
179 - agent.setContact(login.getInfodata().getContact());  
180 - agent.setNameCn(login.getInfodata().getCompany());  
181 - agent.setCountryCode("CN");  
182 - agent.setAddress(login.getInfodata().getAddress());  
183 - int agent_id = agentSerive.save2(agent);  
184 -  
185 - ue = new UserEntity();  
186 - ue.setLoginaccount(loginAccount);  
187 - // 设置用户名密码  
188 - ue.setPassword(MD5Tools.MD5(password));  
189 - ue.setRealName(login.getInfodata().getContact());  
190 - ue.setMobile(login.getInfodata().getMobile());  
191 - ue.setStatus(0);  
192 - ue.setAgent(new Long(agent_id));  
193 - RoleEntity re = new RoleEntity();  
194 - re.setId(new Long(1));  
195 - ue.setRole(re);  
196 - // 删除密码  
197 - userService.save(ue); 239 + // 登录用户
  240 + Subject subject = SecurityUtils.getSubject();
  241 + subject.getSession().setAttribute("user", user);
  242 + UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));
  243 + // System.out.println(loginAccount+" " + password);
  244 + try {
  245 + subject.login(token);
  246 + subject.getSession().setAttribute("permission", roleService
  247 + .findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));
  248 + subject.getSession().setAttribute("all_function", functionService.findAll());
  249 +
  250 + //登录成功 请空失败次数
  251 + userService.emptyLoginerror(loginAccount);
  252 + } catch (UnknownAccountException e) {
  253 + rm.setStatus(500);
  254 + System.out.println();
  255 + rm.setMsg("1");
  256 + } catch (IncorrectCredentialsException e) {
  257 + // 添加错误次数
  258 + userService.updateLoginError(loginAccount, userEntity.getLoginerror() + 1);
  259 + rm.setStatus(500);
  260 + rm.setMsg("1");
  261 + } catch (LockedAccountException e) {
  262 + rm.setStatus(500);
  263 + rm.setMsg("1");
  264 + }
198 } 265 }
199 266
200 - // 登录用户  
201 - Subject subject = SecurityUtils.getSubject();  
202 - subject.getSession().setAttribute("user", user);  
203 - UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));  
204 - try {  
205 - subject.login(token);  
206 - subject.getSession().setAttribute("permission", roleService  
207 - .findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));  
208 - subject.getSession().setAttribute("all_function", functionService.findAll());  
209 - } catch (UnknownAccountException e) {  
210 - rm.setStatus(500);  
211 - rm.setMsg("1");  
212 - } catch (IncorrectCredentialsException e) {  
213 - rm.setStatus(500);  
214 - rm.setMsg("1");  
215 - } catch (LockedAccountException e) {  
216 - rm.setStatus(500);  
217 - rm.setMsg("1");  
218 - }  
219 - } else {  
220 - rm.setStatus(500);  
221 - rm.setMsg("1");  
222 - }  
223 - } else {  
224 - // 登录用户  
225 - Subject subject = SecurityUtils.getSubject();  
226 - subject.getSession().setAttribute("user", user);  
227 - UsernamePasswordToken token = new UsernamePasswordToken(loginAccount, MD5Tools.MD5(password));  
228 - // System.out.println(loginAccount+" " + password);  
229 - try {  
230 - subject.login(token);  
231 - subject.getSession().setAttribute("permission", roleService  
232 - .findAllFunctionByRole(((UserEntity) subject.getSession().getAttribute("user")).getRole()));  
233 - subject.getSession().setAttribute("all_function", functionService.findAll());  
234 - } catch (UnknownAccountException e) {  
235 - rm.setStatus(500);  
236 - rm.setMsg("1");  
237 - } catch (IncorrectCredentialsException e) {  
238 - rm.setStatus(500);  
239 - rm.setMsg("1");  
240 - } catch (LockedAccountException e) {  
241 - rm.setStatus(500);  
242 - rm.setMsg("1"); 267 + return rm;
  268 + }else {
  269 +
  270 + userService.updateStatus(loginAccount);
  271 + rm.setStatus(201);
  272 + return rm;
243 } 273 }
244 } 274 }
245 -  
246 - return rm;  
247 } 275 }
248 276
249 277
@@ -180,7 +180,10 @@ public class UserController extends BasicController { @@ -180,7 +180,10 @@ public class UserController extends BasicController {
180 return model; 180 return model;
181 } 181 }
182 @RequestMapping(value="/changepassword",method=RequestMethod.GET) 182 @RequestMapping(value="/changepassword",method=RequestMethod.GET)
183 - public String changepassword(){ 183 + public String changepassword(Long id, Model model){
  184 +
  185 + model.addAttribute("userid", id);
  186 +
184 return "system/user/changepassword"; 187 return "system/user/changepassword";
185 } 188 }
186 /** 189 /**
@@ -189,10 +192,10 @@ public class UserController extends BasicController { @@ -189,10 +192,10 @@ public class UserController extends BasicController {
189 */ 192 */
190 @RequestMapping(value="/verifyPassword",method=RequestMethod.GET) 193 @RequestMapping(value="/verifyPassword",method=RequestMethod.GET)
191 @ResponseBody 194 @ResponseBody
192 - public ResponseModel verifyPassword(String originalpassword){ 195 + public ResponseModel verifyPassword(Long id, String originalpassword){
193 ResponseModel model = new ResponseModel(); 196 ResponseModel model = new ResponseModel();
194 try { 197 try {
195 - UserEntity user = (UserEntity) SessionUtil.getKey("user"); 198 + UserEntity user = userService.findOne(id);
196 originalpassword = MD5Tools.MD5(originalpassword); 199 originalpassword = MD5Tools.MD5(originalpassword);
197 if(originalpassword.equals(user.getPassword())){ 200 if(originalpassword.equals(user.getPassword())){
198 model.setStatus(200); 201 model.setStatus(200);
@@ -214,25 +217,27 @@ public class UserController extends BasicController { @@ -214,25 +217,27 @@ public class UserController extends BasicController {
214 * @return 217 * @return
215 */ 218 */
216 @RequestMapping(value="/savepassword",method=RequestMethod.POST) 219 @RequestMapping(value="/savepassword",method=RequestMethod.POST)
217 - @ResponseBody  
218 - public ResponseModel savepassword(String originalpassword,String newpassword,String confirmnewpassword){  
219 - ResponseModel model = new ResponseModel();  
220 - try {  
221 - if(newpassword.equals(confirmnewpassword)){  
222 - UserEntity user = (UserEntity) SessionUtil.getKey("user");  
223 - user.setPassword(MD5Tools.MD5(newpassword));  
224 - this.userService.save(user);  
225 - model.setStatus(200);  
226 - model.setMsg("修改成功");  
227 - }else{  
228 - model.setStatus(500);  
229 - model.setMsg("您的两次密码不一致");  
230 - }  
231 - } catch (Exception e) {  
232 - model.setStatus(500);  
233 - model.setMsg("系统异常");  
234 - logger.error("系统异常 >>", e);  
235 - }  
236 - return model;  
237 - } 220 + @ResponseBody
  221 + public ResponseModel savepassword(Long id, String originalpassword,String newpassword,String confirmnewpassword){
  222 + ResponseModel model = new ResponseModel();
  223 + try {
  224 + if(newpassword.equals(confirmnewpassword)){
  225 + UserEntity user = userService.findOne(id);
  226 + user.setPassword(MD5Tools.MD5(newpassword));
  227 + this.userService.save(user);
  228 + model.setStatus(200);
  229 + model.setMsg("修改成功");
  230 + }else{
  231 + model.setStatus(500);
  232 + model.setMsg("您的两次密码不一致");
  233 + }
  234 + } catch (Exception e) {
  235 + model.setStatus(500);
  236 + model.setMsg("系统异常");
  237 + logger.error("系统异常 >>", e);
  238 + }
  239 + return model;
  240 + }
  241 +
  242 +
238 } 243 }
@@ -58,7 +58,7 @@ public class UserEntity extends BasicEntity { @@ -58,7 +58,7 @@ public class UserEntity extends BasicEntity {
58 private String description; 58 private String description;
59 59
60 /** 60 /**
61 - * 0 未启用 1启用 61 + * 0 启用 1禁用
62 */ 62 */
63 private int status = 0; 63 private int status = 0;
64 64
@@ -67,6 +67,12 @@ public class UserEntity extends BasicEntity { @@ -67,6 +67,12 @@ public class UserEntity extends BasicEntity {
67 */ 67 */
68 private Long agent; 68 private Long agent;
69 69
  70 + /**
  71 + * 登录失败次数
  72 + * @return
  73 + */
  74 + private int loginerror;
  75 +
70 @Column(name = "loginaccount", nullable = false, length = 20) 76 @Column(name = "loginaccount", nullable = false, length = 20)
71 public String getLoginaccount() { 77 public String getLoginaccount() {
72 return loginaccount; 78 return loginaccount;
@@ -154,4 +160,12 @@ public class UserEntity extends BasicEntity { @@ -154,4 +160,12 @@ public class UserEntity extends BasicEntity {
154 public void setAgent(Long agent) { 160 public void setAgent(Long agent) {
155 this.agent = agent; 161 this.agent = agent;
156 } 162 }
  163 +
  164 + public int getLoginerror() {
  165 + return loginerror;
  166 + }
  167 +
  168 + public void setLoginerror(int loginerror) {
  169 + this.loginerror = loginerror;
  170 + }
157 } 171 }
@@ -41,4 +41,24 @@ public interface UserRepository extends PagingAndSortingRepository<UserEntity, L @@ -41,4 +41,24 @@ public interface UserRepository extends PagingAndSortingRepository<UserEntity, L
41 @Query(value = "select * from sys_user where LOGINACCOUNT = ?1", nativeQuery = true) 41 @Query(value = "select * from sys_user where LOGINACCOUNT = ?1", nativeQuery = true)
42 UserEntity findLoginaccount(String loginaccount); 42 UserEntity findLoginaccount(String loginaccount);
43 43
  44 + // 锁定账户
  45 + @Transactional
  46 + @Modifying(clearAutomatically=true)
  47 + @Query(value = "UPDATE SYS_USER SET status = 1 where loginaccount=?1", nativeQuery = true)
  48 + public void updateStatus(String loginacount);
  49 +
  50 +
  51 + // 添加错误次数
  52 + @Transactional
  53 + @Modifying(clearAutomatically=true)
  54 + @Query(value = "UPDATE SYS_USER SET loginerror = ?2 where loginaccount=?1", nativeQuery = true)
  55 + public void updateLoginError(String logincount, int loginerror);
  56 +
  57 +
  58 + @Transactional
  59 + @Modifying(clearAutomatically=true)
  60 + @Query(value = "UPDATE SYS_USER SET loginerror = 0 where loginaccount=?1", nativeQuery = true)
  61 + public void emptyLoginerror(String loginaccount);
  62 +
  63 +
44 } 64 }
@@ -151,4 +151,21 @@ public class UserService extends BasicService<UserEntity> { @@ -151,4 +151,21 @@ public class UserService extends BasicService<UserEntity> {
151 public UserEntity findLoginaccount(String loginaccount){ 151 public UserEntity findLoginaccount(String loginaccount){
152 return userDao.findLoginaccount(loginaccount); 152 return userDao.findLoginaccount(loginaccount);
153 } 153 }
  154 +
  155 + // 锁定账户
  156 + public void updateStatus(String loginacount){
  157 +
  158 + userDao.updateStatus(loginacount);
  159 + }
  160 +
  161 + // 添加错误次数
  162 + public void updateLoginError(String logincount, int loginerror){
  163 + userDao.updateLoginError(logincount, loginerror);
  164 + }
  165 +
  166 + public void emptyLoginerror(String loginaccount){
  167 +
  168 + userDao.emptyLoginerror(loginaccount);
  169 + }
  170 +
154 } 171 }
@@ -23,7 +23,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -23,7 +23,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
23 <input class="admin" type="text" placeholder="请输入账号" id="userName" maxlength="30" /> 23 <input class="admin" type="text" placeholder="请输入账号" id="userName" maxlength="30" />
24 <input class="passWord" type="password" placeholder="请输入密码" id="password" maxlength="30" /> 24 <input class="passWord" type="password" placeholder="请输入密码" id="password" maxlength="30" />
25 <input class="submit" type="button" onclick="doLogin()"/> 25 <input class="submit" type="button" onclick="doLogin()"/>
26 - 26 +
  27 +
27 <a style="text-decoration:none;display:inline-block; 28 <a style="text-decoration:none;display:inline-block;
28 color:#fff;left:30%;position:relative; 29 color:#fff;left:30%;position:relative;
29 font-size:20px;margin:0px auto;" 30 font-size:20px;margin:0px auto;"
@@ -73,18 +74,27 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. @@ -73,18 +74,27 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
73 return false; 74 return false;
74 }else{ 75 }else{
75 jQuery.post("<%=basePath %>doLogin",{loginAccount:userName,password:password},function(result){ 76 jQuery.post("<%=basePath %>doLogin",{loginAccount:userName,password:password},function(result){
76 - if(result.status == 200){  
77 - sessionStorage.removeItem("menuid");  
78 - window.location.href="<%=basePath %>index";  
79 - }else{  
80 - if(result.msg==1) {  
81 - $("#password").val("");  
82 - $("#userName").focus();  
83 - layer.tips('用户名或密码错误', '#userName', {  
84 - tips: [1, '#0FA6D8'] //还可配置颜色  
85 - }); 77 +
  78 + if (result.status == 201){
  79 + $("#userName").focus();
  80 + layer.tips('用户名已被禁用请联系管理员', '#userName', {
  81 + tips: [1, '#0FA6D8'] //还可配置颜色
  82 + });
  83 + } else{
  84 + if(result.status == 200){
  85 + sessionStorage.removeItem("menuid");
  86 + window.location.href="<%=basePath %>index";
  87 + }else{
  88 + if(result.msg==1) {
  89 + $("#password").val("");
  90 + $("#userName").focus();
  91 + layer.tips('用户名或密码错误', '#userName', {
  92 + tips: [1, '#0FA6D8'] //还可配置颜色
  93 + });
  94 + }
86 } 95 }
87 } 96 }
  97 +
88 },"json"); 98 },"json");
89 } 99 }
90 } 100 }
@@ -148,6 +148,7 @@ @@ -148,6 +148,7 @@
148 <table class="kv-table"> 148 <table class="kv-table">
149 <tbody> 149 <tbody>
150 <tr> 150 <tr>
  151 + <input type="hidden" id="id" name="id" value="${userid}">
151 <td class="kv-label"><spring:message code="user.oldpwd"/></td> 152 <td class="kv-label"><spring:message code="user.oldpwd"/></td>
152 <td class="kv-content"> 153 <td class="kv-content">
153 <input type="password" id="originalpassword" name="originalpassword" required maxlength="30"> 154 <input type="password" id="originalpassword" name="originalpassword" required maxlength="30">
@@ -155,7 +156,7 @@ @@ -155,7 +156,7 @@
155 </tr> 156 </tr>
156 <tr> 157 <tr>
157 <td class="kv-label"><spring:message code="user.newpwd"/></td> 158 <td class="kv-label"><spring:message code="user.newpwd"/></td>
158 - <td class="kv-content"><input type="password" name="newpassword" id="newpassword" required maxlength="30"> 159 + <td class="kv-content"><input type="password" name="newpassword" id="newpassword" required maxlength="30"><span id="showStrength"></span>
159 </td> 160 </td>
160 </tr> 161 </tr>
161 <tr> 162 <tr>
@@ -248,12 +249,13 @@ @@ -248,12 +249,13 @@
248 var originalpassword = $("#originalpassword").val(); 249 var originalpassword = $("#originalpassword").val();
249 var newpassword = $("#newpassword").val(); 250 var newpassword = $("#newpassword").val();
250 var confirmnewpassword = $("#confirmnewpassword").val(); 251 var confirmnewpassword = $("#confirmnewpassword").val();
251 - $.get("<%=basePath %>system/user/verifyPassword",{originalpassword:originalpassword},function(data){ 252 + var id = $("#id").val();
  253 + $.get("<%=basePath %>system/user/verifyPassword",{id:id, originalpassword:originalpassword},function(data){
252 if(data.status==500){ 254 if(data.status==500){
253 layer.open({content:"<spring:message code="user.differpwd"/>"}); 255 layer.open({content:"<spring:message code="user.differpwd"/>"});
254 return; 256 return;
255 }else if(data.status==200){ 257 }else if(data.status==200){
256 - $.post("<%=basePath %>system/user/savepassword",{originalpassword:originalpassword,newpassword:newpassword,confirmnewpassword:confirmnewpassword},function(data){ 258 + $.post("<%=basePath %>system/user/savepassword",{id:id, originalpassword:originalpassword,newpassword:newpassword,confirmnewpassword:confirmnewpassword},function(data){
257 if(data.status==200){ 259 if(data.status==200){
258 layer.confirm("<spring:message code="opt.savesuccess"/>",{btn:['<spring:message code="opt.confirm"/>','<spring:message code="opt.cancel"/>']},function(){ 260 layer.confirm("<spring:message code="opt.savesuccess"/>",{btn:['<spring:message code="opt.confirm"/>','<spring:message code="opt.cancel"/>']},function(){
259 window.location.href="<%=basePath %>system/user/list"; 261 window.location.href="<%=basePath %>system/user/list";
@@ -310,6 +312,90 @@ @@ -310,6 +312,90 @@
310 window.location.href="<%=basePath %>index?lang="+langVar; 312 window.location.href="<%=basePath %>index?lang="+langVar;
311 } 313 }
312 314
  315 +
  316 + // 验证密码强度
  317 + $("#newpassword")window.onload = function () {
  318 + function setCss(_this,cssOption){
  319 + //判断节点类型
  320 + if (!_this || _this.nodeType ===3 || _this.nodeType === 8 ||!_this.style) {
  321 + return;
  322 + }
  323 + for(var cs in cssOption){
  324 + _this.style[cs] = cssOption[cs];
  325 + }
  326 + return _this;
  327 + }
  328 +
  329 + function trim(chars){
  330 + return (chars ||"").replace(/^(\s|\u00a0)+|(\s|\u00a0)+$/g,"");
  331 + }
  332 + function passwordStrength(newpassword,showStrength){
  333 + var self = this;
  334 +
  335 + /*字符权重；
  336 + 数字1，字母2，其他字符为3
  337 + 当密码长度小于6时不符合标准
  338 + 长度>=6，强度小于10，强度弱
  339 + 长度>=6，长度>=10且<15，强度中
  340 + 长度>=6，强度>=15，强*/
  341 + passwordStrength.onkeyup = function(){
  342 + var _color = ["red","yellow","orange","green"],
  343 + msgs = ["密码太短","弱","中","强"],
  344 + _strength = 0,
  345 + _v= trim(newpassword.value),
  346 + _vL= _v.length,
  347 + i=0;
  348 +
  349 + var charStrength = function(char){
  350 + //计算单个字符强度
  351 + if(char>=48 && char <=57){//数字
  352 + return 1;
  353 + }
  354 + if(char>=97 && char<=122){//小写
  355 + return 2;
  356 + }else{
  357 + return 3; //特殊字符
  358 + }
  359 + }
  360 +
  361 + if(_vL<8){//计算模式
  362 + showStrength.innerText = msgs[0];
  363 + setCss(showStrength,{
  364 + "color":_color[0]
  365 + })
  366 + }else{
  367 + for(;i<_vL;i++){
  368 + //遍历字符
  369 + _strength+=charStrength(_v.toLocaleLowerCase().charCodeAt(i));
  370 + }
  371 + if(_strength<10){
  372 + //强度小于10
  373 + showStrength.innerText = msgs[1];
  374 + setCss(showStrength,{
  375 + "color":_color[1]
  376 + })
  377 + }
  378 + if(_strength>=10&&_strength<15){
  379 + showStrength.innerText = msgs[2];
  380 + setCss(showStrength,{
  381 + "color":_color[2]
  382 + })
  383 + }
  384 + if(_strength>=15){
  385 + showStrength.innerText = msgs[3];
  386 + setCss(showStrength,{
  387 + "color":_color[3]
  388 + })
  389 + }
  390 + }
  391 + }
  392 + }
  393 + passwordStrength(
  394 + document.getElementById("newpassword"),
  395 + document.getElementById("showStrength"));
  396 +
  397 + };
  398 +
313 </script> 399 </script>
314 </body> 400 </body>
315 </html> 401 </html>
1 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> 1 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
  3 +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
3 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 4 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
4 <% 5 <%
5 String path = request.getContextPath(); 6 String path = request.getContextPath();
@@ -35,6 +36,10 @@ @@ -35,6 +36,10 @@
35 <td class="kv-content"> 36 <td class="kv-content">
36 <input id="loginaccount" name="loginaccount" type="text" value="${entity.loginaccount}" required/> 37 <input id="loginaccount" name="loginaccount" type="text" value="${entity.loginaccount}" required/>
37 </td> 38 </td>
  39 + <td class="kv-label">
  40 + <input id="true" name="status" type="radio" ${fn:contains(entity.status, 0)?"checked":""} value="0"/>启用
  41 + <input id="error" name="status" type="radio" ${fn:contains(entity.status, 1)?"checked":""} value="1"/>禁用
  42 + </td>
38 <c:if test="${empty entity.id}"> 43 <c:if test="${empty entity.id}">
39 <td class="kv-label"><spring:message code="user.password" /></td> 44 <td class="kv-label"><spring:message code="user.password" /></td>
40 <td class="kv-content"><input style="width: 220px;" type="password" id="password" name="password" value="${entity.password}" required></td> 45 <td class="kv-content"><input style="width: 220px;" type="password" id="password" name="password" value="${entity.password}" required></td>
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <thead> 30 <thead>
31 <tr> 31 <tr>
32 <th field="id" checkbox="true"></th> 32 <th field="id" checkbox="true"></th>
33 - <th field="." formatter="editFormat" width="25"><spring:message code="opt.edit" /></th> 33 + <th field="." formatter="editFormat" width="50"><spring:message code="opt.edit" /></th>
34 <th field="loginaccount" sortable="true" width="110"><spring:message code="user.loginaccount" /></th> 34 <th field="loginaccount" sortable="true" width="110"><spring:message code="user.loginaccount" /></th>
35 <th field="realName" width="226"><spring:message code="user.fullname" /></th> 35 <th field="realName" width="226"><spring:message code="user.fullname" /></th>
36 <th field="mobile" width="112"><spring:message code="user.mobile" /></th> 36 <th field="mobile" width="112"><spring:message code="user.mobile" /></th>
@@ -80,13 +80,14 @@ @@ -80,13 +80,14 @@
80 80
81 function editFormat(val,row,index){ 81 function editFormat(val,row,index){
82 var html='<a href="javascript:void(0)" style="text-decoration:none;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>' 82 var html='<a href="javascript:void(0)" style="text-decoration:none;" onclick="editRow('+row.id+')"><i class="iconfont">&#xe65a;</i></a>'
  83 + html += '<a href="javascript:void(0)" style="text-decoration:none;" onclick="changepassword('+row.id+')">重置密码</a>'
83 return html; 84 return html;
84 } 85 }
85 86
86 function editRow(id){ 87 function editRow(id){
87 //这个是跳转到九州的页面去修改密码 88 //这个是跳转到九州的页面去修改密码
88 - window.open("http://www.zzcargo.com/index.php?r=member%2Fsite%2Freset-pwd");  
89 - return; 89 +// window.open("http://www.zzcargo.com/index.php?r=member%2Fsite%2Freset-pwd");
  90 +// return;
90 //以下内容暂时不用 91 //以下内容暂时不用
91 if(id==undefined){ 92 if(id==undefined){
92 window.location.href='<%=basePath %>system/user/edit?id='; 93 window.location.href='<%=basePath %>system/user/edit?id=';
@@ -94,6 +95,11 @@ @@ -94,6 +95,11 @@
94 window.location.href='<%=basePath %>system/user/edit?id='+id; 95 window.location.href='<%=basePath %>system/user/edit?id='+id;
95 } 96 }
96 } 97 }
  98 +
  99 +
  100 + function changepassword(id) {
  101 + window.location.href='<%=basePath %>system/user/changepassword?id='+id;
  102 + }
97 103
98 function doSearch(){ 104 function doSearch(){
99 $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson(); 105 $('#dg').datagrid("options").queryParams=$("#searchForm").serializeJson();