TipMessage.Builder API重命名

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminAlbumController.java

@@ -76,7 +76,6 @@ public class AdminAlbumController {
         }
         Album album = topicAlbum.get();
         model.addAttribute("album", album);
-        
         List<AlbumPicture> pictures = new ArrayList<>();
         pictures.addAll(albumPictureService.getAll(album.getId()).collect(Collectors.toList()));
         model.addAttribute("rs", pictures);
@@ -137,6 +136,6 @@ public class AdminAlbumController {
             @RequestParam("cover") long coverPictureId,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->albumService.editCover(topicAlbumId, coverPictureId)).success("封面图片设置成功").error("操作失败");
+        return TipMessage.Builder.take(()->albumService.editCover(topicAlbumId, coverPictureId)).success("封面图片设置成功").error("操作失败");
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardCategoryController.java

@@ -117,7 +117,7 @@ public class AdminBoardCategoryController {
             @RequestParam("category") int topicCategoryId,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.or(()->boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)) == 1).success("版块与话题类型的关联删除成功").error("操作失败");
+        return TipMessage.Builder.of(()->boardTopicCategoryIndexService.deleteForTopic(boardId, Arrays.asList(topicCategoryId)) == 1).success("版块与话题类型的关联删除成功").error("操作失败");
     }
     
     //检查举报和反馈模块是否关联到了某版块

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardController.java

@@ -261,7 +261,7 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->boardService.lock(boardId, boardGroupId, aec)).success("成功锁定版块").error("操作失败");
+        return TipMessage.Builder.take(()->boardService.lock(boardId, boardGroupId, aec)).success("成功锁定版块").error("操作失败");
     }
     //解锁
     @PostMapping(path = "/lock/remove", produces = "application/json;charset=UTF-8")
@@ -273,7 +273,7 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("成功解锁版块").error("操作失败");
+        return TipMessage.Builder.take(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("成功解锁版块").error("操作失败");
     }
     //删除
     @PostMapping(path = "/remove", produces = "application/json;charset=UTF-8")
@@ -285,7 +285,7 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->boardService.remove(boardId, boardGroupId, aec)).success("版块删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->boardService.remove(boardId, boardGroupId, aec)).success("版块删除成功").error("操作失败");
     }
     //查看指定的版块的名称
     @GetMapping(path = "/list.json", produces = "application/json;charset=UTF-8")

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminBoardModeratorController.java

@@ -218,12 +218,6 @@ public class AdminBoardModeratorController {
             @RequestParam(name = "volume", required = false, defaultValue = "0") int volumesId,
             HttpServletRequest request,
             Model model) {
-        Optional<Boolean> symbol;
-        if (0 == boardId) { //大版主
-            symbol = boardModeratorService.remove(volumesId, memberId);
-        } else {
-            symbol = boardModeratorService.remove(volumesId, boardId, memberId);
-        }
-        return TipMessage.Builder.or(()->symbol.orElse(false)).success("版主卸任成功").error("操作失败");
+        return TipMessage.Builder.take(()->boardModeratorService.remove(volumesId, boardId, memberId)).success("版主卸任成功").error("操作失败");
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminForumMessageController.java

@@ -161,7 +161,7 @@ public class AdminForumMessageController {
             MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.or(()->inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1).success("消息删除成功").error("操作失败");
+        return TipMessage.Builder.of(()->inboxService.remove(mbean.getMid(), Arrays.asList(id)) == 1).success("消息删除成功").error("操作失败");
     }
     
     //阅读消息(发件人不可以操作)
@@ -172,7 +172,7 @@ public class AdminForumMessageController {
             MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.or(()->inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1).success("消息标记成功").error("操作失败");
+        return TipMessage.Builder.of(()->inboxService.readed(mbean.getMid(), Arrays.asList(id)) == 1).success("消息标记成功").error("操作失败");
     }
     
     @GetMapping(path = "/label/json", produces = "application/json;charset=UTF-8")

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminHomeController.java

@@ -86,6 +86,7 @@ public class AdminHomeController {
         }
         Member m = rm.get();
         MemberSessionBean mbean = new MemberSessionBean(m, form.getRequestIpAddr(request));
+        
         onlineMemberStorage.store(mbean, request, response);
         return "redirect:/client";
     }

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberNamesProtectController.java

