删除CTL中的MemberFreezeException

thrones/src/main/java/com/apobates/forum/thrones/controller/PostsController.java

@@ -3,6 +3,7 @@ package com.apobates.forum.thrones.controller;
 import com.apobates.forum.core.ImageIOMeta;
 import com.apobates.forum.core.entity.BoardTopicCategoryIndex;
 import com.apobates.forum.core.entity.Posts;
+import com.apobates.forum.core.entity.Topic;
 import com.apobates.forum.core.entity.TopicStats;
 import com.apobates.forum.core.entity.proxy.PostsReplica;
 import com.apobates.forum.core.entity.proxy.TopicReplica;
@@ -24,7 +25,6 @@ import com.apobates.forum.thrones.controller.form.PostsForm;
 import com.apobates.forum.thrones.controller.helper.OnlineDescriptor;
 import com.apobates.forum.thrones.controller.helper.ReportPlugTopic;
 import com.apobates.forum.thrones.exception.ForumValidateException;
-import com.apobates.forum.thrones.exception.MemberFreezeException;
 import com.apobates.forum.thrones.exception.ResourceNotFoundException;
 import com.apobates.forum.thrones.vo.ForumReplierDigest;
 import com.apobates.forum.utils.Commons;
@@ -88,7 +88,7 @@ public class PostsController {
             @ModelAttribute("topicArg") TopicReplica tpObj,
             MemberSessionBean mbean,
             HttpServletRequest request,
-            Model model) throws MemberFreezeException {
+            Model model) {
         //------------------------------------------Http Referer中获取需要的参数
         if (null == tpObj || tpObj.getId() < 1) {
             throw new ResourceNotFoundException("回复话题需要的参数解析失败");
@@ -129,7 +129,7 @@ public class PostsController {
             MemberSessionBean mbean,
             @Valid @ModelAttribute("form") PostsForm form,
             BindingResult bindingResult,
-            Model model) throws MemberFreezeException {
+            Model model) {
         if (bindingResult.hasErrors()) {
             throw new ForumValidateException(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
@@ -247,15 +247,16 @@ public class PostsController {
             @RequestParam(value = "token", required = false, defaultValue = "0") String token,
             MemberSessionBean mbean,
             HttpServletRequest request,
-            Model model) throws MemberFreezeException {
+            Model model) {
         //----------------------------------从Http Referer中获取需要的参数
         TopicReplica tpObj = TopicReplica.of(request.getHeader("referer"), siteDomain).orElse(null);
         if (null == tpObj || tpObj.getId() < 1) {
             return TipMessage.ofError("操作参数解析失败").toJsonString();
         }
-        long topicId = tpObj.getId();
-        long boardId = tpObj.getBoardId();
-        int boardGroupId = tpObj.getVolumesId();
+        Topic topic = topicService.get(tpObj.getId()).orElseThrow(()->new ResourceNotFoundException("话题不存在或暂时无法访问"));
+        long topicId = topic.getId();
+        long boardId = topic.getBoardId();
+        int boardGroupId = topic.getVolumesId();
         ActionEventCulpritor aec = BoardController.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
         //----------------------------------对回复话题进行策略检查
         //  移至StrategyInterceptorAdapter
@@ -285,7 +286,7 @@ public class PostsController {
                         posts.getEntryDateTime(),
                         postsContent,
                         posts.getFloorNumber(),
-                        false, //20200808--->false
+                        (mbean.getMid()==topic.getMemberId()), 
                         false,
                         "-1",
                         null).toJsonString();

thrones/src/main/java/com/apobates/forum/thrones/controller/TopicController.java

@@ -40,7 +40,6 @@ import com.apobates.forum.thrones.controller.form.TopicMoveForm;
 import com.apobates.forum.thrones.controller.helper.OnlineDescriptor;
 import com.apobates.forum.thrones.controller.helper.ReportPlugTopic;
 import com.apobates.forum.thrones.controller.helper.TopicQRCodeFile;
-import com.apobates.forum.thrones.exception.MemberFreezeException;
 import com.apobates.forum.thrones.exception.ResourceNotFoundException;
 import com.apobates.forum.thrones.vo.CommonLink;
 import com.apobates.forum.thrones.vo.CommonLink.CommonLinkBuilder;
@@ -594,7 +593,7 @@ public class TopicController {
             @RequestParam(value = "token", required = false, defaultValue = "0") String token,
             MemberSessionBean mbean,
             HttpServletRequest request,
-            Model model) throws MemberFreezeException {
+            Model model) {
         long boardId = 0L;
         int boardGroupId = -1;
         //-----------------------------------从Referer中获取boardId&boardGroupId
@@ -633,7 +632,7 @@ public class TopicController {
             MemberSessionBean mbean,
             @Valid @ModelAttribute("form") TopicForm form,
             BindingResult bindingResult,
-            Model model) throws MemberFreezeException {
+            Model model) {
         if (bindingResult.hasErrors()) {
             model.addAttribute("errors", bindingResult.getAllErrors().get(0).getDefaultMessage());
             model.addAttribute("form", form);