diff --git a/pom.xml b/pom.xml index 9562ad0..44274bb 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ service-dependencies service-cli service-loki-query + service-test-query diff --git a/service-configuration/src/main/resources/application-discovery.yml b/service-configuration/src/main/resources/application-discovery.yml index 67d011a..0a722ab 100644 --- a/service-configuration/src/main/resources/application-discovery.yml +++ b/service-configuration/src/main/resources/application-discovery.yml @@ -1,12 +1,13 @@ spring: cloud: zookeeper: + enabled: false + connect-string: 127.0.0.1:2181 discovery: - enabled: false + 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} - connect-string: 127.0.0.1:2181 eureka: instance: hostname: localhost diff --git a/service-test-query/pom.xml b/service-test-query/pom.xml new file mode 100644 index 0000000..708aa28 --- /dev/null +++ b/service-test-query/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.lanyuanxiaoyao + hudi-service + 1.0.0-SNAPSHOT + + + com.eshore.odcp.hudi.connector + service-test-query + + + + com.lanyuanxiaoyao + service-dependencies + 1.0.0-SNAPSHOT + + + com.lanyuanxiaoyao + service-configuration + 1.0.0-SNAPSHOT + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/service-test-query/src/main/java/com/lanyuanxiaoyao/service/test/TestApplication.java b/service-test-query/src/main/java/com/lanyuanxiaoyao/service/test/TestApplication.java new file mode 100644 index 0000000..6afa48e --- /dev/null +++ b/service-test-query/src/main/java/com/lanyuanxiaoyao/service/test/TestApplication.java @@ -0,0 +1,47 @@ +package com.lanyuanxiaoyao.service.test; + +import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.cloud.client.loadbalancer.LoadBalancerClient; +import org.springframework.cloud.zookeeper.discovery.LoadBalancerZookeeperAutoConfiguration; + +/** + * 启动类 + * + * @author lanyuanxiaoyao + * @date 2023-07-12 + */ +@SpringBootApplication( + scanBasePackages = {"com.lanyuanxiaoyao.service"}, + exclude = {GsonAutoConfiguration.class, LoadBalancerZookeeperAutoConfiguration.class} +) +@EnableDiscoveryClient +@EnableEncryptableProperties +public class TestApplication implements ApplicationRunner { + private static final Logger logger = LoggerFactory.getLogger(TestApplication.class); + private final DiscoveryClient discoveryClient; + private final LoadBalancerClient loadBalancerClient; + + public TestApplication(DiscoveryClient discoveryClient, LoadBalancerClient loadBalancerClient) { + this.discoveryClient = discoveryClient; + this.loadBalancerClient = loadBalancerClient; + } + + public static void main(String[] args) { + SpringApplication.run(TestApplication.class, args); + } + + @Override + public void run(ApplicationArguments args) { + discoveryClient.getInstances("service-hudi-query").forEach(s -> logger.info("Discovery: {}", s)); + logger.info("LoadBalance: {}", loadBalancerClient.choose("service-hudi-query")); + } +} diff --git a/service-test-query/src/main/resources/application.yml b/service-test-query/src/main/resources/application.yml new file mode 100644 index 0000000..d1595f0 --- /dev/null +++ b/service-test-query/src/main/resources/application.yml @@ -0,0 +1,11 @@ +spring: + application: + name: service-test-query + profiles: + include: random-port,common,discovery,metrics + cloud: + zookeeper: + enabled: false +jasypt: + encryptor: + password: r#(R,P"Dp^A47>WSn:Wn].gs/+"v:q_Q*An~zF*g-@j@jtSTv5H/,S-3:R?r9R}. \ No newline at end of file