From c5f2aba9b20089f184ce175b58a33a881ea9e0b1 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 16 四月 2021 18:23:13 +0800
Subject: [PATCH] 修复 流已经关闭后，再次调用关闭流的接口，返回超时
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 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 e5e4c4d..b552e1e 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,16 +1,18 @@
package com.genersoft.iot.vmp.vmanager.user;
-import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+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 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.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.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.util.DigestUtils;
+import org.springframework.web.bind.annotation.*;
+
+import javax.security.sasl.AuthenticationException;
@Api(tags = "鐢ㄦ埛绠＄悊")
@CrossOrigin
@@ -18,24 +20,56 @@
@RequestMapping("/api/user")
public class UserController {
- @Value("${auth.username}")
- private String usernameConfig;
+ @Autowired
+ private AuthenticationManager authenticationManager;
- @Value("${auth.password}")
- private String passwordConfig;
+ @Autowired
+ private IUserService userService;
@ApiOperation("鐧诲綍")
@ApiImplicitParams({
@ApiImplicitParam(name = "username", value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
- @ApiImplicitParam(name = "password", value = "瀵嗙爜锛�32鏈猰d5鍔犲瘑锛�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", value = "瀵嗙爜锛�32浣峬d5鍔犲瘑锛�", dataTypeClass = String.class),
})
@GetMapping("/login")
public String login(String username, String password){
- if (!StringUtils.isEmpty(username) && username.equals(usernameConfig)
- && !StringUtils.isEmpty(password) && password.equals(passwordConfig)) {
+ 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", value = "鐢ㄦ埛鍚�", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "oldpassword", value = "鏃у瘑鐮侊紙宸瞞d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "password", value = "鏂板瘑鐮侊紙鏈猰d5鍔犲瘑鐨勫瘑鐮侊級", dataTypeClass = String.class),
+ })
+ @PostMapping("/changePassword")
+ public String changePassword(String oldpassword, 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";
+ }
}
--
Gitblit v1.8.0