封装通用登录token认证

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;

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;

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;

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;

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;

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;

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;

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

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;

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);

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;