|
@@ -1,7 +1,6 @@
|
|
|
package com.vber.system.controller.system;
|
|
package com.vber.system.controller.system;
|
|
|
|
|
|
|
|
import cn.dev33.satoken.secure.BCrypt;
|
|
import cn.dev33.satoken.secure.BCrypt;
|
|
|
-import cn.hutool.core.io.FileUtil;
|
|
|
|
|
import com.vber.common.annotation.Log;
|
|
import com.vber.common.annotation.Log;
|
|
|
import com.vber.common.config.VberConfig;
|
|
import com.vber.common.config.VberConfig;
|
|
|
import com.vber.common.core.controller.BaseController;
|
|
import com.vber.common.core.controller.BaseController;
|
|
@@ -21,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
-import java.util.Arrays;
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
@@ -107,10 +105,6 @@ public class SysProfileController extends BaseController {
|
|
|
public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) throws IOException, InvalidExtensionException {
|
|
public R<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) throws IOException, InvalidExtensionException {
|
|
|
Map<String, Object> ajax = new HashMap<>();
|
|
Map<String, Object> ajax = new HashMap<>();
|
|
|
if (!avatarfile.isEmpty()) {
|
|
if (!avatarfile.isEmpty()) {
|
|
|
- String extension = FileUtil.extName(avatarfile.getOriginalFilename());
|
|
|
|
|
- if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
|
|
|
|
|
- return R.fail("文件格式不正确,请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
|
|
|
|
|
- }
|
|
|
|
|
String avatar = FileUploadUtils.upload(VberConfig.getAvatarPath(), avatarfile, MimeTypeUtils.IMAGE_EXTENSION);
|
|
String avatar = FileUploadUtils.upload(VberConfig.getAvatarPath(), avatarfile, MimeTypeUtils.IMAGE_EXTENSION);
|
|
|
if (userService.updateUserAvatar(getUsername(), avatar)) {
|
|
if (userService.updateUserAvatar(getUsername(), avatar)) {
|
|
|
ajax.put("imgUrl", avatar);
|
|
ajax.put("imgUrl", avatar);
|