修改 s3 为 aws

4dkankan-center-modeling/src/main/java/com/fdkankan/modeling/receiver/BuildSceneMQListener.java

@@ -69,7 +69,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
     @Value("${4dkk.laserService.host}")
     private String laserHost;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String ossType;
 
     @Value("${oss.prefix.ali}")
@@ -435,7 +435,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                     if("oss".equals(ossType)){
                         videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up.xml");
                     }
-                    if("s3".equals(ossType)){
+                    if("aws".equals(ossType)){
                         videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up.xml");
                     }
                     if(Integer.parseInt(cameraType) == 13){
@@ -447,7 +447,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                     if("oss".equals(ossType)){
                         videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up2.xml");
                     }
-                    if("s3".equals(ossType)){
+                    if("aws".equals(ossType)){
                         videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up2.xml");
                     }
 
@@ -462,7 +462,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                     if("oss".equals(ossType)){
                         videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/stitch_params.txt");
                     }
-                    if("s3".equals(ossType)){
+                    if("aws".equals(ossType)){
                         videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/stitch_params.txt");
                     }
                 }
@@ -487,7 +487,7 @@ public class BuildSceneMQListener implements RocketMQListener<String> {
                 log.info("推送消息，渠道是 {}, 手机token是 {}", dataJson.get("pushChannel"), dataJson.get("pushToken"));
                 if(dataJson.containsKey("pushChannel") && dataJson.containsKey("pushToken")){
                     try{
-                        if(!"s3".equals(ossType)){
+                        if(!"aws".equals(ossType)){
 
                             PushMessageConfig demo = null;
                             if(dataJson.getIntValue("pushChannel") == 0){

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/ManagerCameraService.java

@@ -72,7 +72,7 @@ public class ManagerCameraService {
     private IAgentFrameworkService agentFrameworkService;
     @Resource
     private RedisUtil redisUtil;
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
 
@@ -196,7 +196,7 @@ public class ManagerCameraService {
         vo.setOrderSn(param.getOrderSn());
         vo.setCameraId(cameraEntity.getId());
         vo.setAbroad(0);//0-国内
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             vo.setAbroad(1);//1-国外
         }
         vo.setUserId(null);// 空表示后台管理员添加
@@ -429,7 +429,7 @@ public class ManagerCameraService {
         detailEntity.setCameraId(cameraEntity.getId());
         detailEntity.setAgency(AgentConstant.DEFAULT_AGENT);
         detailEntity.setCountry(0);//默认中国
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             detailEntity.setCountry(1);//1-国外
         }
         detailEntity.setCameraType(param.getType());

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraServiceImpl.java

@@ -65,7 +65,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     private IUserService userService;
     @Autowired
     private IGoodsService goodsService;
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
 
@@ -446,7 +446,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         detailEntity.setOwn(StringUtils.isEmpty(param.getOwn()) ? 0 : Integer.valueOf(param.getOwn()));
         detailEntity.setAgency(AgentConstant.DEFAULT_AGENT);
         detailEntity.setCountry(0);//默认中国
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             detailEntity.setCountry(1);//1-国外
         }
         detailEntity.setBalance(param.getBalance());

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraVersionServiceImpl.java

@@ -41,7 +41,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
 
     private static Logger log = LoggerFactory.getLogger("programLog");
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String ossType;
     @Value("${prefix.ali}")
     private String prefixAli;
@@ -138,7 +138,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         uploadToOssUtil.upload(filePath, UploadPath.DIR_NAME + fileName);
         log.info("upload success");
         String url = prefixAli + UploadPath.ALIYUN_SSO_PATH + fileName;
-        if("s3".equals(ossType)){
+        if("aws".equals(ossType)){
             url = UploadPath.YAMAXUN_S3_PATH + fileName;
         }
         log.info("upload url: {}" + url);

4dkankan-center-platform/src/main/java/com/fdkankan/platform/order/service/impl/SpaceSdkServiceImpl.java

@@ -42,7 +42,7 @@ public class SpaceSdkServiceImpl extends ServiceImpl<ISpaceSdkMapper, SpaceSdk>
 
     @Autowired
     private UploadToOssUtil uploadToOssUtil;
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String ossType;
 
     @Value("${oss.prefix.sdk}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneFileController.java

@@ -37,7 +37,7 @@ public class SceneFileController extends BaseController {
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Value("${oss.prefix.ali}")

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneAppServiceImpl.java

@@ -53,7 +53,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
     @Value("${oss.prefix.ali}")
     private String prefixAli;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Autowired
@@ -117,7 +117,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         sceneExt.setEntry(base.getInitialPoint());
         scene.setThumbStatus(1);
         scene.setThumb(prefixAli + imagesBuf.append("thumbSmallImg.jpg").toString());
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             scene.setThumb(ConstantUrl.PREFIX_AWS + imagesBuf.append("thumbSmallImg.jpg").toString());
         }
         scene.setVersion(scene.getVersion() + 1);
@@ -603,7 +603,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
             Map map = new HashMap();
             map.put("screencapVoiceFileName", originalFileName);
             String voiceSrc = prefixAli + "voice/voice"+sceneNum+"/"+originalFileName;
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 voiceSrc = ConstantUrl.PREFIX_AWS + "voice/voice"+sceneNum+"/"+originalFileName;
             }
             map.put("screencapVoiceSrc", voiceSrc);
@@ -771,7 +771,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         }
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
@@ -865,7 +865,7 @@ public class SceneAppServiceImpl extends ServiceImpl<ISceneMapper, Scene> implem
         Map map = new HashMap();
         map.put("screencapVoiceFileName", originalFileName);
         String voiceSrc = prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName;
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName;
         }
         map.put("screencapVoiceSrc", voiceSrc);

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneFileBuildServiceImpl.java

@@ -76,7 +76,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Value("${oss.prefix.ali}")
@@ -605,7 +605,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(!filePath.exists()){
             filePath.mkdirs();
         }
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString() + "data.fdage");
         }else {
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString());
@@ -680,7 +680,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(!filePath.exists()){
             filePath.mkdirs();
         }
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString() + "data.fdage");
         }else {
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefixBuffer.toString() + "data.fdage", filePathBuffer.toString());
@@ -798,7 +798,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             uploadToOssUtil.upload(path + File.separator + "capture" + File.separator +
                     jsonObject.getString("icon"), "images/images" + sceneNum + "/" + jsonObject.getString("icon"));
             icon = prefixAli + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 icon = ConstantUrl.PREFIX_AWS + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
             }
         }
@@ -937,7 +937,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
             icon = prefixAli + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
                 icon = ConstantUrl.PREFIX_AWS + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
             }
@@ -1227,7 +1227,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
                     CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
                     icon = prefixAli + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
-                    if("s3".equals(type)){
+                    if("aws".equals(type)){
                         CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
                         icon = ConstantUrl.PREFIX_AWS + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
                     }
@@ -2014,7 +2014,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         //获取解压后的资源的data.fdage中的数据
         File folderPath = new File(path);
 
-        if ("s3".equals(type)) {
+        if ("aws".equals(type)) {
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, ""),
                     path + "/capture/");
         } else {

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -61,7 +61,7 @@ import java.util.stream.Collectors;
 @Service
 public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro> implements ISceneProAppService {
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Value("${oss.prefix.ali}")
@@ -148,7 +148,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEditService.updateById(sceneProEdit);
 
         scenePro.setThumb(prefixAli + imagesBuf.toString() + "thumbSmallImg.jpg");
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             scenePro.setThumb(ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "thumbSmallImg.jpg");
         }
         sceneProService.updateById(scenePro);
@@ -557,7 +557,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             Map map = new HashMap();
             map.put("screencapVoiceFileName", originalFileName);
             String voiceSrc = prefixAli + "voice/voice"+sceneNum+"/"+originalFileName;
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 voiceSrc = ConstantUrl.PREFIX_AWS + "voice/voice"+sceneNum+"/"+originalFileName;
             }
             map.put("screencapVoiceSrc", voiceSrc);
@@ -726,7 +726,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         JSONArray inputdata =  JSONArray.parseArray(base.getData());
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
@@ -838,7 +838,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         Map map = new HashMap();
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
         String voiceSrc = prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName;
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName;
         }
         map.put("screencapVoiceSoundsync", voiceSrc);
