From bbe672208fa862b3a01473336e5711b679279293 Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: 星期三, 02 八月 2023 14:51:23 +0800 Subject: [PATCH] add 新增 SysSocialServiceImpl#updateByBo 更新社会化关系 ; update 优化 SysLoginService#socialRegister 对已绑定用户进行更新 ; reset 回滚上一提交中 SysSocialServiceImpl#selectByAuthId 会导致多种数据库不兼容 ; --- ruoyi-admin/src/main/resources/application-prod.yml | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 5cbe552..f9cddb9 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -21,7 +21,8 @@ enable-test-mode: false max-appended-wf-context-length: 4096 max-result-length: 4096 - port: 27777 + # 28080 绔彛 闅忕潃涓诲簲鐢ㄧ鍙i閫� 閬垮厤闆嗙兢鍐茬獊 + port: 2${server.port} protocol: http server-address: 127.0.0.1:7700 store-strategy: disk @@ -108,7 +109,7 @@ # 杩炴帴瓒呮椂鏃堕棿 timeout: 10s # 鏄惁寮�鍚痵sl - ssl: false + ssl.enabled: false redisson: # redis key鍓嶇紑 @@ -184,13 +185,15 @@ --- # 涓夋柟鎺堟潈 justauth: enabled: true + # 鍓嶇澶栫綉璁块棶鍦板潃 address: http://localhost:80 type: maxkey: # maxkey 鏈嶅姟鍣ㄥ湴鍧� - server-url: http://localhost:8080 - client-id: 10**********6 - client-secret: 1f7d08**********5b7**********29e + # 娉ㄦ剰 濡備笅鍧囬厤缃潎涓嶉渶瑕佷慨鏀� 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 @@ -202,8 +205,8 @@ client-secret: 1f7d08**********5b7**********29e redirect-uri: ${justauth.address}/social-callback?source=weibo gitee: - client-id: 914******************98 - client-secret: 02*****************ac + client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98 + client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac redirect-uri: ${justauth.address}/social-callback?source=gitee dingtalk: client-id: 10**********6 -- Gitblit v1.9.3