From 94ef0d856feb1802a9a672ee079308497578ae6b Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期四, 05 八月 2021 16:14:06 +0800
Subject: [PATCH] 修复关闭接口文档失效
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
index cf781c0..de40c2c 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
@@ -1,18 +1,26 @@
package com.genersoft.iot.vmp.vmanager.user;
+import com.genersoft.iot.vmp.conf.security.SecurityUtils;
+import com.genersoft.iot.vmp.conf.security.dto.LoginUser;
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.security.sasl.AuthenticationException;
+import javax.xml.crypto.Data;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
@Api(tags = "鐢ㄦ埛绠＄悊")
@CrossOrigin
@@ -21,21 +29,120 @@
public class UserController {
@Autowired
+ private AuthenticationManager authenticationManager;
+
+ @Autowired
private IUserService userService;
+ private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ApiOperation("鐧诲綍")
@ApiImplicitParams({
- @ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "瀵嗙爜锛�32鏈猰d5鍔犲瘑锛�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", required = true, value = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", dataTypeClass = String.class),
})
@GetMapping("/login")
- public String login(String username, String password){
- User user = userService.getUser(username, password);
+ public String login(@RequestParam String username, @RequestParam String password){
+ LoginUser user;
+ try {
+ user = SecurityUtils.login(username, password, authenticationManager);
+ } catch (AuthenticationException e) {
+ e.printStackTrace();
+ return "fail";
+ }
if (user != null) {
return "success";
}else {
return "fail";
}
}
+
+ @ApiOperation("淇敼瀵嗙爜")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "oldpassword", required = true, value = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", required = true, value = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ })
+ @PostMapping("/changePassword")
+ public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ String username = SecurityUtils.getUserInfo().getUsername();
+ LoginUser user = null;
+ try {
+ user = SecurityUtils.login(username, oldPassword, authenticationManager);
+ if (user != null) {
+ int userId = SecurityUtils.getUserId();
+ boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
+ if (result) {
+ return "success";
+ }
+ }
+ } catch (AuthenticationException e) {
+ e.printStackTrace();
+ }
+ return "fail";
+ }
+
+
+ @ApiOperation("娣诲姞鐢ㄦ埛")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "username", required = true, value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", required = true, value = "瀵嗙爜锛堟湭md5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "roleId", required = true, value = "瑙掕壊ID", dataTypeClass = String.class),
+ })
+ @PostMapping("/add")
+ public ResponseEntity<WVPResult<Integer>> add(@RequestParam String username,
+ @RequestParam String password,
+ @RequestParam int roleId){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ int currenRoleId = SecurityUtils.getUserInfo().getRoleId();
+ if (currenRoleId != 0) {
+ // 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);
+ }
+ User user = new User();
+ user.setUsername(username);
+ user.setPassword(DigestUtils.md5DigestAsHex(password.getBytes()));
+ user.setRoleId(roleId);
+ user.setCreateTime(format.format(System.currentTimeMillis()));
+ user.setUpdateTime(format.format(System.currentTimeMillis()));
+ int addResult = userService.addUser(user);
+ WVPResult<Integer> result = new WVPResult<>();
+ result.setCode(addResult > 0 ? 0 : -1);
+ result.setMsg(addResult > 0 ? "success" : "fail");
+ result.setData(addResult);
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
+ @ApiOperation("鍒犻櫎鐢ㄦ埛")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
+ })
+ @DeleteMapping("/delete")
+ public ResponseEntity<WVPResult<String>> delete(@RequestParam Integer id){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ int currenRoleId = SecurityUtils.getUserInfo().getRoleId();
+ if (currenRoleId != 0) {
+ // 鍙敤瑙掕壊id涓�0鎵嶅彲浠ュ垹闄ゅ拰娣诲姞鐢ㄦ埛
+ return new ResponseEntity<>(null, HttpStatus.FORBIDDEN);
+ }
+ int deleteResult = userService.deleteUser(id);
+ WVPResult<String> result = new WVPResult<>();
+ result.setCode(deleteResult>0? 0 : -1);
+ result.setMsg(deleteResult>0? "success" : "fail");
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
+
+ @ApiOperation("鏌ヨ鐢ㄦ埛")
+ @ApiImplicitParams({})
+ @GetMapping("/all")
+ public ResponseEntity<WVPResult<List<User>>> all(){
+ // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
+ List<User> allUsers = userService.getAllUsers();
+ WVPResult<List<User>> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ result.setData(allUsers);
+ return new ResponseEntity<>(result, HttpStatus.OK);
+ }
}
--
Gitblit v1.8.0