From e7c3314727fc06444689c0e6ecab5fea337afeb0 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 26 Feb 2021 15:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 c0ad449..38c673b 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
@@ -255,7 +255,7 @@
* 返回给Python加密密码
*/
@GetMapping(value = "/users/python")
- public ResultBody jiaMipython(@RequestBody String password) {
+ public ResultBody jiaMipython(@RequestParam("password") String password) {
if (password==null||"".equals(password)) {
return ResultBody.failed().msg("请输入密码");
}
@@ -268,9 +268,9 @@
*/
@PutMapping(value = "/users/password")
public ResultBody resetPassword(@RequestBody SysUser sysUser) throws Exception {
- if (checkAdmin(sysUser.getId())) {
- return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
- }
+// if (checkAdmin(sysUser.getId())) {
+// return ResultBody.failed().msg(ADMIN_CHANGE_MSG);
+// }
ResultBody resultBody = appUserService.updatePassword(sysUser.getId(), sysUser.getOldPassword(), sysUser.getNewPassword(), false);
return resultBody;
}
--
Gitblit v1.8.0