From 74a3690bce90132d56bad8146f093a1f32e63312 Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期五, 26 五月 2023 15:26:00 +0800
Subject: [PATCH] 跨域
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java | 15 +++++++--------
src/main/java/com/qxueyou/scc/stucontroller/StuLiveController.java | 2 ++
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/stucontroller/StuLiveController.java b/src/main/java/com/qxueyou/scc/stucontroller/StuLiveController.java
index ffe8660..bdf1177 100644
--- a/src/main/java/com/qxueyou/scc/stucontroller/StuLiveController.java
+++ b/src/main/java/com/qxueyou/scc/stucontroller/StuLiveController.java
@@ -7,6 +7,7 @@
import com.qxueyou.scc.sdk.MTCloud;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -28,6 +29,7 @@
@Api(tags="鐩存挱鎺ュ彛-瀛﹀憳绔�")
@RestController
+@CrossOrigin
@RequestMapping(value = "/stu/live")
public class StuLiveController {
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
index c6d79e1..26db190 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/ResService.java
@@ -306,17 +306,16 @@
public Result readAccessPath(String resId, String attribute) {
Res res = read(Res.class, resId);
- String type="0";
// Object path = Res.FILE_TYPE_VIDEO.equals(res.getType())? JSONObject.parse(resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute)):CollectionUtils.newObjectMap("path", resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute));
- Object path = Res.FILE_TYPE_VIDEO.equals(type)? resItemServiceMap.get(type).readAccessPath(res.getItemDestId(), attribute):resItemServiceMap.get(type).readAccessPath(res.getItemDestId(), attribute);
- if(Res.FILE_TYPE_DOC.equals(res.getType())) {
- return new Result(true, "success",
- CollectionUtils.newObjectMap("path", path, "name", res.getName(), "coverPageUrl", res.getCoverPageUrl(), "size",
- this.classLectureService.readDocPageCount(res.getItemDestId())));//鏂囦欢鐨勯〉鏁�
- }else {
+ Object path = Res.FILE_TYPE_VIDEO.equals(res.getType())? resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute):resItemServiceMap.get(res.getType()).readAccessPath(res.getItemDestId(), attribute);
+// if(Res.FILE_TYPE_DOC.equals(res.getType())) {
+// return new Result(true, "success",
+// CollectionUtils.newObjectMap("path", path, "name", res.getName(), "coverPageUrl", res.getCoverPageUrl(), "size",
+// this.classLectureService.readDocPageCount(res.getItemDestId())));//鏂囦欢鐨勯〉鏁�
+// }else {
return new Result(true, "success",
CollectionUtils.newObjectMap("path", path, "name", res.getName(), "coverPageUrl", res.getCoverPageUrl(), "size", 0));
- }
+// }
}
--
Gitblit v1.8.0