From 304883a67683bef36193befd8961119e73d19023 Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 19 Mar 2024 08:21:39 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TransactionRecordServiceImpl.java | 13 +++++-------- .../web/api/admin/AdminArticleController.java | 3 +++ .../rymcu/forest/web/api/admin/AdminController.java | 3 +++ .../web/api/admin/AdminCurrencyRuleController.java | 3 +++ .../forest/web/api/admin/DashboardController.java | 3 +++ .../forest/web/api/article/ArticleController.java | 9 +++++++++ .../forest/web/api/bank/BankAccountController.java | 3 +++ .../web/api/bank/TransactionRecordController.java | 7 +++++-- .../rymcu/forest/web/api/bank/WalletController.java | 2 +- .../forest/web/api/comment/CommentController.java | 2 ++ .../forest/web/api/common/UploadController.java | 4 ++++ .../forest/web/api/common/WebSocketController.java | 2 ++ .../forest/web/api/follow/FollowController.java | 2 ++ .../api/notification/NotificationController.java | 2 ++ .../web/api/portfolio/PortfolioController.java | 2 ++ .../forest/web/api/product/ProductController.java | 5 +++++ .../rymcu/forest/web/api/user/UserController.java | 10 +++++----- .../forest/web/api/user/UserInfoController.java | 7 +++++-- 18 files changed, 64 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java index 281b56b..ee31eec 100644 --- a/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java @@ -67,12 +67,7 @@ public class TransactionRecordServiceImpl extends AbstractService new ReentrantLock()); } } @@ -83,15 +78,15 @@ public class TransactionRecordServiceImpl extends AbstractService postArticle(@RequestBody ArticleDTO article) throws UnsupportedEncodingException { User user = UserUtils.getCurrentUserByToken(); return GlobalResultGenerator.genSuccessResult(articleService.postArticle(article, user)); @@ -75,6 +79,7 @@ public class ArticleController { } @GetMapping("/drafts") + @RequiresPermissions(value = "user") public GlobalResult> drafts(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows) { PageHelper.startPage(page, rows); User user = UserUtils.getCurrentUserByToken(); @@ -84,12 +89,14 @@ public class ArticleController { } @GetMapping("/{idArticle}/share") + @RequiresPermissions(value = "user") public GlobalResult share(@PathVariable Integer idArticle) { User user = UserUtils.getCurrentUserByToken(); return GlobalResultGenerator.genResult(true, articleService.share(idArticle, user.getAccount()), ""); } @PostMapping("/update-tags") + @RequiresPermissions(value = "user") @AuthorshipInterceptor(moduleName = Module.ARTICLE_TAG) public GlobalResult updateTags(@RequestBody Article article) throws UnsupportedEncodingException { Long idArticle = article.getIdArticle(); @@ -99,6 +106,7 @@ public class ArticleController { } @PostMapping("/thumbs-up") + @RequiresPermissions(value = "user") public GlobalResult thumbsUp(@RequestBody ArticleThumbsUp articleThumbsUp) { if (Objects.isNull(articleThumbsUp) || Objects.isNull(articleThumbsUp.getIdArticle())) { throw new BusinessException("数据异常,文章不存在!"); @@ -109,6 +117,7 @@ public class ArticleController { } @PostMapping("/sponsor") + @RequiresPermissions(value = "user") public GlobalResult sponsor(@RequestBody Sponsor sponsor) { if (Objects.isNull(sponsor) || Objects.isNull(sponsor.getDataId()) || Objects.isNull(sponsor.getDataType())) { throw new IllegalArgumentException("数据异常"); diff --git a/src/main/java/com/rymcu/forest/web/api/bank/BankAccountController.java b/src/main/java/com/rymcu/forest/web/api/bank/BankAccountController.java index 50062f9..76202e4 100644 --- a/src/main/java/com/rymcu/forest/web/api/bank/BankAccountController.java +++ b/src/main/java/com/rymcu/forest/web/api/bank/BankAccountController.java @@ -8,6 +8,8 @@ import com.rymcu.forest.dto.BankAccountDTO; import com.rymcu.forest.dto.BankAccountSearchDTO; import com.rymcu.forest.dto.TransactionRecordDTO; import com.rymcu.forest.service.BankAccountService; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -19,6 +21,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/v1/admin/bank-account") +@RequiresRoles(value = {"blog_admin", "admin"}, logical = Logical.OR) public class BankAccountController { @Resource diff --git a/src/main/java/com/rymcu/forest/web/api/bank/TransactionRecordController.java b/src/main/java/com/rymcu/forest/web/api/bank/TransactionRecordController.java index 123162c..caa3b28 100644 --- a/src/main/java/com/rymcu/forest/web/api/bank/TransactionRecordController.java +++ b/src/main/java/com/rymcu/forest/web/api/bank/TransactionRecordController.java @@ -4,6 +4,8 @@ import com.rymcu.forest.core.result.GlobalResult; import com.rymcu.forest.core.result.GlobalResultGenerator; import com.rymcu.forest.entity.TransactionRecord; import com.rymcu.forest.service.TransactionRecordService; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,19 +18,20 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/api/v1/transaction") +@RequiresRoles(value = {"blog_admin", "admin"}, logical = Logical.OR) public class TransactionRecordController { @Resource private TransactionRecordService transactionRecordService; @PostMapping("/transfer") - public GlobalResult transfer(@RequestBody TransactionRecord transactionRecord) { + public GlobalResult transfer(@RequestBody TransactionRecord transactionRecord) { transactionRecord = transactionRecordService.transfer(transactionRecord); return GlobalResultGenerator.genSuccessResult(transactionRecord); } @PostMapping("/newbie-rewards") - public GlobalResult newbieRewards(@RequestBody TransactionRecord transactionRecord) { + public GlobalResult newbieRewards(@RequestBody TransactionRecord transactionRecord) { transactionRecord = transactionRecordService.newbieRewards(transactionRecord); return GlobalResultGenerator.genSuccessResult(transactionRecord); } diff --git a/src/main/java/com/rymcu/forest/web/api/bank/WalletController.java b/src/main/java/com/rymcu/forest/web/api/bank/WalletController.java index 3d05a26..db36568 100644 --- a/src/main/java/com/rymcu/forest/web/api/bank/WalletController.java +++ b/src/main/java/com/rymcu/forest/web/api/bank/WalletController.java @@ -49,7 +49,7 @@ public class WalletController { } PageHelper.startPage(page, rows); List list = bankAccountService.findUserTransactionRecords(bankAccount.getBankAccount(), startDate, endDate); - PageInfo pageInfo = new PageInfo(list); + PageInfo pageInfo = new PageInfo<>(list); return GlobalResultGenerator.genSuccessResult(pageInfo); } diff --git a/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java b/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java index de33cb7..ac0e109 100644 --- a/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java +++ b/src/main/java/com/rymcu/forest/web/api/comment/CommentController.java @@ -5,6 +5,7 @@ import com.rymcu.forest.core.result.GlobalResultGenerator; import com.rymcu.forest.entity.Comment; import com.rymcu.forest.service.CommentService; import com.rymcu.forest.util.UserUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -18,6 +19,7 @@ import javax.servlet.http.HttpServletRequest; */ @RestController @RequestMapping("/api/v1/comment") +@RequiresPermissions(value = "user") public class CommentController { @Resource diff --git a/src/main/java/com/rymcu/forest/web/api/common/UploadController.java b/src/main/java/com/rymcu/forest/web/api/common/UploadController.java index 5d5d30d..54d7ec2 100644 --- a/src/main/java/com/rymcu/forest/web/api/common/UploadController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/UploadController.java @@ -15,6 +15,9 @@ import com.rymcu.forest.util.Utils; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.UnauthorizedException; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.slf4j.LoggerFactory; import org.springframework.core.env.Environment; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +43,7 @@ import com.rymcu.forest.util.SSRFUtil; */ @RestController @RequestMapping("/api/v1/upload") +@RequiresPermissions(value = "user") public class UploadController { private final static String UPLOAD_SIMPLE_URL = "/api/upload/file"; diff --git a/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java index 7a3a4b1..cbbd7ab 100644 --- a/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java @@ -1,6 +1,7 @@ package com.rymcu.forest.web.api.common; import com.alibaba.fastjson.JSONObject; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.messaging.handler.annotation.MessageMapping; import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.messaging.simp.SimpMessagingTemplate; @@ -14,6 +15,7 @@ import javax.annotation.Resource; * @author ronger */ @Controller +@RequiresPermissions(value = "user") public class WebSocketController { @Resource diff --git a/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java b/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java index 210bdaa..a8d4061 100644 --- a/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java +++ b/src/main/java/com/rymcu/forest/web/api/follow/FollowController.java @@ -6,6 +6,7 @@ import com.rymcu.forest.entity.Follow; import com.rymcu.forest.entity.User; import com.rymcu.forest.service.FollowService; import com.rymcu.forest.util.UserUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -15,6 +16,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/api/v1/follow") +@RequiresPermissions(value = "user") public class FollowController { @Resource diff --git a/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java b/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java index 016685a..44324b2 100644 --- a/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java +++ b/src/main/java/com/rymcu/forest/web/api/notification/NotificationController.java @@ -9,6 +9,7 @@ import com.rymcu.forest.entity.Notification; import com.rymcu.forest.entity.User; import com.rymcu.forest.service.NotificationService; import com.rymcu.forest.util.UserUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -22,6 +23,7 @@ import java.util.Objects; */ @RestController @RequestMapping("/api/v1/notification") +@RequiresPermissions(value = "user") public class NotificationController { @Resource diff --git a/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java b/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java index 42c9bbe..96dee59 100644 --- a/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java +++ b/src/main/java/com/rymcu/forest/web/api/portfolio/PortfolioController.java @@ -13,6 +13,7 @@ import com.rymcu.forest.enumerate.Module; import com.rymcu.forest.service.PortfolioService; import com.rymcu.forest.service.UserService; import com.rymcu.forest.util.UserUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -38,6 +39,7 @@ public class PortfolioController { } @PostMapping("/post") + @RequiresPermissions(value = "user") public GlobalResult add(@RequestBody Portfolio portfolio) { User user = UserUtils.getCurrentUserByToken(); portfolio.setPortfolioAuthorId(user.getIdUser()); diff --git a/src/main/java/com/rymcu/forest/web/api/product/ProductController.java b/src/main/java/com/rymcu/forest/web/api/product/ProductController.java index 7873aea..f54dfa0 100644 --- a/src/main/java/com/rymcu/forest/web/api/product/ProductController.java +++ b/src/main/java/com/rymcu/forest/web/api/product/ProductController.java @@ -11,6 +11,8 @@ import com.rymcu.forest.entity.User; import com.rymcu.forest.enumerate.Module; import com.rymcu.forest.service.ProductService; import com.rymcu.forest.util.UserUtils; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,12 +38,14 @@ public class ProductController { } @PostMapping("/post") + @RequiresRoles(value = {"blog_admin", "admin"}, logical = Logical.OR) public GlobalResult add(@RequestBody ProductDTO product) { Product newProduct = productService.postProduct(product); return GlobalResultGenerator.genSuccessResult(newProduct); } @PutMapping("/post") + @RequiresRoles(value = {"blog_admin", "admin"}, logical = Logical.OR) public GlobalResult update(@RequestBody ProductDTO product) { if (product.getIdProduct() == null || product.getIdProduct() == 0) { throw new IllegalArgumentException("产品主键参数异常!"); @@ -52,6 +56,7 @@ public class ProductController { @PatchMapping("/update-status") + @RequiresRoles(value = {"blog_admin", "admin"}, logical = Logical.OR) public GlobalResult updateStatus(@RequestBody Product product) { boolean flag = productService.updateStatus(product.getIdProduct(), product.getStatus()); return GlobalResultGenerator.genSuccessResult(flag); diff --git a/src/main/java/com/rymcu/forest/web/api/user/UserController.java b/src/main/java/com/rymcu/forest/web/api/user/UserController.java index c591b9b..1feb544 100644 --- a/src/main/java/com/rymcu/forest/web/api/user/UserController.java +++ b/src/main/java/com/rymcu/forest/web/api/user/UserController.java @@ -36,7 +36,7 @@ public class UserController { @GetMapping("/{account}") @VisitLogger - public GlobalResult detail(@PathVariable String account) { + public GlobalResult detail(@PathVariable String account) { UserDTO userDTO = userService.findUserDTOByAccount(account); return GlobalResultGenerator.genSuccessResult(userDTO); } @@ -49,7 +49,7 @@ public class UserController { } PageHelper.startPage(page, rows); List list = articleService.findUserArticlesByIdUser(userDTO.getIdUser()); - PageInfo pageInfo = new PageInfo(list); + PageInfo pageInfo = new PageInfo<>(list); return GlobalResultGenerator.genSuccessResult(pageInfo); } @@ -61,7 +61,7 @@ public class UserController { } PageHelper.startPage(page, rows); List list = portfolioService.findUserPortfoliosByUser(userDTO); - PageInfo pageInfo = new PageInfo(list); + PageInfo pageInfo = new PageInfo<>(list); return GlobalResultGenerator.genSuccessResult(pageInfo); } @@ -73,7 +73,7 @@ public class UserController { } PageHelper.startPage(page, rows); List list = followService.findUserFollowersByUser(userDTO); - PageInfo pageInfo = new PageInfo(list); + PageInfo pageInfo = new PageInfo<>(list); return GlobalResultGenerator.genSuccessResult(pageInfo); } @@ -85,7 +85,7 @@ public class UserController { } PageHelper.startPage(page, rows); List list = followService.findUserFollowingsByUser(userDTO); - PageInfo pageInfo = new PageInfo(list); + PageInfo pageInfo = new PageInfo<>(list); return GlobalResultGenerator.genSuccessResult(pageInfo); } diff --git a/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java b/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java index 42d8155..e89f757 100644 --- a/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java +++ b/src/main/java/com/rymcu/forest/web/api/user/UserInfoController.java @@ -13,6 +13,9 @@ import com.rymcu.forest.entity.LoginRecord; import com.rymcu.forest.entity.UserExtend; import com.rymcu.forest.service.LoginRecordService; import com.rymcu.forest.service.UserService; +import org.apache.shiro.authz.annotation.Logical; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/api/v1/user-info") +@RequiresPermissions(value = "user") public class UserInfoController { @Resource @@ -45,8 +49,7 @@ public class UserInfoController { } @GetMapping("/check-nickname") - @SecurityInterceptor - public GlobalResult checkNickname(@RequestParam Long idUser, @RequestParam String nickname) { + public GlobalResult checkNickname(@RequestParam Long idUser, @RequestParam String nickname) { boolean flag = userService.checkNicknameByIdUser(idUser, nickname); return GlobalResultGenerator.genSuccessResult(flag); }