@@ -102,6 +102,6 @@ public class AdminMemberNamesProtectController {
             MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->memberNamesProtectService.editStatus(id, false)).success("会员帐户保护删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->memberNamesProtectService.editStatus(id, false)).success("会员帐户保护删除成功").error("操作失败");
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberPenalizeRecordsController.java

@@ -120,7 +120,7 @@ public class AdminMemberPenalizeRecordsController {
             @RequestParam("id") long id,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->memberPenalizeRecordsService.expired(id)).success("惩罚记录成功结束").error("操作失败");
+        return TipMessage.Builder.take(()->memberPenalizeRecordsService.expired(id)).success("惩罚记录成功结束").error("操作失败");
     }
     
     //会员的惩罚状态

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminMemberVipExchangeRecordsController.java

@@ -4,7 +4,6 @@ import com.apobates.forum.member.entity.Member;
 import com.apobates.forum.member.entity.MemberVipExchangeRecords;
 import com.apobates.forum.member.service.MemberService;
 import com.apobates.forum.member.service.MemberVipExchangeRecordsService;
-import com.apobates.forum.member.storage.core.MemberSessionBean;
 import com.apobates.forum.thrones.admin.controller.form.MemberExchangeForm;
 import com.apobates.forum.thrones.admin.exception.ResourceNotFoundException;
 import java.time.LocalDateTime;
@@ -40,7 +39,7 @@ public class AdminMemberVipExchangeRecordsController {
     private MemberVipExchangeRecordsService memberVipExchangeRecordsService;
     @Value("${site.pageSize}")
     private int pageSize;
-
+    
     @GetMapping(path = "/")
     public String listPage(
             HttpServletRequest request,
@@ -49,7 +48,7 @@ public class AdminMemberVipExchangeRecordsController {
         model.addAttribute("rs", rs.collect(Collectors.toList()));
         return "admin/member_exchange/index";
     }
-
+    
     //创建
     @GetMapping(path = "/create")
     public String createForm(
@@ -146,6 +145,6 @@ public class AdminMemberVipExchangeRecordsController {
             @RequestParam("id") long id,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->memberVipExchangeRecordsService.expired(id)).success("交易记录成功作废").error("操作失败");
+        return TipMessage.Builder.take(()->memberVipExchangeRecordsService.expired(id)).success("交易记录成功作废").error("操作失败");
     }
 }

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminPostsController.java

@@ -76,7 +76,7 @@ public class AdminPostsController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->postsService.remove(postsId, aec)).success("回复删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->postsService.remove(postsId, aec)).success("回复删除成功").error("操作失败");
     }
     
     //指定回复的喜好记录
@@ -88,6 +88,7 @@ public class AdminPostsController {
             Model model) {
         Posts posts = postsService.get(postsId).orElseThrow(()->new ResourceNotFoundException("回复内容不存在或暂时无法访问"));
         model.addAttribute("posts", posts);
+        
         FrontPageURL fpbuild = new FrontPageURL(request.getContextPath() + "/topic/posts/mood").addParameter("posts", postsId).addPageSize("number", pageSize);
         Pageable pr = new PageRequest(page, fpbuild.getPageSize());
         Page<PostsMoodRecords> rs = postsMoodRecordsService.getAllByPosts(postsId, pr);

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminRegisteInviteCodeController.java

@@ -86,6 +86,6 @@ public class AdminRegisteInviteCodeController {
             @RequestParam("id") long id,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->registeInviteCodeService.remove(id)).success("邀请码删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->registeInviteCodeService.remove(id)).success("邀请码删除成功").error("操作失败");
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminSectionArticleController.java

@@ -382,6 +382,6 @@ public class AdminSectionArticleController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->topicService.removeTermArticle(articleId, termId, aec)).success("文章删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.removeTermArticle(articleId, termId, aec)).success("文章删除成功").error("操作失败");
     }
 }
