瀏覽代碼

1.完善用户服务;
2.完善若干前端页面。

Yumin 6 年之前
父節點
當前提交
0fd9804941

+ 11 - 3
src/main/java/cn/minbb/edu/controller/rest/CourseController.java

@@ -3,23 +3,30 @@ package cn.minbb.edu.controller.rest;
 import cn.minbb.edu.data.ResponseResult;
 import cn.minbb.edu.model.Course;
 import cn.minbb.edu.service.CourseService;
+import cn.minbb.edu.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("app/course")
 public class CourseController {
 
+    private UserService userService;
     private CourseService courseService;
 
     @Autowired
-    public CourseController(CourseService courseService) {
+    public CourseController(UserService userService, CourseService courseService) {
+        this.userService = userService;
         this.courseService = courseService;
     }
 
     @GetMapping("")
     public ResponseResult<Course> course(@RequestParam("id") Integer id) {
-        return ResponseResult.ok(true).code(1).data(courseService.findOneById(id));
+        Course course = courseService.findOneById(id);
+        course.setVoTeacher(userService.findUserById(course.getTeacherId()));
+        return ResponseResult.ok(true).code(1).data(course);
     }
 
     @PostMapping("hot")
@@ -29,7 +36,8 @@ public class CourseController {
 
     @PostMapping("excellent")
     public ResponseResult<Course> courseExcellent() {
-        return ResponseResult.ok(true).code(1).dataset(courseService.findAll());
+        List<Course> courseList = courseService.findAll();
+        return ResponseResult.ok(true).code(1).message(courseList.size() + "").dataset(courseList);
     }
 
     @PostMapping("all")

+ 2 - 0
src/main/java/cn/minbb/edu/service/UserService.java

@@ -6,5 +6,7 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 public interface UserService extends UserDetailsService {
     User save(User user);
 
+    User findUserById(Integer id);
+
     User findUserByUsername(String username);
 }

+ 8 - 0
src/main/java/cn/minbb/edu/service/impl/UserServiceImpl.java

@@ -5,6 +5,7 @@ import cn.minbb.edu.model.UserRole;
 import cn.minbb.edu.model.repository.UserRepository;
 import cn.minbb.edu.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Example;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.CredentialsExpiredException;
 import org.springframework.security.authentication.DisabledException;
@@ -38,6 +39,13 @@ public class UserServiceImpl implements UserService {
         return userRepository.save(user);
     }
 
+    @Override
+    public User findUserById(Integer id) {
+        User user = new User();
+        user.setId(id);
+        return userRepository.findOne(Example.of(user)).orElse(null);
+    }
+
     @Override
     public User findUserByUsername(String username) {
         return userRepository.findUserByUsername(username);

+ 1 - 1
src/main/java/cn/minbb/edu/system/Const.java

@@ -6,5 +6,5 @@ public class Const {
     }
 
     public static final String ACTIVE = "ACTIVE";
-    public static final String STORAGE_HOST = "http://127.0.0.1/file/";
+    public static final String STORAGE_HOST = "http://123.207.151.92:8080/file/";
 }

+ 1 - 1
src/main/resources/templates/fragments/header.html

@@ -26,7 +26,7 @@
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="#!" data-toggle="tooltip" data-placement="bottom" data-html="true"
-                   title="<img src='../static/favicon.ico' alt='下载二维码'/><p>Version: 1.0</p>">
+                   title="<img src='https://files-1252373323.cos.ap-beijing.myqcloud.com/images/er_code.jpg' width='150' alt='下载二维码'/><p>Version: 1.0</p>">
                     下载二维码
                 </a>
             </li>

+ 30 - 26
src/main/resources/templates/index-about.html

@@ -30,11 +30,13 @@
         <div class="container">
             <h1 class="display-3">知学教育APP</h1>
             <p>
-                一款很牛逼的教学APP - 来自名人 <code class="highlighter-rouge">朱孟尧.</code>
+                一款很方便的教学APP - 来自 <code class="highlighter-rouge">朱孟尧.</code>
             </p>
             <hr class="my-4">
-            <p>觉得牛逼你就赶快下载吧!还不快去!</p>
-            <p><a class="btn btn-primary btn-lg" href="/download" role="button">立即下载 &raquo;</a></p>
+            <p>觉得好用你就赶快下载吧!还不快去!</p>
+            <p><a class="btn btn-primary btn-lg"
+                  href="https://files-1252373323.cos.ap-beijing.myqcloud.com/apk/%E7%9F%A5%E5%AD%A6%E6%95%99%E8%82%B2v1.0.apk" role="button">
+                立即下载&raquo;</a></p>
         </div>
     </div>
 
@@ -44,21 +46,27 @@
                 <img class="rounded-circle" src="/favicon.ico" alt="" width="140" height="140"/>
                 <h2>加油</h2>
                 <p>不管什么时候,学习都不晚。</p>
-                <p><a class="btn btn-secondary" href="/download" role="button">去下载 &raquo;</a></p>
+                <p><a class="btn btn-secondary"
+                      href="https://files-1252373323.cos.ap-beijing.myqcloud.com/apk/%E7%9F%A5%E5%AD%A6%E6%95%99%E8%82%B2v1.0.apk" role="button">
+                    去下载 &raquo;</a></p>
             </div>
 
             <div class="col-lg-4">
                 <img class="rounded-circle" src="/favicon.ico" alt="" width="140" height="140"/>
                 <h2>奋斗</h2>
                 <p>十年如未死,卷土定重来!</p>
-                <p><a class="btn btn-secondary" href="/download" role="button">去下载 &raquo;</a></p>
+                <p><a class="btn btn-secondary"
+                      href="https://files-1252373323.cos.ap-beijing.myqcloud.com/apk/%E7%9F%A5%E5%AD%A6%E6%95%99%E8%82%B2v1.0.apk" role="button">
+                    去下载 &raquo;</a></p>
             </div>
 
             <div class="col-lg-4">
                 <img class="rounded-circle" src="/favicon.ico" alt="" width="140" height="140"/>
                 <h2>永不放弃</h2>
                 <p>三人行,必有我师焉。</p>
-                <p><a class="btn btn-secondary" href="/download" role="button">去下载 &raquo;</a></p>
+                <p><a class="btn btn-secondary"
+                      href="https://files-1252373323.cos.ap-beijing.myqcloud.com/apk/%E7%9F%A5%E5%AD%A6%E6%95%99%E8%82%B2v1.0.apk" role="button">
+                    去下载 &raquo;</a></p>
             </div>
         </div>
 
@@ -67,16 +75,15 @@
         <div class="row featurette">
             <div class="col-md-7">
                 <h2 class="featurette-heading">
-                    花生之所以没办法捏碎,
-                    <span class="text-muted">是因为它有一颗坚硬的果实,</span>
+                    一对一备考指导<span class="text-muted"></span>
                 </h2>
-                <p class="lead">
-                    所以才会屡经困难才不被击垮。而我们在面对挫折时就需要我们有一颗坚强的心,才能够去迈上新的台阶,使我们得到更大的提高,走向成功之路。我恍然大悟,明白心灰意冷是不能使我迈上新台阶,就重新振作,鼓起勇气,继续努力,争取在学习方面取得更优秀的成绩
+                <p class="lead" style="text-indent: 2em;">
+                    为了让参加考试的考生轻松报考,智学教育特别策划了一对一报考指导。智学教育的一对一报考指导会,解答考生朋友们在报名时遇到的疑难问题,为大家提供详细且十分具体的备考方案,并根据您自身条件,力求避开雷区,合理科学推荐报考职位
                 </p>
             </div>
             <div class="col-md-5">
                 <img class="featurette-image img-fluid mx-auto"
-                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/%E5%8D%8E%E4%BD%97%E4%B8%89%E8%BF%9E.png" alt=""/>
+                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/about/%E5%A4%87%E8%80%83%E6%8C%87%E5%AF%BC.jpg" alt=""/>
             </div>
         </div>
 
@@ -85,16 +92,15 @@
         <div class="row featurette">
             <div class="col-md-7 order-md-2">
                 <h2 class="featurette-heading">
-                    坚持不懈的劳动,自然是“苦”事,
-                    <span class="text-muted">但他们功的必由之路。</span>
+                    全真的考试题库<span class="text-muted"></span>
                 </h2>
-                <p class="lead">
-                    高尔基说过:“天才就是劳动,人的天赋就像火花,它即可以熄灭,也可以旺盛的燃烧起来,而是它门成为熊熊烈火的方法,那就是劳动。”劳动就是勤奋,勤奋是产生天才的根本原因
+                <p class="lead" style="text-indent: 2em;">
+                    考试题库是基于大数据的人工智能算法研发而成的考试题库,根据职业资格考试的考点、考频、难度分布,提供10万套在线试卷进行全真测试、模拟练习,同时提供公务员,外语类,财会类,建筑类,职业资格,学历考试,医药类,外贸类,计算机类等考试试题
                 </p>
             </div>
             <div class="col-md-5 order-md-1">
                 <img class="featurette-image img-fluid mx-auto"
-                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/%E6%89%81%E9%B9%8A%E4%B8%89%E8%BF%9E.png" alt=""/>
+                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/about/%E8%80%83%E8%AF%95%E9%A2%98%E5%BA%93.jpg" alt=""/>
             </div>
         </div>
 
@@ -103,16 +109,15 @@
         <div class="row featurette">
             <div class="col-md-7">
                 <h2 class="featurette-heading">
-                    学习是苦与乐的交织。
-                    <span class="text-muted">俗话说:“一份耕耘,一分收获。”</span>
+                    快速智能的练习<span class="text-muted"></span>
                 </h2>
-                <p class="lead">
-                    耕耘就得付出一定的代价,没有那含辛如苦的“耕耘”,哪能领会到甜人心田的收获?一次次竞赛的成功,一点点细小的进步,一道道难题的突破,都会让我们领略到兴奋、快乐,所以说学习的苦与乐是相对的。没有学习上的苦,那知所取得成就背后的甜呢?学习的苦,是一种苦中作乐
+                <p class="lead" style="text-indent: 2em;">
+                    快速智能练习在学生选定学习区域后,从题库中随机生成在对应的学习区域出现相应的测试题,学生可以方便快捷点击按钮去做题,学习知识
                 </p>
             </div>
             <div class="col-md-5">
                 <img class="featurette-image img-fluid mx-auto"
-                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/%E6%9B%B9%E6%93%8D%E4%B8%89%E8%BF%9E.png" alt=""/>
+                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/about/%E5%BF%AB%E9%80%9F%E7%BB%83%E4%B9%A0.jpg" alt=""/>
             </div>
         </div>
 
@@ -121,16 +126,15 @@
         <div class="row featurette">
             <div class="col-md-7 order-md-2">
                 <h2 class="featurette-heading">
-                    一个人只有在早晨开始就努力学习,
-                    <span class="text-muted">这一天才不会被浪费掉。</span>
+                    精心的家庭作业<span class="text-muted"></span>
                 </h2>
-                <p class="lead">
-                    我们每一个人都应该抓住每一分,每一秒,不让他们偷跑掉。请谨记
+                <p class="lead" style="text-indent: 2em;">
+                    课上听过老师讲解后,老师还会在课下留置作业,这些作业都是根据每节课的内容精心编制的,帮助学生对每一节课的疑难点进行复习巩固,避免在同样的地方出现错误,同时老师也会对作业进行收缴、批注,再分发,帮助学生学习易错点
                 </p>
             </div>
             <div class="col-md-5 order-md-1">
                 <img class="featurette-image img-fluid mx-auto"
-                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/%E8%94%A1%E6%A1%93%E5%85%AC%E4%B8%89%E8%BF%9E.png" alt=""/>
+                     src="https://files-1252373323.cos.ap-beijing.myqcloud.com/images/about/%E5%AE%B6%E5%BA%AD%E4%BD%9C%E4%B8%9A.jpg" alt=""/>
             </div>
         </div>
 

+ 2 - 1
src/main/resources/templates/index.html

@@ -94,7 +94,8 @@
                         <h1 th:text="${banner.getTitle()}"></h1>
                         <p th:text="${banner.getSubtitle()}"></p>
                         <p>
-                            <a class="btn btn-lg btn-success" href="" role="button" th:href="${banner.getPath()}" th:text="${banner.getAction()}"></a>
+                            <a class="btn btn-lg btn-success" href="" role="button" target="_blank"
+                               th:href="${banner.getPath()}" th:text="${banner.getAction()}"></a>
                         </p>
                     </div>
                 </div>