Merge branch 'feature/community-center' into preview

mcwl-admin/src/main/resources/application.yml

@@ -74,7 +74,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 1440
+  expireTime: 43200
 
 # MyBatis Plus配置
 mybatis-plus:

mcwl-communityCenter/src/main/java/com/mcwl/communityCenter/service/impl/QuestionCommentServiceImpl.java

@@ -113,6 +113,11 @@ public class QuestionCommentServiceImpl extends ServiceImpl<QuestionCommentMappe
             return AjaxResult.error("该评论已被采纳");
         }
 
+        Long questionUserId = question.getQuestionUserId();
+        if (questionComment.getUserId().equals(questionUserId)) {
+            return AjaxResult.error("您不能采纳自己的评论");
+        }
+
         questionComment.setIsAccept(1);
         baseMapper.updateById(questionComment);
 

mcwl-communityCenter/src/main/resources/mapper/communityCenter/QuestionMapper.xml

@@ -14,6 +14,7 @@
                question_url,
                is_anonymous,
                amount,
+               status,
                type
         from cc_question
         where del_flag = '0'
@@ -30,6 +31,7 @@
                question_url,
                is_anonymous,
                amount,
+               status,
                type
         from cc_question
         where id = #{id}
@@ -46,6 +48,7 @@
                question_url,
                is_anonymous,
                amount,
+               status,
                type
         from cc_question
         where del_flag = '0'