|  | @ -180,31 +180,16 @@ public class UserController extends BaseController {
 | 
												
													
														
															|  |             String s="username";
 |  |             String s="username";
 | 
												
													
														
															|  |             SystemUser user = (SystemUser) session.getAttribute("userInfo");
 |  |             SystemUser user = (SystemUser) session.getAttribute("userInfo");
 | 
												
													
														
															|  |             String oldPassword = request.getParameter("oldPassword");
 |  |             String oldPassword = request.getParameter("oldPassword");
 | 
												
													
														
															|  |             MessageDigest md = MessageDigest.getInstance("MD5");
 |  | 
 | 
												
													
														
															|  |             byte[] bByte=md.digest(oldPassword.getBytes());
 |  | 
 | 
												
													
														
															|  |             StringBuffer sBuffer = new StringBuffer();
 |  | 
 | 
												
													
														
															|  |             String[] strDigits = { "0", "1", "2", "3", "4", "5",
 |  | 
 | 
												
													
														
															|  |                     "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
 |  | 
 | 
												
													
														
															|  |             for (int i = 0; i < bByte.length; i++) {
 |  | 
 | 
												
													
														
															|  |                 int iRet = bByte[i];
 |  | 
 | 
												
													
														
															|  |                 if (iRet < 0) {
 |  | 
 | 
												
													
														
															|  |                     iRet += 256;
 |  | 
 | 
												
													
														
															|  |                 }
 |  | 
 | 
												
													
														
															|  |                 int iD1 = iRet / 16;
 |  | 
 | 
												
													
														
															|  |                 int iD2 = iRet % 16;
 |  | 
 | 
												
													
														
															|  |                 sBuffer.append(strDigits[iD1] + strDigits[iD2]);
 |  | 
 | 
												
													
														
															|  |             }
 |  | 
 | 
												
													
														
															|  |             if(!userManager.getUserByLoginCode(user.getLoginCode()).getPassword().equals(sBuffer.toString())){
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  |             userManager.getUserByLoginCode(user.getLoginCode()).getSaltValue();
 | 
												
													
														
															|  | 
 |  |             String test= DigestUtils.md5Hex(oldPassword +  userManager.getUserByLoginCode(user.getLoginCode()).getSaltValue());
 | 
												
													
														
															|  | 
 |  |             if(!userManager.getUserByLoginCode(user.getLoginCode()).getPassword().equals(test)){
 | 
												
													
														
															|  |                 return Result.error("旧密码输入错误");
 |  |                 return Result.error("旧密码输入错误");
 | 
												
													
														
															|  |             }
 |  |             }
 | 
												
													
														
															|  | 
 |  |             String newPassword = request.getParameter("newPassword");
 | 
												
													
														
															|  | 
 |  |            return userManager.changePassword(userManager.getUserByLoginCode(user.getLoginCode()).getId(), newPassword);
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  | 
 |  | 
 | 
												
													
														
															|  |             String newPassword = request.getParameter("newPassword");
 |  | 
 | 
												
													
														
															|  |             if(userManager.changePassword(userManager.getUserByLoginCode(user.getLoginCode()).getId(), newPassword)!=null)
 |  | 
 | 
												
													
														
															|  |                return Result.success("修改成功");
 |  | 
 | 
												
													
														
															|  |             else
 |  | 
 | 
												
													
														
															|  |                 return Result.error("修改错误");
 |  | 
 | 
												
													
														
															|  |         } catch (Exception ex) {
 |  |         } catch (Exception ex) {
 | 
												
													
														
															|  |             return Result.error(ex.getMessage());
 |  |             return Result.error(ex.getMessage());
 | 
												
													
														
															|  |         }
 |  |         }
 |