From 4cefcf6ada94919053e66d1756af33fff0dc1c4e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 十二月 2023 10:34:02 +0800
Subject: [PATCH] update easyexcel 3.3.2 => 3.3.3 update springboot-admin 3.1.7 => 3.1.8 update aws-java-sdk-s3 1.12.540 => 1.12.600
---
ruoyi-admin/src/main/resources/application-prod.yml | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 3623e6e..4443779 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -63,8 +63,6 @@
# url: jdbc:oracle:thin:@//localhost:1521/XE
# username: ROOT
# password: root
-# hikari:
-# connectionTestQuery: SELECT 1 FROM DUAL
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver
@@ -90,8 +88,6 @@
idleTimeout: 600000
# 姝ゅ睘鎬ф帶鍒舵睜涓繛鎺ョ殑鏈�闀跨敓鍛藉懆鏈燂紝鍊�0琛ㄧず鏃犻檺鐢熷懡鍛ㄦ湡锛岄粯璁�30鍒嗛挓
maxLifetime: 1800000
- # 杩炴帴娴嬭瘯query锛堥厤缃娴嬭繛鎺ユ槸鍚︽湁鏁堬級
- connectionTestQuery: SELECT 1
# 澶氫箙妫�鏌ヤ竴娆¤繛鎺ョ殑娲绘��
keepaliveTime: 30000
@@ -229,10 +225,10 @@
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
redirect-uri: ${justauth.address}/social-callback?source=oschina
- alipay:
+ alipay_wallet:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: ${justauth.address}/social-callback?source=alipay
+ redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
alipay-public-key: MIIB**************DAQAB
wechat_open:
client-id: 10**********6
--
Gitblit v1.9.3