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/company/src/main/java/com/doumee/api/system/SystemController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 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..3ebf770 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,16 +43,29 @@
@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(value = "鎺堟潈openId",notes = "鐧诲綍鍚�")
+ @GetMapping("/wxEmpower")
+ public ApiResponse<String> wxEmpower (@RequestParam String code, HttpServletRequest request) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ return ApiResponse.success(systemLoginService.wxEmpower(code, loginUserInfo.getId()));
}
@ApiOperation("閫�鍑虹櫥褰�")
--
Gitblit v1.9.3