feat：完善用户密码修改功能

moxi624 · moxi624 · commit 974b462aaed7 · 2020-05-15T08:55:25.000+08:00
fix：解决账号密码登录时，头像无法显示的问题。
fix：后台评论管理页面默认显示用户的评论数据
diff --git a/mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/StudyVideoRestApi.java b/mogu_admin/src/main/java/com/moxi/mogublog/admin/restapi/StudyVideoRestApi.java
@@ -5,7 +5,6 @@
 import com.moxi.mogublog.admin.annotion.AvoidRepeatableCommit.AvoidRepeatableCommit;
 import com.moxi.mogublog.admin.annotion.OperationLogger.OperationLogger;
 import com.moxi.mogublog.admin.global.SysConf;
-import com.moxi.mogublog.commons.feign.PictureFeignClient;
 import com.moxi.mogublog.utils.ResultUtil;
 import com.moxi.mogublog.xo.service.ResourceSortService;
 import com.moxi.mogublog.xo.service.StudyVideoService;
@@ -50,8 +49,6 @@ public class StudyVideoRestApi {
     StudyVideoService studyVideoService;
     @Autowired
     ResourceSortService resourceSortService;
-    @Autowired
-    PictureFeignClient pictureFeignClient;
 
     @AuthorityVerify
     @ApiOperation(value = "获取学习视频列表", notes = "获取学习视频列表", response = String.class)
diff --git a/mogu_base/src/main/java/com/moxi/mougblog/base/global/BaseMessageConf.java b/mogu_base/src/main/java/com/moxi/mougblog/base/global/BaseMessageConf.java
@@ -60,6 +60,8 @@ public class BaseMessageConf {
 
     public static final String DATA_NO_PRIVILEGE = "该数据无权限访问";
 
+    public static final String CANNOT_CHANGE_THE_PASSWORD_BY_USER = "第三方登录的用户无法修改密码";
+
     public static final String RESTAPI_NO_PRIVILEGE = "您无权进行该操作";
 
     public static final String ACCESS_NO_PRIVILEGE = "该资源无权限访问";
diff --git a/mogu_utils/src/main/java/com/moxi/mogublog/utils/WebUtils.java b/mogu_utils/src/main/java/com/moxi/mogublog/utils/WebUtils.java
@@ -93,55 +93,6 @@ public static String getDomainName(String url, Integer level) {
         return result;
     }
 
-    /**
-     * 格式化数据获取图片列表
-     *
-     * @param result
-     * @return
-     */
-    @SuppressWarnings("unchecked")
-    public static List<String> getPicture(String result) {
-
-        List<String> picUrls = new ArrayList<>();
-        Map<String, Object> picMap = (Map<String, Object>) JsonUtils.jsonToObject(result, Map.class);
-        if ("success".equals(picMap.get("code"))) {
-            List<Map<String, Object>> picData = (List<Map<String, Object>>) picMap.get("data");
-            if (picData.size() > 0) {
-                for (int i = 0; i < picData.size(); i++) {
-                    picUrls.add((String) picData.get(i).get("url"));
-                }
-            }
-        }
-        return picUrls;
-    }
-
-    /**
-     * 获取图片，返回Map
-     *
-     * @author xzx19950624@qq.com
-     * @date 2018年10月21日下午12:55:18
-     */
-    @SuppressWarnings("unchecked")
-    public static List<Map<String, Object>> getPictureMap(String result) {
-        List<Map<String, Object>> resultList = new ArrayList<Map<String, Object>>();
-        Map<String, Object> picMap = (Map<String, Object>) JsonUtils.jsonToObject(result, Map.class);
-        if ("success".equals(picMap.get("code"))) {
-            List<Map<String, Object>> picData = (List<Map<String, Object>>) picMap.get("data");
-            if (picData.size() > 0) {
-                for (int i = 0; i < picData.size(); i++) {
-                    Map<String, Object> map = new HashMap<String, Object>();
-                    if (StringUtils.isEmpty(picData.get(i).get("url")) || StringUtils.isEmpty(picData.get(i).get("uid"))) {
-                        continue;
-                    }
-                    map.put("url", (String) picData.get(i).get("url"));
-                    map.put("uid", (String) picData.get(i).get("uid"));
-                    resultList.add(map);
-                }
-            }
-        }
-        return resultList;
-    }
-
     /**
      * 获取结果集的内容
      *
diff --git a/mogu_web/src/main/java/com/moxi/mogublog/web/global/MessageConf.java b/mogu_web/src/main/java/com/moxi/mogublog/web/global/MessageConf.java
@@ -34,4 +34,6 @@ public final class MessageConf extends BaseMessageConf {
 
     public static final String BLOG_LINK_IS_NO_PUBLISH = "您申请的友链，已经下架！";
 
+    public static final String PASSWORD_IS_ERROR = "输入密码有误！";
+
 }
diff --git a/mogu_web/src/main/java/com/moxi/mogublog/web/global/SysConf.java b/mogu_web/src/main/java/com/moxi/mogublog/web/global/SysConf.java
@@ -33,6 +33,7 @@ public final class SysConf extends BaseSysConf {
     public static final String NICKNAME = "nickname";
     public static final String UUID = "uuid";
     public static final String SOURCE = "source";
+    public final static String MOGU = "MOGU";
 
     /**
      * 评论相关
diff --git a/mogu_web/src/main/java/com/moxi/mogublog/web/restapi/AuthRestApi.java b/mogu_web/src/main/java/com/moxi/mogublog/web/restapi/AuthRestApi.java
@@ -376,6 +376,30 @@ public String editUser(HttpServletRequest request, @RequestBody UserVO userVO) {
         }
     }
 
+    @ApiOperation(value = "更新用户密码", notes = "更新用户密码")
+    @PostMapping("/updateUserPwd")
+    public String updateUserPwd(HttpServletRequest request,@RequestParam(value = "oldPwd") String oldPwd,@RequestParam("newPwd") String newPwd) {
+        if(StringUtils.isEmpty(oldPwd) || StringUtils.isEmpty(oldPwd)) {
+            return ResultUtil.result(SysConf.ERROR, MessageConf.PARAM_INCORRECT);
+        }
+        if (request.getAttribute(SysConf.USER_UID) == null || request.getAttribute(SysConf.TOKEN) == null) {
+            return ResultUtil.result(SysConf.ERROR, MessageConf.INVALID_TOKEN);
+        }
+        String userUid = request.getAttribute(SysConf.USER_UID).toString();
+        User user = userService.getById(userUid);
+        // 判断是否是第三方登录的账号
+        if(!user.getSource().equals(SysConf.MOGU)) {
+            return ResultUtil.result(SysConf.ERROR, MessageConf.CANNOT_CHANGE_THE_PASSWORD_BY_USER);
+        }
+        // 判断旧密码是否一致
+        if(user.getPassWord().equals(MD5Utils.string2MD5(oldPwd))) {
+            user.setPassWord(MD5Utils.string2MD5(newPwd));
+            user.updateById();
+            return ResultUtil.result(SysConf.SUCCESS, MessageConf.OPERATION_SUCCESS);
+        }
+        return ResultUtil.result(SysConf.ERROR, MessageConf.PASSWORD_IS_ERROR);
+    }
+
     @ApiOperation(value = "申请友链", notes = "申请友链")
     @PostMapping("/replyBlogLink")
     public String replyBlogLink(HttpServletRequest request, @RequestBody LinkVO linkVO) {
diff --git a/mogu_web/src/main/java/com/moxi/mogublog/web/restapi/LoginRestApi.java b/mogu_web/src/main/java/com/moxi/mogublog/web/restapi/LoginRestApi.java
@@ -3,13 +3,15 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.moxi.mogublog.commons.entity.User;
+import com.moxi.mogublog.commons.feign.PictureFeignClient;
 import com.moxi.mogublog.utils.*;
 import com.moxi.mogublog.web.global.MessageConf;
 import com.moxi.mogublog.web.global.RedisConf;
 import com.moxi.mogublog.web.global.SQLConf;
 import com.moxi.mogublog.web.global.SysConf;
 import com.moxi.mogublog.web.utils.RabbitMqUtil;
 import com.moxi.mogublog.xo.service.UserService;
+import com.moxi.mogublog.xo.utils.WebUtil;
 import com.moxi.mogublog.xo.vo.UserVO;
 import com.moxi.mougblog.base.enums.EStatus;
 import com.moxi.mougblog.base.exception.ThrowableUtils;
@@ -28,6 +30,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -53,10 +56,14 @@ public class LoginRestApi {
     private UserService userService;
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    PictureFeignClient pictureFeignClient;
+    @Autowired
+    WebUtil webUtil;
     @Value(value = "${BLOG.USER_TOKEN_SURVIVAL_TIME}")
     private Long userTokenSurvivalTime;
-
     @ApiOperation(value = "用户登录", notes = "用户登录")
+
     @PostMapping("/login")
     public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, BindingResult result) {
         ThrowableUtils.checkParamArgument(result);
@@ -83,9 +90,17 @@ public String login(@Validated({GetOne.class}) @RequestBody UserVO userVO, Bindi
             user.setLastLoginIp(ip);
             user.setLastLoginTime(new Date());
             user.updateById();
-
+            // 获取用户头像
+            if (!StringUtils.isEmpty(user.getAvatar())) {
+                String avatarResult = pictureFeignClient.getPicture(user.getAvatar(), ",");
+                List<String> picList = webUtil.getPicture(avatarResult);
+                if (picList != null && picList.size() > 0) {
+                    user.setPhotoUrl(webUtil.getPicture(avatarResult).get(0));
+                }
+            }
             // 生成token
             String token = StringUtils.getUUID();
+
             // 过滤密码
             user.setPassWord("");
             //将从数据库查询的数据缓存到redis中
diff --git a/mogu_xo/src/main/java/com/moxi/mogublog/xo/service/impl/BlogServiceImpl.java b/mogu_xo/src/main/java/com/moxi/mogublog/xo/service/impl/BlogServiceImpl.java
@@ -191,7 +191,6 @@ public List<Blog> setTagAndSortAndPictureByBlogList(List<Blog> list) {
             }
         });
         String pictureList = null;
-
         if (fileUids != null) {
             pictureList = this.pictureFeignClient.getPicture(fileUids.toString(), ",");
         }
diff --git a/vue_mogu_admin/src/views/message/comment.vue b/vue_mogu_admin/src/views/message/comment.vue
@@ -165,6 +165,7 @@ export default {
       isEditForm: false,
       commentTypeDictList: [], //评论类型字典
       commentSourceDictList: [], //评论来源字典
+      commentTypeDefaultValue: null, // 评论类型默认值
     };
   },
   created() {
@@ -197,8 +198,15 @@ export default {
       getListByDictTypeList(dictTypeList).then(response => {
         if (response.code == "success") {
           var dictMap = response.data;
+          console.log("得到的字典类型", dictMap)
           this.commentTypeDictList = dictMap.sys_comment_type.list
           this.commentSourceDictList = dictMap.sys_comment_source.list
+
+          if(dictMap.sys_comment_type.defaultValue) {
+            this.commentTypeDefaultValue = dictMap.sys_comment_type.defaultValue
+            this.queryParams.type = this.commentTypeDefaultValue
+            this.commentList()
+          }
         }
       });
     },
diff --git a/vue_mogu_web/src/api/user.js b/vue_mogu_web/src/api/user.js
@@ -27,6 +27,18 @@ export function editUser(params) {
   })
 }
 
+/**
+ * 更新用户密码
+ * @param params
+ */
+export function updateUserPwd(params) {
+  return request({
+    url: process.env.WEB_API + '/oauth/updateUserPwd',
+    method: 'post',
+    data: params
+  })
+}
+
 /**
  * 获取用户反馈
  * @param params
diff --git a/vue_mogu_web/src/views/home.vue b/vue_mogu_web/src/views/home.vue
diff --git a/vue_mogu_web/src/views/messageBoard.vue b/vue_mogu_web/src/views/messageBoard.vue

Original file line number	Diff line number	Diff line change
`@@ -34,4 +34,6 @@ public final class MessageConf extends BaseMessageConf {`
`34`	`34`
`35`	`35`	`public static final String BLOG_LINK_IS_NO_PUBLISH = "您申请的友链，已经下架！";`
`36`	`36`
	`37`	`+ public static final String PASSWORD_IS_ERROR = "输入密码有误！";`
	`38`	`+`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,6 @@ public List<Blog> setTagAndSortAndPictureByBlogList(List<Blog> list) {`
`191`	`191`	`}`
`192`	`192`	`});`
`193`	`193`	`String pictureList = null;`
`194`		`-`
`195`	`194`	`if (fileUids != null) {`
`196`	`195`	`pictureList = this.pictureFeignClient.getPicture(fileUids.toString(), ",");`
`197`	`196`	`}`