648540858
2023-12-26 7c07ae9421850650b9da6d453c498cc3049a83a3
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
old mode 100644 new mode 100755
@@ -14,6 +14,7 @@
import com.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AuthenticationManager;
@@ -42,7 +43,9 @@
    @GetMapping("/login")
    @PostMapping("/login")
    @Operation(summary = "登录")
    @Operation(summary = "登录", description = "登录成功后返回AccessToken, 可以从返回值获取到也可以从响应头中获取到," +
            "后续的请求需要添加请求头 'access-token'或者放在参数里")
    @Parameter(name = "username", description = "用户名", required = true)
    @Parameter(name = "password", description = "密码(32位md5加密)", required = true)
    public LoginUser login(HttpServletRequest request, HttpServletResponse response, @RequestParam String username, @RequestParam String password){
@@ -55,30 +58,13 @@
        if (user == null) {
            throw new ControllerException(ErrorCode.ERROR100.getCode(), "用户名或密码错误");
        }else {
            String jwt = JwtUtils.createToken(username, password);
            String jwt = JwtUtils.createToken(username);
            response.setHeader(JwtUtils.getHeader(), jwt);
            user.setAccessToken(jwt);
        }
        return user;
    }
//    @GetMapping("/logout")
//    @PostMapping("/logout")
//    @Operation(summary = "登出")
//    public LoginUser logout(){
//        LoginUser user;
//        try {
//            user = SecurityUtils.login(username, password, authenticationManager);
//        } catch (AuthenticationException e) {
//            throw new ControllerException(ErrorCode.ERROR100.getCode(), e.getMessage());
//        }
//        if (user == null) {
//            throw new ControllerException(ErrorCode.ERROR100.getCode(), "用户名或密码错误");
//        }else {
//            String jwt = JwtUtils.createToken(username, password);
//            response.setHeader(JwtUtils.getHeader(), jwt);
//        }
//        return user;
//    }
    @PostMapping("/changePassword")
    @Operation(summary = "修改密码")
@@ -98,8 +84,8 @@
            if (user == null) {
                throw new ControllerException(ErrorCode.ERROR100);
            }
            int userId = SecurityUtils.getUserId();
            boolean result = userService.changePassword(userId, DigestUtils.md5DigestAsHex(password.getBytes()));
            //int userId = SecurityUtils.getUserId();
            boolean result = userService.changePassword(user.getId(), DigestUtils.md5DigestAsHex(password.getBytes()));
            if (!result) {
                throw new ControllerException(ErrorCode.ERROR100);
            }
@@ -110,7 +96,7 @@
    @PostMapping("/add")
    @Operation(summary = "添加用户")
    @Operation(summary = "添加用户", security = @SecurityRequirement(name = JwtUtils.HEADER))
    @Parameter(name = "username", description = "用户名", required = true)
    @Parameter(name = "password", description = "密码(未md5加密的密码)", required = true)
    @Parameter(name = "roleId", description = "角色ID", required = true)