|  | @ -15,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 | 
	
		
			
				|  |  | import org.springframework.web.bind.annotation.ResponseBody;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import javax.servlet.http.HttpServletRequest;
 | 
	
		
			
				|  |  | import javax.servlet.http.HttpSession;
 | 
	
		
			
				|  |  | import java.util.HashMap;
 | 
	
		
			
				|  |  | import java.util.Map;
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | import java.security.MessageDigest;
 | 
	
		
			
				|  |  | import java.security.NoSuchAlgorithmException;
 | 
	
		
			
				|  |  | /**
 | 
	
		
			
				|  |  |  * 用户管理
 | 
	
		
			
				|  |  |  * Created by hzp on 2016/01/11.
 | 
	
	
		
			
				|  | @ -81,8 +83,7 @@ public class UserController extends BaseController {
 | 
	
		
			
				|  |  |             model.addAttribute("contentPage", "system/user/editorUser");
 | 
	
		
			
				|  |  |             return "pageView";
 | 
	
		
			
				|  |  |         } catch (Exception ex) {
 | 
	
		
			
				|  |  |             model.addAttribute("contentPage", "system/user/editorUser");
 | 
	
		
			
				|  |  |             return "pageView";
 | 
	
		
			
				|  |  |             return "error";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
	
		
			
				|  | @ -153,7 +154,21 @@ public class UserController extends BaseController {
 | 
	
		
			
				|  |  |             return Result.error(ex.getMessage());
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 修改密码界面
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     @RequestMapping("renewPassword")
 | 
	
		
			
				|  |  |     public String renewPassword(Model model) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             model.addAttribute("model",null);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             model.addAttribute("contentPage", "system/user/changePassword");
 | 
	
		
			
				|  |  |             return "pageView";
 | 
	
		
			
				|  |  |         } catch (Exception ex) {
 | 
	
		
			
				|  |  |             return "error";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 修改密码
 | 
	
		
			
				|  |  |      */
 | 
	
	
		
			
				|  | @ -161,18 +176,42 @@ public class UserController extends BaseController {
 | 
	
		
			
				|  |  |     @ResponseBody
 | 
	
		
			
				|  |  |     public Result changePassword(HttpServletRequest request) {
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             String userid = request.getParameter("userid");
 | 
	
		
			
				|  |  |             String oldps = request.getParameter("oldps");
 | 
	
		
			
				|  |  |             String oldps1 = request.getParameter("oldps1");
 | 
	
		
			
				|  |  |             String newps = request.getParameter("newps");
 | 
	
		
			
				|  |  |             return userManager.changePassword(userid, newps);
 | 
	
		
			
				|  |  |             HttpSession session = request.getSession();
 | 
	
		
			
				|  |  |             String s="username";
 | 
	
		
			
				|  |  |             SystemUser user = (SystemUser) session.getAttribute("userInfo");
 | 
	
		
			
				|  |  |             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())){
 | 
	
		
			
				|  |  |                 return Result.error("旧密码输入错误");
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             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) {
 | 
	
		
			
				|  |  |             return Result.error(ex.getMessage());
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |     }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |     /**
 | 
	
		
			
				|  |  |      * 修改密码
 | 
	
		
			
				|  |  |      * 删除用户
 | 
	
		
			
				|  |  |      */
 | 
	
		
			
				|  |  |     @RequestMapping("deleteUser")
 | 
	
		
			
				|  |  |     @ResponseBody
 |