thrones.admin更新:202006051032

thrones.admin/src/main/java/com/apobates/forum/thrones/admin/ThronesAdminFrontConfig.java

@@ -36,6 +36,8 @@ import org.springframework.web.servlet.view.JstlView;
 public class ThronesAdminFrontConfig implements WebMvcConfigurer{
     @Value("${site.domain}")
     private String siteDomain;
+    @Value("${web.view.index}")
+    private String defPath;
     @Value("${site.cookieSymbol}")
     private String cookieName;
     @Value("${site.cookieDomain}")
@@ -74,7 +76,7 @@ public class ThronesAdminFrontConfig implements WebMvcConfigurer{
     //定义无Controller的path<->view直接映射
     @Override
     public void addViewControllers(ViewControllerRegistry registry) {
-        registry.addViewController("/").setViewName("redirect:/client");
+        registry.addViewController("/").setViewName("redirect:"+defPath);
     }
     //定义视图文件解析View resolvers
     @Override

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

@@ -92,7 +92,7 @@ public class AdminAlbumController {
             HttpServletRequest request,
             Model model) {
         Topic topic = topicService.get(topicId).orElseThrow(()->new ResourceNotFoundException("话题不存在或暂时无法访问"));
-        
+        model.addAttribute("topic", topic);
         AlbumPictureForum form = new AlbumPictureForum();
         form.setAlbumId(topicAlbumId + "");
         form.setTopicId(topicId + "");
@@ -110,12 +110,12 @@ public class AdminAlbumController {
             Model model) {
         Topic topic = topicService.get(form.getLongTopicId()).orElseThrow(()->new ResourceNotFoundException("话题不存在或暂时无法访问"));
         //
-        String imageAddr = null;
+        String imageAddr;
         //------------------------------------------------------------编码图标图片的地址
         imageAddr = form.getEncodePictureAddr(imageIOMeta);
         //------------------------------------------------------------
         Long albumId = form.getLongAlbumId();
-        boolean symbol = false;
+        boolean symbol;
         if (albumId > 0) {
             Optional<AlbumPicture> ap = albumPictureService.create(albumId, imageAddr, form.getCaption(), form.getIntegerRanking(), form.getBooleanStatus());
             symbol = ap.isPresent();

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

@@ -96,7 +96,6 @@ public class AdminBoardCategoryController {
             @ModelAttribute("form") BoardTopicCategoryForm form,
             HttpServletRequest request,
             Model model) {
-        System.out.println("[board-category]form category: " + String.join(",", Arrays.asList(form.getCategory())));
         List<Integer> categoryIdList = AdminUtils.toIntegerList(form.getCategory());
         if (categoryIdList == null || categoryIdList.isEmpty()) {
             model.addAttribute("errors", "没有可供使用的话题类型");

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

@@ -123,14 +123,13 @@ public class AdminBoardController {
         }
         //------------------------------------------------------------
         boolean symbol;
-        String jumpPage = "/board/?volume=" + b.getVolumesId();
         if (form.isUpdate()) {
             symbol = boardService.edit(form.getLongRecord(), b).orElse(false);
         } else {
             symbol = boardService.create(b.getVolumesId(), b.getTitle(), b.getDescription(), b.getImageAddr(), b.getStatus(), b.getRanking()).isPresent();
         }
         if (symbol) {
-            return "redirect:" + jumpPage;
+            return "redirect:/board/?volume=" + b.getVolumesId();
         }
         model.addAttribute("errors", form.getActionTitle() + "版块操作失败");
         //
@@ -270,7 +269,6 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = boardService.lock(boardId, boardGroupId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("成功锁定版块");
@@ -287,7 +285,6 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = boardService.releaseLock(boardId, boardGroupId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("成功解锁版块");
@@ -304,7 +301,6 @@ public class AdminBoardController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = boardService.remove(boardId, boardGroupId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("版块删除成功");
@@ -361,11 +357,7 @@ public class AdminBoardController {
         if (id == 0) {
             return new CommonBean(0, "所有");
         }
-        String title = "版块";
-        Optional<Board> board = boardService.get(id);
-        if (board.isPresent()) {
-            title = board.get().getTitle();
-        }
+        String title = boardService.get(id).map(Board::getTitle).orElse("版块");
         return new CommonBean(id, title);
     }
 }
\ No newline at end of file

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

@@ -87,7 +87,7 @@ public class AdminBoardGroupController {
             bg.setImageAddr(icoImageAddr);
         }
         //------------------------------------------------------------
-        boolean symbol = false;
+        boolean symbol;
         if (form.isUpdate()) {
             symbol = boardGroupService.edit(form.getIntegerRecord(), bg).orElse(false);
         } else {
@@ -131,11 +131,8 @@ public class AdminBoardGroupController {
         if (id == 0) {
             return new CommonBean(0, "默认版块组");
         }
-        String title = "版块组(卷)";
-        Optional<BoardGroup> board = boardGroupService.get(id);
-        if (board.isPresent()) {
-            title = board.get().getTitle();
-        }
+        
+        String title = boardGroupService.get(id).map(BoardGroup::getTitle).orElse("版块组(卷)");
         return new CommonBean(id, title);
     }
 }
\ No newline at end of file

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

@@ -94,8 +94,8 @@ public class AdminForumMessageController {
         //
         boolean isInbox = false;
         long senderMember = 0;
-        String receiver = "";
-        String sender = "";
+        String receiver;
+        String sender;
         //
         if (data.getAuthor() == mbean.getMid()) { //我发送的消息
             receiver = data.getTargetReceiverNicknames();

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

@@ -78,7 +78,7 @@ public class AdminForumScoreRoleController {
         data.setLevel(Integer.valueOf(form.getLevel()));
         data.setScore(Double.valueOf(form.getScore()));
         
-        boolean symbol = false;
+        boolean symbol;
         if (form.isUpdate()) {
             symbol = forumScoreRoleService.edit(form.getIntegerRecord(), data).orElse(false);
         } else {

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

@@ -38,6 +38,8 @@ public class AdminHomeController {
     private OnlineMemberStorage onlineMemberStorage;
     @Value("${site.domain}")
     private String siteDomain;
+    @Value("${web.view.index}")
+    private String defPath;
     private final static Logger logger = LoggerFactory.getLogger(AdminHomeController.class);
     
     // 跳转到版块首页
@@ -56,7 +58,7 @@ public class AdminHomeController {
         }
         //
         LoginForm form = new LoginForm();
-        String A = Commons.isNotBlank(fromPath) ? fromPath : Commons.getNativeURL(request.getHeader("referer"), siteDomain, "/client");
+        String A = Commons.isNotBlank(fromPath) ? fromPath : Commons.getNativeURL(request.getHeader("referer"), siteDomain, defPath);
         form.setRedirect(A);
         form.setLexical("tmp" + Commons.randomAlphaNumeric(12));
         form.setToken(Commons.randomAlphaNumeric(8));

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

@@ -89,7 +89,7 @@ public class AdminHomeRecentController {
             }
             return rs;
         }
-        return Collections.EMPTY_MAP;
+        return Collections.emptyMap();
     }
     
     @GetMapping(path = "/stats/isp/json", produces = "application/json;charset=UTF-8")

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

@@ -76,7 +76,6 @@ public class AdminPostsController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = postsService.remove(postsId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("回复删除成功");

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

@@ -299,7 +299,7 @@ public class AdminSectionArticleController {
             @PathVariable("id") long articleId,
             HttpServletRequest request,
             Model model) {
-        Topic article = topicService.getTermArticleContent(articleId, imageIOMeta);
+        TopicReplica article = topicService.getTermArticleContent(articleId, imageIOMeta);
         if (article == null) {
             throw new ResourceNotFoundException("文章不存在或暂时无法访问");
         }

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

@@ -341,7 +341,6 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = topicService.remove(topicId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("话题删除成功");
@@ -357,7 +356,6 @@ public class AdminTopicController {
             HttpServletRequest request,
             Model model) {
         ActionEventCulpritor aec = AdminHomeController.getActionCulpritor(mbean.getMid(), mbean.getNickname(), request, "");
-        String token = "";
         boolean symbol = topicService.editTop(topicId, aec).orElse(false);
         if (symbol) {
             return TipMessage.ofSuccess("话题置顶成功");
@@ -391,11 +389,7 @@ public class AdminTopicController {
         if (id == 0) {
             return new CommonBean(0, "所有");
         }
-        String title = "话题";
-        Optional<Topic> topic = topicService.get(id);
-        if (topic.isPresent()) {
-            title = topic.get().getTitle();
-        }
+        String title = topicService.get(id).map(Topic::getTitle).orElse("话题");
         return new CommonBean(id, title);
     }
     //Key=SmileyTheme.directNames, Value=SmileyTheme.title

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

@@ -3,7 +3,6 @@ package com.apobates.forum.thrones.admin.controller;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;