diff --git a/ruoyi-admin/src/main/resources/static/juncong.png b/ruoyi-admin/src/main/resources/static/juncong.png index 2c8e37ee4..b8f987b9c 100644 Binary files a/ruoyi-admin/src/main/resources/static/juncong.png and b/ruoyi-admin/src/main/resources/static/juncong.png differ diff --git a/ruoyi-cms/pom.xml b/ruoyi-cms/pom.xml index 2ac670191..749d880ba 100644 --- a/ruoyi-cms/pom.xml +++ b/ruoyi-cms/pom.xml @@ -23,5 +23,15 @@ ruoyi-framework ${ruoyi.version} + + com.ruoyi + ruoyi-train + ${ruoyi.version} + + + com.ruoyi + ruoyi-exam + ${ruoyi.version} + \ No newline at end of file diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java index f1396b1f9..c15b308a0 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsController.java @@ -2,9 +2,13 @@ package com.ruoyi.cms.controller; import com.ruoyi.common.config.Global; import com.ruoyi.common.utils.file.FileUtils; +import com.ruoyi.train.course.domain.TrainCourseVO; +import com.ruoyi.train.course.service.ITrainCourseService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; +import java.util.List; /** * 通用请求处理 @@ -25,11 +30,29 @@ public class CmsController private static final Logger log = LoggerFactory.getLogger(CmsController.class); private String prefix = "web"; - - @RequestMapping("/index") + @Autowired + private ITrainCourseService trainCourseService; + @RequestMapping("") @GetMapping() - public String user() { + public String user(TrainCourseVO trainCourse,ModelMap map) { + List list = trainCourseService.selectTrainCoursePage( trainCourse ); + map.put( "trainCourse", list ); return prefix + "/index"; } + + @RequestMapping("/user/login.html") + @GetMapping() + public String login() { + return prefix + "/user/login"; + } + + + @RequestMapping("/user/reg.html") + @GetMapping() + public String reg() { + return prefix + "/user/reg"; + } + + } diff --git a/ruoyi-cms/src/main/resources/templates/web/index.html b/ruoyi-cms/src/main/resources/templates/web/index.html index c5cce4140..14ff9dae5 100644 --- a/ruoyi-cms/src/main/resources/templates/web/index.html +++ b/ruoyi-cms/src/main/resources/templates/web/index.html @@ -1,18 +1,34 @@ - - - + + + + + + + + + + + -
+
- - +
-
-
- - -
- - 发表新帖 -
-
- 发表新帖 -
-
-
-
-
-
-
- 置顶 - 去签到 -
- -
- -
- -
- 综合 - - 未结 - - 已结 - - 精华 - - 按最新 - - 按热议 - -
- - -
-
- 更多求解 +
+
+
+
-
- -
-
-
- -
-

温馨通道

- -
- - - - - - -
-
本周热议
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
-
- 基于 layui 的极简社区页面模版 - 16 -
- - - -
- -
-
- 这里可作为广告区域 -
-
- LayIM 3.0 - layui 旗舰之作 -
-
- -
-

友情链接

-
-
layui
-
WebIM
-
layer
-
layDate
-
申请友链
-
-
- -
-
-

Fly社区 2017 © layui.com 出品

-

- 付费计划 - 获取Fly社区模版 - 微信公众号 -

+
+

骏聪信息科技

- + diff --git a/ruoyi-cms/src/main/resources/templates/web/user/reg.html b/ruoyi-cms/src/main/resources/templates/web/user/reg.html index bf67ba174..25862e105 100644 --- a/ruoyi-cms/src/main/resources/templates/web/user/reg.html +++ b/ruoyi-cms/src/main/resources/templates/web/user/reg.html @@ -1,53 +1,12 @@ - - - - - - 注册 - - - - - + + + + -
-
- - - - -
+
+
@@ -87,23 +46,9 @@
-
- -
- -
-
- {{d.vercode}} -
-
-
- 或者直接使用社交账号快捷注册 - - -
diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java index a50d68e47..7341510d1 100644 --- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java +++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/ApiTrainCourseController.java @@ -49,7 +49,7 @@ public class ApiTrainCourseController extends BaseController { return success; } /** - * 查询课程列表 + * 查询我的课程列表 */ @GetMapping("/trainCourse/myList") public AjaxResult myList( TrainCourseVO trainCourse) {