From b4fe6958d67ed804f8f89dcc9641e3e111c7aa6f Mon Sep 17 00:00:00 2001
From: zhangrui <zhangrui@lymsh.com>
Date: Thu, 2 Jun 2016 11:32:35 +0800
Subject: [PATCH]           bug fix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

          重置用户密码接口
---
 .../operate/web/controller/UsersController.java    | 45 ++--------------------
 1 file changed, 3 insertions(+), 42 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
index f4df126..8a4c9c2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
@@ -1017,45 +1017,6 @@ public class UsersController extends BaseController {
 
 
 
-    /**
-     * 修改用户密码
-     */
-    @RequestMapping(value = "/passwords", method = RequestMethod.PUT)
-    @TokenRequired
-    public void updateUserPwd(HttpServletResponse httpServletResponse,
-                              HttpServletRequest request,
-                              @RequestParam(value = "oldPwd") String oldPwd,
-                              @RequestParam(value = "newPwd") String newPwd) {
-        Map<String, Object> resultMsgMap = new HashMap<String, Object>();
-        if (StringUtils.isBlank(oldPwd) || StringUtils.isBlank(newPwd)) {
-            ResultUtils.buildParameterErrorResultAndWrite(httpServletResponse);
-            return;
-        }
-        //获取登录用户
-        LoginContext loginContext = (LoginContext) request.getAttribute("loginContext");
-        Users users = usersService.getUsers(loginContext.getId());
-
-        if (null != users) {
-            //修改前的密码
-
-            //验证之前的密码和数据库中的密码是否一致
-            if (null != users && LoginUtil.md5(oldPwd).equals(users.getPwd()) && !LoginUtil.md5(newPwd).equals(users.getPwd())) {
-
-                Users newUsers = new Users();
-                newUsers.setPwd(LoginUtil.md5(newPwd));
-                newUsers.setModified(new Date());
-                newUsers.setId(users.getId());
-
-                //修改数据库的值
-                usersService.updateUsers(newUsers);
-                ResultUtils.buildSuccessResultAndWrite(httpServletResponse);
-            } else {
-                resultMsgMap.put(ResultUtils.ERROR_CODE, ConstantInterface.USER_PASSWORD_ERROR);
-                resultMsgMap.put(ResultUtils.ERROR_MSG, "旧密码错误或新密码和旧密码相同");
-                writeJson(httpServletResponse, JsonUtil.obj2JsonString(resultMsgMap));
-            }
-        }
-    }
 
 
     /**
@@ -1063,8 +1024,8 @@ public class UsersController extends BaseController {
      */
     @RequestMapping(value = "/passwords/reset", method = RequestMethod.PUT)
     @TokenRequired
-    public void updatePassword(HttpServletResponse response, @RequestParam(value = "id") Integer id) {
-        Users users = usersService.getUsers(id);
+    public void updatePassword(HttpServletResponse response, @RequestParam(value = "userId") String id) {
+        Users users = usersService.getUsers(Integer.valueOf(id));
         if (users == null) {
             ResultUtils.buildParameterErrorResultAndWrite(response, "用户ID不存在");
             return;
@@ -1072,7 +1033,7 @@ public class UsersController extends BaseController {
         users.setPwd(defaultPwd);
         users.setModified(new Date());
         usersService.updateUsers(users);
-        LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), null, null, LoginUtil.md5(defaultPwd).toUpperCase(), token, typeId);
+        LoginContext loginContext = LoginUtil.register(users.getLogincenterId().toString(), users.getPhone(),users.getAccount(), LoginUtil.md5(defaultPwd).toUpperCase(), token, typeId);
         if(loginContext.getErrorcode().equals(0)) {
             ResultUtils.buildSuccessResultAndWrite(response);
         } else {
-- 
1.8.3.1