From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/api/system/SystemController.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/doumeemes/api/system/SystemController.java b/server/src/main/java/doumeemes/api/system/SystemController.java
index e9a1f96..61dc7cb 100644
--- a/server/src/main/java/doumeemes/api/system/SystemController.java
+++ b/server/src/main/java/doumeemes/api/system/SystemController.java
@@ -8,9 +8,13 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.utils.Constants;
import doumeemes.dao.business.dto.CompanyInitDataDTO;
+import doumeemes.dao.ext.dto.WxLoginDTO;
+import doumeemes.dao.ext.dto.WxLoginOutDTO;
+import doumeemes.dao.ext.vo.WxLoginVO;
import doumeemes.dao.system.dto.LoginDTO;
import doumeemes.dao.system.dto.UpdatePwdDto;
import doumeemes.service.system.SystemLoginService;
+import doumeemes.service.system.WxLoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -46,22 +50,53 @@
@Autowired
private SystemLoginService systemLoginService;
+ @Autowired
+ private WxLoginService wxLoginService;
+
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("鐧诲綍")
@PostMapping("/login")
public ApiResponse<String> login (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
-// dto.setCompanyId(Constants.de);
return ApiResponse.success(systemLoginService.loginByPassword(dto, request));
}
+
@PreventRepeat(limit = 10, lockTime = 10000)
@ApiOperation("骞冲彴鐧诲綍")
@PostMapping("/platform/login")
public ApiResponse<String> platformLogin (@Validated @RequestBody LoginDTO dto, HttpServletRequest request) {
-// dto.setCompanyId(Constants.de);
return ApiResponse.success(systemLoginService.platformLogin(dto, request));
}
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("寰俊鐧诲綍")
+ @GetMapping("/wxLogin")
+ public ApiResponse<WxLoginVO> wxLogin (@RequestParam String code, HttpServletRequest request) {
+ return ApiResponse.success(wxLoginService.wxLogin(code, request));
+ }
+
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("寰俊灏忕▼搴忕櫥褰�")
+ @GetMapping("/wxProgramLogin")
+ public ApiResponse<WxLoginVO> wxProgramLogin (@RequestParam String code, HttpServletRequest request) {
+ return ApiResponse.success(wxLoginService.wxProgramLogin(code, request));
+ }
+
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("寰俊鐧诲綍璐﹀彿瀵嗙爜")
+ @PostMapping("/wxAccountLogin")
+ public ApiResponse<String> wxAccountLogin (@Validated @RequestBody WxLoginDTO dto, HttpServletRequest request) {
+ return ApiResponse.success(wxLoginService.wxLoginByPassword(dto, request));
+ }
+
+ @PreventRepeat(limit = 10, lockTime = 10000)
+ @ApiOperation("寰俊閫�鍑虹櫥褰�")
+ @PostMapping("/wxLoginOut")
+ public ApiResponse wxLoginOut (@Validated @RequestBody WxLoginOutDTO dto, HttpServletRequest request) {
+ wxLoginService.wxLoginOut(dto);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
@ApiOperation("閫�鍑虹櫥褰�")
@PostMapping("/logout")
public ApiResponse logout () {
--
Gitblit v1.9.3