feat: 2022.1.0

CVEDetect · Jan 20, 2022 · 23f4e50 · 23f4e50
1 parent 5262d98
commit 23f4e50
Show file tree

Hide file tree

Showing 184 changed files with 202 additions and 233 deletions.
diff --git a/dc3-api/dc3-api-auth/pom.xml b/dc3-api/dc3-api-auth/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-api</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-api-auth</artifactId>

diff --git a/dc3-api/dc3-api-data/pom.xml b/dc3-api/dc3-api-data/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-api</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-api-data</artifactId>

diff --git a/dc3-api/dc3-api-data/src/main/java/com/dc3/api/center/data/config/OpenFeignConfig.java b/dc3-api/dc3-api-data/src/main/java/com/dc3/api/center/data/config/OpenFeignConfig.java
diff --git a/dc3-api/dc3-api-manager/pom.xml b/dc3-api/dc3-api-manager/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-api</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-api-manager</artifactId>

diff --git a/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/config/OpenFeignConfig.java b/dc3-api/dc3-api-manager/src/main/java/com/dc3/api/center/manager/config/OpenFeignConfig.java
diff --git a/dc3-api/dc3-api-rtmp/pom.xml b/dc3-api/dc3-api-rtmp/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-api</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-api-rtmp</artifactId>

diff --git a/dc3-api/dc3-api-rtmp/src/main/java/com/dc3/api/transfer/rtmp/config/OpenFeignConfig.java b/dc3-api/dc3-api-rtmp/src/main/java/com/dc3/api/transfer/rtmp/config/OpenFeignConfig.java
diff --git a/dc3-api/pom.xml b/dc3-api/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>iot-dc3</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-api</artifactId>
@@ -38,34 +38,10 @@
 
     <dependencies>
 
-        <!-- Resilience4j -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
-        </dependency>
-
-        <!-- Open Feign -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-        <!-- Feign OkHttp -->
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
-        </dependency>
-
-        <!-- Feign Jackson -->
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-jackson</artifactId>
-        </dependency>
-
-        <!-- Dc3 Common Base -->
+        <!-- Dc3 Common Api -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-base</artifactId>
+            <artifactId>dc3-common-api</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/dc3-auth/pom.xml b/dc3-center/dc3-auth/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-center</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-auth</artifactId>
@@ -36,13 +36,13 @@
         <!-- Dc3 Common Core -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-core</artifactId>
+            <artifactId>dc3-common-core</artifactId>
         </dependency>
 
         <!-- Dc3 Common Profiles -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-profiles</artifactId>
+            <artifactId>dc3-common-profiles</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/dc3-data/pom.xml b/dc3-center/dc3-data/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-center</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-data</artifactId>
@@ -58,13 +58,13 @@
         <!-- Dc3 Common Core -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-core</artifactId>
+            <artifactId>dc3-common-core</artifactId>
         </dependency>
 
         <!-- Dc3 Common Profiles -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-profiles</artifactId>
+            <artifactId>dc3-common-profiles</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/dc3-manager/pom.xml b/dc3-center/dc3-manager/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-center</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-manager</artifactId>
@@ -52,13 +52,13 @@
         <!-- Dc3 Common Core -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-core</artifactId>
+            <artifactId>dc3-common-core</artifactId>
         </dependency>
 
         <!-- Dc3 Common Profiles -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-profiles</artifactId>
+            <artifactId>dc3-common-profiles</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/dc3-monitor/pom.xml b/dc3-center/dc3-monitor/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-center</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-monitor</artifactId>
@@ -36,7 +36,7 @@
         <!-- Dc3 Common Profiles -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-profiles</artifactId>
+            <artifactId>dc3-common-profiles</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/dc3-register/pom.xml b/dc3-center/dc3-register/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-center</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-register</artifactId>
@@ -42,7 +42,7 @@
         <!-- Dc3 Common Profiles -->
         <dependency>
             <groupId>com.dc3</groupId>
-            <artifactId>dc3-profiles</artifactId>
+            <artifactId>dc3-common-profiles</artifactId>
         </dependency>
 
     </dependencies>

diff --git a/dc3-center/pom.xml b/dc3-center/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>iot-dc3</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
     <artifactId>dc3-center</artifactId>

diff --git a/dc3-common/dc3-common-api/pom.xml b/dc3-common/dc3-common-api/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright 2016-2021 Pnoker. All Rights Reserved.
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.dc3</groupId>
+        <artifactId>dc3-common</artifactId>
+        <version>2022.1.0</version>
+    </parent>
+
+    <artifactId>dc3-common-api</artifactId>
+    <packaging>jar</packaging>
+
+    <description>IOT DC3 平台 公共接口逻辑。</description>
+
+    <dependencies>
+
+        <!-- Resilience4j -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-circuitbreaker-resilience4j</artifactId>
+        </dependency>
+
+        <!-- Open Feign -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+        <!-- Feign OkHttp -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-okhttp</artifactId>
+        </dependency>
+
+        <!-- Feign Jackson -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-jackson</artifactId>
+        </dependency>
+
+        <!-- Dc3 Common Base -->
+        <dependency>
+            <groupId>com.dc3</groupId>
+            <artifactId>dc3-common-base</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/...i/center/auth/config/OpenFeignConfig.java → ...om/dc3/common/config/OpenFeignConfig.java b/...i/center/auth/config/OpenFeignConfig.java → ...om/dc3/common/config/OpenFeignConfig.java
@@ -11,7 +11,7 @@
  * limitations under the License.
  */
 
-package com.dc3.api.center.auth.config;
+package com.dc3.common.config;
 
 import feign.Logger;
 import org.springframework.context.annotation.Bean;

