From 2fa18fa4f874315c11787a2162cd8ad7b62c05bf Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Thu, 1 Feb 2024 17:38:54 +0800
Subject: [PATCH] =?UTF-8?q?feat(log):=20=E4=BC=98=E5=8C=96=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA=20=E5=A2=9E=E5=8A=A0ip=E5=92=8Chost?=
 =?UTF-8?q?name=E5=85=A8=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service-cli-runner/src/main/resources/template/deploy.ftl | 4 ++--
 .../src/main/resources/application-discovery-eureka.yml       | 2 +-
 .../src/main/resources/application-discovery.yml              | 2 +-
 service-web/src/main/resources/logback-spring.xml             | 4 +++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl b/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
index 5a4d61f..7539982 100644
--- a/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
+++ b/service-cli/service-cli-runner/src/main/resources/template/deploy.ftl
@@ -15,13 +15,13 @@ security_darkcode='${runtime.security.darkcode}'
 
 <#list hosts as host>
 host=${host}
-hostname=`ssh $host 'echo $HOSTNAME'`
+hostname=`ssh $host 'hostname -f'`
 echo "${info.name} $host $hostname $datetime"
 ssh $host 'bash -s' < stop.sh ${runtime.jarPath}/${info.name}.jar
 <#if selectedHosts?seq_contains(host)>
 ssh $host "mkdir -p ${runtime.jarPath};curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/${info.sourceJar} -o ${runtime.jarPath}/${info.name}.jar"
 start_time=`date +%Y%m%d%H%M%S`
-ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.cloud.zookeeper.discovery.metadata.startTime=${start_time} --spring.cloud.zookeeper.discovery.metadata.hostIp=${host} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
+ssh $host "export JASYPT_ENCRYPTOR_PASSWORD='r#(R,P\"Dp^A47>WSn:Wn].gs/+\"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}.';nohup ${runtime.jdkPath} <#list environments?keys as key>-D${key?replace("_", ".")}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.cloud.zookeeper.discovery.metadata.startTime=${start_time} --spring.cloud.zookeeper.discovery.metadata.hostIp=${host} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}'</#noparse> <#list arguments?keys as key>--${key?replace("_", ".")}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
 </#if>
 echo ''
 </#list>
diff --git a/service-configuration/src/main/resources/application-discovery-eureka.yml b/service-configuration/src/main/resources/application-discovery-eureka.yml
index 8518af6..685fa6a 100644
--- a/service-configuration/src/main/resources/application-discovery-eureka.yml
+++ b/service-configuration/src/main/resources/application-discovery-eureka.yml
@@ -2,7 +2,7 @@ eureka:
   instance:
     hostname: localhost
     prefer-ip-address: true
-    instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${datetime}
+    instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${deploy.datetime}
   client:
     enabled: false
     service-url:
diff --git a/service-configuration/src/main/resources/application-discovery.yml b/service-configuration/src/main/resources/application-discovery.yml
index 6a088b4..c4cf30e 100644
--- a/service-configuration/src/main/resources/application-discovery.yml
+++ b/service-configuration/src/main/resources/application-discovery.yml
@@ -6,6 +6,6 @@ spring:
       discovery:
         enabled: ${spring.cloud.zookeeper.enabled}
         root: /hudi-services
-        instance-id: ${spring.application.name}-${hostname}-${random.uuid}-${datetime:19700101}
+        instance-id: ${spring.application.name}-${deploy.hostname}-${random.uuid}-${deploy.datetime:19700101}
         metadata:
           discovery: zookeeper
\ No newline at end of file
diff --git a/service-web/src/main/resources/logback-spring.xml b/service-web/src/main/resources/logback-spring.xml
index f272f36..d65b0a1 100644
--- a/service-web/src/main/resources/logback-spring.xml
+++ b/service-web/src/main/resources/logback-spring.xml
@@ -6,6 +6,8 @@
     <springProperty scope="context" name="LOKI_PUSH_URL" source="loki.url"/>
     <springProperty scope="context" name="LOGGING_PARENT" source="logging.parent"/>
     <springProperty scope="context" name="APP_NAME" source="spring.application.name"/>
+    <springProperty scope="context" name="DEPLOY_HOSTNAME" source="deploy.hostname"/>
+    <springProperty scope="context" name="DEPLOY_IP" source="deploy.ip"/>
 
     <appender name="Loki" class="com.github.loki4j.logback.Loki4jAppender">
         <metricsEnabled>true</metricsEnabled>
@@ -14,7 +16,7 @@
         </http>
         <format>
             <label>
-                <pattern>app=${APP_NAME:-none},host=${HOSTNAME:-none},level=%level</pattern>
+                <pattern>app=${APP_NAME:-none},host=${DEPLOY_HOSTNAME:-none},ip=${DEPLOY_IP:-none},level=%level</pattern>
                 <readMarkers>true</readMarkers>
             </label>
             <message>