From 8731f641ea096ee44811d2d62e4abc79e0d7d3cf Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Mon, 1 May 2023 16:48:15 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-common.yml |  5 ---
 .../src/main/resources/application-eureka.yml |  8 ----
 .../main/resources/application-metrics.yml    | 12 ------
 .../src/main/resources/application.yml        | 42 +++++++++++++++++++
 ...application-forest.yml => application.yml} |  4 ++
 5 files changed, 46 insertions(+), 25 deletions(-)
 delete mode 100644 service-configuration/src/main/resources/application-common.yml
 delete mode 100644 service-configuration/src/main/resources/application-eureka.yml
 delete mode 100644 service-configuration/src/main/resources/application-metrics.yml
 create mode 100644 service-configuration/src/main/resources/application.yml
 rename service-forest/src/main/resources/{application-forest.yml => application.yml} (74%)

diff --git a/service-configuration/src/main/resources/application-common.yml b/service-configuration/src/main/resources/application-common.yml
deleted file mode 100644
index 6828654..0000000
--- a/service-configuration/src/main/resources/application-common.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-spring:
-  main:
-    banner-mode: off
-server:
-  port: 0
\ 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
deleted file mode 100644
index ea95b57..0000000
--- a/service-configuration/src/main/resources/application-eureka.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index a0cdf20..0000000
--- a/service-configuration/src/main/resources/application-metrics.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-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.yml b/service-configuration/src/main/resources/application.yml
new file mode 100644
index 0000000..183d760
--- /dev/null
+++ b/service-configuration/src/main/resources/application.yml
@@ -0,0 +1,42 @@
+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-forest/src/main/resources/application-forest.yml b/service-forest/src/main/resources/application.yml
similarity index 74%
rename from service-forest/src/main/resources/application-forest.yml
rename to service-forest/src/main/resources/application.yml
index b975ee7..91d4783 100644
--- a/service-forest/src/main/resources/application-forest.yml
+++ b/service-forest/src/main/resources/application.yml
@@ -1,3 +1,7 @@
+spring:
+  config:
+    activate:
+      on-profile: forest
 forest:
   backend: httpclient
   timeout: 60000