diff --git a/shuili-admin/src/main/resources/application-dev.yml b/shuili-admin/src/main/resources/application-dev.yml index 820adedc..b397d007 100644 --- a/shuili-admin/src/main/resources/application-dev.yml +++ b/shuili-admin/src/main/resources/application-dev.yml @@ -74,12 +74,13 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.1.20 + host: localhost # 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 +# database: 11 # 密码 password: # 连接超时时间 diff --git a/shuili-admin/src/main/resources/application-druid-dev.yml b/shuili-admin/src/main/resources/application-druid-dev.yml index c9d93913..2eebde8e 100644 --- a/shuili-admin/src/main/resources/application-druid-dev.yml +++ b/shuili-admin/src/main/resources/application-druid-dev.yml @@ -3,13 +3,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource # driverClassName: com.mysql.jdbc.Driver - driverClassName: org.gjt.mm.mysql.Driver + driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://192.168.12.20:23306/tianhui_lyj1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: 123456 + url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai + username: shuili + password: wuxukgdvJ1!@! # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/shuili-admin/src/main/resources/application-druid-sy.yml b/shuili-admin/src/main/resources/application-druid-sy.yml index 3037030c..65f37610 100644 --- a/shuili-admin/src/main/resources/application-druid-sy.yml +++ b/shuili-admin/src/main/resources/application-druid-sy.yml @@ -2,13 +2,13 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver + driverClassName: com.mysql.cj.jdbc.Driver druid: # 主库数据源 master: - url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: mysql123456 + 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/application-druid-test.yml b/shuili-admin/src/main/resources/application-druid-test.yml index 43713932..433612bf 100644 --- a/shuili-admin/src/main/resources/application-druid-test.yml +++ b/shuili-admin/src/main/resources/application-druid-test.yml @@ -2,14 +2,17 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource - driverClassName: com.mysql.jdbc.Driver + driverClassName: com.mysql.cj.jdbc.Driver # driverClassName: org.gjt.mm.mysql.Driver druid: # 主库数据源 master: - url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: shuili - password: wuxukgdvJ1!@! +# 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!@! + 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 # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/shuili-admin/src/main/resources/application-druid-zhishiku.yml b/shuili-admin/src/main/resources/application-druid-zhishiku.yml index 1ebf6d30..fc0aa3d3 100644 --- a/shuili-admin/src/main/resources/application-druid-zhishiku.yml +++ b/shuili-admin/src/main/resources/application-druid-zhishiku.yml @@ -2,8 +2,8 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource -# driverClassName: com.mysql.jdbc.Driver - driverClassName: org.gjt.mm.mysql.Driver + driverClassName: com.mysql.cj.jdbc.Driver +# driverClassName: org.gjt.mm.mysql.Driver druid: # 主库数据源 master: diff --git a/shuili-admin/src/main/resources/application-test.yml b/shuili-admin/src/main/resources/application-test.yml index 7b502c49..78ba5b6e 100644 --- a/shuili-admin/src/main/resources/application-test.yml +++ b/shuili-admin/src/main/resources/application-test.yml @@ -12,7 +12,7 @@ shuili: demoEnabled: true # 临时文件地址 # profile: /home/project/tianhui-chonggou - profile: E:/tianhui + profile: D:/tianhui # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 @@ -130,7 +130,7 @@ spring: # redis 配置 redis: # 地址 - host: 127.0.0.1 + host: localhost # 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 @@ -297,12 +297,41 @@ water: #数据同步 dataSync: #数据同步地址 - enabled: false + enabled: true #服务地址 - url: http://19.25.35.205:31190/ZHSL_ZY + # url: http://19.25.35.205:31190/ZHSL_ZY + url: http://19.25.40.10:31190 #认证ID x-h3c-id: 3359137640337 #认证秘钥 x-h3c-appKey: q7sli9ch - #同步天数 -# days: 7 \ No newline at end of file + paths: + "{ + att_res_base:'/ZHSL_ZY/jck/ygtjgx/dws_att_res_base', + att_waga_escpp:'/ZHSL_ZY/dws_att_waga_escpp', + att_res_rspp:'/ZHSL_ZY/jck/ytjgx/dws_att_res_rspp', + att_res_rwacdr:'/ZHSL_ZY/jck/ytjgx/dws_att_res_rwacdr', + att_dike_base:'/ZHSL_ZY/jck/yggx/dws_att_dike_base', + att_dike_bsfst:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_bsfst', + att_disc_base:'/ZHSL_ZY/jck/yggx/dws_att_disc_base', + att_dike_dbiabt:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_dbiabt', + att_dike_dkhos:'/ZHSL_ZY/jck/ytjgx/dws_att_dike_dkhos', + att_waga_base:'/ZHSL_ZY/jck/yggx/dws_att_waga_base', + att_waga_slhypr:'/ZHSL_ZY/jck/ytjgx/dws_att_waga_slhypr', + att_waga_sligvl:'/ZHSL_ZY/dws_att_waga_sligvl', + att_waga_sldnnt:'/ZHSL_ZY/jck/yggx/dws_att_waga_sldnnt', + att_rv_base:'/ZHSL_ZY/jck/yggx/dws_att_rv_base', + att_dpds_base:'/ZHSL_ZY/jck/yggx/dws_att_dpds_base', + att_bas_base:'/ZHSL_ZY/jck/yggx/dws_att_bas_base', + att_st_base:'/ZHSL_ZY/jck/dws_att_st_base', + att_st_mp:'/ZHSL/jck/dws_att_st_mp', + sys_xzqh:'/ZHSL_ZY/jck/dws_att_ad_base', + dws_rel_waga_ad:'/ZHSL_ZY/dws_rel_waga_ad', + dws_rel_dike_ad:'/ZHSL_ZY/dws_rel_dike_ad', + dws_rel_res_dscdnm:'/ZHSL_ZY/dws_rel_res_dscdnm', + dws_rel_st_res:'/ZHSL_ZY/jck/ytjgx/dws_rel_st_res', + ms_hdm_obp:'/ZHSL_ZY/bzjck/ms_hdm_obp', + ms_hdm_rsvr:'/ZHSL_ZY/bzjck/ms_hdm_rsvr', + ms_hdm_river:'/ZHSL_ZY/bzjck/ms_hdm_river', + ms_dsm_srhrds:'/ZHSL_ZY/bzjck/ms_dsm_srhrds' + }" \ No newline at end of file diff --git a/shuili-admin/src/main/resources/application-zhishiku.yml b/shuili-admin/src/main/resources/application-zhishiku.yml index 3a396d5b..b1f46a90 100644 --- a/shuili-admin/src/main/resources/application-zhishiku.yml +++ b/shuili-admin/src/main/resources/application-zhishiku.yml @@ -11,7 +11,7 @@ shuili: # 实例演示开关 demoEnabled: true # 临时文件地址 - profile: E:/tianhui + profile: D:/tianhui # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 @@ -127,7 +127,7 @@ spring: # redis 配置 redis: # 地址 - host: 192.168.0.61 + host: 127.0.0.1 # 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 diff --git a/shuili-admin/src/main/resources/config/application-dev.yml b/shuili-admin/src/main/resources/config/application-dev.yml index fe21260c..32f9a672 100644 --- a/shuili-admin/src/main/resources/config/application-dev.yml +++ b/shuili-admin/src/main/resources/config/application-dev.yml @@ -78,15 +78,15 @@ spring: # redis 配置 redis: # 地址 - host: redis - database: 2 + host: 127.0.0.1 +# 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: redis12345 + password: # 连接超时时间 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 3037030c..2ea26ea1 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,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - username: root - password: mysql123456 + 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 # 从库数据源 slave: # 从数据源开关/默认关闭