From 009d0975615f66fe4b04d7b9f3e6fe7c4a1b5c99 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Thu, 13 Aug 2020 19:05:29 +0800
Subject: [PATCH] 修改超级管理的id和名称全局值
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
index bb3a836..48676b1 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java
@@ -199,8 +199,6 @@
})
@GetMapping("/users")
public PageResult<SysUser> findUsers(@RequestParam Map<String, Object> params) {
-// log.info("租户ID："+ TenantContextHolder.getTenant());
-// log.info("IP:"+request.getHeader(CommonConstant.USER_AGENT_IP));
return appUserService.findUsers(params);
}
/**
@@ -247,7 +245,7 @@
*/
@PutMapping(value = "/users/{id}/password")
@AuditLog(operation = "'重置用户密码:' + #id")
- public ResultBody resetPassword(@PathVariable Long id) {
+ public ResultBody resetPassword(@PathVariable Long id) throws Exception{
if (checkAdmin(id)) {
return ResultBody.failed(ADMIN_CHANGE_MSG);
}
@@ -255,10 +253,22 @@
}
/**
+ * 返回给Python加密密码
+ */
+ @GetMapping(value = "/users/python")
+ public ResultBody jiaMipython(@RequestBody String password) {
+ if (password==null||"".equals(password)) {
+ return ResultBody.failed().msg("请输入密码");
+ }
+ ResultBody resultBody = appUserService.jiaMipython(password);
+ return resultBody;
+ }
+
+ /**
* 用户自己修改密码
*/
@PutMapping(value = "/users/password")
- public ResultBody resetPassword(@RequestBody SysUser sysUser) {
+ public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
if (checkAdmin(sysUser.getId())) {
return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
}
@@ -270,7 +280,7 @@
* 用户自己修改密码-后端以外
*/
@PutMapping(value = "/users/resetpassword")
- public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) {
+ public ResultBody resetClientPassword(@RequestParam Map<String, Object> params) throws Exception {
Long id = MapUtils.getLong(params, "id");
String oldPassword = MapUtils.getString(params, "oldPassword");
String newPassword = MapUtils.getString(params, "newPassword");
@@ -293,7 +303,7 @@
* @return
*/
@PutMapping(value = "/users/updateusertel")
- public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) {
+ public ResultBody updateUserTel(@RequestParam Map<String, Object> params,@LoginUser SysUser sysUser) throws Exception {
String oldTel = MapUtils.getString(params, "oldTel");
if (oldTel==null){
return ResultBody.failed("请输入原账号");
@@ -341,7 +351,7 @@
*/
@PostMapping("/users/doctorUserReg")
@AuditLog(operation = "'注册/添加用户:' + #userRegVo.mobile")
- public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) {
+ public ResultBody doctorUserReg(@RequestBody UserRegVo userRegVo,SysUser sysUser) throws Exception {
return appUserService.doctorUserReg(userRegVo,sysUser);
}
@@ -398,7 +408,7 @@
* 根据map查询
*/
private boolean checkAdmin(long id) {
- return id == 1L;
+ return id == CommonConstant.ADMIN_USER_ID;
}
@PostMapping("/users/findAll")
@@ -429,7 +439,7 @@
* 通过手机修改密码
*/
@PutMapping(value = "/users/passwordByPhone")
- public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) {
+ public ResultBody passwordByPhone(@RequestBody Map<String, Object> map) throws Exception {
return appUserService.passwordByPhone(map);
}
--
Gitblit v1.8.0