From a01d637e9ff2bf26aa44c65a239413a38bd8b1fe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 04 六月 2025 09:39:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/system/SystemLoginService.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/system/SystemLoginService.java b/server/service/src/main/java/com/doumee/service/system/SystemLoginService.java
index 6805744..0b91c5e 100644
--- a/server/service/src/main/java/com/doumee/service/system/SystemLoginService.java
+++ b/server/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.LoginDTO;
import com.doumee.dao.system.dto.LoginPhoneDTO;
+import com.doumee.dao.system.dto.WxMiniLoginDTO;
import javax.servlet.http.HttpServletRequest;
@@ -17,6 +19,17 @@
* @author Eva.Caesar Liu
* @date 2023/03/21 14:49
*/
- String loginByPassword (LoginDTO dto,int type, HttpServletRequest request);
- String loginByPhone (LoginPhoneDTO dto, int type, HttpServletRequest request);
+ String loginByPassword (LoginDTO dto,int type,Boolean checkCaptcha, HttpServletRequest request);
+ String loginByPhone (LoginPhoneDTO dto, int type,Boolean checkSmsCode, HttpServletRequest request);
+ String switchCompany (LoginUserInfo loginUserInfo, Integer companyId, HttpServletRequest request);
+
+ /**
+ *
+ * @param wxMiniLoginDTO
+ * @param request
+ * @return
+ */
+ String loginByWxMini (WxMiniLoginDTO wxMiniLoginDTO, HttpServletRequest request);
+
+ void cleaOpenid();
}
--
Gitblit v1.9.3