From 7af65af6cd8fa26dd279a5b6c517360b7bcef01c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 10 四月 2025 10:18:14 +0800
Subject: [PATCH] 工单业务

---
 server/src/main/java/com/doumee/api/web/WebMemberController.java |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/server/src/main/java/com/doumee/api/web/WebMemberController.java b/server/src/main/java/com/doumee/api/web/WebMemberController.java
index 15e772c..b34efe3 100644
--- a/server/src/main/java/com/doumee/api/web/WebMemberController.java
+++ b/server/src/main/java/com/doumee/api/web/WebMemberController.java
@@ -9,6 +9,8 @@
 import com.doumee.core.model.ApiResponse;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.web.dto.LoginH5DTO;
+import com.doumee.dao.web.dto.UpdEmailDTO;
+import com.doumee.service.business.MemberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.server.reactive.ServerHttpRequest;
@@ -27,17 +29,19 @@
 public class WebMemberController {
     @Resource
     private JwtTokenUtil jwtTokenUtil;
+
+    @Resource
+    private MemberService memberService;
+
+
     @PreventRepeat(limit = 10, lockTime = 10000)
     @ApiOperation("H5涓氬姟鐧诲綍")
     @PostMapping("/loginH5")
     public ApiResponse<Member> loginH5 (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
-            //---------TODO-----浠诲悍---鍋氱敤鎴风櫥褰曢�昏緫澶勭悊-------start-------
             //鎷緾ODE鎹wid锛屽厛鏌ヤ笅鏈郴缁熸槸鍚﹀瓨鍦紝瀛樺湪鐩存帴杩斿洖member锛屽惁鍒欑敤qwid鏌ヨ浼佷笟鐢ㄦ埛鏁版嵁锛屾彃鍏ユ暟鎹簱锛坢ember)
-            Member user =  new Member();
-
-            //---------TODO--------鍋氱敤鎴风櫥褰曢�昏緫澶勭悊-------end-------
+            Member user =  memberService.getUserInfo(dto);
             String token = jwtTokenUtil.generateToken(user);
             user.setToken(token);
             return ApiResponse.success(user);
@@ -48,17 +52,17 @@
             return ApiResponse.failed(ResponseStatus.SERVER_ERROR);
         }
     }
-    @ApiOperation("鏇存柊鐢ㄦ埛淇℃伅")
+
+    @LoginRequired
+    @ApiOperation("鏇存柊鐢ㄦ埛閭淇℃伅")
     @PostMapping("/upateInfo")
-    public ApiResponse<String> upateInfo (@Validated @RequestBody LoginH5DTO dto, ServerWebExchange serverWebExchange) {
+    public ApiResponse upateInfo (@RequestBody UpdEmailDTO updEmailDTO ,@RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange) {
         try {
             ServerHttpRequest request = serverWebExchange.getRequest();
-            //---------TODO-----浠诲悍---鍋氱敤鎴蜂俊鎭洿鏂帮紙閭锛夊鐞�-------start-------
-            Member user =  new Member();
-
-            //---------TODO--------鍋氱敤鎴蜂俊鎭洿鏂帮紙閭锛夊鐞�-------end-------
-            String token = jwtTokenUtil.generateToken(user);
-            return ApiResponse.success(token);
+            Member user =  jwtTokenUtil.getUserInfoByToken(token);
+            updEmailDTO.setUserId(user.getId());
+            memberService.updEmail(updEmailDTO);
+            return ApiResponse.success("鎿嶄綔鎴愬姛");
         }catch (BusinessException e){
             return ApiResponse.failed(e.getCode(),e.getMessage());
         }catch (Exception e){
@@ -69,16 +73,14 @@
     /**
      * 鍒锋柊JWT浠ょ墝,鐢ㄦ棫鐨勪护鐗屾崲鏂扮殑浠ょ墝
      */
+    @LoginRequired
     @GetMapping("/getMemberInfo")
     @ApiOperation("鑾峰彇褰撳墠鐧婚檰鐢ㄦ埛")
-    @LoginRequired
     public ApiResponse<Member> getMemberInfo(@RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
         try {
-            Member user =jwtTokenUtil.getUserInfoByToken(token);
-            //---------TODO------浠诲悍--妫�鏌ョ敤鎴蜂俊鎭綋鍓嶆槸鍚﹀悎娉�-------start-------
-
-            //---------TODO--------妫�鏌ョ敤鎴蜂俊鎭綋鍓嶆槸鍚﹀悎娉�-------end-------
-            jwtTokenUtil.refreshToken(token);//姣忔鏇存柊token鏈夋晥鏈�
+            Member user = jwtTokenUtil.getUserInfoByToken(token);
+            user = memberService.checkUserValid(user);
+            user.setToken(jwtTokenUtil.refreshToken(token));//姣忔鏇存柊token鏈夋晥鏈�
            if(user !=null){
                return ApiResponse.success( user);
            }

--
Gitblit v1.9.3