lbqms.git - Gitblit

			@@ -3,7 +3,6 @@
			import cn.dev33.satoken.secure.BCrypt;
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.io.FileUtil;
			import com.ruoyi.common.core.constant.UserConstants;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.StringUtils;
			import com.ruoyi.common.core.utils.file.MimeTypeUtils;
			@@ -39,7 +38,7 @@
			public class SysProfileController extends BaseController {

			private final ISysUserService userService;
			private final ISysOssService iSysOssService;
			private final ISysOssService sysOssService;

			/**
			* 个人信息
			@@ -60,13 +59,11 @@
			@Log(title = "个人信息", businessType = BusinessType.UPDATE)
			@PutMapping
			public R<Void> updateProfile(@RequestBody SysUserProfileBo profile) {
			SysUserBo user = BeanUtil.copyProperties(profile, SysUserBo.class);
			if (StringUtils.isNotEmpty(user.getPhonenumber())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) {
			SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
			if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
			return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
			}
			if (StringUtils.isNotEmpty(user.getEmail())
			&& UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user))) {
			if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
			return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
			}
			user.setUserId(LoginHelper.getUserId());
			@@ -114,7 +111,7 @@
			if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
			return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
			}
			SysOssVo oss = iSysOssService.upload(avatarfile);
			SysOssVo oss = sysOssService.upload(avatarfile);
			String avatar = oss.getUrl();
			if (userService.updateUserAvatar(LoginHelper.getUsername(), oss.getOssId())) {
			AvatarVo avatarVo = new AvatarVo();