From 0cd6712b2a73a3f0a85a87b7e5cc256a09b34378 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 15 九月 2023 18:07:10 +0800
Subject: [PATCH] fix 修复 三方登录支付宝source与实际支付宝业务code不匹配问题
---
ruoyi-admin/src/main/resources/application-dev.yml | 161 ++++++++++++++---------------------------------------
1 files changed, 42 insertions(+), 119 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 432607f..b168542 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -18,7 +18,8 @@
enable-test-mode: false
max-appended-wf-context-length: 4096
max-result-length: 4096
- port: 27777
+ # 28080 绔彛 闅忕潃涓诲簲鐢ㄧ鍙ｉ閫� 閬垮厤闆嗙兢鍐茬獊
+ port: 2${server.port}
protocol: http
server-address: 127.0.0.1:7700
store-strategy: disk
@@ -42,7 +43,7 @@
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 鎵�鏈夊弬鏁伴厤缃弬鑰� https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 鎵瑰鐞嗕紭鍖� 澶у箙鎻愬崌鎵归噺鎻掑叆鏇存柊鍒犻櫎鎬ц兘(瀵规暟鎹簱鏈夋�ц兘鎹熻�� 浣跨敤鎵归噺鎿嶄綔搴旇�冭檻鎬ц兘闂)
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username: root
password: root
# 浠庡簱鏁版嵁婧�
@@ -50,7 +51,7 @@
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true
username:
password:
# oracle:
@@ -105,7 +106,7 @@
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
# 鏄惁寮�鍚痵sl
- ssl: false
+ ssl.enabled: false
redisson:
# redis key鍓嶇紑
@@ -179,150 +180,72 @@
territory: ap-guangzhou
-
+--- # 涓夋柟鎺堟潈
justauth:
enabled: true
+ # 鍓嶇澶栫綉璁块棶鍦板潃
+ address: http://localhost:80
type:
- QQ:
+ maxkey:
+ # maxkey 鏈嶅姟鍣ㄥ湴鍧�
+ # 娉ㄦ剰 濡備笅鍧囬厤缃潎涓嶉渶瑕佷慨鏀� maxkey 宸茬粡鍐呯疆濂戒簡鏁版嵁
+ server-url: http://sso.maxkey.top
+ client-id: 876892492581044224
+ client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+ redirect-uri: ${justauth.address}/social-callback?source=maxkey
+ qq:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/qq/callback
+ redirect-uri: ${justauth.address}/social-callback?source=qq
union-id: false
- WEIBO:
+ weibo:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/weibo/callback
+ redirect-uri: ${justauth.address}/social-callback?source=weibo
gitee:
- client-id: 38eaaa1b77b5e064313057a2f5745ce3a9f3e7686d9bd302c7df2f308ef6db81
- client-secret: 2e633af8780cb9fe002c4c7291b722db944402e271efb99b062811f52d7da1ff
- redirect-uri: http://localhost:80/social-login?source=gitee
- DINGTALK:
+ client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+ client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+ redirect-uri: ${justauth.address}/social-callback?source=gitee
+ dingtalk:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/dingtalk/callback
- BAIDU:
+ redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+ baidu:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/baidu/callback
- CSDN:
+ redirect-uri: ${justauth.address}/social-callback?source=baidu
+ csdn:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/csdn/callback
- CODING:
+ redirect-uri: ${justauth.address}/social-callback?source=csdn
+ coding:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/coding/callback
+ redirect-uri: ${justauth.address}/social-callback?source=coding
coding-group-name: xx
- OSCHINA:
+ oschina:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/oschina/callback
- ALIPAY:
+ redirect-uri: ${justauth.address}/social-callback?source=oschina
+ alipay_wallet:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/alipay/callback
+ redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
alipay-public-key: MIIB**************DAQAB
- WECHAT_OPEN:
+ wechat_open:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/wechat_open/callback
- WECHAT_MP:
+ redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+ wechat_mp:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/wechat_mp/callback
- WECHAT_ENTERPRISE:
+ redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+ wechat_enterprise:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/wechat_enterprise/callback
+ redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
agent-id: 1000002
- TAOBAO:
+ gitlab:
client-id: 10**********6
client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/taobao/callback
- GOOGLE:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/google/callback
- FACEBOOK:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/facebook/callback
- DOUYIN:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/douyin/callback
- LINKEDIN:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/linkedin/callback
- MICROSOFT:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/microsoft/callback
- MI:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/mi/callback
- TOUTIAO:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/toutiao/callback
- TEAMBITION:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/teambition/callback
- RENREN:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/renren/callback
- PINTEREST:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/pinterest/callback
- STACK_OVERFLOW:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/stack_overflow/callback
- stack-overflow-key: asd*********asd
- HUAWEI:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/huawei/callback
- KUJIALE:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/kujiale/callback
- GITLAB:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/gitlab/callback
- MEITUAN:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/meituan/callback
- ELEME:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/eleme/callback
- TWITTER:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/twitter/callback
- XMLY:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/xmly/callback
- # 璁惧鍞竴鏍囪瘑ID
- device-id: xxxxxxxxxxxxxx
- # 瀹㈡埛绔搷浣滅郴缁熺被鍨嬶紝1-iOS绯荤粺锛�2-Android绯荤粺锛�3-Web
- client-os-type: 3
- # 瀹㈡埛绔寘鍚嶏紝濡傛灉 clientOsType 涓�1鎴�2鏃跺繀濉�傚Android瀹㈡埛绔槸鍖呭悕锛屽IOS瀹㈡埛绔槸Bundle ID
- #pack-id: xxxx
- FEISHU:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/feishu/callback
- JD:
- client-id: 10**********6
- client-secret: 1f7d08**********5b7**********29e
- redirect-uri: http://oauth.xkcoding.com/demo/oauth/jd/callback
+ redirect-uri: ${justauth.address}/social-callback?source=gitlab
--
Gitblit v1.9.3