commit 注释

mirage-service/src/main/java/com/mirage/mirageservice/controller/FamilyController.java

@@ -122,6 +122,12 @@ public class FamilyController {
         if(null == relationEnum){
             throw new AppRuntimeException(AppCode.BAD_REQUEST);
         }
+        if(null != request.getSourceMid()){
+            FamilyMemberInfo sourceMember = familyService.getMemberById(request.getSourceMid());
+            if(null == sourceMember){
+                throw new AppRuntimeException("mid参数不合法!");
+            }
+        }
         // SELF代表填写自己
         if(relationEnum == FamilyRelationEnum.SELF) {
             request.getMemberInfo().setUid(csMinWechatUser.getId());
@@ -167,7 +173,7 @@ public class FamilyController {
     /**
      * 获取用户相册内容.
      *
-     * @param mid
+     * @param mid 不传代表获取自己相册内容
      * @param type 不传为全部，0:图片 1:视频
      * @param pageSize
      * @param pageIndex
@@ -290,13 +296,13 @@ public class FamilyController {
 
     /**
      * 新家族圈消息提示(新消息、新回复、新点赞).
-     * @return Map结构，key：newsMoments（true/false） newCommentOrLike (NewsRedDodInfo type 1:点赞 2:评论 momentId:家族圈信息id)
+     * @return Map结构，key：newMoments（true/false） newCommentOrLike (NewsRedDodInfo type 1:点赞 2:评论 momentId:家族圈信息id)
      */
     @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/member/newsRedDot", method = RequestMethod.GET)
     public Object newsRedDot(){
         Map<String, Object> newsRedDot = Maps.newHashMap();
-        newsRedDot.put("newsMoments", familyService.newsRedDot(AppContext.getUid()));
+        newsRedDot.put("newMoments", familyService.newsRedDot(AppContext.getUid()));
         newsRedDot.put("newCommentOrLike", asyncService.batchGetAndRemoveRedDotData(AppContext.getUid()));
         return newsRedDot;
     }
@@ -358,7 +364,7 @@ public class FamilyController {
      * @return
      */
     @Auth(value = AuthType.COOKIES)
-    @RequestMapping(value = "/member/moment/delete", method = RequestMethod.POST)
+    @RequestMapping(value = "/member/moment/deleteComment", method = RequestMethod.POST)
     public Object deleteComment(@RequestBody MomentsLikeAndCommentRequest momentsRequest){
         if(null == momentsRequest
                 || null == momentsRequest.getCommentId()){

mirage-service/src/main/resources/application.yml

@@ -28,14 +28,14 @@ spring:
       driver-class-name: com.mysql.cj.jdbc.Driver
       druid:
         exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
-        validation-query: SELECT 1
-        test-while-idle: false
-        test-on-borrow: true
+        validation-query: SELECT 1 FROM DUAL
+        test-while-idle: true
+        test-on-borrow: false
         test-on-return: true
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-        time-between-eviction-runs-millis: 30000
+        time-between-eviction-runs-millis: 60000
         # 配置一个连接在池中最小生存的时间，单位是毫秒
-        min-evictable-idle-time-millis: 180000
+        min-evictable-idle-time-millis: 300000
         max-wait: 60000
         initial-size: 2
         max-active: 2