From 592d27ad6ff20a1b28d0ca5d2f2ed9779a060165 Mon Sep 17 00:00:00 2001 From: v-zhangjc9 Date: Thu, 16 May 2024 16:37:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(cli):=20=E5=A2=9E=E5=8A=A0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=A1=E6=81=AF=E5=88=B0?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=87=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 5 -- .../src/main/resources/application-b12.yml | 7 +++ .../src/main/resources/application-b5.yml | 63 ------------------- .../src/main/resources/application.yml | 10 +++ .../main/resources/template/cloud/deploy.ftl | 2 +- .../src/main/resources/application.yml | 5 -- 6 files changed, 18 insertions(+), 74 deletions(-) delete mode 100644 service-cli/service-cli-runner/src/main/resources/application-b5.yml diff --git a/service-api/src/main/resources/application.yml b/service-api/src/main/resources/application.yml index a5e754c..f1d534e 100644 --- a/service-api/src/main/resources/application.yml +++ b/service-api/src/main/resources/application.yml @@ -3,11 +3,6 @@ spring: name: service-api profiles: include: random-port,common,discovery,metrics - datasource: - url: ENC(tDeB9gYs1IHN90VV+KhNQAVEKSqeInEmFhgma7A0g6surB5pOyJC3lJx0QrvQo4zYz0WOhSgqjglHDSX7nh7k9ak3OQMgLYkHQGVawAZfcsGT/1m0csyjQzCxTCOZr5r) - username: ENC(29BKiU1cMKlA61gszFeYfWvoDVtLCCQAtfraxMq+f6Gm2LFu+67lkkBhoWgWIJga) - password: ENC(t+7GZM/tfqYeTlOugjcO6lUsHlacoVaomxLOeDpb6LhVB5+wbZHkKkW1xke8jNhQ) - driver-class-name: com.mysql.jdbc.Driver druid: initial-size: 5 max-active: 10 diff --git a/service-cli/service-cli-runner/src/main/resources/application-b12.yml b/service-cli/service-cli-runner/src/main/resources/application-b12.yml index 6bc2ff2..cb87436 100644 --- a/service-cli/service-cli-runner/src/main/resources/application-b12.yml +++ b/service-cli/service-cli-runner/src/main/resources/application-b12.yml @@ -44,6 +44,13 @@ deploy: authority: ENC(GXKnbq1LS11U2HaONspvH+D/TkIx13aWTaokdkzaF7HSvq6Z0Rv1+JUWFnYopVXu) username: ENC(moIO5mO39V1Z+RDwROK9JXY4GfM8ZjDgM6Si7wRZ1MPVjbhTpmLz3lz28rAiw7c2LeCmizfJzHkEXIwGlB280g==) darkcode: ENC(0jzpQ7T6S+P7bZrENgYsUoLhlqGvw7DA2MN3BRqEOwq7plhtg72vuuiPQNnr3DaYz0CpyTvxInhpx11W3VZ1trD6NINh7O3LN70ZqO5pWXk=) + database: + # 配置数据库连接信息 + config: + url: ENC(tDeB9gYs1IHN90VV+KhNQAVEKSqeInEmFhgma7A0g6surB5pOyJC3lJx0QrvQo4zYz0WOhSgqjglHDSX7nh7k9ak3OQMgLYkHQGVawAZfcsGT/1m0csyjQzCxTCOZr5r) + username: ENC(29BKiU1cMKlA61gszFeYfWvoDVtLCCQAtfraxMq+f6Gm2LFu+67lkkBhoWgWIJga) + password: ENC(t+7GZM/tfqYeTlOugjcO6lUsHlacoVaomxLOeDpb6LhVB5+wbZHkKkW1xke8jNhQ) + driver-class-name: com.mysql.jdbc.Driver # hudi运行集群（集群名称需要和代码里定义的名称一致） yarn: # hudi表数据存放集群 diff --git a/service-cli/service-cli-runner/src/main/resources/application-b5.yml b/service-cli/service-cli-runner/src/main/resources/application-b5.yml deleted file mode 100644 index eb5756d..0000000 --- a/service-cli/service-cli-runner/src/main/resources/application-b5.yml +++ /dev/null @@ -1,63 +0,0 @@ -deploy: - runtime: - signature: b5 - user: datalake - jar-path: /apps/datalake/hudi/jars - jdk-path: /opt/jdk1.8.0_162 - log-path: /apps/datalake/hudi/logs - conf-path: /apps/datalake/hudi/conf - data-path: /apps/datalake/hudi/data - kerberos-keytab-path: /etc/security/keytabs/datalake.app.keytab - loki: - service-url: http://132.122.116.142:33100 - service-push-url: ${deploy.runtime.loki.service-url}/loki/api/v1/push - hudi-url: http://132.122.116.142:33100 - hudi-push-url: ${deploy.runtime.loki.hudi-url}/loki/api/v1/push - zk-url: b5m1.hdp.dc:2181,b5m2.hdp.dc:2181,b5m3.hdp.dc:2181 - connector-zk-url: b5m1.hdp.dc:2181,b5m2.hdp.dc:2181,b5m3.hdp.dc:2181 - hudi: - app-hdfs-path: hdfs://b2/apps/datalake/jars/app - victoria-push-url: http://132.122.116.142:35710/api/v1/import/prometheus - loki-push-url: ${deploy.runtime.loki.hudi-push-url} - executor: - task-jar-path: hdfs://b2/apps/datalake/jars/service - task-result-path: hdfs://b2/apps/datalake/task-results - security: - authority: ENC(GXKnbq1LS11U2HaONspvH+D/TkIx13aWTaokdkzaF7HSvq6Z0Rv1+JUWFnYopVXu) - username: ENC(moIO5mO39V1Z+RDwROK9JXY4GfM8ZjDgM6Si7wRZ1MPVjbhTpmLz3lz28rAiw7c2LeCmizfJzHkEXIwGlB280g==) - darkcode: ENC(0jzpQ7T6S+P7bZrENgYsUoLhlqGvw7DA2MN3BRqEOwq7plhtg72vuuiPQNnr3DaYz0CpyTvxInhpx11W3VZ1trD6NINh7O3LN70ZqO5pWXk=) - yarn: - store-cluster: b2 - sync-clusters: b5-sync - compaction-clusters: b12,b1,b5,a4 - hosts: - "[b5s119.hdp.dc]": - ip: 132.122.116.142 - "[b5s120.hdp.dc]": - ip: 132.122.116.143 - "[b5s121.hdp.dc]": - ip: 132.122.116.144 - "[b5s122.hdp.dc]": - ip: 132.122.116.145 - "[b5s123.hdp.dc]": - ip: 132.122.116.146 - "[b5s124.hdp.dc]": - ip: 132.122.116.147 - "[b5s125.hdp.dc]": - ip: 132.122.116.148 - "[b5s126.hdp.dc]": - ip: 132.122.116.149 - "[b5s127.hdp.dc]": - ip: 132.122.116.150 - "[b5s128.hdp.dc]": - ip: 132.122.116.151 - "[b5s129.hdp.dc]": - ip: 132.122.116.152 - "[b5s130.hdp.dc]": - ip: 132.122.116.153 - "[b5s131.hdp.dc]": - ip: 132.122.116.154 - "[b5s132.hdp.dc]": - ip: 132.122.116.155 - "[b5s133.hdp.dc]": - ip: 132.122.116.156 \ No newline at end of file diff --git a/service-cli/service-cli-runner/src/main/resources/application.yml b/service-cli/service-cli-runner/src/main/resources/application.yml index deddd45..ed4fcdb 100644 --- a/service-cli/service-cli-runner/src/main/resources/application.yml +++ b/service-cli/service-cli-runner/src/main/resources/application.yml @@ -13,6 +13,11 @@ deploy: order: 1 source-jar: service-api-1.0.0-SNAPSHOT.jar replicas: 10 + arguments: + "[spring.datasource.url]": ${deploy.runtime.database.config.url} + "[spring.datasource.username]": ${deploy.runtime.database.config.username} + "[spring.datasource.password]": ${deploy.runtime.database.config.password} + "[spring.datasource.driver-class-name]": ${deploy.runtime.database.config.driver-class-name} service-scheduler: order: 3 groups: @@ -106,6 +111,11 @@ deploy: - "service" source-jar: service-info-query-1.0.0-SNAPSHOT.jar replicas: 10 + arguments: + "[spring.datasource.url]": ${deploy.runtime.database.config.url} + "[spring.datasource.username]": ${deploy.runtime.database.config.username} + "[spring.datasource.password]": ${deploy.runtime.database.config.password} + "[spring.datasource.driver-class-name]": ${deploy.runtime.database.config.driver-class-name} service-yarn-query: order: 2 groups: 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 96a9a7f..66a679b 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 @@ -13,7 +13,7 @@ hostname_full=`ssh $host 'hostname -f'` <#-- 获取当前时间 --> start_time=`date +%Y%m%d%H%M%S` 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}/bin/java <#list environments?keys as key>-D${key}=${environments[key]?string} -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} --hudi-service.signature=${runtime.signature} --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} > /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}/bin/java <#list environments?keys as key>-D${key}=${environments[key]?string} -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} --hudi-service.signature=${runtime.signature} --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}' > /dev/null 2>&1 &" echo '' diff --git a/service-info-query/src/main/resources/application.yml b/service-info-query/src/main/resources/application.yml index 0b817a2..db23904 100644 --- a/service-info-query/src/main/resources/application.yml +++ b/service-info-query/src/main/resources/application.yml @@ -3,11 +3,6 @@ spring: name: service-info-query profiles: include: random-port,common,discovery,metrics - datasource: - url: ENC(tDeB9gYs1IHN90VV+KhNQAVEKSqeInEmFhgma7A0g6surB5pOyJC3lJx0QrvQo4zYz0WOhSgqjglHDSX7nh7k9ak3OQMgLYkHQGVawAZfcsGT/1m0csyjQzCxTCOZr5r) - username: ENC(29BKiU1cMKlA61gszFeYfWvoDVtLCCQAtfraxMq+f6Gm2LFu+67lkkBhoWgWIJga) - password: ENC(t+7GZM/tfqYeTlOugjcO6lUsHlacoVaomxLOeDpb6LhVB5+wbZHkKkW1xke8jNhQ) - driver-class-name: com.mysql.jdbc.Driver druid: initial-size: 5 max-active: 10