@@ -853,7 +853,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEdit.setUpdateTime(Calendar.getInstance().getTime());
         sceneProEditService.updateById(sceneProEdit);
         FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             return ResultData.ok(ConstantUrl.PREFIX_AWS+"voice/voice"+base.getNum()+"/"+originalFileName);
         }
         return ResultData.ok(prefixAli+"voice/voice"+base.getNum()+"/"+originalFileName);
@@ -924,7 +924,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
@@ -986,7 +986,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         }
 
         FileUtils.delAllFile(path + File.separator + "part");
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
         }else {
             CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
@@ -998,7 +998,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
@@ -1118,7 +1118,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
@@ -1598,7 +1598,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             FileUtils.deleteFile(partPath + File.separator + fileName);
         }
 
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
         }else {
             CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
@@ -1639,7 +1639,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
@@ -1667,7 +1667,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         this.dealVioce(path, partPath, fileName, originalFileName, sceneNum, times);
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
@@ -1876,7 +1876,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
                     jsonhots.remove(i);
                     jsonhot = ele;
 
-                    if(!"s3".equals(this.type)){
+                    if(!"aws".equals(this.type)){
                         JSONObject paramData = new JSONObject();
                         paramData.put("hotId", sid);
                         JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -66,7 +66,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Value("${oss.prefix.ali}")
     private String prefixAli;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Value("${hot.domain.list}")
@@ -409,7 +409,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getNum() + File.separator + "floor.json", new String(sceneEdit.getWebFloor().getBytes(), "UTF-8"));
             //下载vision.modeldata，解压成vision.txt,并且删除vision.modeldata
             log.info("下载vision.modeldata文件");
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                         "vision.modeldata", target + File.separator + "extras" + File.separator);
             }
