From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/controller/ResController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/ResController.java b/src/main/java/com/qxueyou/scc/controller/ResController.java
index 89e1119..4f3d8b6 100644
--- a/src/main/java/com/qxueyou/scc/controller/ResController.java
+++ b/src/main/java/com/qxueyou/scc/controller/ResController.java
@@ -14,6 +14,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Map;
@@ -24,6 +25,7 @@
* @author chenjunliang
*/
@Api(tags = "璧勬簮绠＄悊鎺ュ彛")
+@CrossOrigin
@RestController
@RequestMapping(value = "/teach/res")
public class ResController {
@@ -207,14 +209,11 @@
* @param id 璧勬簮id
*/
@GetMapping(value = "getResDetail")
- public Result getResDetail(String id) {
-
+ public Result getResDetail(String id,HttpServletResponse response) {
Res res = resService.read(id);
Result pathResult = resService.readAccessPath(id, null);
-
return new Result(true, "success", CollectionUtils.newObjectMap("type", res.getType(), "name", res.getName(),
"coverUrl", res.getCoverPageUrl(), "remark", res.getRemark(), "fullPath", pathResult.getDataT("path")));
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0