From f8ab5663ef7220f8adc0fd8fcbd7d0cf84c6d77d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 12:15:14 +0800
Subject: [PATCH] update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 31ca6dd..9e1e715 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -1,6 +1,6 @@
package com.ruoyi.web.controller.system;
-import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.UserConstants;
@@ -59,19 +59,22 @@
@PutMapping
public AjaxResult updateProfile(@RequestBody SysUser user)
{
- if (StrUtil.isNotEmpty(user.getPhonenumber())
+ if (StringUtils.isNotEmpty(user.getPhonenumber())
&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
}
- if (StrUtil.isNotEmpty(user.getEmail())
+ if (StringUtils.isNotEmpty(user.getEmail())
&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))
{
return AjaxResult.error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
}
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ SysUser sysUser = loginUser.getUser();
+ user.setUserId(sysUser.getUserId());
+ user.setPassword(null);
if (userService.updateUserProfile(user) > 0)
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
// 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
loginUser.getUser().setNickName(user.getNickName());
loginUser.getUser().setPhonenumber(user.getPhonenumber());
--
Gitblit v1.9.3