Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/base/controller/MessageController.java

@@ -272,7 +272,7 @@ public class MessageController {
         return msgResult;
     }
 
-    @ApiOperation(value="消息设为已读")
+    @ApiOperation(value="获取是否有未读消息和消息条数")
     @PostMapping("getMessageCount")
     public MessageResult<Integer> getMessageCount(@RequestAttribute String subject){
         MessageResult<Integer> msgResult = new MessageResult<>();

picc-admin-server/src/main/java/com/jpsoft/picc/modules/sys/controller/UserController.java

@@ -300,6 +300,8 @@ public class UserController {
 
             if(curPwd.equals(oldPwdDes3)){
                 user.setPassword(des3.encrypt(jwtSecret, newPwd));
+                user.setUpdateBy(subject);
+                user.setUpdateTime(new Date());
                 int affectCount = userService.update(user);
 
                 if(affectCount>0){
@@ -325,6 +327,46 @@ public class UserController {
 
 
 
+        return msgResult;
+    }
+
+
+
+    @ApiOperation(value="修改用户密码")
+    @PostMapping("changeUserPassword")
+    public MessageResult<Integer> changeUserPassword(String userId,String newPwd,@RequestAttribute String subject) {
+
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+
+            User user = userService.get(userId);
+
+            DES3 des3 = new DES3();
+
+            user.setPassword(des3.encrypt(jwtSecret, newPwd));
+            user.setUpdateBy(subject);
+            user.setUpdateTime(new Date());
+
+            int affectCount = userService.update(user);
+
+            if(affectCount>0){
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            }
+            else{
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败！");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+
+
         return msgResult;
     }
 }