From bc44044892b29973b6faab8cccc0bbf317e601de Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 29 十一月 2024 09:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
start/src/main/resources/application-dev.yml | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/start/src/main/resources/application-dev.yml b/start/src/main/resources/application-dev.yml
index 2d110e7..4c99180 100644
--- a/start/src/main/resources/application-dev.yml
+++ b/start/src/main/resources/application-dev.yml
@@ -1,30 +1,31 @@
# 椤圭洰鐩稿叧閰嶇疆
-ruoyi:
+ycl:
# 鍚嶇О
- name: RuoYi
+ name: projectManagement
# 鐗堟湰
version: 1.0.0
# 鐗堟潈骞翠唤
copyrightYear: 2024
- # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/projectManagement/uploadPath锛孡inux閰嶇疆 /home/projectManagement/uploadPath锛�
+ profile: D:/projectManagement/uploadPath
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
# 楠岃瘉鐮佺被鍨� math 鏁板瓧璁＄畻 char 瀛楃楠岃瘉
captchaType: math
+
# 鏁版嵁婧愰厤缃�
spring:
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 47.108.189.108
+ host: 42.193.1.25
# 绔彛锛岄粯璁や负6379
- port: 6480
+ port: 6379
# 鏁版嵁搴撶储寮�
- database: 8
+ database: 2
# 瀵嗙爜
- password:
+ password: ycl2018
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
lettuce:
@@ -43,9 +44,10 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://120.24.204.87:3306/airport_screen?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+# url: jdbc:mysql://42.193.1.25:3306/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+ url: jdbc:mysql://42.193.1.25:3306/project_management?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
- password: Hnct2023
+ password: 321$YcYl@1970!
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
--
Gitblit v1.8.0