From bf283bff4efa337e13adbe53218fc2b8173b1ffe Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Fri, 27 Sep 2024 17:44:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/system/api/RemoteFileService.java | 2 +- .../main/java/com/bonus/system/api/domain/SysFile.java | 4 ---- .../system/api/factory/RemoteFileFallbackFactory.java | 4 ++-- .../com/bonus/file/controller/SysFileController.java | 6 +++--- .../bonus/system/controller/SysProfileController.java | 9 ++++----- .../com/bonus/system/controller/SysUserController.java | 10 ++++++++++ 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java index c5a907c..b88d30c 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java @@ -27,7 +27,7 @@ public interface RemoteFileService * @return 结果 */ @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) - public R upload(@RequestPart(value = "file") MultipartFile file); + public AjaxResult upload(@RequestPart(value = "file") MultipartFile file); /** * 多文件上传 diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysFile.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysFile.java index 7f96da9..a8473db 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysFile.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysFile.java @@ -21,10 +21,6 @@ public class SysFile * 文件地址，除mongodb 存fileid之外，其他均存上传文件的网络路径 */ private String url; -// /** -// * 文件存储类型，包括 本地、obs、mongodb等 -// */ -// private String storageType; public String getName() { diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java index 9057fc6..d2d7d44 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java @@ -27,9 +27,9 @@ public class RemoteFileFallbackFactory implements FallbackFactory upload(MultipartFile file) + public AjaxResult upload(MultipartFile file) { - return R.fail("单上传文件失败:" + throwable.getMessage()); + return AjaxResult.error("单上传文件失败:" + throwable.getMessage()); } @Override diff --git a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java index 2e4c996..6edb272 100644 --- a/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java +++ b/bonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java @@ -43,18 +43,18 @@ public class SysFileController */ @PostMapping("upload") @ApiOperation("上传本地文件到服务器") - public R upload(MultipartFile file) + public AjaxResult upload(MultipartFile file) { try { // 上传并返回访问地址 SysFile sysFile = sysFileService.uploadFile(file); - return R.ok(sysFile); + return AjaxResult.success(sysFile); } catch (Exception e) { log.error("上传文件失败", e); - return R.fail(e.getMessage()); + return AjaxResult.error(e.getMessage()); } } diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysProfileController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysProfileController.java index 092ebac..de2b9c2 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysProfileController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysProfileController.java @@ -1,6 +1,5 @@ package com.bonus.system.controller; -import com.bonus.common.core.domain.R; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.file.FileTypeUtils; import com.bonus.common.core.utils.file.MimeTypeUtils; @@ -40,7 +39,7 @@ public class SysProfileController extends BaseController { @Autowired private TokenService tokenService; - @Autowired + @Resource private RemoteFileService remoteFileService; @Resource @@ -146,11 +145,11 @@ public class SysProfileController extends BaseController { if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) { return error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式"); } - R fileResult = remoteFileService.upload(file); - if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData())) { + AjaxResult fileResult = remoteFileService.upload(file); + if (fileResult.isError()) { return error("文件服务异常，请联系管理员"); } - String url = fileResult.getData().getUrl(); + String url = fileResult.getDataAs(SysFile.class).getUrl(); if (userService.updateUserAvatar(loginUser.getUsername(), url)) { AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", url); diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java index f649d9d..2309e9f 100644 --- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java +++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java @@ -12,12 +12,15 @@ import com.bonus.common.security.annotation.InnerAuth; import com.bonus.common.security.annotation.RequiresPermissions; import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; import com.bonus.common.security.utils.SecurityUtils; +import com.bonus.system.api.RemoteFileService; import com.bonus.system.api.domain.SysDept; +import com.bonus.system.api.domain.SysFile; import com.bonus.system.api.domain.SysRole; import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.model.LoginUser; import com.bonus.system.domain.UserPasswordHistory; import com.bonus.system.service.*; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -27,6 +30,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.rmi.Remote; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -61,9 +65,15 @@ public class SysUserController extends BaseController { @Resource private PasswordValidatorService passwordValidatorService; + @Resource + private RemoteFileService remoteFileService; /** * 获取用户列表 */ + @PostMapping("upload") + public AjaxResult upload(MultipartFile file){ + return remoteFileService.upload(file); + } @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:user:list")) @GetMapping("/list") @SysLog(title = "用户管理", businessType = OperaType.QUERY, logType = 0, module = "系统管理->用户管理", details = "查询用户列表")