优化

src/main/java/com/zhgd/config/CorsConfig.java

@@ -14,7 +14,8 @@ public class CorsConfig{
     public FilterRegistrationBean corsFilter() {
         CorsConfiguration config = new CorsConfiguration();
         config.setAllowCredentials(true);
-        config.addAllowedOrigin("*");
+//        config.addAllowedOrigin("*");
+        config.addAllowedOrigin("http://10.75.253.12:6090");
         config.addAllowedHeader("*");
         config.addAllowedMethod("*");
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/FileController.java

@@ -1,6 +1,5 @@
 package com.zhgd.xmgl.modules.basicdata.controller.admin;
 
-import cn.xuyanwu.spring.file.storage.FileInfo;
 import cn.xuyanwu.spring.file.storage.FileStorageService;
 import com.zhgd.annotation.OperLog;
 import com.zhgd.file.FileUtil;
@@ -17,7 +16,6 @@ import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
-import java.net.URLEncoder;
 import java.util.Map;
 
 /**
@@ -42,23 +40,38 @@ public class FileController {
     /**
      * 上传文件到指定存储平台，成功返回文件信息
      */
-    @OperLog(operModul = "文件管理", operType = "文件上传", operDesc = "文件上传")
-    @ApiOperation(value = "文件上传", notes = "文件上传",  httpMethod="POST")
-    @PostMapping("/upload")
-    public Result<FileInfo> uploadPlatform(MultipartFile file) {
-        return Result.success(fileStorageService.of(file)
-                .setPlatform("minio-1")    //使用指定的存储平台
-                .upload());
-    }
-
-//    /**
-//     * 上传文件到本地，成功返回文件信息
-//     */
 //    @OperLog(operModul = "文件管理", operType = "文件上传", operDesc = "文件上传")
 //    @ApiOperation(value = "文件上传", notes = "文件上传",  httpMethod="POST")
 //    @PostMapping("/upload")
-//    public Result<Map<String, Object>> upload(MultipartFile file) {
+//    public Result<FileInfo> uploadPlatform(MultipartFile file) {
-//        return Result.success(fileDetailService.upload(file));
+//        return Result.success(fileStorageService.of(file)
+//                .setPlatform("minio-1")    //使用指定的存储平台
+//                .upload());
+//    }
+
+    /**
+     * 上传文件到本地，成功返回文件信息
+     */
+    @OperLog(operModul = "文件管理", operType = "文件上传", operDesc = "文件上传")
+    @ApiOperation(value = "文件上传", notes = "文件上传",  httpMethod="POST")
+    @PostMapping("/upload")
+    public Result<Map<String, Object>> upload(MultipartFile file) {
+        return Result.success(fileDetailService.upload(file));
+    }
+
+//    /**
+//     * 上传BASE64文件
+//     */
+//    @OperLog(operModul = "文件管理", operType = "BASE64文件上传", operDesc = "BASE64文件上传")
+//    @ApiOperation(value = "BASE64文件上传", notes = "BASE64文件上传",  httpMethod="POST")
+//    @ApiImplicitParam(name = "base64", value = "BASE64字符串", required = true, dataType = "String")
+//    @PostMapping("/uploadBase64")
+//    public Result<FileInfo> uploadBase64(@ApiIgnore @RequestBody Map<String, Object> map) {
+//        String base64 = MapUtils.getString(map, "base64");
+//        MultipartFile multipartFile = FileUtil.base64toMultipart(base64, "text.jpg");
+//        return Result.success(fileStorageService.of(multipartFile)
+//                .setPlatform("minio-1")    //使用指定的存储平台
+//                .upload());
 //    }
 
     /**
@@ -68,33 +81,48 @@ public class FileController {
     @ApiOperation(value = "BASE64文件上传", notes = "BASE64文件上传",  httpMethod="POST")
     @ApiImplicitParam(name = "base64", value = "BASE64字符串", required = true, dataType = "String")
     @PostMapping("/uploadBase64")
-    public Result<FileInfo> uploadBase64(@ApiIgnore @RequestBody Map<String, Object> map) {
+    public Result<Map<String, Object>> uploadBase64(@ApiIgnore @RequestBody Map<String, Object> map) {
         String base64 = MapUtils.getString(map, "base64");
         MultipartFile multipartFile = FileUtil.base64toMultipart(base64, "text.jpg");
-        return Result.success(fileStorageService.of(multipartFile)
+        return Result.success(fileDetailService.upload(multipartFile));
-                .setPlatform("minio-1")    //使用指定的存储平台
-                .upload());
     }
 
 
     /**
      * 下载文件
      */
-    @OperLog(operModul = "文件管理", operType = "文件下载", operDesc = "文件下载")
+//    @OperLog(operModul = "文件管理", operType = "文件下载", operDesc = "文件下载")
-    @ApiOperation(value = "文件下载", notes = "文件下载",  httpMethod="POST")
+//    @ApiOperation(value = "文件下载", notes = "文件下载",  httpMethod="POST")
-    @ApiImplicitParam(name = "fileUrl", value = "文件路径", paramType = "body", dataType = "String")
+//    @ApiImplicitParam(name = "fileUrl", value = "文件路径", paramType = "body", dataType = "String")
-    @PostMapping("/download")
+//    @PostMapping("/download")
-    public void download(@ApiIgnore @RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+//    public void download(@ApiIgnore @RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        // 获取文件信息
+//        // 获取文件信息
-        String fileUrl = MapUtils.getString(map, "fileUrl");
+//        String fileUrl = MapUtils.getString(map, "fileUrl");
-        FileInfo fileInfo = fileStorageService.getFileInfoByUrl(fileUrl);
+//        FileInfo fileInfo = fileStorageService.getFileInfoByUrl(fileUrl);
-        if (null == fileInfo) {
+//        if (null == fileInfo) {
-            throw new Exception("缩略图文件下载失败，文件不存在！fileInfo：" + fileInfo);
+//            throw new Exception("缩略图文件下载失败，文件不存在！fileInfo：" + fileInfo);
-        }
+//        }
-        response.setHeader("Content-disposition", "attachment; filename=" + fileUrl.substring(fileUrl.lastIndexOf("/") + 1));
+//        response.setHeader("Content-disposition", "attachment; filename=" + fileUrl.substring(fileUrl.lastIndexOf("/") + 1));
-        response.setContentType("application/octet-stream");// 定义输出类型
+//        response.setContentType("application/octet-stream");// 定义输出类型
-        fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
+//        fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
-    }
+//    }
+
+    /**
+     * 获取预览文件流
+     */
+//    @OperLog(operModul = "文件管理", operType = "获取预览文件流", operDesc = "获取预览文件流")
+//    @ApiOperation(value = "获取预览文件流", notes = "获取预览文件流",  httpMethod="POST")
+//    @GetMapping("/preview")
+//    public void download(@RequestParam(value = "fileUrl", required = true) String fileUrl, HttpServletResponse response) throws Exception {
+//        // 获取文件信息
+//        FileInfo fileInfo = fileStorageService.getFileInfoByUrl(fileUrl);
+//        if (null == fileInfo) {
+//            throw new Exception("缩略图文件预览失败，文件不存在！fileInfo：" + fileInfo);
+//        }
+//        response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileInfo.getOriginalFilename(), "UTF-8"));
+//        response.setContentType("application/octet-stream");// 定义输出类型
+//        fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
+//    }
 
     /**
      * 获取预览文件流
@@ -104,23 +132,6 @@ public class FileController {
     @GetMapping("/preview")
     public void download(@RequestParam(value = "fileUrl", required = true) String fileUrl, HttpServletResponse response) throws Exception {
         // 获取文件信息
-        FileInfo fileInfo = fileStorageService.getFileInfoByUrl(fileUrl);
+        fileDetailService.download(fileUrl, response);
-        if (null == fileInfo) {
-            throw new Exception("缩略图文件预览失败，文件不存在！fileInfo：" + fileInfo);
-        }
-        response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileInfo.getOriginalFilename(), "UTF-8"));
-        response.setContentType("application/octet-stream");// 定义输出类型
-        fileStorageService.download(fileInfo).outputStream(response.getOutputStream());
     }
-
-//    /**
-//     * 获取预览文件流
-//     */
-//    @OperLog(operModul = "文件管理", operType = "获取预览文件流", operDesc = "获取预览文件流")
-//    @ApiOperation(value = "获取预览文件流", notes = "获取预览文件流",  httpMethod="POST")
-//    @GetMapping("/preview")
-//    public void download(@RequestParam(value = "fileUrl", required = true) String fileUrl, HttpServletResponse response) throws Exception {
-//        // 获取文件信息
-//        fileDetailService.download(fileUrl, response);
-//    }
 }

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/SystemUserOpController.java

@@ -80,6 +80,7 @@ public class SystemUserOpController {
         systemUser.setIsManager(false);
         systemUser.setAccountType(2);
         systemUser.setUserTel(systemUserOpVo.getNumPhone());
+        systemUser.setRealName(systemUserOpVo.getRealName());
         systemUserService.save(systemUser);
         //新增用户角色
         SystemUserRole systemUserRole = new SystemUserRole();

src/main/java/com/zhgd/xmgl/modules/basicdata/vo/SystemUserOpVo.java

@@ -25,4 +25,7 @@ public class SystemUserOpVo {
 
     @ApiModelProperty(value = "手机号")
     private String numPhone;
+
+    @ApiModelProperty(value = "用户名")
+    private String realName;
 }