From 88e6a9d61d9e2ef28b62fdac59f311a137fa27f2 Mon Sep 17 00:00:00 2001 From: zhangsz Date: Wed, 22 Jan 2025 20:56:32 +0800 Subject: [PATCH] feat: i18n local file --- build/docker/compose/docker-compose-debug.yml | 7 +++++++ build/docker/compose/docker-compose.yml | 13 +++++++++--- .../conf/default/application-common.yml | 21 ++++++++++--------- build/docker/nginx/conf/default/nginx.conf | 2 +- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/build/docker/compose/docker-compose-debug.yml b/build/docker/compose/docker-compose-debug.yml index 923250c..39546b0 100644 --- a/build/docker/compose/docker-compose-debug.yml +++ b/build/docker/compose/docker-compose-debug.yml @@ -91,6 +91,7 @@ services: volumes: - ./wfc/gateway/jar/wfc-gateway.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/gateway/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -124,6 +125,7 @@ services: volumes: - ./wfc/auth/jar/wfc-auth.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/auth/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -160,6 +162,7 @@ services: volumes: - ./wfc/modules/system/jar/wfc-modules-system.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/system/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -197,6 +200,7 @@ services: volumes: - ./wfc/modules/user/jar/wfc-modules-user.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/user/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -235,6 +239,7 @@ services: - ./wfc/modules/file/upload:/opt/wfc/upload - ./wfc/modules/file/logs/:/opt/wfc/logs/ - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/file/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-auth: @@ -261,6 +266,7 @@ services: volumes: - ./wfc/modules/job/jar/wfc-modules-job.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/job/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-mysql: @@ -290,6 +296,7 @@ services: - ./wfc/modules/payment/jar/wfc-modules-payment.jar:/opt/wfc/app.jar - ./wfc/modules/payment/logs/:/opt/wfc/logs/ - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/payment/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: diff --git a/build/docker/compose/docker-compose.yml b/build/docker/compose/docker-compose.yml index 49413fd..b449c65 100644 --- a/build/docker/compose/docker-compose.yml +++ b/build/docker/compose/docker-compose.yml @@ -91,6 +91,7 @@ services: volumes: - ./wfc/gateway/jar/wfc-gateway.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/gateway/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -124,6 +125,7 @@ services: volumes: - ./wfc/auth/jar/wfc-auth.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/auth/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -159,6 +161,7 @@ services: volumes: - ./wfc/modules/system/jar/wfc-modules-system.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/system/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -194,6 +197,7 @@ services: volumes: - ./wfc/modules/user/jar/wfc-modules-user.jar:/opt/wfc/app.jar - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/user/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: @@ -230,7 +234,8 @@ services: - ./wfc/modules/file/jar/wfc-modules-file.jar:/opt/wfc/app.jar - ./wfc/modules/file/upload:/opt/wfc/upload - ./wfc/modules/file/logs/:/opt/wfc/logs/ - - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/file/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-auth: @@ -256,7 +261,8 @@ services: - wfc-be-network volumes: - ./wfc/modules/job/jar/wfc-modules-job.jar:/opt/wfc/app.jar - - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/job/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-mysql: @@ -285,7 +291,8 @@ services: volumes: - ./wfc/modules/payment/jar/wfc-modules-payment.jar:/opt/wfc/app.jar - ./wfc/modules/payment/logs/:/opt/wfc/logs/ - - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/application-common.yml:/opt/wfc/conf/application-common.yml + - ./conf/i18n/:/opt/wfc/conf/i18n - ./wfc/modules/payment/conf/application.yml:/opt/wfc/conf/application.yml depends_on: wfc-redis: diff --git a/build/docker/conf/default/application-common.yml b/build/docker/conf/default/application-common.yml index f6657fe..d32be25 100644 --- a/build/docker/conf/default/application-common.yml +++ b/build/docker/conf/default/application-common.yml @@ -4,16 +4,16 @@ spring: mvc: pathmatch: matching-strategy: ant_path_matcher - # 资源信息 + # i18n resource file path messages: - # 国际化资源文件路径 - basename: i18n/messages + # i18n resource file path + basename: optional:file:/opt/wfc/conf/i18n/messages,i18n/messages # Enable remote debugging devtools: remote: secret: 123456 -# feign 配置 +# feign config feign: sentinel: enabled: true @@ -34,16 +34,17 @@ feign: response: enabled: true -# 暴露监控端点 +# eureka config management: endpoints: web: exposure: include: '*' -# Omada 配置 +# Omada config omada: - omada-url: 'https://192.168.2.249:8043' - omadac-id: 'f3aa6e479b94222581523710cc2c2a9d' - client-id: '5036e77c81a74008821c694a715fe2b8' - client-secret: '29faa06fb7f244b094377b48eb3083a7' \ No newline at end of file + # web url or host exp: 'https://192.168.2.249:8043' + omada-url: 'https://aps1-omada-northbound.tplinkcloud.com' + omadac-id: '10ccde5bfee5142b28a07f6146f41056' + client-id: '48b3be2083dd4fbdb5f7cfd5c3a4abb6' + client-secret: '2556dfcafe6d4288b3f0921aa6391c76' \ No newline at end of file diff --git a/build/docker/nginx/conf/default/nginx.conf b/build/docker/nginx/conf/default/nginx.conf index 088deb6..6a34fbf 100644 --- a/build/docker/nginx/conf/default/nginx.conf +++ b/build/docker/nginx/conf/default/nginx.conf @@ -56,7 +56,7 @@ http { proxy_set_header Content-Length $http_content_length; } - # 避免actuator暴露 + # Avoid actuator access if ($request_uri ~ "/actuator") { return 403; }