diff --git a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java index c674021..cafd777 100644 --- a/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java +++ b/blade-auth/src/main/java/org/springblade/auth/AuthApplication.java @@ -43,6 +43,8 @@ import org.springframework.session.data.redis.config.annotation.web.http.EnableR public class AuthApplication { public static void main(String[] args) { + // 禁用框架注入的nacos import配置、config、discovery 配置 + BladeApplication.disableNacosLaunchConfig(); BladeApplication.run(AppConstant.APPLICATION_AUTH_NAME, AuthApplication.class, args); } diff --git a/blade-auth/src/main/resources/application-dev.yml b/blade-auth/src/main/resources/application-dev.yml deleted file mode 100644 index 25bafbc..0000000 --- a/blade-auth/src/main/resources/application-dev.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.dev.url} - username: ${blade.datasource.dev.username} - password: ${blade.datasource.dev.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/src/main/resources/application-prod.yml b/blade-auth/src/main/resources/application-prod.yml deleted file mode 100644 index dc6f80c..0000000 --- a/blade-auth/src/main/resources/application-prod.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.prod.url} - username: ${blade.datasource.prod.username} - password: ${blade.datasource.prod.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/src/main/resources/application-test.yml b/blade-auth/src/main/resources/application-test.yml deleted file mode 100644 index c7c6c40..0000000 --- a/blade-auth/src/main/resources/application-test.yml +++ /dev/null @@ -1,15 +0,0 @@ -#服务器端口 -server: - port: 8100 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.test.url} - username: ${blade.datasource.test.username} - password: ${blade.datasource.test.password} - -#第三方登陆 -social: - enabled: true - domain: http://127.0.0.1:2888 diff --git a/blade-auth/src/main/resources/application.yml b/blade-auth/src/main/resources/application.yml index 9e7573c..d81e0c6 100644 --- a/blade-auth/src/main/resources/application.yml +++ b/blade-auth/src/main/resources/application.yml @@ -1,6 +1,30 @@ -# 在使用Spring默认数据源Hikari的情况下配置以下配置项 +#服务器端口 +server: + port: 8100 spring: + application: + name: blade-auth + config: + import: + - nacos:blade.yaml?group=DEFAULT_GROUP&refreshEnabled=true + - nacos:blade-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true + - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml?group=DEFAULT_GROUP&refreshEnabled=true + cloud: + nacos: + username: ${NACOS_USERNAME:nacos} + password: ${NACOS_PASSWORD:nacos} + server-addr: ${NACOS_HOST:127.0.0.1:8848} + discovery: + namespace: ${NACOS_NAMESPACE:${spring.profiles.active}} + config: + # 文件后缀名 + file-extension: yaml + namespace: ${NACOS_NAMESPACE:${spring.profiles.active}} datasource: + url: ${blade.datasource.${spring.profiles.active}.url} + username: ${blade.datasource.${spring.profiles.active}.username} + password: ${blade.datasource.${spring.profiles.active}.password} + # 在使用Spring默认数据源Hikari的情况下配置以下配置项 hikari: # 自动提交从池中返回的连接 auto-commit: true @@ -42,6 +66,8 @@ swagger: #第三方登陆 social: + enabled: true + domain: http://127.0.0.1:2888 oauth: GITHUB: client-id: 233************