Merge remote-tracking branch 'origin/master'

gateway/src/main/resources/application.yml

@@ -16,12 +16,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**
-
-        - id: file_route
-          uri: http://localhost:8083/
-          predicates:
-            - Path=/file/**
+            - Path=/userRole/**,/system/**,/file/**
 
         - id: tenant_route
           uri: http://localhost:8084/

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -1,6 +1,5 @@
 package com.jzg.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.core.page.HttpResult;
 import com.jzg.entity.po.SysUploadFiles;
@@ -17,10 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.Objects;
 
 /**
  * 文件上传接口
@@ -54,7 +50,7 @@ public class FileUploadController {
 
             // 查找文件是否已经存在于MinIO
             if (isFileExistsInMinIO(objectName, fileETag)) {
-                return HttpResult.ok(getFileFromDatabase(fileETag));
+                return HttpResult.ok(getFileFromDatabase(fileETag,objectName, extension));
             }
 
             //如果文件不存在，执行上传操作
@@ -91,13 +87,17 @@ public class FileUploadController {
         }
     }
 
-    private SysUploadFiles getFileFromDatabase(String fileETag) {
+    private SysUploadFiles getFileFromDatabase(String fileETag,String fileName,String fileType) {
         SysUploadFiles sysUploadFiles = sysUploadFilesMapper.selectOne(
                 new LambdaQueryWrapper<SysUploadFiles>().eq(SysUploadFiles::getEtag, fileETag));
 
         if (sysUploadFiles == null) {
             sysUploadFiles = new SysUploadFiles();
             sysUploadFiles.setId(IdGenerate.nextId());
+            sysUploadFiles.setFileName(fileName);
+            sysUploadFiles.setFileType(fileType);
+            sysUploadFiles.setBucketName(bucketName);
+            sysUploadFiles.setEtag(fileETag);
             sysUploadFiles.setCreateTime(LocalDateTime.now());
             sysUploadFilesMapper.insert(sysUploadFiles);
         }