\ No newline at end of file

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCarouselController.java

@@ -110,7 +110,7 @@ public class AdminTopicCarouselController {
             MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId)).success("轮播图删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicCarouselService.remove(topicCarouselId)).success("轮播图删除成功").error("操作失败");
     }
     //轮播图下所有幻灯片,忽略状态
     @GetMapping(path = "/slide")
@@ -178,7 +178,7 @@ public class AdminTopicCarouselController {
             MemberSessionBean mbean,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId)).success("幻灯片删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicCarouselSlideService.remove(topicCarouselSlideId, topicCarouselId)).success("幻灯片删除成功").error("操作失败");
     }
     //版块绑定轮播图
     @GetMapping(path = "/bind")
@@ -220,7 +220,7 @@ public class AdminTopicCarouselController {
             @RequestParam("volumes") int volumesId,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->topicCarouselService.remove(topicCarouselId, volumesId, boardId)).success("版块轮播图关联删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicCarouselService.remove(topicCarouselId, volumesId, boardId)).success("版块轮播图关联删除成功").error("操作失败");
     }
     
     //版块绑定轮播图记录

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicCategoryController.java

@@ -106,7 +106,7 @@ public class AdminTopicCategoryController {
             @RequestParam("id") int categoryId,
             HttpServletRequest request,
             Model model) {
-        return TipMessage.Builder.condition(()->topicCategoryService.remove(categoryId)).success("话题类型删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicCategoryService.remove(categoryId)).success("话题类型删除成功").error("操作失败");
     }
     
     //所有可用的

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicController.java

@@ -111,13 +111,14 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, form.getToken());
-        boolean symbol = topicService.edit(
+        Boolean symbol = topicService.edit(
                 form.getLongRecord(),
                 form.getTitle(),
                 form.getContent(),
                 form.getWordsArray(),
                 imageIOMeta,
                 aec).orElse(false);
+        
         if (symbol) {
             return "redirect:/topic/" + form.getLongRecord() + ".xhtml";
         }
@@ -292,7 +293,7 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->topicService.lock(topicId, aec)).success("成功锁定话题").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.lock(topicId, aec)).success("成功锁定话题").error("操作失败");
     }
     //锁定话题
     @PostMapping(path = "/lock/remove", produces = "application/json;charset=UTF-8")
@@ -303,7 +304,7 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->topicService.releaseLock(topicId, aec)).success("成功解锁话题").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.releaseLock(topicId, aec)).success("成功解锁话题").error("操作失败");
     }
     //删除话题
     @PostMapping(path = "/remove", produces = "application/json;charset=UTF-8")
@@ -314,7 +315,7 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->topicService.remove(topicId, aec)).success("话题删除成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.remove(topicId, aec)).success("话题删除成功").error("操作失败");
     }
     //置顶话题
     @PostMapping(path = "/top", produces = "application/json;charset=UTF-8")
@@ -325,7 +326,7 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        return TipMessage.Builder.condition(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
     }
     
     @GetMapping(path = "/{id}.xhtml")

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/controller/AdminTopicTagController.java

@@ -69,7 +69,7 @@ public class AdminTopicTagController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, token);
-        return TipMessage.Builder.condition(()->topicTagService.deleteForTopic(topicId, tagId, aec)).success("成功删除标签").error("操作失败");
+        return TipMessage.Builder.take(()->topicTagService.deleteForTopic(topicId, tagId, aec)).success("成功删除标签").error("操作失败");
     }
     
     @GetMapping(path = "/collection")

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

@@ -170,7 +170,7 @@ public class BoardController {
         //----------------------------------策略检查开始,不限角色.
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->boardService.removeFavorite(boardId, aec)).success("已成功取消收藏").error("取消收藏失败").toJsonString();
+        return TipMessage.Builder.take(()->boardService.removeFavorite(boardId, aec)).success("已成功取消收藏").error("取消收藏失败").toJsonString();
     }
     
     // 锁定
