Merge branch 'refs/heads/release-swsx' into test

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

@@ -430,7 +430,11 @@ public class CommonServiceImpl implements ICommonService {
             int imgVersion = 0;
             int linkVersion = 0;
             //获取展示页的版本号
-            String sceneJsonStr = fYunFileServiceInterface.getFileContent(String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json");
+            String sceneJsonStr = null;
+            String sceneJsonKey = String.format(UploadFilePath.DATA_VIEW_PATH, scenePlus.getNum()) + "scene.json";
+            if(fYunFileService.fileExist(sceneJsonKey)){
+                sceneJsonStr = fYunFileServiceInterface.getFileContent(sceneJsonKey);
+            }
             if(StrUtil.isNotEmpty(sceneJsonStr)){
                 JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
                 version = sceneJson.getIntValue("version");