From 989783dbb8dc67b9bafa3d51fbcf8d1e393b8aea Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Mon, 21 Sep 2020 16:53:39 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20Spring=20boot=20=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6=E5=8D=87=E7=BA=A7=E5=88=B02.3.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 36 ++++++++++---------
 .../test/common/CommonEnvironment.java        |  4 ++-
 .../test/dev/Global/InitTestEnvironment.java  | 22 ++++++------
 .../com/dispose/test/exec/TestCaseRun.java    |  2 --
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0de89494..d8ba47be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,27 +3,29 @@
          xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.9.RELEASE</version>
-        <relativePath/>
-    </parent>
-    <groupId>com.dispose</groupId>
-    <artifactId>phoenix_ddos_handle</artifactId>
-    <version>1.0.0</version>
-    <name>phoenix_ddos_handle</name>
-    <description>Demo project for Spring Boot</description>
     <properties>
         <java.version>1.8</java.version>
         <spring-cloud.version>Greenwich.SR3</spring-cloud.version>
         <undertow.version>2.1.3.Final</undertow.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring.framework.version>2.3.4.RELEASE</spring.framework.version>
     </properties>
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.3.4.RELEASE</version>
+        <relativePath/>
+    </parent>
+    <groupId>com.dispose</groupId>
+    <artifactId>phoenix_ddos_handle</artifactId>
+    <version>2.0.0</version>
+    <name>phoenix_ddos_handle</name>
+    <description>Dispose Platform</description>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring.framework.version}</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
@@ -127,6 +129,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
+            <version>2.10.6</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -146,11 +149,6 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.9</version>
         </dependency>
-        <dependency>
-            <groupId>com.cmcc</groupId>
-            <artifactId>enc.dec</artifactId>
-            <version>1.3.1</version>
-        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
@@ -212,6 +210,12 @@
             <artifactId>jasypt-spring-boot</artifactId>
             <version>3.0.3</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.1.5.Final</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/test/java/com/dispose/test/common/CommonEnvironment.java b/src/test/java/com/dispose/test/common/CommonEnvironment.java
index 905a2c4b..6ae90b14 100644
--- a/src/test/java/com/dispose/test/common/CommonEnvironment.java
+++ b/src/test/java/com/dispose/test/common/CommonEnvironment.java
@@ -7,6 +7,7 @@ import com.dispose.mapper.UserAccountMapper;
 import com.dispose.pojo.entity.UserAccount;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.service.UserAccountService;
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.test.context.ActiveProfiles;
@@ -23,7 +24,8 @@ import java.util.Optional;
  */
 @Data
 @Slf4j
-@ActiveProfiles("test,dispose")
+@EnableEncryptableProperties
+@ActiveProfiles({"test", "dispose"})
 public class CommonEnvironment {
 
     /**
diff --git a/src/test/java/com/dispose/test/dev/Global/InitTestEnvironment.java b/src/test/java/com/dispose/test/dev/Global/InitTestEnvironment.java
index f95b6daf..e89f32b4 100644
--- a/src/test/java/com/dispose/test/dev/Global/InitTestEnvironment.java
+++ b/src/test/java/com/dispose/test/dev/Global/InitTestEnvironment.java
@@ -7,6 +7,7 @@ import com.dispose.common.ProtoCryptoType;
 import com.dispose.pojo.dto.protocol.base.ProtocolRespDTO;
 import com.dispose.pojo.po.MulReturnType;
 import com.dispose.service.UserAccountService;
+import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
@@ -24,7 +25,8 @@ import javax.annotation.Resource;
  */
 @Slf4j
 @Getter
-@ActiveProfiles("test,dispose")
+@EnableEncryptableProperties
+@ActiveProfiles({"test", "dispose"})
 public class InitTestEnvironment {
     /**
      * The constant HTTP_CONNECT_TIMEOUT.
@@ -48,14 +50,6 @@ public class InitTestEnvironment {
     @Resource
     private UserAccountService userAccountService;
 
-    /**
-     * Init global value.
-     */
-    @PostConstruct
-    public void initGlobalValue() {
-        DisposeConfigValue.ENABLE_UTEST_MOCK = true;
-    }
-
     /**
      * Init virtual device.
      */
@@ -64,6 +58,14 @@ public class InitTestEnvironment {
         log.warn("Current Used Virtual Dispose Device");
     }
 
+    /**
+     * Init global value.
+     */
+    @PostConstruct
+    public void initGlobalValue() {
+        DisposeConfigValue.ENABLE_UTEST_MOCK = true;
+    }
+
     /**
      * User login.
      *
@@ -98,7 +100,7 @@ public class InitTestEnvironment {
             // 检查请求是否超时
             if (DisposeConfigValue.CHECK_PROTO_REQUEST_TIMEOUT) {
                 Assert.assertFalse(Math.abs(System.currentTimeMillis() - proObject.getTimeStamp())
-                        >= DisposeConfigValue.REQUEST_TIMEOUT_MS);
+                                       >= DisposeConfigValue.REQUEST_TIMEOUT_MS);
             }
 
             // 检查加密方式
diff --git a/src/test/java/com/dispose/test/exec/TestCaseRun.java b/src/test/java/com/dispose/test/exec/TestCaseRun.java
index 0c002e68..4a188486 100644
--- a/src/test/java/com/dispose/test/exec/TestCaseRun.java
+++ b/src/test/java/com/dispose/test/exec/TestCaseRun.java
@@ -76,8 +76,6 @@ public interface TestCaseRun {
         Collections.addAll(tolTestCase, P2TaskStop.getTestCase());
         Collections.addAll(tolTestCase, P2TaskList.getTestCase());
 
-
-
         Collections.addAll(tolTestCase, ProtocolSecurity.getTestCase());
         Collections.addAll(tolTestCase, CodeCoverage.getTestCase());