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/portal/homepage/controller/HomepageController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/portal/homepage/controller/HomepageController.java b/src/main/java/com/qxueyou/scc/portal/homepage/controller/HomepageController.java
index cb69dc3..e1f65ba 100644
--- a/src/main/java/com/qxueyou/scc/portal/homepage/controller/HomepageController.java
+++ b/src/main/java/com/qxueyou/scc/portal/homepage/controller/HomepageController.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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;
@@ -15,6 +16,7 @@
* @author ZERO 2021-03-03 09:06
*/
@RestController
+@CrossOrigin
@RequestMapping("/homepage")
@Api(tags = "棣栭〉鐩稿叧鎺ュ彛")
public class HomepageController {
@@ -29,12 +31,19 @@
return new Result(true, "tab",homepageService.getTabs());
}
-// @GetMapping
-// @ApiOperation("鑾峰彇鍒楄〃")
-// public Result getIndexDetail() {
-//// System.err.println("=====>鑾峰彇鍒楄〃");
-// return new Result(true,"", homepageService.getIndexDetail());
-// }
+ @GetMapping(value = "/home")
+ @ApiOperation("鑾峰彇鍒楄〃")
+ public Result getIndexDetail() {
+// System.err.println("=====>鑾峰彇鍒楄〃");
+ return new Result(true,"", homepageService.getIndexDetail());
+ }
+
+ @GetMapping(value = "/getExcellentTeaching")
+ @ApiOperation("鑾峰彇绮惧搧鏁欏")
+ public Result getExcellentTeaching() {
+// System.err.println("=====>鑾峰彇鍒楄〃");
+ return new Result(true,"", homepageService.getExcellentTeaching());
+ }
@GetMapping("/article")
@ApiOperation("鑾峰彇鏂囩珷鍒楄〃")
--
Gitblit v1.8.0