From c07629868331fa468ab4a297057f5a42a5383527 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Mon, 1 May 2023 15:40:10 +0800
Subject: [PATCH] =?UTF-8?q?feature(all):=20=E4=BC=98=E5=8C=96=20yml=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E7=9A=84=E5=A4=8D=E7=94=A8?=
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        | 29 ++-----------------
 .../src/main/resources/application-forest.yml |  5 ++++
 .../src/main/resources/application.yml        | 26 ++---------------
 .../src/main/resources/application.yml        | 29 ++-----------------
 .../src/main/resources/application.yml        | 26 ++---------------
 .../src/main/resources/application.yml        | 29 ++-----------------
 9 files changed, 40 insertions(+), 129 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-forest/src/main/resources/application-forest.yml

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..6828654
--- /dev/null
+++ b/service-configuration/src/main/resources/application-common.yml
@@ -0,0 +1,5 @@
+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
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-flink-query/src/main/resources/application.yml b/service-flink-query/src/main/resources/application.yml
index d7c7adb..a545c11 100644
--- a/service-flink-query/src/main/resources/application.yml
+++ b/service-flink-query/src/main/resources/application.yml
@@ -1,30 +1,5 @@
-server:
-  port: 0
 spring:
   application:
     name: service-flink-query
-  main:
-    banner-mode: off
-  jackson:
-    serialization:
-      fail-on-empty-beans: false
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
-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
+  profiles:
+    active: common,eureka,metrics
\ No newline at end of file
diff --git a/service-forest/src/main/resources/application-forest.yml b/service-forest/src/main/resources/application-forest.yml
new file mode 100644
index 0000000..b975ee7
--- /dev/null
+++ b/service-forest/src/main/resources/application-forest.yml
@@ -0,0 +1,5 @@
+forest:
+  backend: httpclient
+  timeout: 60000
+  log-enabled: false
+  interceptors: com.lanyuanxiaoyao.service.forest.configuration.SpringCloudDiscoveryInterceptor
\ No newline at end of file
diff --git a/service-hudi-query/src/main/resources/application.yml b/service-hudi-query/src/main/resources/application.yml
index 662e0b5..eb60e1b 100644
--- a/service-hudi-query/src/main/resources/application.yml
+++ b/service-hudi-query/src/main/resources/application.yml
@@ -1,27 +1,5 @@
-server:
-  port: 0
 spring:
   application:
     name: service-hudi-query
-  main:
-    banner-mode: off
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
-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
+  profiles:
+    active: 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 3a75ea1..7b26670 100644
--- a/service-info-query/src/main/resources/application.yml
+++ b/service-info-query/src/main/resources/application.yml
@@ -1,8 +1,8 @@
-server:
-  port: 0
 spring:
   application:
     name: service-info-query
+  profiles:
+    active: common,eureka,metrics
   datasource:
     url: jdbc:mysql://132.121.204.217:17906/iap-datahub?useSSL=false
     username: odcp
@@ -11,28 +11,3 @@ spring:
     druid:
       initial-size: 5
       max-active: 10
-  main:
-    banner-mode: off
-  jackson:
-    serialization:
-      fail-on-empty-beans: false
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
-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/
diff --git a/service-pulsar-query/src/main/resources/application.yml b/service-pulsar-query/src/main/resources/application.yml
index 251713d..b6ff5e3 100644
--- a/service-pulsar-query/src/main/resources/application.yml
+++ b/service-pulsar-query/src/main/resources/application.yml
@@ -1,27 +1,5 @@
-server:
-  port: 0
 spring:
   application:
     name: service-pulsar-query
-  main:
-    banner-mode: off
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
-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
+  profiles:
+    active: common,eureka,metrics
diff --git a/service-yarn-query/src/main/resources/application.yml b/service-yarn-query/src/main/resources/application.yml
index bbae112..220312e 100644
--- a/service-yarn-query/src/main/resources/application.yml
+++ b/service-yarn-query/src/main/resources/application.yml
@@ -1,30 +1,5 @@
-server:
-  port: 0
 spring:
   application:
     name: service-yarn-query
-  main:
-    banner-mode: off
-  jackson:
-    serialization:
-      fail-on-empty-beans: false
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  endpoint:
-    prometheus:
-      enabled: true
-  metrics:
-    export:
-      jmx:
-        enabled: false
-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
+  profiles:
+    active: common,eureka,metrics