@@ -427,7 +427,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneEdit.getNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
                         "vision2.modeldata", target + File.separator + "extras" + File.separator);
             }
-            if("s3".equals(type)){
+            if("aws".equals(type)){
                 FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
                         "vision2.modeldata", target + File.separator + "extras" + File.separator);
             }
@@ -1689,7 +1689,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(sceneProEdit.getThumbStatus() == 1)
             {
                 scenePro.setThumb(prefixAli + imagesBuf.toString() + "thumbSmallImg.jpg");
-                if("s3".equals(this.type)){
+                if("aws".equals(this.type)){
                     scenePro.setThumb(ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "thumbSmallImg.jpg");
                 }
             }
@@ -1884,7 +1884,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(scenejson.getIntValue("buildImages") == 1){
                 log.info("下载vision.modeldata文件");
-                if("s3".equals(this.type)){
+                if("aws".equals(this.type)){
                     FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + scenePro.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                             "vision.modeldata", target + File.separator + "extras" + File.separator);
                 }
@@ -1930,7 +1930,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         FileUtils.delAllFile(target + File.separator + "results");
                     }
                     //下载data.fdage
-                    if("s3".equals(this.type)){
+                    if("aws".equals(this.type)){
                         //亚马逊保持旧方式，超链接capture
                         CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
                     }
@@ -2278,7 +2278,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         }
                     }
 
-                    if(!"s3".equals(this.type)){
+                    if(!"aws".equals(this.type)){
                         JSONObject paramData = new JSONObject();
                         paramData.put("hotId", sid);
                         JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));
@@ -2701,7 +2701,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         JSONArray inputdata =  JSONArray.parseArray(base.getData());
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
@@ -3994,7 +3994,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.delAllFile(target + File.separator + "results");
         }
         //下载data.fdage
-        if("s3".equals(this.type)){
+        if("aws".equals(this.type)){
             //亚马逊保持旧方式，超链接capture
             CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
         }
@@ -4335,7 +4335,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -63,7 +63,7 @@ import java.util.stream.Collectors;
 @Service
 public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implements ISceneService {
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String type;
 
     @Value("${oss.prefix.ali}")
@@ -640,7 +640,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         JSONArray inputdata =  JSONArray.parseArray(base.getData());
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if("s3".equals(type)){
+        if("aws".equals(type)){
             modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
@@ -801,7 +801,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             BeanUtils.copyProperties(po, sceneVO);
             if (po.getCreateTime() != null) {
                 sceneVO.setCreateTime(new DateTime(po.getCreateTime()).toString("yyyy-MM-dd"));
-                if ("s3".equals(this.type)) {
+                if ("aws".equals(this.type)) {
                     sceneVO.setCreateTime(new DateTime(DateExtUtil.hoursCalculate(po.getCreateTime(), 8)).toString("yyyy-MM-dd"));
                 }
                 sceneVO.setCreateDate(po.getCreateTime().getTime());