去掉 dc3-config，取而代之的是 dc3-profiles，这样更合理一些，同时更便于管理

CVEDetect · Jun 8, 2021 · 50cdad8 · 50cdad8
1 parent df48129
commit 50cdad8
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 350 deletions.
diff --git a/dc3-common/dc3-config/pom.xml b/dc3-common/dc3-config/pom.xml
diff --git a/dc3-common/dc3-config/src/main/resources/META-INF/spring-configuration-metadata.json b/dc3-common/dc3-config/src/main/resources/META-INF/spring-configuration-metadata.json
diff --git a/dc3-common/dc3-config/src/main/resources/banner.txt b/dc3-common/dc3-config/src/main/resources/banner.txt
diff --git a/dc3-common/dc3-config/src/main/resources/bootstrap.yml b/dc3-common/dc3-config/src/main/resources/bootstrap.yml
diff --git a/dc3-common/dc3-config/src/main/resources/license/license b/dc3-common/dc3-config/src/main/resources/license/license
diff --git a/dc3-common/dc3-config/src/main/resources/license/license.key b/dc3-common/dc3-config/src/main/resources/license/license.key
diff --git a/dc3-common/dc3-config/src/main/resources/logback.xml b/dc3-common/dc3-config/src/main/resources/logback.xml
diff --git a/dc3-common/dc3-config/src/main/resources/static/favicon.ico b/dc3-common/dc3-config/src/main/resources/static/favicon.ico
diff --git a/dc3-common/pom.xml b/dc3-common/pom.xml
@@ -31,7 +31,6 @@
     <modules>
         <module>dc3-core</module>
         <module>dc3-base</module>
-        <module>dc3-config</module>
         <module>dc3-profiles</module>
         <module>dc3-sdk</module>
     </modules>

diff --git a/dc3-transfer/dc3-rtmp/pom.xml b/dc3-transfer/dc3-rtmp/pom.xml
@@ -33,6 +33,12 @@
             <artifactId>dc3-api-rtmp</artifactId>
         </dependency>
 
+        <!-- Dc3 Common Profiles -->
+        <dependency>
+            <groupId>com.dc3</groupId>
+            <artifactId>dc3-profiles</artifactId>
+        </dependency>
+
         <!-- Dc3 Common Core -->
         <dependency>
             <groupId>com.dc3</groupId>

diff --git a/dc3-transfer/dc3-rtmp/src/main/resources/application.yml b/dc3-transfer/dc3-rtmp/src/main/resources/application.yml
@@ -9,6 +9,14 @@ server:
 spring:
   application:
     name: @project.artifactId@
+  profiles:
+    active:
+      - register
+      - monitor
+      - server
+      - mysql
+      - redis
+      - feign
   main:
     allow-bean-definition-overriding: true
   mvc:

diff --git a/dc3-transfer/pom.xml b/dc3-transfer/pom.xml
@@ -51,12 +51,6 @@
             <artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
 
-        <!-- Dc3 Common Config -->
-        <dependency>
-            <groupId>com.dc3</groupId>
-            <artifactId>dc3-config</artifactId>
-        </dependency>
-
     </dependencies>
 
     <build>