diff --git a/src/main/java/com/zcloud/controller/eduBus/VideoResController.java b/src/main/java/com/zcloud/controller/eduBus/VideoResController.java index 0deade7..57c38ee 100644 --- a/src/main/java/com/zcloud/controller/eduBus/VideoResController.java +++ b/src/main/java/com/zcloud/controller/eduBus/VideoResController.java @@ -101,7 +101,7 @@ public class VideoResController extends BaseController { map.put("varList", responseResult.getJSONArray("curriculumList")); map.put("page", responseResult.getJSONObject("page")); } else { - map.put("message", "请求出错,请联系管理员。"); + map.put("msg", "请求出错,请联系管理员。"); } // List varList = videocoursewareService.list(page); //列出VideoCourseware列表 // map.put("page", page); @@ -132,7 +132,7 @@ public class VideoResController extends BaseController { // String msg = viedoResService.updAllNow(pd); // if (StringUtils.isNotEmpty(msg)) { // map.put("result", "error"); -// map.put("message", msg); +// map.put("msg", msg); // } else { // map.put("result", errInfo); // @@ -173,7 +173,7 @@ public class VideoResController extends BaseController { List list = analysisService.analysisVideoList(responseResult.getJSONArray("videoList")); map.put("varList", list); } else { - map.put("message", "请求出错,请联系管理员。"); + map.put("msg", "请求出错,请联系管理员。"); } map.put("result", errInfo); return map; @@ -206,8 +206,8 @@ public class VideoResController extends BaseController { map.put("pd", responseResult.getJSONObject("pd")); map.put("chapterList", responseResult.getJSONArray("chapterList")); } else { - errInfo = "warning"; - map.put("message", "请求出错,请联系管理员。"); + errInfo = "fail"; + map.put("msg", "请求出错,请联系管理员。"); } // map.put("chapterList", chapterList); map.put("result", errInfo); @@ -235,13 +235,13 @@ public class VideoResController extends BaseController { if (response.get("code") != null && Tools.notEmpty(response.get("code").toString()) && "0".equals(response.get("code"))) { map.put("pd", response.getJSONObject("video")); } else { - errInfo = "warning"; - map.put("message", response.get("errorMessage")); + errInfo = "fail"; + map.put("msg", response.get("errorMessage")); } } else { - errInfo = "warning"; - map.put("message", "请求出错,请联系管理员。"); + errInfo = "fail"; + map.put("msg", "请求出错,请联系管理员。"); } // map.put("chapterList", chapterList); map.put("result", errInfo); @@ -268,8 +268,8 @@ public class VideoResController extends BaseController { // 验证是否添加过此课程 PageData curriculumRes = curriculumService.findByRemoteId(curRemote); if (curriculumRes != null && curriculumRes.get("CURRICULUM_ID") != null && Tools.notEmpty(curriculumRes.get("CURRICULUM_ID").toString())) { - map.put("message", "该课程已添加。无需二次添加。"); - errInfo = "warning"; + map.put("msg", "该课程已添加。无需二次添加。"); + errInfo = "fail"; } else { Map request = new HashMap(); request.put("CURRICULUM_ID", pd.get("CURRICULUM_ID").toString()); @@ -353,8 +353,8 @@ public class VideoResController extends BaseController { } } } else { - errInfo = "warning"; - map.put("message", "请求出错,请联系管理员。"); + errInfo = "fail"; + map.put("msg", "请求出错,请联系管理员。"); } } @@ -409,8 +409,8 @@ public class VideoResController extends BaseController { // 验证是否添加过此课程 PageData curriculumRes = curriculumService.findByRemoteId(curRemote); if (curriculumRes != null && curriculumRes.get("CURRICULUM_ID") != null && Tools.notEmpty(curriculumRes.get("CURRICULUM_ID").toString())) { - map.put("message", "该课程已添加。无需二次添加。"); - errInfo = "warning"; + map.put("msg", "该课程已添加。无需二次添加。"); + errInfo = "fail"; } else { Map request = new HashMap(); request.put("CURRICULUM_ID", pd.get("CURRICULUM_ID").toString()); @@ -492,8 +492,8 @@ public class VideoResController extends BaseController { } } } else { - errInfo = "warning"; - map.put("message", "请求出错,请联系管理员。"); + errInfo = "fail"; + map.put("msg", "请求出错,请联系管理员。"); } } @@ -524,8 +524,8 @@ public class VideoResController extends BaseController { // 验证是否添加过此课程 PageData videoRes = videoCoursewareService.findByRemoteId(videoRemote); if (videoRes != null && videoRes.get("VIDEOCOURSEWARE_ID") != null && Tools.notEmpty(videoRes.get("VIDEOCOURSEWARE_ID").toString())) { - map.put("message", "该课件已添加。无需二次添加。"); - errInfo = "warning"; + map.put("msg", "该课件已添加。无需二次添加。"); + errInfo = "fail"; } else { pd.put("TYPE", "1"); JSONObject response = synchronizeInformationService.syncVideoInfo(pd); @@ -552,13 +552,13 @@ public class VideoResController extends BaseController { videoCoursewareService.save(video); } else { - errInfo = "warning"; - map.put("message", response.get("errorMessage")); + errInfo = "fail"; + map.put("msg", response.get("errorMessage")); } } else { - errInfo = "warning"; - map.put("message", "请求出错,请联系管理员。"); + errInfo = "fail"; + map.put("msg", "请求出错,请联系管理员。"); } } map.put("result", errInfo); @@ -584,14 +584,14 @@ public class VideoResController extends BaseController { if (playAuth != null) { if (playAuth.get("code") != null && "0".equals(playAuth.get("code"))) { map.put("playAuth", playAuth.get("PlayAuth")); - map.put("message", "获取成功。"); + map.put("msg", "获取成功。"); } else { - map.put("message", playAuth.get("errorMessage")); - errInfo = "warning"; + map.put("msg", playAuth.get("errorMessage")); + errInfo = "fail"; } } else { - map.put("message", "获取失败,请联系管理员。"); - errInfo = "warning"; + map.put("msg", "获取失败,请联系管理员。"); + errInfo = "fail"; } // map.put("chapterList", chapterList); map.put("result", errInfo); @@ -616,14 +616,14 @@ public class VideoResController extends BaseController { if (playInfo != null) { if (playInfo.get("code") != null && "0".equals(playInfo.get("code"))) { map.put("urlList", playInfo.get("urlList")); - map.put("message", "获取成功。"); + map.put("msg", "获取成功。"); } else { - map.put("message", playInfo.get("errorMessage")); - errInfo = "warning"; + map.put("msg", playInfo.get("errorMessage")); + errInfo = "fail"; } } else { - map.put("message", "获取失败,请联系管理员。"); - errInfo = "warning"; + map.put("msg", "获取失败,请联系管理员。"); + errInfo = "fail"; } map.put("result", errInfo); return map; diff --git a/src/main/java/com/zcloud/util/Const.java b/src/main/java/com/zcloud/util/Const.java index 1b9b186..f5a5b58 100644 --- a/src/main/java/com/zcloud/util/Const.java +++ b/src/main/java/com/zcloud/util/Const.java @@ -61,8 +61,8 @@ public class Const { // public static final String HTTPFILEURL = "https://qask.qhdsafety.com/file/"; //文件服务器地址 - public static final String FILEURL = "/mnt/wwag/file/"; //文件服务器地址 - public static final String HTTPFILEURL = "https://wwag.qhdsafety.com/file/"; //文件服务器地址 + public static final String FILEURL = "/mnt/qask/file/"; //文件服务器地址 + public static final String HTTPFILEURL = "https://file.zcloudchina.com/YTHFile"; //文件服务器地址 public static final Map WARNING_TYPE_MAP = new HashMap() {{ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 04f11ee..3f87af7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,9 @@ spring.application.name=integrated_traffic_admin -server.port=7070 +server.port=7080 #\u5F00\u53D1 spring.profiles.active=dev +#\u6D4B\u8BD5 +#spring.profiles.active=debug +##\u6B63\u5F0F +#spring.profiles.active=master