From f0ed73b8faa5e86ac79dce309c8a28bb1b918554 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 16 四月 2025 16:44:27 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
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 77bdddb..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,7 @@
package com.doumee.service.system;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.dao.system.dto.LoginByOpenidDTO;
+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;
@@ -23,18 +23,24 @@
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(LoginDTO 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