diff --git a/MamaCollege/src/main/java/edu/mama/college/controller/admin/CourseController.java b/MamaCollege/src/main/java/edu/mama/college/controller/admin/CourseController.java index 61fe9d9664f4bbbe8902abbbcf698979b1527671..fcbb87866d3aea81446c6fbd0af22f6201744c1d 100644 --- a/MamaCollege/src/main/java/edu/mama/college/controller/admin/CourseController.java +++ b/MamaCollege/src/main/java/edu/mama/college/controller/admin/CourseController.java @@ -3,13 +3,10 @@ package edu.mama.college.controller.admin; import edu.mama.college.model.Course; import edu.mama.college.model.JsonResult; import edu.mama.college.model.Page; -import edu.mama.college.model.User; import edu.mama.college.service.CourseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController("adminCourseController") @RequestMapping("/admin") public class CourseController { diff --git a/MamaCollege/src/main/java/edu/mama/college/controller/admin/ResourceController.java b/MamaCollege/src/main/java/edu/mama/college/controller/admin/ResourceController.java index 0715a05ff390987025d458e193218db09ca66af4..7c40b8a54596ad2772a17d60d27f49f3aab167c7 100644 --- a/MamaCollege/src/main/java/edu/mama/college/controller/admin/ResourceController.java +++ b/MamaCollege/src/main/java/edu/mama/college/controller/admin/ResourceController.java @@ -133,7 +133,7 @@ public class ResourceController { } /** - * 素材中心(视频/图片)分页查询 + * 素材中心调整轮播图 */ @PostMapping("/resource/carousel") public JsonResult carousel(@RequestBody List list) { diff --git a/MamaCollege/src/main/java/edu/mama/college/mapper/CourseMapper.java b/MamaCollege/src/main/java/edu/mama/college/mapper/CourseMapper.java index 00642164b80c4746ae38d07a55a76abdd8cd600a..08ed6a09afc6f33e868eafff0ebf0fb6dfea410e 100644 --- a/MamaCollege/src/main/java/edu/mama/college/mapper/CourseMapper.java +++ b/MamaCollege/src/main/java/edu/mama/college/mapper/CourseMapper.java @@ -8,7 +8,7 @@ import java.util.List; @Mapper public interface CourseMapper { - @Select("SELECT * FROM course ORDER BY students DESC LIMIT #{limit}") + @Select("SELECT * FROM course WHERE deleted = false ORDER BY students DESC LIMIT #{limit}") List hotCourse(@Param("limit") int limit); Course detail(@Param("id") int id); diff --git a/MamaCollege/src/main/resources/application.yml b/MamaCollege/src/main/resources/application.yml index 97ff5785c4236cd2074db7d421191d17eb83af28..9d7aff6b345fb093890cfe1958bfedbe3f1c2451 100644 --- a/MamaCollege/src/main/resources/application.yml +++ b/MamaCollege/src/main/resources/application.yml @@ -1,8 +1,8 @@ spring: servlet: multipart: - max-file-size: 5GB #允许上传的文件大小 - max-request-size: 5GB #允许一次请求上传的文件大小 + max-file-size: 2GB #允许上传的文件大小 + max-request-size: 2GB #允许一次请求上传的文件大小 jackson: serialization: write-dates-as-timestamps: true #输出日期为时间戳 diff --git a/MamaCollege/src/main/resources/mapper/CourseMapper.xml b/MamaCollege/src/main/resources/mapper/CourseMapper.xml index 37e26fb24a3282737ac883e04810595ffa915e61..3a9574a04de8f76214a5dd26a0f646d4e66d63a0 100644 --- a/MamaCollege/src/main/resources/mapper/CourseMapper.xml +++ b/MamaCollege/src/main/resources/mapper/CourseMapper.xml @@ -41,11 +41,12 @@ + deleted = false - name LIKE CONCAT('%', #{name}, '%') + AND name LIKE CONCAT('%', #{name}, '%') - teacher LIKE CONCAT('%', #{teacher}, '%') + AND teacher LIKE CONCAT('%', #{teacher}, '%')