From 393df8c2013b34fdd60bff312815d6a05d3e0ecc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 02 四月 2024 10:33:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 0
ycl-server/src/main/resources/application-dev.yml | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 08f01db..cd6ac34 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -36,9 +36,9 @@
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://42.193.1.25:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
+ url: jdbc:mysql://101.35.247.188:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false
username: root
- password: 321$YcYl@1970!
+ password: 123456
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -76,10 +76,10 @@
spring.data:
redis:
# 鍦板潃
- host: localhost
+ host: 42.193.1.25
# 绔彛锛岄粯璁や负6379
port: 6379
- password: 123456
+ password: ycl2018
# 鏁版嵁搴撶储寮�
database: 0
# 杩炴帴瓒呮椂鏃堕棿
diff --git a/ycl-server/src/main/resources/mapper/ycl/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
similarity index 100%
rename from ycl-server/src/main/resources/mapper/ycl/YwThresholdMapper.xml
rename to ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
--
Gitblit v1.8.0