From b9247fa4f0375677972f52cff6fa4df10667dc68 Mon Sep 17 00:00:00 2001
From: lanyuanxiaoyao <lanyuanxiaoyao@gmail.com>
Date: Wed, 28 Feb 2024 14:30:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(cli):=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/template/cloud/deploy.ftl  | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/service-cli/service-cli-runner/src/main/resources/template/cloud/deploy.ftl b/service-cli/service-cli-runner/src/main/resources/template/cloud/deploy.ftl
index eff7841..b84fc44 100644
--- a/service-cli/service-cli-runner/src/main/resources/template/cloud/deploy.ftl
+++ b/service-cli/service-cli-runner/src/main/resources/template/cloud/deploy.ftl
@@ -1,30 +1,19 @@
 #!/bin/bash
 
-<#--hosts=(
-<#list hosts as host>
-  ${host}
-</#list>
-)-->
 datetime=`date +%Y%m%d%H%M%S`
-log_path='${runtime.logPath}'
-loki_url='${runtime.loki.servicePushUrl}'
-zk_url='${runtime.zkUrl}'
-security_authority='${runtime.security.authority}'
-security_username='${runtime.security.username}'
-security_darkcode='${runtime.security.darkcode}'
-sync_clusters='${runtime.yarn.syncClusters}'
-compaction_clusters='${runtime.yarn.compactionClusters}'
-
 <#list hosts as host>
 host=${host.ip}
 echo "${info.name} ${host.ip} ${host.hostname} $datetime"
 ssh $host 'bash -s' < ${currentPath}/stop.sh ${runtime.jarPath}/${info.name}.jar
 <#if selectedHosts?seq_contains(host.ip)>
+<#-- 获取主机域名 -->
 hostname=`ssh $host 'hostname'`
+<#-- 获取主机域名全名 -->
 hostname_full=`ssh $host 'hostname -f'`
-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}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar<#noparse> --datetime=${datetime} --hostname=${hostname} --deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --deploy.hostname-full=${hostname_full} --deploy.start-time=${start_time} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --spring.security.meta.authority='${security_authority}' --spring.security.meta.username='${security_username}' --spring.security.meta.darkcode='${security_darkcode}' --yarn-cluster.sync-clusters=${sync_clusters} --yarn-cluster.compaction-clusters=${compaction_clusters}</#noparse> <#list arguments?keys as key>--${key}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
+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"
+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}=${environments[key]?string} </#list>-jar ${runtime.jarPath}/${info.name}.jar <#noparse>--deploy.datetime=${datetime} --deploy.ip=${host} --deploy.hostname=${hostname} --deploy.hostname-full=${hostname_full} --deploy.start-time=${start_time}</#noparse> --logging.parent=${runtime.logPath} --loki.url=${runtime.loki.servicePushUrl} --spring.cloud.zookeeper.connect-string=${runtime.zkUrl} --spring.security.meta.authority='${runtime.security.authority}' --spring.security.meta.username='${runtime.security.username}' --spring.security.meta.darkcode='${runtime.security.darkcode}' --yarn-cluster.sync-clusters=${runtime.yarn.syncClusters} --yarn-cluster.compaction-clusters=${runtime.yarn.compactionClusters} <#list arguments?keys as key>--${key}=${arguments[key]?string} </#list>> /dev/null 2>&1 &"
 </#if>
 echo ''
 </#list>