app上传

src/main/java/com/fdkankan/manage/controller/AppFileController.java

@@ -34,7 +34,7 @@ public class AppFileController {
         String md5 = FileMd5Util.getFileMD5(filePath);
         Map<String,String> result = new HashMap<>(2);
         result.put("md5",md5);
-        return ResultData.ok(md5);
+        return ResultData.ok(result);
     }
 
     @PostMapping(value = "/add")

src/main/java/com/fdkankan/manage/controller/SpaceSdkController.java

@@ -32,7 +32,7 @@ public class SpaceSdkController {
      * @param platformType
      */
     @PostMapping(value = "/upload", consumes = { "multipart/form-data" })
-    private String upload(@RequestParam("file") MultipartFile file,
+    public String upload(@RequestParam("file") MultipartFile file,
                           @RequestParam("version") String version,
                           @RequestParam("imprintCh") String imprintCh,
                           @RequestParam("imprintEn") String imprintEn,
@@ -71,7 +71,7 @@ public class SpaceSdkController {
      * 上下架
      */
     @PostMapping(value = "/online")
-    private ResultData online(@RequestBody SpaceSdkParam param) {
+    public ResultData online(@RequestBody SpaceSdkParam param) {
         spaceSdkService.online(param);
         return ResultData.ok();
     }
@@ -80,7 +80,7 @@ public class SpaceSdkController {
      * 置顶
      */
     @PostMapping(value = "/top")
-    private ResultData top(@RequestBody SpaceSdkParam param) {
+    public ResultData top(@RequestBody SpaceSdkParam param) {
         spaceSdkService.top(param);
         return ResultData.ok();
 

src/main/java/com/fdkankan/manage/service/impl/AppFileServiceImpl.java

@@ -7,7 +7,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.entity.AppFile;
 import com.fdkankan.manage.mapper.IAppFileMapper;
 import com.fdkankan.manage.service.IAppFileService;
@@ -106,12 +106,12 @@ public class AppFileServiceImpl extends ServiceImpl<IAppFileMapper, AppFile> imp
 
         String ossPathPrefix = "apps/customApp/" + param.getAgent() + "/"+param.getAppType()+"/";
 
-        uploadToOssUtil.upload(filePath, ossPathPrefix+"4dkankan."+fileType);
+        uploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"4dkankan."+fileType);
         // 上传到 历史记录文件夹目录
-        uploadToOssUtil.upload(filePath, ossPathPrefix+"oldapps/" + file.getName());
+        uploadToOssUtil.upload(param.getFileServerType(),filePath, ossPathPrefix+"oldapps/" + file.getName());
 
         // 上传到 version.json 文件
-        uploadToOssUtil.upload(versionFilePath, ossPathPrefix+"version/version.json");
+        uploadToOssUtil.upload(param.getFileServerType(),versionFilePath, ossPathPrefix+"version/version.json");
 
         // 删除旧文件
         FileUtils.deleteFile(filePath);

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -11,7 +11,7 @@ import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileMd5Util;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.validation.ValidationUtils;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.entity.CameraVersion;
 import com.fdkankan.manage.mapper.ICameraVersionMapper;
 import com.fdkankan.manage.service.ICameraVersionService;

src/main/java/com/fdkankan/manage/service/impl/CommonServiceImpl.java

@@ -6,7 +6,7 @@ import cn.hutool.core.io.FileUtil;
 import com.fdkankan.common.constant.UploadFilePath;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.service.ICommonService;
 import java.io.File;
 import java.io.IOException;

src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -12,7 +12,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.Result;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.DateExtUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.entity.Invoice;
 import com.fdkankan.manage.entity.InvoiceRegister;

src/main/java/com/fdkankan/manage/service/impl/ScenePlusServiceImpl.java

@@ -2,7 +2,7 @@ package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.IScenePlusMapper;
 import com.fdkankan.manage.service.*;

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -15,7 +15,7 @@ import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.RandomUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.common.CameraConstant;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.mapper.ISceneProMapper;

src/main/java/com/fdkankan/manage/service/impl/SpaceSdkServiceImpl.java

@@ -10,7 +10,7 @@ import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.PageInfo;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.manage.util.UploadToOssUtil;
 import com.fdkankan.manage.entity.SpaceSdk;
 import com.fdkankan.manage.mapper.ISpaceSdkMapper;
 import com.fdkankan.manage.service.ISpaceSdkService;