From e9c1bc2e789f6f9f8c52fbd10788ad5a0d1f841b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 13:39:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/resources/application-dev.yml | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index aa3c857..aa4e6d9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,11 +3,33 @@
upload:
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- url: E:/ycl/file
+ url: D:/ycl/file
+
spring:
+ config:
+ url: http://localhost:8000
datasource:
url: jdbc:mysql://42.193.1.25:3306/xzs?useSSL=true&useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
username: root
password: 321$YcYl@1970!
driver-class-name: com.mysql.cj.jdbc.Driver
+ rabbitmq:
+ host: 101.35.247.188
+ username: ycl
+ password: ycl@2024
+ virtual-host: jxkg
+ port: 5672
+ publisher-confirms: true # 寮�鍚敓浜ц�呭彂閫佺‘璁�
+ publisher-returns: true # 寮�鍚敓浜ц�呭彂閫佸け璐ラ��鍥�
+# listener:
+# simple:
+# default-requeue-rejected: false # 鍏抽棴榛樿鎷掔粷娑堣垂鏃剁殑閲嶆柊鍏ラ槦锛屾垜浠娇鐢ㄦ湰鍦伴噸璇曟秷璐�
+# # 纭妯″紡锛氭墜鍔紝寮�鍚簡灏卞繀椤诲湪浠ｇ爜涓墜鍔ㄧ‘璁わ紝鍚﹀垯娑堟伅浼氫竴鐩撮噸澶嶆秷璐广��
+# # 寮�鍚簡閲嶈瘯灏卞簲璇ヨ缃负鑷姩纭锛屽洜涓烘墜鍔ㄧ‘璁ら渶瑕佹崟鑾峰紓甯革紝鑰岄噸璇曞氨鏄彂鐢熷紓甯告墠浼氶噸璇�
+# acknowledge-mode: auto
+# retry:
+# enabled: true # 娑堣垂鏃跺嚭鐜板紓甯歌繘琛岄噸璇曟秷璐癸紝娉ㄦ剰涓嶈兘琚崟鑾凤紝鍚﹀垯鏃犳硶閲嶈瘯
+# max-attempts: 3 # 鏈�澶ч噸璇曟鏁�
+# initial-interval: 3000 # 鍒濇閲嶈瘯绛夊緟闂撮殧
+# multiplier: 2 # 閲嶈瘯澶辫触鍚庯紝涓嬫绛夊緟鏃堕棿澧炲姞澶氬皯鍊嶃��
--
Gitblit v1.8.0