From 134f5b1aedeb90b9f7a71dc41e8f08e96bcb3f85 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期二, 29 七月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
index 94fc569..ee7821f 100644
--- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
+++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
@@ -1,5 +1,6 @@
 package cn.lili.modules.connect.service;
 
+import cn.lili.base.Result;
 import cn.lili.cache.CachePrefix;
 import cn.lili.common.security.token.Token;
 import cn.lili.modules.connect.entity.Connect;
@@ -35,7 +36,7 @@
      * @param uuid     鐢ㄦ埛uuid
      * @return token
      */
-    Token unionLoginCallback(ConnectAuthUser authUser, String uuid);
+    Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice);
 
     /**
      * 缁戝畾
@@ -105,4 +106,12 @@
      * @param type 骞冲彴绫诲瀷
      */
     void loginBindUser(String userId, String unionId, String type);
-}
\ No newline at end of file
+
+    /**
+     * 灏忕▼搴忛潤榛樼櫥褰�
+     *
+     * @param code
+     * @return
+     */
+    Result silentLogin(String code);
+}

--
Gitblit v1.8.0