From 9958c9393c8c3a5e2350fa9023e14cbbf74b0d9a Mon Sep 17 00:00:00 2001
From: weimingfei <fei_gaming@sina.com>
Date: 星期五, 31 十月 2025 12:05:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/service/system/SystemLoginService.java | 12 +++++++++++-
1 files changed, 11 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 83fbc82..aeeef17 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,5 +1,7 @@
package com.doumee.service.system;
+import com.doumee.dao.system.dto.LoginCabinetDTO;
+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;
@@ -23,12 +25,16 @@
LoginUserInfo loginByPasswordNew (LoginDTO dto, ServerHttpRequest request);
+ LoginUserInfo loginByPasswordForCabinet(LoginCabinetDTO 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);
/**
@@ -37,4 +43,8 @@
* @return
*/
String loginByUserId(Integer userId);
+
+ LoginUserInfo loginH5ByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
+
+ LoginUserInfo loginDriverByPhone(LoginPhoneDTO dto, ServerHttpRequest request);
}
--
Gitblit v1.9.3