|
@@ -253,7 +253,7 @@ public class JmgaServiceImpl implements IJmgaService {
|
|
|
String sceneNum = null;
|
|
String sceneNum = null;
|
|
|
if(param.getSourceType().equals("orig")){//原始资源
|
|
if(param.getSourceType().equals("orig")){//原始资源
|
|
|
String dataFdageStr = com.fdkankan.contro.util.ZipUtil.readUtf8(zipDir + zipName, "data.fdage");
|
|
String dataFdageStr = com.fdkankan.contro.util.ZipUtil.readUtf8(zipDir + zipName, "data.fdage");
|
|
|
- if(StrUtil.isEmpty(dataFdageStr) || JSONUtil.isJson(dataFdageStr)){
|
|
|
|
|
|
|
+ if(StrUtil.isEmpty(dataFdageStr) || !JSONUtil.isJson(dataFdageStr)){
|
|
|
throw new BusinessException(60027, "data.fdage文件数据异常");
|
|
throw new BusinessException(60027, "data.fdage文件数据异常");
|
|
|
}
|
|
}
|
|
|
JSONObject dataFdage = JSON.parseObject(dataFdageStr);
|
|
JSONObject dataFdage = JSON.parseObject(dataFdageStr);
|
|
@@ -289,7 +289,7 @@ public class JmgaServiceImpl implements IJmgaService {
|
|
|
|
|
|
|
|
}else{//离线包
|
|
}else{//离线包
|
|
|
String sceneJsonStr = com.fdkankan.contro.util.ZipUtil.readUtf8(zipDir + zipName, "scene.json");
|
|
String sceneJsonStr = com.fdkankan.contro.util.ZipUtil.readUtf8(zipDir + zipName, "scene.json");
|
|
|
- if(StrUtil.isEmpty(sceneJsonStr) || JSONUtil.isJson(sceneJsonStr)){
|
|
|
|
|
|
|
+ if(StrUtil.isEmpty(sceneJsonStr) || !JSONUtil.isJson(sceneJsonStr)){
|
|
|
throw new BusinessException(60027, "scene.json文件数据异常");
|
|
throw new BusinessException(60027, "scene.json文件数据异常");
|
|
|
}
|
|
}
|
|
|
JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
|
|
JSONObject sceneJson = JSON.parseObject(sceneJsonStr);
|