1.系统上传，改成存相对路径

2.修复资源文件上传，git合并错误

snowy-plugin/snowy-plugin-dev/snowy-plugin-dev-func/src/main/java/vip/xiaonuo/dev/modular/file/util/DevFileMinIoUtil.java

@@ -425,7 +425,8 @@ public class DevFileMinIoUtil {
         try {
             initClient();
             DevConfigApi devConfigApi = SpringUtil.getBean(DevConfigApi.class);
-            return devConfigApi.getValueByKey(SNOWY_FILE_MINIO_END_POINT_KEY) + StrUtil.SLASH + bucketName + StrUtil.SLASH + key;
+//            return devConfigApi.getValueByKey(SNOWY_FILE_MINIO_END_POINT_KEY) + StrUtil.SLASH + bucketName + StrUtil.SLASH + key;
+            return key;
         } catch (Exception e) {
             throw new CommonException(e.getMessage());
         }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceFileController.java

@@ -103,7 +103,6 @@ public class ResourceFileController {
         if (!isCheckSuccess) {
             return RestResult.fail().message("存储空间不足");
         }
-        resourceFileService.uploadFile(request, uploadFileDto, userId);
 
         UploadFileVo uploadFileVo =resourceFileService.uploadFile(request, uploadFileDto, userId);