diff --git a/shuili-admin/src/main/resources/config/application-dev.yml b/shuili-admin/src/main/resources/config/application-dev.yml index 32f9a672..c62db212 100644 --- a/shuili-admin/src/main/resources/config/application-dev.yml +++ b/shuili-admin/src/main/resources/config/application-dev.yml @@ -79,14 +79,14 @@ spring: redis: # 地址 host: 127.0.0.1 -# database: 2 + database: 2 # cluster: # nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006 # max-redirects: 3 # 端口,默认为6379 port: 6379 # 密码 - password: + password: 12345 # 连接超时时间 timeout: 10s lettuce: diff --git a/shuili-admin/src/main/resources/config/application-druid-dev.yml b/shuili-admin/src/main/resources/config/application-druid-dev.yml index 2ea26ea1..796faa75 100644 --- a/shuili-admin/src/main/resources/config/application-druid-dev.yml +++ b/shuili-admin/src/main/resources/config/application-druid-dev.yml @@ -6,9 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true - username: zhsl_ygc_sgcyxgl - password: J[@D|&.<:_G+)sp2 + # url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + # username: zhsl_ygc_sgcyxgl + # password: J[@D|&.<:_G+)sp2 + url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true + username: shuili + password: wuxukgdvJ1!@! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/shuili-admin/src/main/resources/config/application.yml b/shuili-admin/src/main/resources/config/application.yml index 2b78765a..f9d7ea60 100644 --- a/shuili-admin/src/main/resources/config/application.yml +++ b/shuili-admin/src/main/resources/config/application.yml @@ -1,3 +1,4 @@ spring: profiles: - include: dev,druid-dev +# include: dev,druid-dev +# \ No newline at end of file