From 41e05da9a811cd9394ce9bddf5edcb7cde58db06 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 06 三月 2025 16:49:36 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang
---
ruoyi-admin/src/main/resources/application-test.yml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml
index ec0ed40..4fa25ea 100644
--- a/ruoyi-admin/src/main/resources/application-test.yml
+++ b/ruoyi-admin/src/main/resources/application-test.yml
@@ -14,7 +14,6 @@
addressEnabled: false
# 验证码类型 math 数字计算 char 字符验证
captchaType: math
-
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
@@ -103,7 +102,7 @@
druid:
# 主库数据源
master:
- url: jdbc:mysql://xzgt.test.591taxi.cn:13306/xizang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://xzgt.test.591taxi.cn:13306/xizang?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: 8f5z9g52gx4bg
# 从库数据源
@@ -199,6 +198,8 @@
qrLocation: /file/qrCode/
accessPath: /file/
allowExt: .jpg|.png|.gif|.jpeg|.doc|.docx|.apk|.MP4|.mp4|.pdf|.PDF
+ url:
+ prefix: http://localhost:${server.port}${server.servlet.context-path}
wx:
conf:
appId: wxe91f1af7638aa5dd
@@ -219,10 +220,18 @@
bucket: xzgttest-1305134071
bucketAddr: ap-chengdu
rootSrc: https://xzgttest-1305134071.cos.ap-chengdu.myqcloud.com/
- location: xizang
+ location: /xizang
sms:
enable: true
appId: 1400957506
secretid: AKIDCF5EF2c0DE1e5JK8r4EGJF4mNsMgp26x
secretkey: lLl184rUyFOOE0d5KNGC3kmfNsCWk4GU
- sign: 畅云出行
\ No newline at end of file
+ sign: 畅云出行
+com:
+ taxi591:
+ bank:
+ cer-path: D:\workspaces\工作文件\畅云\农业银行\TrustPayTest.cer
+ base-url: http://hello.enjoy.abchina.com
+ enable: true
+ keystore-password:
+ pfx-path: D:\workspaces\工作文件\畅云\农业银行\103882200000958.pfx
\ No newline at end of file
--
Gitblit v1.7.1