From b762ec2dd9db7ebcf222b0621cd3c1671f9f451c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 22 Jun 2021 17:47:02 +0800
Subject: [PATCH] 版本合并
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 4567fdf..7000c8c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -231,7 +231,25 @@
@ApiOperation(value = "修改基本信息", notes = "传入User")
public R updateInfo(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+ if (null!= user.getAvatar() && user.getAvatar()!="") {
+ String avatar = user.getAvatar();
+ String substring = avatar.substring(25, avatar.length());
+ String url = "https://web.byisf.com/minio" + substring;
+ user.setAvatar(url);
+ }
return R.status(userService.updateUserInfo(user));
+ }
+
+ /**
+ * 修改用户基本信息,不修改用户密码
+ * @param user 用户信息
+ * @autor zhongrj
+ * @time 2021-06-16
+ */
+ @PostMapping("/updateUserInfo")
+ public R updateUserInfo(@Valid @RequestBody User user) {
+ CacheUtil.clear(USER_CACHE);
+ return R.status(userService.updateUserInfos(user));
}
/**
@@ -345,7 +363,7 @@
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
- return R.data(userService.selectSecurityUserPageList(Condition.getPage(query),user));
+ return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
}
/**
--
Gitblit v1.9.3