This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch 2.8.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.8.x by this push:
new 5dbde62aa [SCB-2793]Kie custom label should take the first priority
(#3782)
5dbde62aa is described below
commit 5dbde62aa722844f3f3eb01bdb8121fe7d7ea30b
Author: liubao68 <[email protected]>
AuthorDate: Wed May 10 13:40:31 2023 +0800
[SCB-2793]Kie custom label should take the first priority (#3782)
---
.../config/kie/client/model/ConfigurationsRequest.java | 1 +
.../config/kie/client/model/ConfigurationsRequestFactory.java | 8 ++++----
demo/demo-cse-v2/README.md | 9 ++-------
demo/demo-cse-v2/consumer/src/main/resources/application.yml | 4 ++--
demo/demo-cse-v2/pom.xml | 4 ++++
demo/demo-cse-v2/provider/src/main/resources/application.yml | 4 ++--
.../java/org/apache/servicecomb/samples/ConsumerConfigIT.java | 6 +++---
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequest.java
b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequest.java
index b0e9344e4..b22f7ecaa 100644
---
a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequest.java
+++
b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequest.java
@@ -80,6 +80,7 @@ public class ConfigurationsRequest implements
Comparable<ConfigurationsRequest>
@Override
public int compareTo(ConfigurationsRequest o) {
+ // Higher priority, query the last
return o.getOrder() - this.order;
}
}
diff --git
a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequestFactory.java
b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequestFactory.java
index 4f2b4325c..20c6ba3ba 100644
---
a/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequestFactory.java
+++
b/clients/config-kie-client/src/main/java/org/apache/servicecomb/config/kie/client/model/ConfigurationsRequestFactory.java
@@ -32,13 +32,13 @@ public class ConfigurationsRequestFactory {
private static final String KEY_VERSION = "version";
- private static final int VERSION_ORDER = 50;
+ private static final int CUSTOM_ORDER = 100;
- private static final int SERVICE_ORDER = 100;
+ private static final int VERSION_ORDER = 200;
- private static final int APP_ORDER = 200;
+ private static final int SERVICE_ORDER = 300;
- private static final int CUSTOM_ORDER = 300;
+ private static final int APP_ORDER = 400;
public static List<ConfigurationsRequest>
buildConfigurationRequests(KieConfiguration configuration) {
List<ConfigurationsRequest> result = new ArrayList<>();
diff --git a/demo/demo-cse-v2/README.md b/demo/demo-cse-v2/README.md
index 7d6b20b47..001b59da9 100644
--- a/demo/demo-cse-v2/README.md
+++ b/demo/demo-cse-v2/README.md
@@ -59,6 +59,7 @@ cse:
test:
priority: v4
```
+
* 应用级配置：consumerApp.yaml，应用选择demo-java-chassis-cse-v2。类型为 yaml。
```yaml
cse:
@@ -66,6 +67,7 @@ cse:
test:
priority1: v1
```
+
* 服务级配置：consumerSer.yaml，微服务性选择consumer。类型为 yaml。
```yaml
cse:
@@ -73,13 +75,6 @@ cse:
test:
priority1: v2
```
-* 版本级配置：consumerIns.yaml，labels:
app=demo-java-chassis-cse-v2,environment=,service=consumer,version = 0.0.1。类型为
yaml。
-```yaml
-cse:
- v2:
- test:
- priority1: v3
-```
* 应用级配置： cse.v2.test.bar: bar 。 类型为 text。
diff --git a/demo/demo-cse-v2/consumer/src/main/resources/application.yml
b/demo/demo-cse-v2/consumer/src/main/resources/application.yml
index 72a6dafad..38113f6c9 100644
--- a/demo/demo-cse-v2/consumer/src/main/resources/application.yml
+++ b/demo/demo-cse-v2/consumer/src/main/resources/application.yml
@@ -25,11 +25,11 @@ servicecomb:
name: consumer
version: 0.0.1
registry:
- address: ${CSE_V2_SC}
+ address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}
instance:
watch: false
kie:
- serverUri: ${CSE_V2_CC}
+ serverUri: ${PAAS_CSE_CC_ENDPOINT:http://127.0.0.1:30110}
customLabel: public
customLabelValue: default
diff --git a/demo/demo-cse-v2/pom.xml b/demo/demo-cse-v2/pom.xml
index 0222496bc..cec5a5057 100644
--- a/demo/demo-cse-v2/pom.xml
+++ b/demo/demo-cse-v2/pom.xml
@@ -41,6 +41,10 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>servicestage-environment</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
</dependencies>
<modules>
diff --git a/demo/demo-cse-v2/provider/src/main/resources/application.yml
b/demo/demo-cse-v2/provider/src/main/resources/application.yml
index 991bf6d7d..a3a6f874f 100644
--- a/demo/demo-cse-v2/provider/src/main/resources/application.yml
+++ b/demo/demo-cse-v2/provider/src/main/resources/application.yml
@@ -28,11 +28,11 @@ servicecomb:
name: provider
version: 0.0.1
registry:
- address: ${CSE_V2_SC}
+ address: ${PAAS_CSE_SC_ENDPOINT:http://127.0.0.1:30100}
instance:
watch: false
kie:
- serverUri: ${CSE_V2_CC}
+ serverUri: ${PAAS_CSE_CC_ENDPOINT:http://127.0.0.1:30110}
customLabel: public
rest:
diff --git
a/demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
b/demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
index 8d783d626..f25980d47 100644
---
a/demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
+++
b/demo/demo-cse-v2/test-client/src/main/java/org/apache/servicecomb/samples/ConsumerConfigIT.java
@@ -38,13 +38,13 @@ public class ConsumerConfigIT implements
CategorizedTestCase {
result = template.getForObject(Config.GATEWAY_URL +
"/config?key=cse.v2.test.bar", String.class);
TestMgr.check("\"bar\"", result);
result = template.getForObject(Config.GATEWAY_URL +
"/config?key=cse.v2.test.priority", String.class);
- TestMgr.check("\"v3\"", result);
+ TestMgr.check("\"v1\"", result);
result = template.getForObject(Config.GATEWAY_URL +
"/config?key=cse.v2.test.common", String.class);
TestMgr.check("\"common\"", result);
result = template.getForObject(Config.GATEWAY_URL +
"/config?key=cse.v2.test.extra", String.class);
TestMgr.check("\"common\"", result);
result = template.getForObject(Config.GATEWAY_URL +
"/config?key=cse.v2.test.priority1", String.class);
- TestMgr.check("\"v3\"", result);
+ TestMgr.check("\"v2\"", result);
}
private void testFooBar() {
@@ -53,7 +53,7 @@ public class ConsumerConfigIT implements CategorizedTestCase {
result = template.getForObject(Config.GATEWAY_URL + "/foo", String.class);
TestMgr.check("\"foo\"", result);
result = template.getForObject(Config.GATEWAY_URL + "/priority",
String.class);
- TestMgr.check("\"v3\"", result);
+ TestMgr.check("\"v1\"", result);
result = template.getForObject(Config.GATEWAY_URL + "/common",
String.class);
TestMgr.check("\"common\"", result);
result = template.getForObject(Config.GATEWAY_URL + "/extra",
String.class);
