diff --git a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java index 32783aa8c..f2092e2b3 100644 --- a/src/main/java/cn/iocoder/dashboard/DashboardApplication.java +++ b/src/main/java/cn/iocoder/dashboard/DashboardApplication.java @@ -5,10 +5,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@EnableAdminServer +@EnableAdminServer // TODO 芋艿:需要迁移出去 public class DashboardApplication { public static void main(String[] args) { + // 设置读取的配置文件 + System.setProperty("spring.config.name", "application,db"); + + // 启动 Spring Boot SpringApplication.run(DashboardApplication.class, args); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 634cbd325..9fd382e14 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -2,13 +2,6 @@ spring: application: name: dashboard - # 数据源配置项 TODO 多数据源;TODO 监控配置 - datasource: - url: jdbc:mysql://127.0.1:33061/ruoyi-vue-pro?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT - driver-class-name: com.mysql.jdbc.Driver - username: root - password: 123456 - # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优 redis: host: 127.0.0.1 # 地址 diff --git a/src/main/resources/db.yaml b/src/main/resources/db.yaml new file mode 100644 index 000000000..05018f24f --- /dev/null +++ b/src/main/resources/db.yaml @@ -0,0 +1,7 @@ +spring: + # 数据源配置项 TODO 多数据源;TODO 监控配置 + datasource: + url: jdbc:mysql://127.0.1:33061/ruoyi-vue-pro?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT + driver-class-name: com.mysql.jdbc.Driver + username: root + password: 123456