From 8577a11e5093871b2b5d6988431e7e22e76d43e6 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期一, 29 四月 2024 01:46:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java index 1504f8d..a645ff0 100644 --- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java +++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java @@ -15,8 +15,10 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import java.util.HashMap; import java.util.Map; @@ -148,4 +150,24 @@ return Result.success(userService.getDeviceManager()); } + @ValueAuth + @GetMapping("/getUserNow") + @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�") + public Result<?> getUserNow(){ + return Result.success(userService.getUserNow()); + } + + @ValueAuth + @GetMapping("/getUserInfo") + @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�") + public Result<?> getUserInfo(){ + return Result.success(userService.getUserInfo()); + } + + @PostMapping("/upUserPassword") + @ApiOperation(value = "淇敼鐢ㄦ埛瀵嗙爜") + @ValueAuth + public Result<?> upUserPassword(String oldPassword, String newPassWord){ + return Result.success(userService.upUserPassword(oldPassword, newPassWord)); + } } -- Gitblit v1.9.3