From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
index fafcdf5..5269f53 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
+
@RestController //娉ㄨВuser鎺у埗鍣紝鎸傝浇鍒皊pringboot褰撲腑
@RequestMapping("/user") //娉ㄨВ鍓嶇寮傛璇锋眰濡傦細localhost锛�8080/user
public class UserController {
@@ -28,7 +30,6 @@
@GetMapping
public List<User> getUser(){
- System.out.println(cacheUtil.getCacheData("admin"));
return userMapper.findAll();
}
@ApiOperation("鐧诲綍")
@@ -38,7 +39,7 @@
userService.deleteCache(userDTO.getUserId());
UserDTO getUserDTO=userService.login(userDTO);
if(getUserDTO!=null){
- return Result.seccess(userDTO);
+ return Result.success(userDTO);
}else{
throw new ServiceException(Constants.Code_600,"鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒");
}
@@ -50,9 +51,27 @@
if(getUser == null){
throw new ServiceException(Constants.Code_500,"娉ㄥ唽澶辫触");
}else {
- return Result.seccess(getUser);
+ return Result.success(getUser);
}
//return
}
+ @ApiOperation("淇敼瀵嗙爜")
+ @PostMapping("/updatePassWord")
+ public Result updatePassWord(@RequestBody Map<String,Object> object){
+ return Result.success( userService.updatePassWord(object));
+ }
+
+ @ApiOperation("淇敼鐢ㄦ埛鍚�")
+ @PostMapping("/updateUserName")
+ public Result updateUserName(@RequestBody Map<String,Object> object){
+ return Result.success( userService.updateUserName(object));
+ }
+
+ @ApiOperation("鐢ㄦ埛鐧诲綍璁板綍")
+ @PostMapping("/getUserLog")
+ public Result getUserLog(){
+ return Result.success( userService.getUserLog());
+ }
+
}
--
Gitblit v1.8.0