From 8c189b243bfbbacb2ab1ce79f4e1ff22708f125a Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 26 七月 2021 16:45:09 +0800
Subject: [PATCH] 修复接口

---
 src/main/java/com/whyc/controller/UserController.java |   48 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index b19d605..774c958 100644
--- a/src/main/java/com/whyc/controller/UserController.java
+++ b/src/main/java/com/whyc/controller/UserController.java
@@ -14,6 +14,7 @@
 import com.whyc.service.JobService;
 import com.whyc.service.LoginService;
 import com.whyc.service.UserService;
+import com.whyc.util.DigestsUtil;
 import com.whyc.util.UserExcelVerify;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
@@ -50,14 +51,14 @@
 
     @PostMapping
     @ApiOperation(value = "娣诲姞鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
+    //@RequiresPermissions(value = {"user:add","user:update"},logical = Logical.OR)
     public Response add(@RequestBody User user){
         return userService.add(user);
     }
 
     @GetMapping
     @ApiOperation(value = "鏌ヨ鐢ㄦ埛byId")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public Response getById(@RequestParam int id){
         User user = userService.getById(id);
         if (user==null){
@@ -68,44 +69,67 @@
 
     @GetMapping("/all")
     @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴�")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public List<User> getAll(){
         return userService.getAll();
     }
 
     @GetMapping("/page")
     @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public IPage<User> getPage(@RequestParam int pageNum,@RequestParam int pageSize){
         Page<Object> page = new Page<>(pageNum, pageSize);
         return userService.getAllWithPage(page);
     }
     @PostMapping("/search")
     @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
-    @RequiresPermissions(value = {"user:get"})
+    //@RequiresPermissions(value = {"user:get"})
     public Response<IPage<User>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody User user){
         return userService.getPageByCondition(pageNum,pageSize,user);
     }
 
+    @GetMapping("validatePassword")
+    @ApiOperation(value = "楠岃瘉瀵嗙爜")
+    public boolean validatePassword(@RequestParam int id, @RequestParam String password){
+        return userService.validatePassword(id,password);
+    }
+    @GetMapping("getSaltPassword")
+    @ApiOperation(value = "鑾峰彇鍔犲瘑瀵嗙爜")
+    public String getSaltPassword(@RequestParam String password,@RequestParam String salt){
+        return DigestsUtil.sha1(password,salt);
+    }
+    @PutMapping("updatePassword")
+    @ApiOperation(value = "淇敼瀵嗙爜")
+    public Response updatePassword(@RequestParam int id,@RequestParam String password){
+        return userService.updatePassword(id,password);
+    }
+
+    @PutMapping("resetPassword")
+    @ApiOperation(value = "閲嶇疆瀵嗙爜")
+    public Response resetPassword(@RequestParam int id){
+        return userService.resetPassword(id);
+    }
+
+
     @PutMapping
     @ApiOperation(value = "缂栬緫鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:update"})
+    //@RequiresPermissions(value = {"user:update"})
     public Response update(@RequestBody User user){
         return userService.update(user);
     }
 
     @PutMapping("freezeUser")
-    @ApiOperation(value = "鍐荤粨鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:update"})
-    public Response updateUserFreeze(@RequestParam int id){
-        return userService.updateUserFreeze(id);
+    @ApiOperation(value = "鍚姩/鍐荤粨鐢ㄦ埛")
+    //@RequiresPermissions(value = {"user:update"})
+    public Response updateUserFreeze(@RequestParam int id,@RequestParam int state){
+        return userService.updateUserFreeze(id,state);
     }
 
     @PutMapping("deleteUser")
     @ApiOperation(value = "鍒犻櫎鐢ㄦ埛")
-    @RequiresPermissions(value = {"user:delete"})
+    //@RequiresPermissions(value = {"user:delete"})
     public Response delete(@RequestParam int id){
-        return userService.deleteUser(id);
+        return userService.delete(id);
     }
 
     /**

--
Gitblit v1.9.1