|
@@ -363,11 +363,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
String icon = null;
|
|
|
if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
|
|
|
fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
|
|
|
- icon = fYunFileConfig.getHost() + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
|
|
|
- if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
|
|
|
- fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
|
|
|
- icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
|
|
|
- }
|
|
|
+ icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
|
|
|
fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imgViewPath + jsonObject.getString("icon"));
|
|
|
}
|
|
|
|
|
@@ -679,10 +675,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
|
|
|
fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
|
|
|
icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
|
|
|
- if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
|
|
|
- fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
|
|
|
- icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
|
|
|
- }
|
|
|
fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imageViewPath + jsonObject.getString("icon"));
|
|
|
|
|
|
log.info("上传icon成功....");
|