@@ -195,7 +195,7 @@ public class BoardController {
         //----------------------------------策略检查开始:只有管理员可以锁定
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->boardService.lock(boardId, boardGroupId, aec)).success("版块成功锁定").error("操作失败");
+        return TipMessage.Builder.take(()->boardService.lock(boardId, boardGroupId, aec)).success("版块成功锁定").error("操作失败");
     }
     
     // 解锁
@@ -220,7 +220,7 @@ public class BoardController {
         //----------------------------------策略检查开始:只有管理员可以解锁
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("版块解锁成功").error("操作失败");
+        return TipMessage.Builder.take(()->boardService.releaseLock(boardId, boardGroupId, aec)).success("版块解锁成功").error("操作失败");
     }
     
     // 编辑版块的配置

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

@@ -195,7 +195,7 @@ public class MainController {
         if(!btc.isPresent()){
             return TipMessage.ofError("未知的存储目标");
         }
-        return TipMessage.Builder.or(()->topicService.plug(new FeedbackPlugTopic(aec, title, content, btc.get())).isPresent()).success("感谢您反馈的意见或建议").error("操作失败");
+        return TipMessage.Builder.of(()->topicService.plug(new FeedbackPlugTopic(aec, title, content, btc.get())).isPresent()).success("感谢您反馈的意见或建议").error("操作失败");
     }
     private String encodeJsonString(long mid, String token, int limit, long timestamp) {
         Map<String, String> data = Map.ofEntries(Map.entry("mid", mid + ""), Map.entry("token", token), Map.entry("limit", limit + ""), Map.entry("timestamp", timestamp + ""));

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

@@ -156,7 +156,6 @@ public class MemberController {
     public String getMemberProfile(MemberSessionBean mbean, HttpServletRequest request, Model model) {
         try {
             String defAvatar = onlineMemberStorage.getMetaConfig().getSite()+"/"+avatarDefaultDirect+"/empty.png";
-            logger.info("[MCTL]def avatar url:"+defAvatar);
             Supplier<URL> def = () -> {
                 try{
                     return new URL(defAvatar);
@@ -165,7 +164,6 @@ public class MemberController {
                 }
             };
             URL avatarUrl = decodeDefaultAvatarURL(mbean.getAvatar()).orElseGet(def);
-            logger.info("[MCTL]avatar url:"+avatarUrl);
             return mbean.clone(avatarUrl).toJson();
         } catch (NullPointerException | IOException e) {
             if (logger.isDebugEnabled()) {
@@ -374,7 +372,7 @@ public class MemberController {
         if (memberId <= 0) {
             return TipMessage.ofError("会员不接受消息");
         }
-        Member m = memberService.get(memberId).orElseGet(() -> null);
+        final Member m = memberService.get(memberId).orElse(null);
         if (null == m || m.getId() == mbean.getMid()) {
             return TipMessage.ofError("会员不存在");
         }

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

@@ -338,7 +338,7 @@ public class MemberHomeController {
         String avatarURL = imageStoreDomain.getDirectoryEnumDomain(ImageDirectoryEnum.LOCAL).orElse(imageStoreDomain.getLocalDomain()) + "/" + avatarDefaultDirect + avtarPath;
         // 编码头像地址
         String encodeAvtarFormatPath = new AvatarImagePathConvert(imageStoreDomain, avatarDefaultDirect).encode(new URL(avatarURL), ImageDirectoryEnum.LOCAL).orElse(null);
-        if (null != encodeAvtarFormatPath && memberService.updateAvatar(mbean.getMid(), encodeAvtarFormatPath, MemberController.getInstance(request, token)).isPresent()) {
+        if (null != encodeAvtarFormatPath && memberService.updateAvatar(mbean.getMid(), encodeAvtarFormatPath, MemberController.getInstance(request, token)).orElse(false)) {
             mbean = mbean.refact(encodeAvtarFormatPath);
             onlineMemberStorage.store(mbean, request, response);
             // 更新mbean中的图片

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

@@ -222,7 +222,7 @@ public class MessageController {
             HttpServletRequest request,
             Model model) {
         List<Long> messageIdList = Commons.toLongList(idString);
-        return TipMessage.Builder.or(()->inboxService.readed(mbean.getMid(), messageIdList)>0).success("标记成功").error("标记为阅读操作失败");
+        return TipMessage.Builder.of(()->inboxService.readed(mbean.getMid(), messageIdList)>0).success("标记成功").error("标记为阅读操作失败");
     }
     
     //收件人将消息标为删除
@@ -236,7 +236,7 @@ public class MessageController {
             HttpServletRequest request,
             Model model) {
         List<Long> messageIdList = Commons.toLongList(idString);
-        return TipMessage.Builder.or(()->inboxService.remove(mbean.getMid(), messageIdList)>0).success("删除成功").error("删除消息操作失败");
+        return TipMessage.Builder.of(()->inboxService.remove(mbean.getMid(), messageIdList)>0).success("删除成功").error("删除消息操作失败");
     }
     
     //收件箱中的查看
@@ -315,7 +315,7 @@ public class MessageController {
             HttpServletRequest request,
             Model model) {
         final long othMember =(direction == 1)?memberId:-1;
-        return TipMessage.Builder.condition(()->inboxService.compositeReaded(mbean.getMid(), othMember, direction)).success("标记成功").error("标记为阅读操作失败");
+        return TipMessage.Builder.take(()->inboxService.compositeReaded(mbean.getMid(), othMember, direction)).success("标记成功").error("标记为阅读操作失败");
     }
     
     //今天的公告

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

@@ -316,7 +316,7 @@ public class PostsController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->postsService.remove(postsId, aec)).success("话题回复成功删除").error("操作失败");
+        return TipMessage.Builder.take(()->postsService.remove(postsId, aec)).success("话题回复成功删除").error("操作失败");
     }
     
     // 返回引用的回复内容
@@ -400,14 +400,14 @@ public class PostsController {
         if(!btc.isPresent()){
             return TipMessage.ofError("未知的存储目标");
         }
-        Optional<TopicReplica> result = topicService.plug(new ReportPlugTopic(
+        final Optional<TopicReplica> result = topicService.plug(new ReportPlugTopic(
                 ForumActionEnum.POSTS_REPORT,
                 aec,
                 posts,
                 reportTypeSymbol,
                 reportContent,
                 btc.get()));
-        return TipMessage.Builder.or(()->result.isPresent()).success("回复举报成功").error("操作失败");
+        return TipMessage.Builder.of(()->result.isPresent()).success("回复举报成功").error("操作失败");
     }
     //引用回复时,引用的内容
     private String quoteContent(Optional<Posts> quotePosts) {

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

@@ -69,7 +69,7 @@ public class PostsMoodController {
         //  移至StrategyInterceptorAdapter
         //----------------------------------
         boolean liked = (moodStatus == 1);
-        return TipMessage.Builder.or(()->postsMoodRecordsService.toggleMoodRecord(postsId, tpObj.getId(), liked, aec)>0).success("回复点赞成功").error("点赞失败");
+        return TipMessage.Builder.of(()->postsMoodRecordsService.toggleMoodRecord(postsId, tpObj.getId(), liked, aec)>0).success("回复点赞成功").error("点赞失败");
     }
     
     //查看点赞的计数

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

@@ -181,7 +181,7 @@ public class TopicController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.editTop(topicId, aec)).success("话题置顶成功").error("操作失败");
     }
     
     // 版主话题加精
@@ -204,7 +204,7 @@ public class TopicController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.editGoods(topicId, aec)).success("话题加精成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.editGoods(topicId, aec)).success("话题加精成功").error("操作失败");
     }
     
     // 版主锁定话题
@@ -227,7 +227,7 @@ public class TopicController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.lock(topicId, aec)).success("话题成功锁定").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.lock(topicId, aec)).success("话题成功锁定").error("操作失败");
     }
     
     // 版主解锁话题
@@ -250,7 +250,7 @@ public class TopicController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.releaseLock(topicId, aec)).success("话题解锁成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.releaseLock(topicId, aec)).success("话题解锁成功").error("操作失败");
     }
     
     // 版主删除话题
@@ -273,7 +273,7 @@ public class TopicController {
         //----------------------------------策略检查开始,限制角色:管理员,版主,大版主都可以
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.remove(topicId, aec)).success("话题成功删除").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.remove(topicId, aec)).success("话题成功删除").error("操作失败");
     }
     
     // 版主移动话题
@@ -363,10 +363,7 @@ public class TopicController {
         }catch(IllegalStateException e){
             return TipMessage.ofError(e.getMessage(), TopicReplica.generateConnectString(topicId, topic.getBoardId(), topic.getVolumesId())).toJsonString();
         }
-        if (symbol) {
-            return TipMessage.ofSuccess("话题收藏成功").toJsonString(); //extOutputCacheParames
-        }
-        return TipMessage.ofError("收藏失败").toJsonString();
+        return TipMessage.Builder.of(()->symbol).success("话题收藏成功").error("收藏失败").toJsonString();
     }
     
     //取消收藏
@@ -387,7 +384,7 @@ public class TopicController {
         //----------------------------------策略检查开始,不限制角色
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.removeFavorite(id, aec)).success("已成功取消收藏").error("收藏取消失败").toJsonString();
+        return TipMessage.Builder.take(()->topicService.removeFavorite(id, aec)).success("已成功取消收藏").error("收藏取消失败").toJsonString();
     }
     // 话题点赞
     @PostMapping(path = "/like", produces = "application/json;charset=UTF-8")
