From fc0ad32f815535a5a4aee55f92eaac92cbd4d97b Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期二, 19 七月 2022 18:13:19 +0800
Subject: [PATCH] 1.修复新增用户没有pushkey的问题 2.将重置pushkey改为修改pushkey
---
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java | 15 +++++++++------
1 files changed, 9 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 ca6fc84..442832b 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
@@ -124,7 +124,8 @@
User user = new User();
user.setUsername(username);
user.setPassword(DigestUtils.md5DigestAsHex(password.getBytes()));
-
+ //鏂板鐢ㄦ埛鐨刾ushKey鐨勭敓鎴愯鍒欎负md5(鏃堕棿鎴�+鐢ㄦ埛鍚�)
+ user.setPushKey(DigestUtils.md5DigestAsHex((System.currentTimeMillis()+password).getBytes()));
Role role = roleService.getRoleById(roleId);
if (role == null) {
@@ -137,6 +138,7 @@
user.setCreateTime(DateUtil.getNow());
user.setUpdateTime(DateUtil.getNow());
int addResult = userService.addUser(user);
+
result.setCode(addResult > 0 ? 0 : -1);
result.setMsg(addResult > 0 ? "success" : "fail");
@@ -196,12 +198,13 @@
return userService.getUsers(page, count);
}
- @ApiOperation("閲嶇疆pushkey")
+ @ApiOperation("淇敼pushkey")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "userId", required = true, value = "鐢ㄦ埛Id", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "pushKey", required = true, value = "鏂扮殑pushKey", dataTypeClass = String.class),
})
- @RequestMapping("/resetPushKey")
- public ResponseEntity<WVPResult<String>> resetPushKey(@RequestParam Integer id) {
+ @RequestMapping("/changePushKey")
+ public ResponseEntity<WVPResult<String>> changePushKey(@RequestParam Integer userId,@RequestParam String pushKey) {
// 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛id
int currenRoleId = SecurityUtils.getUserInfo().getRole().getId();
WVPResult<String> result = new WVPResult<>();
@@ -211,7 +214,7 @@
result.setMsg("鐢ㄦ埛鏃犳潈闄�");
return new ResponseEntity<>(result, HttpStatus.FORBIDDEN);
}
- int resetPushKeyResult = userService.resetPushKey(id);
+ int resetPushKeyResult = userService.changePushKey(userId,pushKey);
result.setCode(resetPushKeyResult > 0 ? 0 : -1);
result.setMsg(resetPushKeyResult > 0 ? "success" : "fail");
--
Gitblit v1.8.0