commit 优化代码及fix bug

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

@@ -289,6 +289,7 @@ public class FamilyController {
      * 新家族圈消息提示.
      * @return true / false
      */
+    // TODO 新回复、新点赞
     @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/member/newsRedDot", method = RequestMethod.GET)
     public Object newsRedDot(){
@@ -350,7 +351,7 @@ public class FamilyController {
      * @return
      */
     @Auth(value = AuthType.COOKIES)
-    @RequestMapping(value = "/member/moment/comment", method = RequestMethod.POST)
+    @RequestMapping(value = "/member/moment/delete", method = RequestMethod.POST)
     public Object deleteComment(@RequestBody MomentsLikeAndCommentRequest momentsRequest){
         if(null == momentsRequest
                 || null == momentsRequest.getCommentId()){
@@ -393,17 +394,17 @@ public class FamilyController {
         // 可见范围：0:全员 1:支系堂派 2:聚落 3:家族内男性 4:出生地
         if(Objects.equals(momentsRequest.getVisibleType(), MomentsVisibleTypeEnum.SPECIAL_BRANCH_HALL.getType())
                 && StringUtils.isBlank(memberInfo.getBranchFamilyHall())){
-            throw new AppRuntimeException("仅支持发布到自己设置的支系堂派!");
+            throw new AppRuntimeException("信息发布支系堂派请先设置自己的支系堂派!");
         } else if (Objects.equals(momentsRequest.getVisibleType(), MomentsVisibleTypeEnum.SPECIAL_CLUSTER_PLACE.getType())
                 && StringUtils.isBlank(memberInfo.getClusterPlace())) {
-            throw new AppRuntimeException("仅支持发布到自己设置的聚落!");
+            throw new AppRuntimeException("信息发布聚落请先设置自己的聚落!");
         } else if (Objects.equals(momentsRequest.getVisibleType(), MomentsVisibleTypeEnum.SPECIAL_SEX.getType())
                 && (StringUtils.isBlank(momentsRequest.getVisibleValue())
                 || (!"1".equals(momentsRequest.getVisibleValue()) && !"2".equals(momentsRequest.getVisibleValue())))) {
             throw new AppRuntimeException("性别可见设置错误!");
         } else if (Objects.equals(momentsRequest.getVisibleType(), MomentsVisibleTypeEnum.SPECIAL_BIRTH_PLACE.getType())
                 && StringUtils.isBlank(memberInfo.getBirthPlace())) {
-            throw new AppRuntimeException("仅支持发布到自己设置的出生第!");
+            throw new AppRuntimeException("信息发布出生地先设置自己的出生地!");
         }
         return true;
     }

mirage-service/src/main/java/com/mirage/mirageservice/meta/MomentsCommentsResponse.java

@@ -30,6 +30,6 @@ public class MomentsCommentsResponse {
 
     private Integer level;
 
-    private Integer path;
+    private String path;
 
 }

mirage-service/src/main/java/com/mirage/mirageservice/service/FamilyService.java

@@ -551,12 +551,13 @@ public class FamilyService {
                 return true;
             }
             familyMomentsLike = new FamilyMomentsLike();
-            familyMomentsLike.setMomentId(familyMomentsLike.getMomentId());
+            familyMomentsLike.setMomentId(familyMoments.getId());
             familyMomentsLike.setUid(uid);
             familyMomentsLike.setIsDeleted(0);
             familyMomentsLike.setGmtModified(new Date());
             familyMomentsLike.setGmtCreate(new Date());
             familyMomentsLikeMapper.insertSelective(familyMomentsLike);
+            // TODO 点赞信息 同步通知该家族圈发布者，已点赞者，已评论者
             return true;
         }
         return false;
@@ -592,6 +593,7 @@ public class FamilyService {
         familyMomentsComment.setGmtCreate(new Date());
         familyMomentsComment.setGmtModified(new Date());
         familyMomentsCommentMapper.insertSelective(familyMomentsComment);
+        // TODO 评论信息 同步通知该家族圈发布者，已点赞者，已评论者
         return true;
     }
 

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

@@ -30,7 +30,7 @@ spring:
         exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
         validation-query: SELECT 1
         test-while-idle: false
-        test-on-borrow: false
+        test-on-borrow: true
         test-on-return: true
         # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
         time-between-eviction-runs-millis: 30000