@@ -417,7 +414,7 @@ public class TopicController {
         }catch(IllegalStateException e){
             return TipMessage.ofError(e.getMessage(), TopicReplica.generateConnectString(topicId, topic.getBoardId(), topic.getVolumesId())).toJsonString();
         }
-        return TipMessage.Builder.or(()->symbol).success("话题点赞成功").error("点赞失败").toJsonString();
+        return TipMessage.Builder.of(()->symbol).success("话题点赞成功").error("点赞失败").toJsonString();
     }
     
     //取消点赞
@@ -438,7 +435,7 @@ public class TopicController {
         //----------------------------------策略检查开始,不限制角色
         //  移至StrategyInterceptorAdapter
         //----------------------------------策略检查结束
-        return TipMessage.Builder.condition(()->topicService.removeLike(id, aec)).success("赞已成功取消").error("赞取消失败").toJsonString();
+        return TipMessage.Builder.take(()->topicService.removeLike(id, aec)).success("赞已成功取消").error("赞取消失败").toJsonString();
     }
     // 浏览话题
     @GetMapping(path = "/browse", produces = "application/json;charset=UTF-8")
@@ -456,7 +453,7 @@ public class TopicController {
         long topicId = tpObj.getId();
         //-------------------------------------------------
         ActionEventCulpritor aec = BoardController.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
-        return TipMessage.Builder.condition(()->topicService.browse(topicId, aec)).success("话题浏览成功").error("操作失败");
+        return TipMessage.Builder.take(()->topicService.browse(topicId, aec)).success("话题浏览成功").error("操作失败");
     }
     
     // 话题配置
