Skip to content

Commit 6dd734b

Browse files
committed
fix: update authentication mode and disable Keylo for local development
1 parent ee58b4d commit 6dd734b

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

docker/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ services:
9797
KEYSTONE_REDIS_ENCRYPT_KEY_FILE: /run/secrets/.redis_password.key
9898
TOKEN_SECRET: ${TOKEN_SECRET:-sdhfkjshBN6rr32df38}
9999
KEYSTONE_RSA_PRIVATE_KEY: ${KEYSTONE_RSA_PRIVATE_KEY:?KEYSTONE_RSA_PRIVATE_KEY is required}
100-
KEYSTONE_AUTH_MODE: ${KEYSTONE_AUTH_MODE:-mixed}
101-
KEYSTONE_AUTH_KEYLO_ENABLED: ${KEYSTONE_AUTH_KEYLO_ENABLED:-true}
100+
KEYSTONE_AUTH_MODE: ${KEYSTONE_AUTH_MODE:-local}
101+
KEYSTONE_AUTH_KEYLO_ENABLED: ${KEYSTONE_AUTH_KEYLO_ENABLED:-false}
102102
DRUID_USERNAME: ${DRUID_USERNAME:-keystone}
103103
DRUID_PASSWORD: ${DRUID_PASSWORD:-}
104104
LOG_PATH: /app/logs

keystone-admin/src/main/resources/application-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ keystone:
88
rsaPrivateKey: ${KEYSTONE_RSA_PRIVATE_KEY:MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAKHoeQr6sIzfsUDMIdXK2FNzqnG+vnnUrTsJGF1f82MJ10cC5Aw53/ntHl+IjCBU0R8KwPVwjJLoDwhaPgO0ktHa3b0l6E+mqIVIniE20Nws3E0mJhFwJC/IxB7JAg8TkuNzflzvZjAO1ACwgkKGxq7Iutz4TocLeCfUkObXwc1fAgMBAAECgYAWwCzqDwnp8bDdkxGaEhPNvi4QJ6ZqRilFZ2TGEiqIGyTl9JEI6sT/QIOJFw3hqSltfDxbAMKwDe221b9rE9+hZhE2rrpwcTKuehob9Z8CObYeUHR9HG7Qb2tYRElvSCWo74iz2zajXAvJLjIE4MPuPYqXC5zOabH+EJ/eaOzVwQJBANmRkMlb+qzp1GWuqFMHP+5MeYhFwUHVX7fxKNA24oHldX8zjPIZ6d3vaRfliTvxOaz1T80acvJkkb7zHBmaW38CQQC+gfF8Lg+nvBY/S3wfOPL8FcntP16jdFhNNZmbOxq72ZmCfl5Zk5cYNBc4rDSrd9Sj4TkLLug+wrK6Wr117P4hAkBOVxnZR2NVy8SM8HzvmJauiZ7hMKzLtbcHlrBpeLnKqALM0JUZv7b0EPa4ghAOI2fvHU2kvrdRDGFmbkdZ+LilAkBnX8eT5MKl+A/yZJmDr7laRNB/poVKGNXZf55Md3P4Pwlnn/6+iLHSdmGrZPZnnOyLyKjVgqyPccLeEGMCXIlBAkAt2OMwss16OH2x79OcfBrabU5iCVbDHg56JYGbWP8KcPfvspxtL/4TdACRsa+yCMcI6L29Q4wn791SEEnE834a}
99
auth:
1010
# 本地开发默认对接 Keylo;如需本地账号密码登录,可设置 KEYSTONE_AUTH_MODE=local 且 KEYSTONE_AUTH_KEYLO_ENABLED=false。
11-
mode: ${KEYSTONE_AUTH_MODE:mixed}
11+
mode: ${KEYSTONE_AUTH_MODE:local}
1212
keylo:
13-
enabled: ${KEYSTONE_AUTH_KEYLO_ENABLED:true}
13+
enabled: ${KEYSTONE_AUTH_KEYLO_ENABLED:false}
1414
base-url: ${KEYLO_BASE_URL:http://10.17.17.74:2345}
1515
issuer-uri: ${KEYLO_ISSUER_URI:http://10.17.17.74:2345}
1616
trusted-issuers: ${KEYLO_TRUSTED_ISSUERS:keylo}
@@ -34,7 +34,7 @@ spring:
3434
dynamic:
3535
datasource:
3636
master:
37-
url: ${SPRING_DATASOURCE_URL:jdbc:mysql://10.17.17.74:33066/ship-db?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8mb4_unicode_ci&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC}
37+
url: ${SPRING_DATASOURCE_URL:jdbc:mysql://localhost:33066/keystone?useUnicode=true&characterEncoding=utf8&connectionCollation=utf8mb4_unicode_ci&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=UTC}
3838
username: ${SPRING_DATASOURCE_USERNAME:root}
3939
password-file: ${SPRING_DATASOURCE_PASSWORD_FILE:docker/.secrets/.database_password.enc}
4040

@@ -50,7 +50,7 @@ spring:
5050

5151
data:
5252
redis:
53-
host: ${SPRING_DATA_REDIS_HOST:10.17.17.74}
53+
host: ${SPRING_DATA_REDIS_HOST:localhost}
5454
port: ${SPRING_DATA_REDIS_PORT:6379}
5555
username: ${SPRING_DATA_REDIS_USERNAME:keystone}
5656
database: ${SPRING_DATA_REDIS_DATABASE:0}

0 commit comments

Comments
 (0)