Revert "feat: 新增访问私有资源拦截注解,给需要的接口添加登陆校验注解 (#71)" (#72)

This reverts commit 7a9291d.
AchoBeta · Nov 27, 2024 · 37c4d4d · 37c4d4d
1 parent 252da62
commit 37c4d4d
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 141 deletions.
diff --git a/polaris-api/src/main/java/com/achobeta/api/dto/like/LikeRequestDTO.java b/polaris-api/src/main/java/com/achobeta/api/dto/like/LikeRequestDTO.java
@@ -18,7 +18,7 @@
 public class LikeRequestDTO {
     @NotBlank(message = "点赞的用户id不能为空")
     @FieldDesc(name = "点赞人id")
-    private String userId;
+    private String fromId;
     @NotBlank(message = "获赞的人id不能为空")
     @FieldDesc(name = "获赞人id")
     private String toId;

diff --git a/polaris-app/src/main/java/com/achobeta/aop/AuthVerifyAspect.java b/polaris-app/src/main/java/com/achobeta/aop/AuthVerifyAspect.java
@@ -10,7 +10,6 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -28,7 +27,6 @@
 @Aspect
 @Component
 @Slf4j
-@Order(Integer.MIN_VALUE+2)
 public class AuthVerifyAspect {
 
     @Resource

diff --git a/polaris-app/src/main/java/com/achobeta/aop/LoginVerificationAspect.java b/polaris-app/src/main/java/com/achobeta/aop/LoginVerificationAspect.java
@@ -10,7 +10,6 @@
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -29,7 +28,6 @@
 @Slf4j
 @Component
 @Aspect
-@Order(Integer.MIN_VALUE)
 public class LoginVerificationAspect {
 
     private final long EXPIRED = 100*1000;
@@ -89,7 +87,7 @@ public Object checkToken(ProceedingJoinPoint joinPoint) throws Throwable {
         }
 
         if(accessTokenExpired <= EXPIRED){
-            //如果token已经超时失效也会进这里
+            //如果token是持久化的或者已经超时失效也会进这里
             response.setHeader(ACCESS_TOKEN_NEED_REFRESH, "true");
         }
 

diff --git a/polaris-app/src/main/java/com/achobeta/aop/SelfPermissionVerificationAspect.java b/polaris-app/src/main/java/com/achobeta/aop/SelfPermissionVerificationAspect.java
diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/AnnounceController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/AnnounceController.java
@@ -4,7 +4,6 @@
 import com.achobeta.domain.announce.model.valobj.UserAnnounceVO;
 import com.achobeta.domain.announce.service.IAnnounceService;
 import com.achobeta.types.Response;
-import com.achobeta.types.constraint.LoginVerification;
 import com.achobeta.types.enums.GlobalServiceStatusCode;
 import com.achobeta.types.exception.AppException;
 import lombok.RequiredArgsConstructor;
@@ -33,7 +32,6 @@ public class AnnounceController implements com.achobeta.api.IAnnounceService {
      * @return
      */
     @GetMapping("/getUserAnnounce")
-    @LoginVerification
     @Override
     public Response<GetUserAnnounceResponseDTO> getUserAnnounce(@Valid GetUserAnnounceRequestDTO getUserAnnounceRequestDTO) {
         try {
@@ -57,7 +55,6 @@ public Response<GetUserAnnounceResponseDTO> getUserAnnounce(@Valid GetUserAnnoun
     }
 
     @Override
-    @LoginVerification
     @PostMapping("/readUserAnnounce")
     public Response readAnnounce(@Valid @RequestBody ReadAnnounceRequestDTO readAnnounceRequestDTO) {
         try {
@@ -79,7 +76,6 @@ public Response readAnnounce(@Valid @RequestBody ReadAnnounceRequestDTO readAnno
     }
 
     @Override
-    @LoginVerification
     @GetMapping("/getAnnounceCount")
     public Response<GetUserAnnounceCountResponseDTO> getUserAnnounceCount(@Valid GetUserAnnounceCountRequestDTO getUserAnnounceCountRequestDTO) {
         try {
@@ -98,7 +94,6 @@ public Response<GetUserAnnounceCountResponseDTO> getUserAnnounceCount(@Valid Get
     }
 
     @Override
-    @LoginVerification
     @PostMapping("/readAllAnnounce")
     public Response readAllAnnounce(@Valid @RequestBody ReadAllAnnounceRequestDTO readAllAnnounceRequestDTO) {
         try {

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/AuthController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/AuthController.java
@@ -3,7 +3,6 @@
 import com.achobeta.api.dto.AuthRequestDTO;
 import com.achobeta.types.Response;
 import com.achobeta.types.annotation.AuthVerify;
-import com.achobeta.types.constraint.LoginVerification;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
@@ -33,7 +32,6 @@ public class AuthController {
      * @return
      */
     @GetMapping("test")
-    @LoginVerification
     @AuthVerify("TEAM_DELETE")
     public Response test(@Valid AuthRequestDTO authRequestDTO) {
         log.info("进入鉴权测试接口，参数：{}", authRequestDTO);

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/DeviceController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/DeviceController.java
@@ -5,8 +5,6 @@
 import com.achobeta.domain.device.model.valobj.UserCommonDevicesVO;
 import com.achobeta.domain.device.service.IDeviceService;
 import com.achobeta.types.Response;
-import com.achobeta.types.constraint.LoginVerification;
-import com.achobeta.types.constraint.SelfPermissionVerification;
 import com.achobeta.types.enums.GlobalServiceStatusCode;
 import com.achobeta.types.exception.AppException;
 import lombok.RequiredArgsConstructor;
@@ -34,8 +32,6 @@ public class DeviceController implements com.achobeta.api.IDeviceService {
      * @return
      */
     @GetMapping("/getDevices")
-    @LoginVerification
-    @SelfPermissionVerification
     @Override
     public Response<GetUserDeviceResponseDTO> getDevices(@Valid  GetUserDeviceRequestDTO getUserDeviceRequestDTO) {
         try {

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/LikeController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/LikeController.java
@@ -3,8 +3,6 @@
 import com.achobeta.api.dto.like.LikeRequestDTO;
 import com.achobeta.domain.like.service.ILikeService;
 import com.achobeta.types.Response;
-import com.achobeta.types.constraint.LoginVerification;
-import com.achobeta.types.constraint.SelfPermissionVerification;
 import com.achobeta.types.enums.GlobalServiceStatusCode;
 import com.achobeta.types.exception.AppException;
 import lombok.RequiredArgsConstructor;
@@ -28,25 +26,23 @@ public class LikeController implements com.achobeta.api.ILikeService {
     private final ILikeService service;
 
     @Override
-    @LoginVerification
-    @SelfPermissionVerification
     @PostMapping("/like")
     public Response like(@Valid @RequestBody LikeRequestDTO likeRequestDTO) {
         try {
             log.info("点赞系统开始，fromId:{} toId:{} liked:{}",
-                    likeRequestDTO.getUserId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
-            service.Like(likeRequestDTO.getUserId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
+                    likeRequestDTO.getFromId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
+            service.Like(likeRequestDTO.getFromId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
             log.info("点赞系统结束，fromId:{} toId:{} liked:{}",
-                    likeRequestDTO.getUserId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
+                    likeRequestDTO.getFromId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked());
             return Response.SYSTEM_SUCCESS();
         } catch (AppException e){
             log.error("fromId:{} toId:{} liked:{} 已知异常e:{}",
-                    likeRequestDTO.getUserId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked(), e.getMessage(), e);
+                    likeRequestDTO.getFromId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked(), e.getMessage(), e);
             return Response.CUSTOMIZE_ERROR(GlobalServiceStatusCode.REQUEST_NOT_VALID);
         }
         catch (Exception e) {
             log.error("fromId:{} toId:{} liked:{}",
-                    likeRequestDTO.getUserId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked(), e);
+                    likeRequestDTO.getFromId(),likeRequestDTO.getToId(),likeRequestDTO.isLiked(), e);
             return Response.SERVICE_ERROR(e.getMessage());
         }
     }

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/ReadController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/ReadController.java
@@ -13,7 +13,6 @@
 import javax.validation.constraints.Min;
 
 import com.achobeta.types.constraint.LoginVerification;
-import com.achobeta.types.constraint.SelfPermissionVerification;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
@@ -44,7 +43,6 @@ public class ReadController implements IReadService {
      */
     @PostMapping("render")
     @LoginVerification
-    @SelfPermissionVerification
     @Override
     public Response<RenderResponseDTO> render(@Valid @RequestBody RenderRequestDTO renderRequestDTO) {
         try {

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/TeamController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/TeamController.java
@@ -11,7 +11,6 @@
 import com.achobeta.types.Response;
 import com.achobeta.types.annotation.AuthVerify;
 import com.achobeta.types.common.Constants;
-import com.achobeta.types.constraint.LoginVerification;
 import com.achobeta.types.exception.AppException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -48,7 +47,6 @@ public class TeamController implements ITeamService {
      */
     @Override
     @DeleteMapping("member")
-    @LoginVerification
     @AuthVerify("MEMBER:MEMBER_DELETE")
     public Response<DeleteMemberResponseDTO> deleteMember(@Valid DeleteMemberRequestDTO requestDTO) {
         try {
@@ -85,7 +83,6 @@ public Response<DeleteMemberResponseDTO> deleteMember(@Valid DeleteMemberRequest
      */
     @Override
     @PostMapping("member")
-    @LoginVerification
     @AuthVerify("MEMBER:MEMBER_ADD")
     public Response<AddMemberResponseDTO> addMember(@Valid @RequestBody AddMemberRequestDTO requestDTO) {
         try {
@@ -136,7 +133,6 @@ public Response<AddMemberResponseDTO> addMember(@Valid @RequestBody AddMemberReq
      */
     @Override
     @PutMapping("member/detail")
-    @LoginVerification
     @AuthVerify("MEMBER:MEMBER_MODIFY")
     public Response<ModifyMemberInfoResponseDTO> modifyMemberInfo(@Valid @RequestBody ModifyMemberInfoRequestDTO requestDTO) {
         String teamId = requestDTO.getTeamId();
@@ -165,7 +161,6 @@ public Response<ModifyMemberInfoResponseDTO> modifyMemberInfo(@Valid @RequestBod
      * 查看团队成员信息详情接口
      */
     @GetMapping("/member/detail")
-    @LoginVerification
     @Override
     public Response<QueryMemberInfoResponseDTO> queryMemberInfo(@Valid QueryMemberInfoRequestDTO requestDTO) {
         try {
@@ -211,7 +206,6 @@ public Response<QueryMemberInfoResponseDTO> queryMemberInfo(@Valid QueryMemberIn
      */
     @PutMapping("structure")
     @Override
-    @LoginVerification
     @AuthVerify("STRUCTURE:STRUCTURE_MODIFY")
     public Response<ModifyStructureResponseDTO> modifyStructure(@Valid @RequestBody ModifyStructureRequestDTO modifyStructureRequestDTO) {
         try {
@@ -267,7 +261,6 @@ public Response<ModifyStructureResponseDTO> modifyStructure(@Valid @RequestBody
      * @return
      */
     @Override
-    @LoginVerification
     @GetMapping("/member/list")
     public Response<ResponseMemberListDTO> queryMemberList(@Valid RequestMemberListDTO requestMemberListDTO) {
         try {
@@ -305,7 +298,6 @@ public Response<ResponseMemberListDTO> queryMemberList(@Valid RequestMemberListD
      */
     @GetMapping("structure")
     @Override
-    @LoginVerification
     @AuthVerify("STRUCTURE:STRUCTURE_VIEW")
     public Response<QueryStructureResponseDTO> queryStructure(@Valid QueryStructureRequestDTO querystructureRequestDTO) {
         try {

diff --git a/polaris-trigger/src/main/java/com/achobeta/trigger/http/UserController.java b/polaris-trigger/src/main/java/com/achobeta/trigger/http/UserController.java
@@ -12,7 +12,6 @@
 
 import com.achobeta.types.Response;
 import com.achobeta.types.common.Constants;
-import com.achobeta.types.constraint.LoginVerification;
 import com.achobeta.types.exception.AppException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -45,7 +44,6 @@ public class UserController implements IUserService {
      * @date 2024/11/9
      */
     @PutMapping("info")
-    @LoginVerification
     @Override
     public Response<ModifyUserInfoResponseDTO> modifyUserInfo(@Valid @RequestBody ModifyUserInfoRequestDTO modifyUserInfoRequestDTO) {
         try {
@@ -87,7 +85,6 @@ public Response<ModifyUserInfoResponseDTO> modifyUserInfo(@Valid @RequestBody Mo
      * @date 2024/11/6
      */
     @GetMapping("info")
-    @LoginVerification
     @Override
     public Response<QueryUserInfoResponseDTO> queryUserCenterInfo(@Valid QueryUserInfoRequestDTO queryUserInfoRequestDTO) {
         try {

diff --git a/polaris-types/src/main/java/com/achobeta/types/constraint/LoginVerification.java b/polaris-types/src/main/java/com/achobeta/types/constraint/LoginVerification.java
@@ -5,12 +5,6 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-/**
- * @Author: 严豪哲
- * @Description: 登录验证注解
- * @Date: 2024/11/18 10:27
- * @Version: 1.0
- */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface LoginVerification {

diff --git a/polaris-types/src/main/java/com/achobeta/types/constraint/SelfPermissionVerification.java b/polaris-types/src/main/java/com/achobeta/types/constraint/SelfPermissionVerification.java