@@ -834,14 +831,14 @@ public class TopicController {
         if(!btc.isPresent()){
             return TipMessage.ofError("未知的存储目标");
         }
-        Optional<TopicReplica> result = topicService.plug(new ReportPlugTopic(
+        final Optional<TopicReplica> result = topicService.plug(new ReportPlugTopic(
                 ForumActionEnum.TOPIC_REPORT,
                 aec,
                 pr,
                 reportTypeSymbol,
                 reportContent,
                 btc.get()));
-        return TipMessage.Builder.or(()->result.isPresent()).success("话题举报成功").error("操作失败");
+        return TipMessage.Builder.of(()->result.isPresent()).success("话题举报成功").error("操作失败");
     }
     //
     private Optional<MemberProfileBean> queryMemberProfileBean(long memberId){

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

@@ -72,7 +72,7 @@ public class TopicTagController {
         //  移至StrategyInterceptorAdapter
         //------------------------------
         ActionEventCulpritor aec = BoardController.getInstance(mbean.getMid(), mbean.getNickname(), request, token);
-        return TipMessage.Builder.condition(()->topicTagService.deleteForTopic(tpObj.getId(), tagId, aec)).success("标签成功删除").error("操作失败");
+        return TipMessage.Builder.take(()->topicTagService.deleteForTopic(tpObj.getId(), tagId, aec)).success("标签成功删除").error("操作失败");
     }
     
     //添加(并统计词频)(版主和管理员)

utils/src/main/java/com/apobates/forum/utils/TipMessage.java

@@ -95,37 +95,36 @@ public final class TipMessage {
     public static TipMessage ofSuccess(String message, String url) {
         return new TipMessage(message, TipMessageLevelEnum.ACC, url);
     }
-
+    
     public static class Builder{
         private final boolean condition;
         private final String message;
-
+        
         private Builder(boolean condition) {
-            this.condition = condition;
-            this.message = null;
+            this(condition, null);
         }
-
+        
         private Builder(boolean condition, String message) {
             this.condition = condition;
             this.message = message;
         }
-
-        public static Builder condition(Supplier<Optional<Boolean>> condition){
+        
+        public static Builder take(Supplier<Optional<Boolean>> condition){
             try{
                 return new Builder(condition.get().orElse(false));
             }catch(Exception e){
                 return new Builder(false, e.getMessage());
             }
         }
-
-        public static Builder or(Supplier<Boolean> condition){
+        
+        public static Builder of(Supplier<Boolean> condition){
             try{
                 return new Builder(condition.get());
             }catch(Exception e){
                 return new Builder(false, e.getMessage());
             }
         }
-
+        
         /**
          * 若不调用默认为:操作成功
          *
@@ -138,7 +137,7 @@ public final class TipMessage {
             }
             return new Builder(isCondition(), successMessage);
         }
-
+        
         /**
          * 生成TipMessage
          *
@@ -148,11 +147,11 @@ public final class TipMessage {
         public TipMessage error(String errorMessage){
             return isCondition()?TipMessage.ofSuccess(Optional.ofNullable(getMessage()).orElse("操作成功")):TipMessage.ofError(Optional.ofNullable(getMessage()).orElse(errorMessage));
         }
-
+        
         public boolean isCondition() {
             return condition;
         }
-
+        
         public String getMessage() {
             return message;
         }

utils/src/main/java/com/apobates/forum/utils/lang/CommonDoubleBean.java

@@ -102,7 +102,7 @@ public class CommonDoubleBean implements Serializable {
         public String format(double value) {
             int maxIndex = source.size();
             int index = IntStream.range(0, maxIndex).filter(i -> source.get(i).getValue() >= value).findAny().orElse(-1);
-            logger.info("[format]look up index: " + index);
+            //logger.info("[DoubleBeanFormatter][format]look up index: " + index);
             
             if (index == -1) {
                 //可能大于上限值
@@ -124,7 +124,7 @@ public class CommonDoubleBean implements Serializable {
         public String getTitle(double value) {
             double[] data = source.stream().map(CommonDoubleBean::getValue).mapToDouble(Double::doubleValue).toArray();
             int indexOfData = lookIndex(value, data);
-            logger.info("[getTitle]look up index: " + indexOfData);
+            //logger.info("[DoubleBeanFormatter][getTitle]look up index: " + indexOfData);
             return source.get(indexOfData).getTitle();
         }