From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
admin/src/main/resources/application.yml | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index 7e498c4..6f3f595 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -50,6 +50,14 @@
# Spring閰嶇疆
spring:
+ rabbitmq:
+ # 闆嗙兢鍦板潃锛岀敤閫楀彿鍒嗛殧
+ host: ${custom.rabbitmq.host}
+ port: ${custom.rabbitmq.port}
+ virtual-host: ${custom.rabbitmq.virtual-host}
+ username: ${custom.rabbitmq.username}
+ password: ${custom.rabbitmq.password}
+ connection-timeout: 15000
# 璧勬簮淇℃伅
messages:
# 鍥介檯鍖栬祫婧愭枃浠惰矾寰�
@@ -74,7 +82,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://${custom.datasource.master.ip}:${custom.datasource.master.port}/${custom.datasource.master.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://${custom.datasource.master.ip}:${custom.datasource.master.port}/${custom.datasource.master.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
username: ${custom.datasource.master.username}
password: ${custom.datasource.master.password}
# 浠庡簱鏁版嵁婧�
@@ -84,6 +92,12 @@
url: jdbc:mysql://${custom.datasource.slave.ip}:${custom.datasource.slave.port}/${custom.datasource.slave.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: ${custom.datasource.slave.username}
password: ${custom.datasource.slave.password}
+ cwsj:
+ # 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
+ enabled: ${custom.datasource.cwsj.enabled}
+ url: jdbc:mysql://${custom.datasource.cwsj.ip}:${custom.datasource.cwsj.port}/${custom.datasource.cwsj.database}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: ${custom.datasource.cwsj.username}
+ password: ${custom.datasource.cwsj.password}
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -158,7 +172,7 @@
# 浠ょ墝瀵嗛挜
secret: abcdefghijklmnopqrstuvwxyz
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
- expireTime: 30
+ expireTime: 43200
# MyBatis-plus閰嶇疆
mybatis-plus:
@@ -168,6 +182,7 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
configLocation: classpath:mybatis/mybatis-config.xml
+
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
helperDialect: mysql
@@ -189,3 +204,15 @@
excludes: /system/notice
# 鍖归厤閾炬帴
urlPatterns: /system/*,/monitor/*,/tool/*
+
+oss:
+ access-key-id: "LTAI5t8MF5uEc3ZjqLFCR9bP"
+ access-key-secret: "CjdGwbbPlyv6kZessjLMZ52V2w0RBX"
+ endpoint: "oss-cn-hongkong.aliyuncs.com"
+ bucket: "huichang-tms.oss-cn-hongkong.aliyuncs.com"
+ region: "cn-hongkong"
+ roleArn: "acs:ram::1097562432747899:role/tms-oss"
+ key: "tms"
+
+
+
--
Gitblit v1.8.0