Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

侯瑞军

2021-03-31 90f2acaa6c61d5a60822d4fee5a44ec3c5404f67

 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;
    }