From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

---
 server/company/src/main/java/com/doumee/api/system/SystemController.java |   11 ++---------
 1 files changed, 2 insertions(+), 9 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 6cc52a0..85cb705 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
@@ -50,9 +50,8 @@
     @ApiOperation("鐭俊楠岃瘉鐮佺櫥褰�")
     @PostMapping("/loginByPhone")
     public ApiResponse<String> loginByPhone (@Validated @RequestBody LoginPhoneDTO dto, HttpServletRequest request) {
-        return ApiResponse.success(systemLoginService.loginByPhone(dto, Constants.ZERO, true, request));
+        return ApiResponse.success(systemLoginService.loginByPhone(dto, Constants.ONE, true, request));
     }
-
 
     @PreventRepeat(limit = 10, lockTime = 10000)
     @ApiOperation("寰俊灏忕▼搴忕櫥褰�")
@@ -61,16 +60,10 @@
         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("閫�鍑虹櫥褰�")
     @PostMapping("/logout")
     public ApiResponse logout () {
+        systemLoginService.cleaOpenid();
         Subject subject = SecurityUtils.getSubject();
         subject.logout();
         return ApiResponse.success(null);

--
Gitblit v1.9.3