diff --git a/spring-cloud-starter-tencent-polaris-discovery/pom.xml b/spring-cloud-starter-tencent-polaris-discovery/pom.xml index c2c532ec6..d282dc512 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/pom.xml +++ b/spring-cloud-starter-tencent-polaris-discovery/pom.xml @@ -23,6 +23,12 @@ com.tencent.cloud spring-cloud-tencent-rpc-enhancement + + + spring-security-crypto + org.springframework.security + + diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application-context.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application-context.yml index 5b90a3e2d..8b9249d43 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application-context.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/application-context.yml @@ -3,10 +3,10 @@ spring: tencent: gateway: groups: - group-scg2p: + group-callee: predicate: apiType: ms - context: /group1 + context: /group-callee namespace: key: null position: PATH @@ -15,17 +15,64 @@ spring: position: PATH routes: - host: null - metadata: {} + metadata: { } method: GET namespace: default - path: /echo/{param} - service: provider-demo + path: /quickstart/callee/{segment} + service: QuickstartCalleeService + group-caller: + predicate: + apiType: ms + context: /group-caller + namespace: + key: null + position: PATH + service: + key: null + position: PATH + routes: + - host: null + metadata: { } + method: GET + namespace: default + path: /** + service: QuickstartCallerService + external-api: + predicate: + apiType: EXTERNAL + context: /external-api + routes: + - host: http://127.0.0.1:48082/ + metadata: { } + method: GET + path: /v3/api-docs routes: - group1: + group-callee: + filters: + - Context=group-callee + order: -1 + predicates: + - Context=group-callee + - Path=/group-callee/** + uri: lb://group-callee # do not use "_". + group-caller: + filters: + - Context=group-caller + order: -1 + predicates: + - Context=group-caller + - Path=/group-caller/** + uri: lb://group-caller # do not use "_". + external-api: filters: - - Context=group1 + - Context=external-api order: -1 predicates: - - Context=group1 - - Path=/group1/** - uri: lb://group1 + - Context=external-api + - Path=/external-api/** + uri: lb://external-api # do not use "_". + +# +#http://localhost:48081/group-callee/default/QuickstartCalleeService/quickstart/callee/info +#http://localhost:48081/group-caller/default/QuickstartCallerService/quickstart/caller/info +#http://localhost:48081/external-api/v3/api-docs \ No newline at end of file diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml index 995e2eb5e..8ca2705d3 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml @@ -1,6 +1,8 @@ server: port: 48081 spring: +# profiles: +# active: context application: name: QuickStartGatewayService cloud: diff --git a/spring-cloud-tencent-rpc-enhancement/pom.xml b/spring-cloud-tencent-rpc-enhancement/pom.xml index e25532100..b48bb11ee 100644 --- a/spring-cloud-tencent-rpc-enhancement/pom.xml +++ b/spring-cloud-tencent-rpc-enhancement/pom.xml @@ -39,12 +39,6 @@ org.springframework.cloud spring-cloud-loadbalancer - - - spring-security-crypto - org.springframework.security - -