From 277f2d65a70bddbf9c571e2023315faad26e12d0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 14:11:44 +0800
Subject: [PATCH] Merge branch 'master' into 1.0.1
---
server/service/src/main/java/com/doumee/service/system/SystemLoginService.java | 21 +++++++++++++++++++--
1 files changed, 19 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..1e3e3da 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
@@ -2,6 +2,7 @@
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 +18,22 @@
* @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);
+
+ /**
+ * 寰俊鎺堟潈
+ * @param code
+ * @param userId
+ * @return
+ */
+ String wxEmpower(String code,Integer userId);
+
+ /**
+ *
+ * @param wxMiniLoginDTO
+ * @param request
+ * @return
+ */
+ String loginByWxMini (WxMiniLoginDTO wxMiniLoginDTO, HttpServletRequest request);
}
--
Gitblit v1.9.3