diff --git a/dc3-common/dc3-common-api/src/main/resources/META-INF/spring.factories b/dc3-common/dc3-common-api/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.dc3.common.config.OpenFeignConfig
diff --git a/dc3-common/dc3-base/pom.xml → dc3-common/dc3-common-base/pom.xml b/dc3-common/dc3-base/pom.xml → dc3-common/dc3-common-base/pom.xml
@@ -20,10 +20,10 @@
     <parent>
         <groupId>com.dc3</groupId>
         <artifactId>dc3-common</artifactId>
-        <version>1.3.2.SR</version>
+        <version>2022.1.0</version>
     </parent>
 
-    <artifactId>dc3-base</artifactId>
+    <artifactId>dc3-common-base</artifactId>
     <packaging>jar</packaging>
 
     <description>IOT DC3 平台 公共基础集合。</description>

diff --git a/...n/java/com/dc3/common/base/Converter.java → ...n/java/com/dc3/common/base/Converter.java b/...n/java/com/dc3/common/base/Converter.java → ...n/java/com/dc3/common/base/Converter.java
diff --git a/...ain/java/com/dc3/common/base/Service.java → ...ain/java/com/dc3/common/base/Service.java b/...ain/java/com/dc3/common/base/Service.java → ...ain/java/com/dc3/common/base/Service.java
diff --git a/.../java/com/dc3/common/bean/Dictionary.java → .../java/com/dc3/common/bean/Dictionary.java b/.../java/com/dc3/common/bean/Dictionary.java → .../java/com/dc3/common/bean/Dictionary.java
diff --git a/...c/main/java/com/dc3/common/bean/Keys.java → ...c/main/java/com/dc3/common/bean/Keys.java b/...c/main/java/com/dc3/common/bean/Keys.java → ...c/main/java/com/dc3/common/bean/Keys.java
diff --git a/.../main/java/com/dc3/common/bean/Login.java → .../main/java/com/dc3/common/bean/Login.java b/.../main/java/com/dc3/common/bean/Login.java → .../main/java/com/dc3/common/bean/Login.java
diff --git a/.../main/java/com/dc3/common/bean/Pages.java → .../main/java/com/dc3/common/bean/Pages.java b/.../main/java/com/dc3/common/bean/Pages.java → .../main/java/com/dc3/common/bean/Pages.java
diff --git a/.../src/main/java/com/dc3/common/bean/R.java → .../src/main/java/com/dc3/common/bean/R.java b/.../src/main/java/com/dc3/common/bean/R.java → .../src/main/java/com/dc3/common/bean/R.java
diff --git a/...om/dc3/common/bean/batch/BatchDevice.java → ...om/dc3/common/bean/batch/BatchDevice.java b/...om/dc3/common/bean/batch/BatchDevice.java → ...om/dc3/common/bean/batch/BatchDevice.java
diff --git a/...om/dc3/common/bean/batch/BatchDriver.java → ...om/dc3/common/bean/batch/BatchDriver.java b/...om/dc3/common/bean/batch/BatchDriver.java → ...om/dc3/common/bean/batch/BatchDriver.java
diff --git a/...com/dc3/common/bean/batch/BatchGroup.java → ...com/dc3/common/bean/batch/BatchGroup.java b/...com/dc3/common/bean/batch/BatchGroup.java → ...com/dc3/common/bean/batch/BatchGroup.java
diff --git a/...com/dc3/common/bean/batch/BatchPoint.java → ...com/dc3/common/bean/batch/BatchPoint.java b/...com/dc3/common/bean/batch/BatchPoint.java → ...com/dc3/common/bean/batch/BatchPoint.java
diff --git a/...m/dc3/common/bean/batch/BatchProfile.java → ...m/dc3/common/bean/batch/BatchProfile.java b/...m/dc3/common/bean/batch/BatchProfile.java → ...m/dc3/common/bean/batch/BatchProfile.java
diff --git a/...dc3/common/bean/driver/AttributeInfo.java → ...dc3/common/bean/driver/AttributeInfo.java b/...dc3/common/bean/driver/AttributeInfo.java → ...dc3/common/bean/driver/AttributeInfo.java
diff --git a/...mmon/bean/driver/DriverConfiguration.java → ...mmon/bean/driver/DriverConfiguration.java b/...mmon/bean/driver/DriverConfiguration.java → ...mmon/bean/driver/DriverConfiguration.java
diff --git a/...c3/common/bean/driver/DriverMetadata.java → ...c3/common/bean/driver/DriverMetadata.java b/...c3/common/bean/driver/DriverMetadata.java → ...c3/common/bean/driver/DriverMetadata.java
diff --git a/...c3/common/bean/driver/DriverRegister.java → ...c3/common/bean/driver/DriverRegister.java b/...c3/common/bean/driver/DriverRegister.java → ...c3/common/bean/driver/DriverRegister.java
diff --git a/...om/dc3/common/bean/point/PointDetail.java → ...om/dc3/common/bean/point/PointDetail.java b/...om/dc3/common/bean/point/PointDetail.java → ...om/dc3/common/bean/point/PointDetail.java
diff --git a/...com/dc3/common/bean/point/PointValue.java → ...com/dc3/common/bean/point/PointValue.java b/...com/dc3/common/bean/point/PointValue.java → ...com/dc3/common/bean/point/PointValue.java
diff --git a/...m/dc3/common/bean/point/TsPointValue.java → ...m/dc3/common/bean/point/TsPointValue.java b/...m/dc3/common/bean/point/TsPointValue.java → ...m/dc3/common/bean/point/TsPointValue.java
diff --git a/.../common/bean/property/ThreadProperty.java → .../common/bean/property/ThreadProperty.java b/.../common/bean/property/ThreadProperty.java → .../common/bean/property/ThreadProperty.java
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
		com.dc3.common.config.OpenFeignConfig