From f7e2789a576b2db4217d20d5cfdeb20249c83a5b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 24 七月 2025 17:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index f0c599a..42dfb1d 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -87,8 +87,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Token unionLoginCallback(ConnectAuthUser authUser, String uuid) {
- return this.unionLoginCallback(authUser, false);
+ public Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice) {
+ return this.unionLoginCallback(authUser, false,encryptTwice);
}
@Override
@@ -196,7 +196,7 @@
AuthToken authToken = new AuthToken();
authToken.setUnionId(unionId);
connectAuthUser.setToken(authToken);
- return this.unionLoginCallback(connectAuthUser, true);
+ return this.unionLoginCallback(connectAuthUser, true,true);
} catch (Exception e) {
e.printStackTrace();
}
@@ -305,7 +305,7 @@
* @return token
* @throws NoPermissionException 涓嶅厑璁告搷浣�
*/
- private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm) {
+ private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm,boolean encryptTwice) {
try {
Member member = null;
@@ -336,14 +336,14 @@
Connect connect = this.getOne(queryWrapper);
if (connect == null) {
- member = memberService.autoRegister(authUser);
+ member = memberService.autoRegister(authUser,encryptTwice);
} else {
//鏌ヨ浼氬憳
member = memberService.getById(connect.getUserId());
//濡傛灉鏈粦瀹氫細鍛橈紝鍒欐妸鍒氭墠鏌ヨ鍒扮殑鑱斿悎鐧诲綍琛ㄦ暟鎹垹闄�
if (member == null) {
this.remove(queryWrapper);
- member = memberService.autoRegister(authUser);
+ member = memberService.autoRegister(authUser,encryptTwice);
}
}
}
--
Gitblit v1.8.0