diff --git a/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/RunnerApplication.java b/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/RunnerApplication.java index 67f3b3f..d4f0087 100644 --- a/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/RunnerApplication.java +++ b/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/RunnerApplication.java @@ -62,7 +62,7 @@ public class RunnerApplication implements ApplicationRunner { .select(ServiceInfoWrapper::getEnabled) .toSortedListBy(ServiceInfoWrapper::getOrder) .toImmutable(); - hostInfoList = Lists.immutable.ofAll(SpringPropertiesEscapeHelper.escapeMapKey(deployInformationProperties.getHosts()).entrySet()) + hostInfoList = Lists.immutable.ofAll(deployInformationProperties.getHosts().entrySet()) .collect(entry -> new HostInfoWrapper(entry.getKey(), entry.getValue())) .toSortedListBy(HostInfoWrapper::getHost) .toImmutable(); diff --git a/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/ServiceInfoWrapper.java b/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/ServiceInfoWrapper.java index d01a153..4441690 100644 --- a/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/ServiceInfoWrapper.java +++ b/service-cli/service-cli-runner/src/main/java/com/lanyuanxiaoyao/service/cli/runner/ServiceInfoWrapper.java @@ -21,8 +21,8 @@ public class ServiceInfoWrapper { public ServiceInfoWrapper(String name, ServiceInfo serviceInfo) { this.name = name; this.serviceInfo = serviceInfo; - this.environments = SpringPropertiesEscapeHelper.escapeMap(serviceInfo.getEnvironments()); - this.arguments = SpringPropertiesEscapeHelper.escapeMap(serviceInfo.getArguments()); + this.environments = SpringPropertiesEscapeHelper.escapeMapValue(serviceInfo.getEnvironments()); + this.arguments = SpringPropertiesEscapeHelper.escapeMapValue(serviceInfo.getArguments()); } public Boolean getEnabled() { 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 29316d1..5fb57e5 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 @@ -54,99 +54,99 @@ deploy: service-flink-query: replicas: 10 hosts: - b12s4_hdp_dc: + "[b12s4.hdp.dc]": ip: 132.126.207.130 - b12s5_hdp_dc: + "[b12s5.hdp.dc]": ip: 132.126.207.131 - b12s6_hdp_dc: + "[b12s6.hdp.dc]": ip: 132.126.207.132 - b12s7_hdp_dc: + "[b12s7.hdp.dc]": ip: 132.126.207.133 - b12s8_hdp_dc: + "[b12s8.hdp.dc]": ip: 132.126.207.134 - b12s9_hdp_dc: + "[b12s9.hdp.dc]": ip: 132.126.207.135 - b12s10_hdp_dc: + "[b12s10.hdp.dc]": ip: 132.126.207.136 - b12s11_hdp_dc: + "[b12s11.hdp.dc]": ip: 132.126.207.137 - b12s12_hdp_dc: + "[b12s12.hdp.dc]": ip: 132.126.207.138 - b12s13_hdp_dc: + "[b12s13.hdp.dc]": ip: 132.126.207.139 - b12s14_hdp_dc: + "[b12s14.hdp.dc]": ip: 132.126.207.140 - b12s15_hdp_dc: + "[b12s15.hdp.dc]": ip: 132.126.207.141 - b12s16_hdp_dc: + "[b12s16.hdp.dc]": ip: 132.126.207.142 - b12s17_hdp_dc: + "[b12s17.hdp.dc]": ip: 132.126.207.143 - b12s18_hdp_dc: + "[b12s18.hdp.dc]": ip: 132.126.207.144 - b12s19_hdp_dc: + "[b12s19.hdp.dc]": ip: 132.126.207.145 - b12s20_hdp_dc: + "[b12s20.hdp.dc]": ip: 132.126.207.146 - b12s21_hdp_dc: + "[b12s21.hdp.dc]": ip: 132.126.207.147 - b12s22_hdp_dc: + "[b12s22.hdp.dc]": ip: 132.126.207.148 - b12s23_hdp_dc: + "[b12s23.hdp.dc]": ip: 132.126.207.149 - b12s24_hdp_dc: + "[b12s24.hdp.dc]": ip: 132.126.207.150 - b12s25_hdp_dc: + "[b12s25.hdp.dc]": ip: 132.126.207.151 - b12s26_hdp_dc: + "[b12s26.hdp.dc]": ip: 132.126.207.152 - b12s27_hdp_dc: + "[b12s27.hdp.dc]": ip: 132.126.207.153 - b12s28_hdp_dc: + "[b12s28.hdp.dc]": ip: 132.126.207.154 - b12s29_hdp_dc: + "[b12s29.hdp.dc]": ip: 132.126.207.155 - b12s30_hdp_dc: + "[b12s30.hdp.dc]": ip: 132.126.207.156 - b12s31_hdp_dc: + "[b12s31.hdp.dc]": ip: 132.126.207.157 - b12s32_hdp_dc: + "[b12s32.hdp.dc]": ip: 132.126.207.158 - b12s33_hdp_dc: + "[b12s33.hdp.dc]": ip: 132.126.207.159 - b12s34_hdp_dc: + "[b12s34.hdp.dc]": ip: 132.126.207.160 - b12s35_hdp_dc: + "[b12s35.hdp.dc]": ip: 132.126.207.161 - b12s36_hdp_dc: + "[b12s36.hdp.dc]": ip: 132.126.207.162 - b12s37_hdp_dc: + "[b12s37.hdp.dc]": ip: 132.126.207.163 - b12s38_hdp_dc: + "[b12s38.hdp.dc]": ip: 132.126.207.164 - b12s39_hdp_dc: + "[b12s39.hdp.dc]": ip: 132.126.207.165 - b12s40_hdp_dc: + "[b12s40.hdp.dc]": ip: 132.126.207.166 - b12s41_hdp_dc: + "[b12s41.hdp.dc]": ip: 132.126.207.167 - b12s42_hdp_dc: + "[b12s42.hdp.dc]": ip: 132.126.207.168 - b12s43_hdp_dc: + "[b12s43.hdp.dc]": ip: 132.126.207.169 - b12s44_hdp_dc: + "[b12s44.hdp.dc]": ip: 132.126.207.170 - b12s45_hdp_dc: + "[b12s45.hdp.dc]": ip: 132.126.207.171 - b12s46_hdp_dc: + "[b12s46.hdp.dc]": ip: 132.126.207.172 - b12s47_hdp_dc: + "[b12s47.hdp.dc]": ip: 132.126.207.173 - b12s48_hdp_dc: + "[b12s48.hdp.dc]": ip: 132.126.207.174 - b12s49_hdp_dc: + "[b12s49.hdp.dc]": ip: 132.126.207.175 - b12s50_hdp_dc: + "[b12s50.hdp.dc]": ip: 132.126.207.176 - b12s51_hdp_dc: + "[b12s51.hdp.dc]": ip: 132.126.207.177 \ No newline at end of file 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 index ea62d74..10d6e91 100644 --- a/service-cli/service-cli-runner/src/main/resources/application-b5.yml +++ b/service-cli/service-cli-runner/src/main/resources/application-b5.yml @@ -30,33 +30,33 @@ deploy: sync-clusters: b5-sync compaction-clusters: b12,b1,b5,a4 hosts: - b5s119_hdp_dc: + "[b5s119.hdp.dc]": ip: 132.122.116.142 - b5s120_hdp_dc: + "[b5s120.hdp.dc]": ip: 132.122.116.143 - b5s121_hdp_dc: + "[b5s121.hdp.dc]": ip: 132.122.116.144 - b5s122_hdp_dc: + "[b5s122.hdp.dc]": ip: 132.122.116.145 - b5s123_hdp_dc: + "[b5s123.hdp.dc]": ip: 132.122.116.146 - b5s124_hdp_dc: + "[b5s124.hdp.dc]": ip: 132.122.116.147 - b5s125_hdp_dc: + "[b5s125.hdp.dc]": ip: 132.122.116.148 - b5s126_hdp_dc: + "[b5s126.hdp.dc]": ip: 132.122.116.149 - b5s127_hdp_dc: + "[b5s127.hdp.dc]": ip: 132.122.116.150 - b5s128_hdp_dc: + "[b5s128.hdp.dc]": ip: 132.122.116.151 - b5s129_hdp_dc: + "[b5s129.hdp.dc]": ip: 132.122.116.152 - b5s130_hdp_dc: + "[b5s130.hdp.dc]": ip: 132.122.116.153 - b5s131_hdp_dc: + "[b5s131.hdp.dc]": ip: 132.122.116.154 - b5s132_hdp_dc: + "[b5s132.hdp.dc]": ip: 132.122.116.155 - b5s133_hdp_dc: + "[b5s133.hdp.dc]": ip: 132.122.116.156 \ No newline at end of file