From d739bfa5976e36ced26f906ab16f83c20c8cb27c Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:44:21 +0800
Subject: [PATCH] 处理冲突
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 756fecd..152122d 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
@@ -6,6 +6,7 @@
import com.genersoft.iot.vmp.service.IUserService;
import com.genersoft.iot.vmp.storager.dao.dto.Role;
import com.genersoft.iot.vmp.storager.dao.dto.User;
+import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -20,7 +21,6 @@
import org.springframework.web.bind.annotation.*;
import javax.security.sasl.AuthenticationException;
-import java.text.SimpleDateFormat;
import java.util.List;
@Api(tags = "鐢ㄦ埛绠＄悊")
@@ -37,8 +37,6 @@
@Autowired
private IRoleService roleService;
-
- private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ApiOperation("鐧诲綍")
@ApiImplicitParams({
@@ -76,7 +74,11 @@
@PostMapping("/changePassword")
public String changePassword(@RequestParam String oldPassword, @RequestParam String password){
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
- String username = SecurityUtils.getUserInfo().getUsername();
+ LoginUser userInfo = SecurityUtils.getUserInfo();
+ if (userInfo== null) {
+ return "fail";
+ }
+ String username = userInfo.getUsername();
LoginUser user = null;
try {
user = SecurityUtils.login(username, oldPassword, authenticationManager);
@@ -131,8 +133,8 @@
return new ResponseEntity<>(result, HttpStatus.OK);
}
user.setRole(role);
- user.setCreateTime(format.format(System.currentTimeMillis()));
- user.setUpdateTime(format.format(System.currentTimeMillis()));
+ user.setCreateTime(DateUtil.getNow());
+ user.setUpdateTime(DateUtil.getNow());
int addResult = userService.addUser(user);
result.setCode(addResult > 0 ? 0 : -1);
--
Gitblit v1.8.0