From a3587349291777acedb0a8e366fda6c43a504e1f Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Mon, 1 May 2023 16:53:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor(all):=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=9A=8F=E6=9C=BA=E7=AB=AF=E5=8F=A3=E7=9A=84=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

同一个配置文件里用横线分割的写法实际不生效
---
 .../src/main/resources/application-common.yml |  3 ++
 .../src/main/resources/application-eureka.yml |  8 ++++
 .../main/resources/application-metrics.yml    | 12 ++++++
 .../resources/application-random-port.yml     |  2 +
 .../src/main/resources/application.yml        | 42 -------------------
 .../src/main/resources/application.yml        |  2 +-
 ...application.yml => application-forest.yml} |  4 --
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 .../src/main/resources/application.yml        |  6 +--
 .../src/main/resources/application.yml        |  2 +-
 12 files changed, 33 insertions(+), 54 deletions(-)
 create mode 100644 service-configuration/src/main/resources/application-common.yml
 create mode 100644 service-configuration/src/main/resources/application-eureka.yml
 create mode 100644 service-configuration/src/main/resources/application-metrics.yml
 create mode 100644 service-configuration/src/main/resources/application-random-port.yml
 delete mode 100644 service-configuration/src/main/resources/application.yml
 rename service-forest/src/main/resources/{application.yml => application-forest.yml} (74%)

diff --git a/service-configuration/src/main/resources/application-common.yml b/service-configuration/src/main/resources/application-common.yml
new file mode 100644
index 0000000..fa3c272
--- /dev/null
+++ b/service-configuration/src/main/resources/application-common.yml
@@ -0,0 +1,3 @@
+spring:
+  main:
+    banner-mode: off
\ No newline at end of file
diff --git a/service-configuration/src/main/resources/application-eureka.yml b/service-configuration/src/main/resources/application-eureka.yml
new file mode 100644
index 0000000..ea95b57
--- /dev/null
+++ b/service-configuration/src/main/resources/application-eureka.yml
@@ -0,0 +1,8 @@
+eureka:
+  instance:
+    hostname: localhost
+    prefer-ip-address: true
+    instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${datetime}
+  client:
+    service-url:
+      defaultZone: http://localhost:35670/eureka/
\ No newline at end of file
diff --git a/service-configuration/src/main/resources/application-metrics.yml b/service-configuration/src/main/resources/application-metrics.yml
new file mode 100644
index 0000000..a0cdf20
--- /dev/null
+++ b/service-configuration/src/main/resources/application-metrics.yml
@@ -0,0 +1,12 @@
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+  endpoint:
+    prometheus:
+      enabled: true
+  metrics:
+    export:
+      jmx:
+        enabled: false
\ No newline at end of file
diff --git a/service-configuration/src/main/resources/application-random-port.yml b/service-configuration/src/main/resources/application-random-port.yml
new file mode 100644
index 0000000..46eac2f
--- /dev/null
+++ b/service-configuration/src/main/resources/application-random-port.yml
@@ -0,0 +1,2 @@
+server:
+  port: 0
\ No newline at end of file
diff --git a/service-configuration/src/main/resources/application.yml b/service-configuration/src/main/resources/application.yml
deleted file mode 100644
index 183d760..0000000
--- a/service-configuration/src/main/resources/application.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-spring:
-  config:
-    activate:
-      on-profile: common
-  main:
-    banner-mode: off
-server:
-  port: 0
-
----
-
-spring:
-  config:
-    activate:
-      on-profile: eureka
-eureka:
-  instance:
-    hostname: localhost
-    prefer-ip-address: true
-    instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${datetime}
-  client:
-    service-url:
-      defaultZone: http://localhost:35670/eureka/
-
----
-
-spring:
-  config:
-    activate:
-      on-profile: metrics
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
diff --git a/service-flink-query/src/main/resources/application.yml b/service-flink-query/src/main/resources/application.yml
index a545c11..cd366e0 100644
--- a/service-flink-query/src/main/resources/application.yml
+++ b/service-flink-query/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: service-flink-query
   profiles:
-    active: common,eureka,metrics
\ No newline at end of file
+    include: random-port,common,eureka,metrics
\ No newline at end of file
diff --git a/service-forest/src/main/resources/application.yml b/service-forest/src/main/resources/application-forest.yml
similarity index 74%
rename from service-forest/src/main/resources/application.yml
rename to service-forest/src/main/resources/application-forest.yml
index 91d4783..b975ee7 100644
--- a/service-forest/src/main/resources/application.yml
+++ b/service-forest/src/main/resources/application-forest.yml
@@ -1,7 +1,3 @@
-spring:
-  config:
-    activate:
-      on-profile: forest
 forest:
   backend: httpclient
   timeout: 60000
diff --git a/service-hudi-query/src/main/resources/application.yml b/service-hudi-query/src/main/resources/application.yml
index eb60e1b..cc236dd 100644
--- a/service-hudi-query/src/main/resources/application.yml
+++ b/service-hudi-query/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: service-hudi-query
   profiles:
-    active: common,eureka,metrics,forest
\ No newline at end of file
+    include: random-port,common,eureka,metrics,forest
\ No newline at end of file
diff --git a/service-info-query/src/main/resources/application.yml b/service-info-query/src/main/resources/application.yml
index 7b26670..b67e031 100644
--- a/service-info-query/src/main/resources/application.yml
+++ b/service-info-query/src/main/resources/application.yml
@@ -2,7 +2,7 @@ spring:
   application:
     name: service-info-query
   profiles:
-    active: common,eureka,metrics
+    include: random-port,common,eureka,metrics
   datasource:
     url: jdbc:mysql://132.121.204.217:17906/iap-datahub?useSSL=false
     username: odcp
diff --git a/service-pulsar-query/src/main/resources/application.yml b/service-pulsar-query/src/main/resources/application.yml
index b6ff5e3..d24cecc 100644
--- a/service-pulsar-query/src/main/resources/application.yml
+++ b/service-pulsar-query/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: service-pulsar-query
   profiles:
-    active: common,eureka,metrics
+    include: random-port,common,eureka,metrics
diff --git a/service-web/src/main/resources/application.yml b/service-web/src/main/resources/application.yml
index 466d920..ea43f32 100644
--- a/service-web/src/main/resources/application.yml
+++ b/service-web/src/main/resources/application.yml
@@ -1,9 +1,9 @@
+server:
+  port: 38000
 spring:
   application:
     name: service-web
   profiles:
     include: common,eureka,metrics,forest
   jackson:
-    default-property-inclusion: non_null
-server:
-  port: 38000
\ No newline at end of file
+    default-property-inclusion: non_null
\ No newline at end of file
diff --git a/service-yarn-query/src/main/resources/application.yml b/service-yarn-query/src/main/resources/application.yml
index 220312e..7f61bb9 100644
--- a/service-yarn-query/src/main/resources/application.yml
+++ b/service-yarn-query/src/main/resources/application.yml
@@ -2,4 +2,4 @@ spring:
   application:
     name: service-yarn-query
   profiles:
-    active: common,eureka,metrics
+    include: random-port,common,eureka,metrics