Merge pull request #42 from provenceee/fix-springcloud

*修复灰度发布和降级不生效的bug
servicestage-demo · Aug 25, 2023 · b71b911 · b71b911
2 parents c4d1486 + 6962b11
commit b71b911
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 29 deletions.
diff --git a/fusionweather/pom.xml b/fusionweather/pom.xml
@@ -66,14 +66,6 @@
       <artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
       <groupId>com.huaweicloud</groupId>
     </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-config</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-swagger</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
     <dependency>
       <artifactId>slf4j-log4j12</artifactId>
       <groupId>org.slf4j</groupId>

diff --git a/fusionweather/src/main/resources/bootstrap.yml b/fusionweather/src/main/resources/bootstrap.yml
@@ -6,6 +6,9 @@ spring:
     name: fusionweather
   cloud:
     servicecomb:
+      context:
+        query-context-mapper:
+          city: city
       discovery:
         version: 0.0.2
         address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}

diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
 
   <properties>
     <spring-boot.version>2.6.13</spring-boot.version>
-    <spring-cloud-huawei.version>1.10.10-2021.0.x</spring-cloud-huawei.version>
+    <spring-cloud-huawei.version>1.10.13-2021.0.x</spring-cloud-huawei.version>
     <spring-cloud.version>2021.0.5</spring-cloud.version>
     <servicecomb.version>2.5.2</servicecomb.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/weather-beta/pom.xml b/weather-beta/pom.xml
@@ -47,14 +47,6 @@
       <artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
       <groupId>com.huaweicloud</groupId>
     </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-config</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-swagger</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
     <!-- using log4j -->
     <dependency>
       <artifactId>slf4j-log4j12</artifactId>

diff --git a/weather/pom.xml b/weather/pom.xml
@@ -47,18 +47,6 @@
       <artifactId>spring-cloud-starter-huawei-service-engine</artifactId>
       <groupId>com.huaweicloud</groupId>
     </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-config</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
-    <dependency>
-      <artifactId>spring-cloud-starter-huawei-swagger</artifactId>
-      <groupId>com.huaweicloud</groupId>
-    </dependency>
-    <dependency>
-      <groupId>com.huaweicloud</groupId>
-      <artifactId>spring-cloud-starter-huawei-governance</artifactId>
-    </dependency>
     <!-- using log4j -->
     <dependency>
       <artifactId>slf4j-log4j12</artifactId>