From 9050bb230d00a0028f1e68a723b3d89efd18c9f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=88=98=E6=B4=AA=E9=9D=92?= Date: Fri, 20 Sep 2019 12:32:07 +0800 Subject: [PATCH] =?utf8?q?chore:=20=E6=95=B4=E7=90=86=E9=83=A8=E7=BD=B2?= =?utf8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bff/admin/src/main/resources/application-docker.yml | 2 +- gateway/src/main/resources/application-docker.yml | 10 +++++----- sa/admin/src/main/resources/application-docker.yml | 4 ++-- sa/admin/src/main/resources/application.yml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bff/admin/src/main/resources/application-docker.yml b/bff/admin/src/main/resources/application-docker.yml index 78c8a3d..81e78c9 100644 --- a/bff/admin/src/main/resources/application-docker.yml +++ b/bff/admin/src/main/resources/application-docker.yml @@ -64,7 +64,7 @@ sw-backend-system-api: trust-store-password: ${SW_BACKEND_SYSTEM_API_CLIENT_AUTH_TRUSTSTORE_PASSWORD:} sw-backend-biz-api: - uri: ${SW_BACKEND_BIZ_API_URI:https://sw-backend-admin-sa} + uri: ${SW_BACKEND_BIZ_API_URI:https://sw-backend-biz-sa} client-auth: enabled: ${SW_BACKEND_BIZ_API_CLIENT_AUTH_ENABLED:true} key-password: ${SW_BACKEND_BIZ_API_CLIENT_AUTH_KEY_PASSWORD:} diff --git a/gateway/src/main/resources/application-docker.yml b/gateway/src/main/resources/application-docker.yml index 219f4f7..661b919 100644 --- a/gateway/src/main/resources/application-docker.yml +++ b/gateway/src/main/resources/application-docker.yml @@ -41,7 +41,7 @@ spring: enabled: true routes: - id: bff-api - uri: ${SW_BACKEND_AGGR_API_URI:https://sw-backend-admin-bff} + uri: ${SW_BACKEND_BFF_API_URI:https://sw-backend-admin-bff} predicates: - Path=/api/bff/** filters: @@ -59,7 +59,7 @@ spring: filters: - RewritePath=/api/system/(?.*), /$\{suffix} - id: biz-api - uri: ${SW_BACKEND_BIZ_API_URI:https://sw-backend-admin-sa} + uri: ${SW_BACKEND_BIZ_API_URI:https://sw-backend-biz-sa} predicates: - Path=/api/biz/** filters: @@ -77,13 +77,13 @@ infras.online-doc.api-docs.staitc.path: ${INFRAS_ONLINE_DOC_API_DOCS_STATIC_PATH ## # infras.security basic # -infras.security.basic.enabled: ${INFRAS_SECURITY_BASIC_ENABLED:true} +infras.security.basic.reactive.enabled: ${INFRAS_SECURITY_BASIC_REACTIVE_ENABLED:true} ## # infras.security jwt # -infras.security.jwt.enabled: ${INFRAS_SECURITY_JWT_ENABLED:false} +infras.security.jwt.enabled: ${INFRAS_SECURITY_JWT_REACTIVE_ENABLED:false} infras.security.jwt.public-key-pem: ${INFRAS_SECURITY_JWT_PUBLIC_KEY_PEM:} infras.security.jwt.private-key-pem-pkcs8: ${INFRAS_SECURITY_JWT_PRIVATE_KEY_PEM_PKCS8:} @@ -92,7 +92,7 @@ infras.security.jwt.private-key-pem-pkcs8: ${INFRAS_SECURITY_JWT_PRIVATE_KEY_PEM ## # infras.security cas # -infras.security.cas.enabled: ${INFRAS_SECURITY_CAS_ENABLED:false} +infras.security.cas.enabled: ${INFRAS_SECURITY_CAS_REACTIVE_ENABLED:false} #应用访问地址 app.server.host.url: ${APP_SERVER_HOST_URL:https://localhost:8443} diff --git a/sa/admin/src/main/resources/application-docker.yml b/sa/admin/src/main/resources/application-docker.yml index ba6bbce..d72a475 100644 --- a/sa/admin/src/main/resources/application-docker.yml +++ b/sa/admin/src/main/resources/application-docker.yml @@ -33,8 +33,8 @@ spring: datasource: driver-class-name: ${JDBC_DRIVER_CLASS_NAME:com.mysql.cj.jdbc.Driver} - url: ${JDBC_URL:jdbc:mysql://mysql-server:3306/user_authorization_service} - username: ${JDBC_USERNAME:user_authorization_service} + url: ${JDBC_URL:jdbc:mysql://mysql-server:3306/sw-admin} + username: ${JDBC_USERNAME:sw-admin} password: ${JDBC_PASSWORD:} diff --git a/sa/admin/src/main/resources/application.yml b/sa/admin/src/main/resources/application.yml index da96932..0694d87 100644 --- a/sa/admin/src/main/resources/application.yml +++ b/sa/admin/src/main/resources/application.yml @@ -23,7 +23,7 @@ spring: time-zone: Asia/Shanghai datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/sw-backend + url: jdbc:mysql://localhost:3306/sw-admin username: root password: root hikari: -- 2.17.1