lbqms.git - Gitblit

			@@ -1,5 +1,7 @@
			package com.ruoyi.web.controller.system;

			import cn.dev33.satoken.secure.BCrypt;
			import cn.hutool.core.io.FileUtil;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.constant.UserConstants;
			import com.ruoyi.common.core.controller.BaseController;
			@@ -7,8 +9,8 @@
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.helper.LoginHelper;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.file.MimeTypeUtils;
			import com.ruoyi.system.domain.SysOss;
			import com.ruoyi.system.service.ISysOssService;
			import com.ruoyi.system.service.ISysUserService;
			@@ -22,6 +24,7 @@
			import org.springframework.web.multipart.MultipartFile;

			import java.io.File;
			import java.util.Arrays;
			import java.util.HashMap;
			import java.util.Map;

			@@ -92,13 +95,14 @@
			SysUser user = userService.selectUserById(LoginHelper.getUserId());
			String userName = user.getUserName();
			String password = user.getPassword();
			if (!SecurityUtils.matchesPassword(oldPassword, password)) {
			if (!BCrypt.checkpw(oldPassword, password)) {
			return R.fail("修改密码失败，旧密码错误");
			}
			if (SecurityUtils.matchesPassword(newPassword, password)) {
			if (BCrypt.checkpw(newPassword, password)) {
			return R.fail("新密码不能与旧密码相同");
			}
			if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0) {

			if (userService.resetUserPwd(userName, BCrypt.hashpw(newPassword)) > 0) {
			return R.ok();
			}
			return R.fail("修改密码异常，请联系管理员");
			@@ -109,13 +113,17 @@
			*/
			@ApiOperation("头像上传")
			@ApiImplicitParams({
			@ApiImplicitParam(name = "avatarfile", value = "用户头像", dataTypeClass = File.class, required = true),
			@ApiImplicitParam(name = "avatarfile", value = "用户头像", paramType = "query", dataTypeClass = File.class, required = true)
			})
			@Log(title = "用户头像", businessType = BusinessType.UPDATE)
			@PostMapping("/avatar")
			public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
			Map<String, Object> ajax = new HashMap<>();
			if (!file.isEmpty()) {
			String extension = FileUtil.extName(file.getOriginalFilename());
			if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
			return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
			}
			SysOss oss = iSysOssService.upload(file);
			String avatar = oss.getUrl();
			if (userService.updateUserAvatar(getUsername(), avatar)) {