Merge pull request #33 from go-chassis/master

修改service comb版本以及修改配置文件
servicestage-demo · Sep 19, 2022 · 7b4378b · 7b4378b
2 parents fee4306 + 05a1efe
commit 7b4378b
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 2 deletions.
diff --git a/edge-service/pom.xml b/edge-service/pom.xml
@@ -20,7 +20,7 @@
     <properties>
         <demo.main>com.service.edge-service.GatewayApplication</demo.main>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <servicecomb.version>2.6.0</servicecomb.version>
+        <servicecomb.version>2.7.9</servicecomb.version>
     </properties>
 
     <dependencyManagement>

diff --git a/edge-service/src/main/resources/application.yml b/edge-service/src/main/resources/application.yml
@@ -23,6 +23,10 @@ servicecomb:
 
   rest:
     address: 0.0.0.0:3010?sslEnabled=false
+  monitor:
+    client:
+      enabled: true
+      serverUri: http://127.0.0.1:30109
 
 # Here we just give a simple demo.
 # The traffic is forwarded to the microservice fusionweather, and the actual scene is much more complex than this

diff --git a/forecast/pom.xml b/forecast/pom.xml
@@ -48,6 +48,10 @@
 			<groupId>org.apache.servicecomb</groupId>
 			<artifactId>dashboard</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.servicecomb</groupId>
+			<artifactId>handler-router</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.servicecomb</groupId>
 			<artifactId>darklaunch</artifactId>

diff --git a/forecast/src/main/resources/microservice.yaml b/forecast/src/main/resources/microservice.yaml
@@ -16,6 +16,12 @@ servicecomb:
       refresh_interval: 5000
   rest:
     address: 0.0.0.0:13091
+  router:
+    type: router
+  monitor:
+    client:
+      enabled: true
+      serverUri: http://127.0.0.1:30109
   handler:
     chain:
       Provider:

diff --git a/fusionweather/pom.xml b/fusionweather/pom.xml
@@ -48,6 +48,10 @@
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>dashboard</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb</groupId>
+            <artifactId>handler-router</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>darklaunch</artifactId>

diff --git a/fusionweather/src/main/resources/microservice.yaml b/fusionweather/src/main/resources/microservice.yaml
@@ -21,6 +21,12 @@ servicecomb:
     address: 0.0.0.0:13092
   request:
     timeout: 3000
+  router:
+    type: router
+  monitor:
+    client:
+      enabled: true
+      serverUri: http://127.0.0.1:30109
   handler:
     chain:
       Provider:

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<servicecomb.version>2.6.3</servicecomb.version>
+		<servicecomb.version>2.7.9</servicecomb.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>

diff --git a/weather-beta/pom.xml b/weather-beta/pom.xml
@@ -49,6 +49,10 @@
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>dashboard</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb</groupId>
+            <artifactId>handler-router</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>darklaunch</artifactId>

diff --git a/weather-beta/src/main/resources/microservice.yaml b/weather-beta/src/main/resources/microservice.yaml
@@ -17,6 +17,12 @@ servicecomb:
       refresh_interval: 5000
   rest:
     address: 0.0.0.0:13093
+  router:
+    type: router
+  monitor:
+    client:
+      enabled: true
+      serverUri: http://127.0.0.1:30109
   handler:
     chain:
       Provider:

diff --git a/weather/pom.xml b/weather/pom.xml
@@ -48,6 +48,10 @@
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>dashboard</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.servicecomb</groupId>
+            <artifactId>handler-router</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.servicecomb</groupId>
             <artifactId>darklaunch</artifactId>

diff --git a/weather/src/main/resources/microservice.yaml b/weather/src/main/resources/microservice.yaml
@@ -21,6 +21,12 @@ servicecomb:
       compression: false
       connection:
         idleTimeoutInSeconds: 2
+  router:
+    type: router
+  monitor:
+    client:
+      enabled: true
+      serverUri: http://127.0.0.1:30109
   handler:
     chain:
       Provider: