feat(cli): 适配使用uploader上传jar包

service-cli/service-cli-core/src/main/java/com/lanyuanxiaoyao/service/cli/core/RuntimeInfo.java

@@ -13,6 +13,7 @@ public class RuntimeInfo {
     private String logPath;
     private String confPath;
     private String dataPath;
+    private String downloadUrl;
     private String kerberosKeytabPath;
     private LokiInfo loki;
     private String zkUrl;
@@ -69,6 +70,14 @@ public class RuntimeInfo {
         this.dataPath = dataPath;
     }
 
+    public String getDownloadUrl() {
+        return downloadUrl;
+    }
+
+    public void setDownloadUrl(String downloadUrl) {
+        this.downloadUrl = downloadUrl;
+    }
+
     public String getKerberosKeytabPath() {
         return kerberosKeytabPath;
     }
@@ -134,6 +143,7 @@ public class RuntimeInfo {
                ", logPath='" + logPath + '\'' +
                ", confPath='" + confPath + '\'' +
                ", dataPath='" + dataPath + '\'' +
+               ", downloadUrl='" + downloadUrl + '\'' +
                ", kerberosKeytabPath='" + kerberosKeytabPath + '\'' +
                ", loki=" + loki +
                ", zkUrl='" + zkUrl + '\'' +

service-cli/service-cli-runner/src/main/resources/application-b12.yml

@@ -6,6 +6,7 @@ deploy:
     log-path: /data/datalake/logs
     conf-path: /data/datalake/conf
     data-path: /data/datalake/data
+    download-url: http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.126.207.34:36800
     kerberos-keytab-path: /etc/security/keytabs/datalake.app.keytab
     loki:
       service-url: http://132.126.207.125:33100

service-cli/service-cli-runner/src/main/resources/template/cloud/deploy.ftl

@@ -12,7 +12,7 @@ hostname=`ssh $host 'hostname'`
 hostname_full=`ssh $host 'hostname -f'`
 <#-- 获取当前时间 -->
 start_time=`date +%Y%m%d%H%M%S`
-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 "mkdir -p ${runtime.jarPath};curl ${runtime.downloadUrl}/${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 ''

service-cli/service-cli-runner/src/main/resources/template/command/update.ftl

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/service-command-1.0.0-SNAPSHOT.jar -o ${runtime.jarPath}/service-command.jar
+curl ${runtime.downloadUrl}/service-command-1.0.0-SNAPSHOT.jar -o ${runtime.jarPath}/service-command.jar

service-cli/service-cli-runner/src/main/resources/template/uploader/update.ftl

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-curl ftp://yyy:QeY\!68\)4nH1@132.121.122.15:2222/service-uploader-1.0.0-SNAPSHOT.jar -o ${runtime.jarPath}/service-uploader.jar
+curl ${runtime.downloadUrl}/service-uploader-1.0.0-SNAPSHOT.jar -o ${runtime.jarPath}/service-uploader.jar