From e8a0fd29e22c43c2146ffae0564ff03cbf0fc2c4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 14 十月 2025 09:57:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
index a413735..58bc41f 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java
@@ -1,7 +1,9 @@
package com.doumee.service.system;
-import com.doumee.core.model.LoginUserInfo;
+import com.doumee.dao.system.dto.LoginH5DTO;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.dao.system.dto.LoginDTO;
+import com.doumee.dao.system.dto.LoginPhoneDTO;
import org.springframework.http.server.reactive.ServerHttpRequest;
import javax.servlet.http.HttpServletRequest;
@@ -19,5 +21,26 @@
* @date 2023/03/21 14:49
*/
String loginByPassword (LoginDTO dto, HttpServletRequest request);
+
LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginH5 (LoginH5DTO dto, ServerHttpRequest request);
+
+ LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request);
+
+ LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
+
+
+ LoginUserInfo driverLogin(LoginH5DTO dto, ServerHttpRequest request);
+ LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginGkUserWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
+ /**
+ * 鏍规嵁 openId鐧诲綍
+ * @param userId
+ * @return
+ */
+ String loginByUserId(Integer userId);
+
+ LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
+
+ LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
}
--
Gitblit v1.9.3