feat：对齐deployment与application中的服务名定义 (#172)

* fix: optimize the discovery inject logic and fix nacos config not working issue * feat: 删除无用的导入 * feat: 增加actuator到demo中 * fix: add lossless healthcheck for example * fix: add configuration comments * fix: 修复事件日志不输出的问题 * release: release version to 1.7.0-RC1 * feat: new add java agent for hoxton * feat: support service registry and config * feat: refrator all inject logics into BeanInjector * feat: add gray release example & dispatch bean register into plugins * feat: add environment parameter to obtain the configuration * feat: 增加元数据传输相关拦截器 * feat: 调整example打包脚本 * fix: 修复脚本没法跳转的问题 * fix: 修正样例的配置文件 * fix: 修复熔断无法加载的问题 * fix: 更新北极星的版本号依赖 * fix: 调整版本依赖 * feat：对齐deployment与application中的服务名定义
polarismesh · May 11, 2024 · f7cb5ae · f7cb5ae
1 parent 4ab49d9
commit f7cb5ae
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 29 deletions.
diff --git a/...xamples/service-a/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceA.java b/...xamples/service-a/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceA.java
@@ -53,7 +53,7 @@ public RestTemplate restTemplate() {
 	@RestController
 	public static class EchoController {
 
-		private Registration registration;
+		//private Registration registration;
 
 		private RestTemplate template;
 
@@ -63,7 +63,7 @@ public static class EchoController {
 		@Value("${spring.cloud.tencent.metadata.content.lane:base}")
 		private String lane;
 
-		public EchoController(RestTemplate restTemplate, Registration registration) {
+		public EchoController(RestTemplate restTemplate) {
 			this.template = restTemplate;
 		//	this.registration = registration;
 		}

diff --git a/...xamples/service-b/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceB.java b/...xamples/service-b/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceB.java
@@ -50,8 +50,6 @@ public RestTemplate restTemplate() {
 	@RestController
 	public static class EchoController {
 
-		private Registration registration;
-
 		private RestTemplate restTemplate;
 
 		@Autowired
@@ -60,9 +58,8 @@ public static class EchoController {
 		@Value("${spring.cloud.tencent.metadata.content.lane:base}")
 		private String lane;
 
-		public EchoController(RestTemplate restTemplate, Registration registration) {
+		public EchoController(RestTemplate restTemplate) {
 			this.restTemplate = restTemplate;
-		//	this.registration = registration;
 		}
 
 

diff --git a/...xamples/service-c/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceC.java b/...xamples/service-c/src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/ServiceC.java
@@ -47,16 +47,9 @@ public RestTemplate restTemplate() {
 	@RestController
 	public static class EchoController {
 
-		private Registration registration;
-
 		@Value("${spring.cloud.tencent.metadata.content.lane:base}")
 		private String lane;
 
-	//	public EchoController(Registration registration) {
-	//		this.registration = registration;
-	//	}
-
-
 		@GetMapping("/echo")
 		public String echo() {
 			return String.format("[%s]",  lane);

diff --git a/...lugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml b/...lugins-examples/spring-cloud-hoxton-examples/quickstart-examples/consumer/deployment.yaml
@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: hoxton-consumer
-  name: hoxton-consumer
+    app: service-consumer-hoxton
+  name: service-consumer-hoxton
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: hoxton-consumer
+      app: service-consumer-hoxton
   template:
     metadata:
       labels:
-        app: hoxton-consumer
+        app: service-consumer-hoxton
       annotations:
         polarismesh.cn/javaagent: "true"
         polarismesh.cn/javaagentVersion: "1.7.0-RC2"

diff --git a/.../src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ConsumerApplication.java b/.../src/main/java/cn/polarismesh/agent/examples/alibaba/cloud/cloud/ConsumerApplication.java
@@ -54,7 +54,7 @@ public EchoController(RestTemplate restTemplate) {
 
 		@GetMapping("/echo/{str}")
 		public ResponseEntity<String> rest(@PathVariable String str) {
-			ResponseEntity<String> response = template.getForEntity("http://service-provider/echo/" + str,
+			ResponseEntity<String> response = template.getForEntity("http://service-provider-hoxton/echo/" + str,
 					String.class);
 			return response;
 		}

diff --git a/...ud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties b/...ud-hoxton-examples/quickstart-examples/consumer/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=65002
-spring.application.name=service-consumer-quickstart-hotxon
+spring.application.name=service-consumer-hoxton
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 spring.cloud.nacos.discovery.enabled=false
 spring.cloud.nacos.config.enabled=false
diff --git a/...lugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml b/...lugins-examples/spring-cloud-hoxton-examples/quickstart-examples/provider/deployment.yaml
@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: hoxton-provider
-  name: hoxton-provider
+    app: service-provider-hoxton
+  name: service-provider-hoxton
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: hoxton-provider
+      app: service-provider-hoxton
   template:
     metadata:
       labels:
-        app: hoxton-provider
+        app: service-provider-hoxton
       annotations:
         polarismesh.cn/javaagent: "true"
         polarismesh.cn/javaagentVersion: "1.7.0-RC2"

diff --git a/...ud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties b/...ud-hoxton-examples/quickstart-examples/provider/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=65001
-spring.application.name=service-provider-quickstart-hotxon
+spring.application.name=service-provider-hoxton
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 spring.cloud.nacos.discovery.enabled=false
 spring.cloud.nacos.config.enabled=false

diff --git a/...oud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml b/...oud-plugins-examples/spring-cloud-hoxton-examples/quickstart-examples/scg/deployment.yaml
@@ -3,18 +3,18 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: hoxton-scg
-  name: hoxton-scg
+    app: scg-gateway-hoxton
+  name: scg-gateway-hoxton
   namespace: default
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: hoxton-scg
+      app: scg-gateway-hoxton
   template:
     metadata:
       labels:
-        app: hoxton-scg
+        app: scg-gateway-hoxton
       annotations:
         polarismesh.cn/javaagent: "true"
         polarismesh.cn/javaagentVersion: "1.7.0-RC2"

diff --git a/...g-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties b/...g-cloud-hoxton-examples/quickstart-examples/scg/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 server.port=65000
-spring.application.name=service-gateway-quickstart-hoxton
+spring.application.name=scg-gateway-hoxton
 spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
 spring.cloud.nacos.discovery.enabled=false
 spring.cloud.gateway.discovery.locator.enabled=true