From 2b88f76c533a2fa94cd029b8a88c2d4da437552c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 29 三月 2024 08:55:22 +0800
Subject: [PATCH] git ch

---
 server/company/src/main/java/com/doumee/api/system/SystemController.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/server/company/src/main/java/com/doumee/api/system/SystemController.java b/server/company/src/main/java/com/doumee/api/system/SystemController.java
index 1f3c5e3..c6d61cb 100644
--- a/server/company/src/main/java/com/doumee/api/system/SystemController.java
+++ b/server/company/src/main/java/com/doumee/api/system/SystemController.java
@@ -7,9 +7,7 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.utils.Constants;
-import com.doumee.dao.system.dto.LoginDTO;
-import com.doumee.dao.system.dto.UpdatePwdDto;
-import com.doumee.dao.system.dto.WebLoginDTO;
+import com.doumee.dao.system.dto.*;
 import com.doumee.service.system.SystemLoginService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -45,25 +43,32 @@
     @ApiOperation("鐧诲綍 - 鍚庣")
     @PostMapping("/login")
     public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
-        return ApiResponse.success(systemLoginService.loginByPassword(dto, Constants.ONE, request));
+        return ApiResponse.success(systemLoginService.loginByPassword(dto, Constants.ONE, true, request));
     }
 
     @PreventRepeat(limit = 10, lockTime = 10000)
-    @ApiOperation("鐧诲綍 - H5")
-    @PostMapping("/loginH5")
-    public ApiResponse<String> loginH5 (@Validated @RequestBody WebLoginDTO dto, HttpServletRequest request) {
-        LoginDTO loginDTO = new LoginDTO();
-        BeanUtils.copyProperties(dto,loginDTO);
-        return ApiResponse.success(systemLoginService.loginByPassword(loginDTO, Constants.TWO, request));
+    @ApiOperation("鐭俊楠岃瘉鐮佺櫥褰�")
+    @PostMapping("/loginByPhone")
+    public ApiResponse<String> loginByPhone (@Validated @RequestBody LoginPhoneDTO dto, HttpServletRequest request) {
+        return ApiResponse.success(systemLoginService.loginByPhone(dto, Constants.ONE, true, request));
+    }
+
+    @PreventRepeat(limit = 10, lockTime = 10000)
+    @ApiOperation("寰俊灏忕▼搴忕櫥褰�")
+    @PostMapping("/loginByWxMini")
+    public ApiResponse<String> loginByWxMini (@Validated @RequestBody WxMiniLoginDTO dto, HttpServletRequest request) {
+        return ApiResponse.success(systemLoginService.loginByWxMini(dto, request));
     }
 
     @ApiOperation("閫�鍑虹櫥褰�")
     @PostMapping("/logout")
     public ApiResponse logout () {
+        systemLoginService.cleaOpenid();
         Subject subject = SecurityUtils.getSubject();
         subject.logout();
         return ApiResponse.success(null);
     }
+
     @Trace(withRequestParameters = false)
     @ApiOperation("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
     @PostMapping("/updatePwd")

--
Gitblit v1.9.3