From 93fc01349aa48a086c71123a2317765a925c0897 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 10:22:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 f6ebaca..83fbc82 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,8 +1,8 @@
 package com.doumee.service.system;
 
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.system.dto.LoginByOpenidDTO;
+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;
@@ -23,11 +23,17 @@
 
     LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);
 
+    LoginUserInfo loginByPasswordForPda(LoginDTO dto, ServerHttpRequest request);
+
+    LoginUserInfo loginByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
+
+
     LoginUserInfo driverLogin(LoginDTO dto, ServerHttpRequest request);
+    LoginUserInfo loginDriverWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
+    LoginUserInfo loginGkUserWithCode(LoginPhoneDTO dto, ServerHttpRequest request);
     /**
      * 鏍规嵁 openId鐧诲綍
      * @param userId
-     * @param request
      * @return
      */
     String loginByUserId(Integer userId);

--
Gitblit v1.9.3