From ce3a9bda839bec09599b8c38addeafc147ba1deb Mon Sep 17 00:00:00 2001 From: linrf Date: Fri, 15 Sep 2023 11:23:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E8=A3=85=E9=80=9A=E7=94=A8=E7=99=BB?= =?UTF-8?q?=E5=BD=95token=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/docus/server/common/auth}/ApiRequestContext.java | 2 +- .../java/com/docus/server/common/auth}/CloudBaseConfig.java | 2 +- .../docus/server/common/auth}/FeignRequestInterceptor.java | 2 +- .../java/com/docus/server/common/auth}/IgnoreValidate.java | 2 +- .../com/docus/server/common/auth}/RedisStringService.java | 2 +- .../docus/server/common/auth}/RequestContextInterceptor.java | 2 +- .../java/com/docus/server/common/auth}/TokenInterceptor.java | 2 +- .../java/com/docus/server/controller/RcvBasicController.java | 2 +- .../com/docus/server/controller/RcvSysUserController.java | 2 +- .../com/docus/server/service/impl/RcvBasicServiceImpl.java | 4 ++++ .../com/docus/server/service/impl/RcvSysUserServiceImpl.java | 2 +- 11 files changed, 14 insertions(+), 10 deletions(-) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/ApiRequestContext.java (99%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/CloudBaseConfig.java (97%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/FeignRequestInterceptor.java (98%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/IgnoreValidate.java (88%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/RedisStringService.java (97%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/RequestContextInterceptor.java (98%) rename {docus-recovery/src/main/java/com/docus/server/common => docus-api-common/src/main/java/com/docus/server/common/auth}/TokenInterceptor.java (99%) diff --git a/docus-recovery/src/main/java/com/docus/server/common/ApiRequestContext.java b/docus-api-common/src/main/java/com/docus/server/common/auth/ApiRequestContext.java similarity index 99% rename from docus-recovery/src/main/java/com/docus/server/common/ApiRequestContext.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/ApiRequestContext.java index 1d046f8..657c564 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/ApiRequestContext.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/ApiRequestContext.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.docus.server.constants.BusinessConstant; import com.docus.server.vo.recovery.UserInfoView; diff --git a/docus-recovery/src/main/java/com/docus/server/common/CloudBaseConfig.java b/docus-api-common/src/main/java/com/docus/server/common/auth/CloudBaseConfig.java similarity index 97% rename from docus-recovery/src/main/java/com/docus/server/common/CloudBaseConfig.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/CloudBaseConfig.java index 68141f2..82aae5f 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/CloudBaseConfig.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/CloudBaseConfig.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.docus.server.constants.BusinessConstant; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/docus-recovery/src/main/java/com/docus/server/common/FeignRequestInterceptor.java b/docus-api-common/src/main/java/com/docus/server/common/auth/FeignRequestInterceptor.java similarity index 98% rename from docus-recovery/src/main/java/com/docus/server/common/FeignRequestInterceptor.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/FeignRequestInterceptor.java index 7f3dcb0..9f36a64 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/FeignRequestInterceptor.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/FeignRequestInterceptor.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.docus.infrastructure.core.db.KeyGenerator; import com.docus.server.constants.BusinessConstant; diff --git a/docus-recovery/src/main/java/com/docus/server/common/IgnoreValidate.java b/docus-api-common/src/main/java/com/docus/server/common/auth/IgnoreValidate.java similarity index 88% rename from docus-recovery/src/main/java/com/docus/server/common/IgnoreValidate.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/IgnoreValidate.java index aef0f76..e165a21 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/IgnoreValidate.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/IgnoreValidate.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/docus-recovery/src/main/java/com/docus/server/common/RedisStringService.java b/docus-api-common/src/main/java/com/docus/server/common/auth/RedisStringService.java similarity index 97% rename from docus-recovery/src/main/java/com/docus/server/common/RedisStringService.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/RedisStringService.java index 47a327c..c29cc0c 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/RedisStringService.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/RedisStringService.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.docus.infrastructure.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/docus-recovery/src/main/java/com/docus/server/common/RequestContextInterceptor.java b/docus-api-common/src/main/java/com/docus/server/common/auth/RequestContextInterceptor.java similarity index 98% rename from docus-recovery/src/main/java/com/docus/server/common/RequestContextInterceptor.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/RequestContextInterceptor.java index 7ecfce0..80dab62 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/RequestContextInterceptor.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/RequestContextInterceptor.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.docus.server.constants.BusinessConstant; import com.docus.server.vo.recovery.UserInfoView; diff --git a/docus-recovery/src/main/java/com/docus/server/common/TokenInterceptor.java b/docus-api-common/src/main/java/com/docus/server/common/auth/TokenInterceptor.java similarity index 99% rename from docus-recovery/src/main/java/com/docus/server/common/TokenInterceptor.java rename to docus-api-common/src/main/java/com/docus/server/common/auth/TokenInterceptor.java index 94c3cb2..17ec29e 100644 --- a/docus-recovery/src/main/java/com/docus/server/common/TokenInterceptor.java +++ b/docus-api-common/src/main/java/com/docus/server/common/auth/TokenInterceptor.java @@ -1,4 +1,4 @@ -package com.docus.server.common; +package com.docus.server.common.auth; import com.alibaba.fastjson.JSON; import com.docus.infrastructure.web.exception.ApiException; diff --git a/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java b/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java index 46e8fb4..ecc91a4 100644 --- a/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java +++ b/docus-recovery/src/main/java/com/docus/server/controller/RcvBasicController.java @@ -188,7 +188,7 @@ public class RcvBasicController implements RcvBasicApi { /** * 批量编辑 * - * @param editRcvBasicDTO 编辑参数 + * @param serialNumbers 编辑参数 */ @ApiOperation("批量编辑") @Override diff --git a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java index 005b53c..726acf7 100644 --- a/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java +++ b/docus-recovery/src/main/java/com/docus/server/controller/RcvSysUserController.java @@ -4,7 +4,7 @@ import com.docus.infrastructure.web.api.CommonResult; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; import com.docus.server.api.recovery.RcvSysUserApi; -import com.docus.server.common.IgnoreValidate; +import com.docus.server.common.auth.IgnoreValidate; import com.docus.server.dto.recovery.rcvsysuser.AddRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.DeleteRcvSysUserDTO; import com.docus.server.dto.recovery.rcvsysuser.EditRcvSysUserDTO; diff --git a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java index 468cd28..99f7684 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java +++ b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvBasicServiceImpl.java @@ -1,9 +1,11 @@ package com.docus.server.service.impl; +import com.docus.core.util.DateUtil; import com.docus.infrastructure.core.db.dao.IBaseDao; import com.docus.infrastructure.redis.service.IdService; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; +import com.docus.server.common.auth.ApiRequestContext; import com.docus.server.convert.RcvBasicConvert; import com.docus.server.dto.recovery.rcvbasic.AddRcvBasicDTO; import com.docus.server.dto.recovery.rcvbasic.DeleteRcvBasicDTO; @@ -254,6 +256,8 @@ public class RcvBasicServiceImpl implements IRcvBasicService { rcvBasics.forEach(p -> { p.setRecoveryState(RecoveryStateEnum.RECYCLED_ALREADY); + p.setRevoveryUser(ApiRequestContext.get().getUserId()); + p.setRevoveryTime(DateUtil.now()); }); return iRcvBasicDao.updateBatchById(rcvBasics, IBaseDao.DEFAULT_BATCH_SIZE); diff --git a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java index 04174c9..307b0c6 100644 --- a/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java +++ b/docus-recovery/src/main/java/com/docus/server/service/impl/RcvSysUserServiceImpl.java @@ -8,7 +8,7 @@ import com.docus.infrastructure.web.exception.ApiException; import com.docus.infrastructure.web.exception.ExceptionCode; import com.docus.infrastructure.web.request.SearchDTO; import com.docus.infrastructure.web.response.PageResult; -import com.docus.server.common.RedisStringService; +import com.docus.server.common.auth.RedisStringService; import com.docus.server.constants.BusinessConstant; import com.docus.server.convert.RcvSysUserConvert; import com.docus.server.dto.recovery.rcvsysuser.AddRcvSysUserDTO;