diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 9271e46a..26887bc0 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -7,15 +7,15 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# url: jdbc:mysql://localhost:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 腾讯云 -# url: jdbc:mysql://172.17.0.3:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云 + url: jdbc:mysql://172.17.0.3:3306/wenlvapp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # 火山云 # url: jdbc:mysql://localhost:3306/xingming?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # url: jdbc:mysql://172.17.0.7:3306/wenlvapp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false username: root - password: root -# password: dnxxkj +# password: root + password: dnxxkj # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c3573ebc..35a477a1 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,20 +9,20 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath - - # 保存身份证文件地址 - idCardPath: D:/ruoyi/IdCard - domain: http://10.0.0.17:8081 +# profile: D:/ruoyi/uploadPath +# +# # 保存身份证文件地址 +# idCardPath: D:/ruoyi/IdCard +# domain: http://10.0.0.17:8081 # 腾讯云 # domain: http://82.156.153.112:8081 # 火山云 -# domain: http://14.103.162.172:8081 -# -# idCardPath: /home/IdCard -# profile: /home/uploadPath + domain: http://14.103.162.172:8081 + + idCardPath: /home/IdCard + profile: /home/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数组计算 char 字符验证 @@ -86,9 +86,9 @@ spring: # redis 配置 redis: # 地址 - host: localhost +# host: localhost ## host: 172.17.0.3 # 腾讯云 -# host: 172.17.0.2 #火山云 + host: 172.17.0.2 #火山云 # 端口,默认为6379 port: 6379 diff --git a/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml b/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml index b721f281..70a4cf8b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/DailySysMapper.xml @@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select t_income,t_refund ,data from daily_sys where data between #{startDate} and #{endDate}