feature(all): 切换使用zookeeper作为注册中心

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

@@ -21,7 +21,7 @@ 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"
-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} --spring.cloud.zookeeper.discovery.instance-host=${hostname} --eureka.instance.hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --eureka.client.service-url.defaultZone='${eureka_url}' --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} --eureka.instance.hostname=${hostname} --logging.parent=${log_path} --loki.url=${loki_url} --spring.cloud.zookeeper.connect-string=${zk_url} --eureka.client.service-url.defaultZone='${eureka_url}' --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>

service-configuration/src/main/resources/application-discovery.yml

@@ -1,20 +1,19 @@
 spring:
   cloud:
     zookeeper:
-      enabled: false
+      enabled: true
       connect-string: 127.0.0.1:2181
       discovery:
         enabled: ${spring.cloud.zookeeper.enabled}
         root: /hudi-services
-        instance-host: localhost
-        instance-id: ${spring.application.name}-${spring.cloud.zookeeper.discovery.instance-host}-${random.uuid}-${datetime:19700101}
+        instance-id: ${spring.application.name}-${hostname}-${random.uuid}-${datetime:19700101}
 eureka:
   instance:
     hostname: localhost
     prefer-ip-address: true
     instance-id: ${spring.application.name}-${eureka.instance.hostname}-${random.uuid}-${datetime}
   client:
-    enabled: true
+    enabled: false
     service-url:
       defaultZone: http://localhost:35670/eureka/
     registry-fetch-interval-seconds: 10

service-hudi-query/pom.xml

@@ -73,6 +73,10 @@
                     <groupId>commons-logging</groupId>
                     <artifactId>commons-logging</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.apache.curator</groupId>
+                    <artifactId>curator-client</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -80,6 +84,21 @@
             <artifactId>hudi-flink1.13-bundle</artifactId>
             <version>0.12.0-eshore-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>5.1.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j</artifactId>
+                    <groupId>log4j</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>netty</artifactId>
+                    <groupId>io.netty</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

service-web/src/main/java/com/lanyuanxiaoyao/service/web/controller/CloudController.java

@@ -76,7 +76,7 @@ public class CloudController extends BaseController {
         return services()
                 .groupBy(groupByField)
                 .toMap()
-                .collectValues((serviceId, services) -> new CloudServiceVO(serviceId, services.toSortedListBy(CloudServiceVO.Service::getServiceUpTime).toImmutable()))
+                .collectValues((serviceId, services) -> new CloudServiceVO(serviceId, services.toSortedListBy(CloudServiceVO.Service::getHost).toImmutable()))
                 .valuesView()
                 .toSortedListBy(CloudServiceVO::getName)
                 .toImmutable();

test/test.http

@@ -5,6 +5,7 @@
 @url = http://{{username}}:{{password}}@{{host}}:{{port}}
 @queue-url = {{url}}/hudi_services/queue
 @scheduler-url = {{url}}/hudi_services/service_scheduler
+@web-url = {{url}}/hudi_services/service_web
 
 ### 队列名称
 GET {{queue-url}}/queue/names
@@ -50,5 +51,8 @@ GET {{scheduler-url}}/schedule/all_focus
 ### schedule table force
 GET {{scheduler-url}}/schedule/table?flink_job_id=1542097993662164992&alias=acct_oa_attach_dg&force=b5-sync
 
+### Query Scheduler
+GET {{web-url}}/cloud/list
+
 ### Yarn query
 GET http://AxhEbscwsJDbYMH2:cYxg3b4PtWoVD5SjFayWxtnSVsjzRsg4@132.122.116.143:34903/job/list?cluster=a4