OCT

REM:
1. 重构协议加密解密功能包路径

src/main/java/com/dispose/config/CfgFileSecurityConfigure.java

@@ -1,6 +1,6 @@
 package com.dispose.config;
 
-import com.security.configure.EncryptionPropertyResolver;
+import com.dispose.security.configure.EncryptionPropertyResolver;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/dispose/controller/AuthController.java

@@ -8,10 +8,10 @@ import com.dispose.pojo.dto.protocol.base.BaseRespStatus;
 import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.pojo.po.MulReturnType;
+import com.dispose.security.annotation.Decryption;
+import com.dispose.security.annotation.Encryption;
 import com.dispose.service.UserAccountService;
 import com.dispose.validation.group.ValidGroups;
-import com.security.annotation.Decryption;
-import com.security.annotation.Encryption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/dispose/controller/DisposeDeviceManagerController.java

@@ -26,11 +26,11 @@ import com.dispose.pojo.dto.protocol.device.manager.GetDeviceRsp;
 import com.dispose.pojo.entity.DisposeCapacity;
 import com.dispose.pojo.entity.DisposeDevice;
 import com.dispose.pojo.po.MulReturnType;
+import com.dispose.security.annotation.Decryption;
+import com.dispose.security.annotation.Encryption;
 import com.dispose.service.DisposeDeviceManagerService;
 import com.dispose.validation.group.ValidGroups;
 import com.github.pagehelper.PageInfo;
-import com.security.annotation.Decryption;
-import com.security.annotation.Encryption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/dispose/controller/DisposeInfoController.java

@@ -13,12 +13,12 @@ import com.dispose.pojo.dto.protocol.device.info.GetAreaInfoRsp;
 import com.dispose.pojo.dto.protocol.device.info.GetDeviceInfoRsp;
 import com.dispose.pojo.dto.protocol.device.info.GetPlatformVerInfoRsp;
 import com.dispose.pojo.entity.DisposeDevice;
+import com.dispose.security.annotation.Decryption;
+import com.dispose.security.annotation.Encryption;
 import com.dispose.service.AreaCodeManagerService;
 import com.dispose.service.DisposeAbilityRouterService;
 import com.dispose.service.DisposeDeviceManagerService;
 import com.dispose.validation.group.ValidGroups;
-import com.security.annotation.Decryption;
-import com.security.annotation.Encryption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/dispose/controller/DisposeTaskController.java

@@ -24,12 +24,12 @@ import com.dispose.pojo.dto.protocol.task.TaskStopRsp;
 import com.dispose.pojo.entity.DeviceTask;
 import com.dispose.pojo.entity.DisposeTask;
 import com.dispose.pojo.po.MulReturnType;
+import com.dispose.security.annotation.Decryption;
+import com.dispose.security.annotation.Encryption;
 import com.dispose.service.DisposeTaskService;
 import com.dispose.service.UserAccountService;
 import com.dispose.validation.group.ValidGroups;
 import com.github.pagehelper.PageInfo;
-import com.security.annotation.Decryption;
-import com.security.annotation.Encryption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/dispose/exception/GlobalExceptionHandler.java

@@ -3,7 +3,7 @@ package com.dispose.exception;
 import com.dispose.common.ErrorCode;
 import com.dispose.pojo.dto.protocol.base.BaseRespStatus;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
-import com.security.exception.SecurityProtocolException;
+import com.dispose.security.exception.SecurityProtocolException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;

src/main/java/com/dispose/interceptor/RequestProtocolSecurity.java

@@ -1,7 +1,7 @@
 package com.dispose.interceptor;
 
+import com.dispose.security.annotation.Decryption;
 import com.dispose.service.ProtocolSecurityService;
-import com.security.annotation.Decryption;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.core.MethodParameter;

src/main/java/com/dispose/interceptor/ResponseProtocolSecurity.java

@@ -4,8 +4,8 @@ import com.dispose.common.DisposeConfigValue;
 import com.dispose.common.ProtoCryptoType;
 import com.dispose.common.SecurityConfigValue;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
+import com.dispose.security.annotation.Encryption;
 import com.dispose.service.ProtocolSecurityService;
-import com.security.annotation.Encryption;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.core.MethodParameter;

src/main/java/com/dispose/security/annotation/Decryption.java

@@ -1,4 +1,4 @@
-package com.security.annotation;
+package com.dispose.security.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/dispose/security/annotation/Encryption.java

@@ -1,4 +1,4 @@
-package com.security.annotation;
+package com.dispose.security.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/dispose/security/arithmetic/CryptoHelper.java

@@ -1,4 +1,4 @@
-package com.security.arithmetic;
+package com.dispose.security.arithmetic;
 
 import jodd.util.Base64;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/dispose/security/configure/EncryptionPropertyResolver.java

@@ -1,6 +1,6 @@
-package com.security.configure;
+package com.dispose.security.configure;
 
-import com.security.arithmetic.CryptoHelper;
+import com.dispose.security.arithmetic.CryptoHelper;
 import com.ulisesbocchio.jasyptspringboot.EncryptablePropertyResolver;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;

src/main/java/com/dispose/security/exception/SecurityProtocolException.java

@@ -1,4 +1,4 @@
-package com.security.exception;
+package com.dispose.security.exception;
 
 import com.dispose.common.ErrorCode;
 import lombok.Getter;

src/main/java/com/dispose/security/protocol/DecryptRequestProtocol.java

@@ -1,4 +1,4 @@
-package com.security.protocol;
+package com.dispose.security.protocol;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;

src/main/java/com/dispose/service/ProtocolSecurityService.java

@@ -1,8 +1,8 @@
 package com.dispose.service;
 
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
+import com.dispose.security.protocol.DecryptRequestProtocol;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.security.protocol.DecryptRequestProtocol;
 import org.springframework.http.HttpInputMessage;
 
 import java.io.IOException;

src/main/java/com/dispose/service/impl/ProtocolSecurityServiceImpl.java

@@ -6,14 +6,14 @@ import com.dispose.common.ProtoCryptoType;
 import com.dispose.common.SecurityConfigValue;
 import com.dispose.pojo.dto.protocol.base.ProtocolReqDTO;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
+import com.dispose.security.arithmetic.CryptoHelper;
+import com.dispose.security.exception.SecurityProtocolException;
+import com.dispose.security.protocol.DecryptRequestProtocol;
 import com.dispose.service.ProtocolSecurityService;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.security.arithmetic.CryptoHelper;
-import com.security.exception.SecurityProtocolException;
-import com.security.protocol.DecryptRequestProtocol;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpInputMessage;

src/test/java/com/dispose/test/dev/debug/demo.java

@@ -9,9 +9,9 @@ import com.dispose.common.HttpType;
 import com.dispose.common.ObjectStatus;
 import com.dispose.common.PrivacyHelper;
 import com.dispose.pojo.entity.DisposeDevice;
+import com.dispose.security.arithmetic.CryptoHelper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.security.arithmetic.CryptoHelper;
 import inet.ipaddr.IPAddress;
 import inet.ipaddr.IPAddressString;
 import lombok.extern.slf4j.Slf4j;

src/test/java/com/dispose/test/dev/function/CryptoHelperTest.java

@@ -1,6 +1,6 @@
 package com.dispose.test.dev.function;
 
-import com.security.arithmetic.CryptoHelper;
+import com.dispose.security.arithmetic.CryptoHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;