Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ba886c7191 | |||
| 05f3af0c77 | |||
| c42a3a55ec | |||
| d027e26f8c | |||
| f9272335f2 | |||
| 5885f365db | |||
| 780e4793de | |||
| f6d5112ad5 | |||
| dafdf82f5d | |||
| aae8147143 | |||
| fe58248efc | |||
| 9569a30a8a | |||
| ef10067345 | |||
| 09ebd82dac | |||
| 94a7b1bc13 |
5
pom.xml
5
pom.xml
@ -93,11 +93,6 @@
|
|||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>com.h2database</groupId>-->
|
|
||||||
<!-- <artifactId>h2</artifactId>-->
|
|
||||||
<!-- <scope>runtime</scope>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.mysql</groupId>
|
<groupId>com.mysql</groupId>
|
||||||
<artifactId>mysql-connector-j</artifactId>
|
<artifactId>mysql-connector-j</artifactId>
|
||||||
|
|||||||
@ -0,0 +1,138 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.controller;
|
||||||
|
|
||||||
|
import org.cmh.backend.CourseManagement.dto.GetCourseListResponse;
|
||||||
|
import org.cmh.backend.CourseManagement.dto.MessageResponse;
|
||||||
|
import org.cmh.backend.CourseManagement.dto.CourseRequest;
|
||||||
|
import org.cmh.backend.CourseManagement.dto.SearchCourseRequest;
|
||||||
|
import org.cmh.backend.CourseManagement.model.Course;
|
||||||
|
import org.cmh.backend.CourseManagement.service.CourseService;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.dao.DataIntegrityViolationException;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/courses")
|
||||||
|
public class CourseController {
|
||||||
|
|
||||||
|
private static final Logger logger = LoggerFactory.getLogger(CourseController.class);
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private CourseService courseService;
|
||||||
|
|
||||||
|
@GetMapping
|
||||||
|
public ResponseEntity<GetCourseListResponse> getCoursesByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
|
||||||
|
if (start >= end) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
long courseCount = courseService.getCourseCount();
|
||||||
|
return new ResponseEntity<>(new GetCourseListResponse(courseCount, courseService.getCoursesByRange(start, end)), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/{id}")
|
||||||
|
public ResponseEntity<Course> getCoursePage(@PathVariable Long id, @RequestParam String token) {
|
||||||
|
try {
|
||||||
|
return new ResponseEntity<>(courseService.getCourseById(id), HttpStatus.OK);
|
||||||
|
} catch (EntityNotFoundException e) {
|
||||||
|
logger.error("Course not found with id: {}", id, e);
|
||||||
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping
|
||||||
|
public ResponseEntity<MessageResponse> createCourse(@RequestBody CourseRequest request) {
|
||||||
|
try {
|
||||||
|
courseService.createCourse(request);
|
||||||
|
} catch (DataIntegrityViolationException e) {
|
||||||
|
logger.error("Create course failed: Data integrity violation", e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("创建失败,课程已存在或缺少字段"), HttpStatus.BAD_REQUEST);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Create course failed: {}", e.getMessage(), e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("创建失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
return new ResponseEntity<>(new MessageResponse("创建成功"), HttpStatus.CREATED);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/{id}")
|
||||||
|
public ResponseEntity<MessageResponse> updateCourse(@PathVariable Long id, @RequestBody CourseRequest request) {
|
||||||
|
try {
|
||||||
|
courseService.updateCourse(id, request);
|
||||||
|
} catch (DataIntegrityViolationException e) {
|
||||||
|
logger.error("Update course failed: Data integrity violation", e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("修改失败,新标题已存在或缺少字段"), HttpStatus.BAD_REQUEST);
|
||||||
|
} catch (EntityNotFoundException e) {
|
||||||
|
logger.error("Course not found with id: {}", id, e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("修改失败: 课程不存在"), HttpStatus.NOT_FOUND);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Update course failed: {}", e.getMessage(), e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("修改失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
return new ResponseEntity<>(new MessageResponse("修改成功"), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/{id}")
|
||||||
|
public ResponseEntity<MessageResponse> deleteCourse(@PathVariable Long id, @RequestParam String token) {
|
||||||
|
try {
|
||||||
|
courseService.deleteCourse(id);
|
||||||
|
} catch (EntityNotFoundException e) {
|
||||||
|
logger.error("Course not found with id: {}", id, e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("删除失败,课程不存在"), HttpStatus.BAD_REQUEST);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Delete course failed: {}", e.getMessage(), e);
|
||||||
|
return new ResponseEntity<>(new MessageResponse("删除失败:" + e.getMessage()), HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
return new ResponseEntity<>(new MessageResponse("删除成功"), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/search")
|
||||||
|
public ResponseEntity<GetCourseListResponse> searchCourses(@RequestParam String token,
|
||||||
|
@RequestParam(required = false) String title,
|
||||||
|
@RequestParam(required = false) String author,
|
||||||
|
@RequestParam(required = false) String description,
|
||||||
|
@RequestParam(required = false) String sortOrder,
|
||||||
|
@RequestParam Integer start,
|
||||||
|
@RequestParam Integer end) {
|
||||||
|
if (start >= end) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
SearchCourseRequest request = new SearchCourseRequest(token, title, author, description, sortOrder, start, end);
|
||||||
|
List<Course> courses = courseService.searchCourses(request);
|
||||||
|
long courseCount = courseService.getCourseCountByCriteria(title, author, description, sortOrder);
|
||||||
|
|
||||||
|
return new ResponseEntity<>(new GetCourseListResponse(courseCount, courses), HttpStatus.OK);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Search courses failed with parameters: title={}, author={}, description={}, sortOrder={}, start={}, end={}",
|
||||||
|
title, author, description, sortOrder, start, end, e);
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@GetMapping("/sort")
|
||||||
|
public ResponseEntity<GetCourseListResponse> sortCourses(@RequestParam String token,
|
||||||
|
@RequestParam String sortField,
|
||||||
|
@RequestParam String sortDirection,
|
||||||
|
@RequestParam Integer start,
|
||||||
|
@RequestParam Integer end) {
|
||||||
|
if (start >= end) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
long courseCount = courseService.getCourseCount();
|
||||||
|
List<Course> sortedCourses = courseService.sortCourses(sortField, sortDirection, start, end);
|
||||||
|
|
||||||
|
return new ResponseEntity<>(new GetCourseListResponse(courseCount, sortedCourses), HttpStatus.OK);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("Sort courses failed with parameters: sortField={}, sortDirection={}, start={}, end={}",
|
||||||
|
sortField, sortDirection, start, end, e);
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.controller;
|
||||||
|
|
||||||
|
import org.cmh.backend.CourseManagement.dto.UploadFileResponse;
|
||||||
|
import org.springframework.core.io.UrlResource;
|
||||||
|
import org.springframework.http.HttpHeaders;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
|
import org.springframework.http.ResponseEntity;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
import org.springframework.core.io.Resource;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.nio.file.Files;
|
||||||
|
import java.nio.file.Path;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/courses")
|
||||||
|
public class FileController {
|
||||||
|
private static final String UPLOAD_DIR = "uploads/";
|
||||||
|
|
||||||
|
@PostMapping("/upload")
|
||||||
|
public ResponseEntity<UploadFileResponse> uploadFile(@RequestParam("file") MultipartFile file) {
|
||||||
|
if (file.isEmpty()) {
|
||||||
|
return new ResponseEntity<>(new UploadFileResponse("文件不能为空", null), HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 确保上传目录存在
|
||||||
|
Path uploadDirPath = Paths.get(UPLOAD_DIR);
|
||||||
|
if (!Files.exists(uploadDirPath)) {
|
||||||
|
Files.createDirectories(uploadDirPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 生成文件路径
|
||||||
|
byte[] bytes = file.getBytes();
|
||||||
|
Path path = Paths.get(UPLOAD_DIR + file.getOriginalFilename());
|
||||||
|
Files.write(path, bytes);
|
||||||
|
|
||||||
|
// 返回成功信息
|
||||||
|
return new ResponseEntity<>(new UploadFileResponse("文件上传成功", "/api/courses/files/" + file.getOriginalFilename()), HttpStatus.OK);
|
||||||
|
} catch (IOException e) {
|
||||||
|
return new ResponseEntity<>(new UploadFileResponse("文件上传失败", null), HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@GetMapping("/files/{filename}")
|
||||||
|
public ResponseEntity<Resource> getFile(@PathVariable String filename) {
|
||||||
|
try {
|
||||||
|
Path filePath = Paths.get(UPLOAD_DIR).resolve(filename).normalize();
|
||||||
|
Resource resource = new UrlResource(filePath.toUri());
|
||||||
|
|
||||||
|
if (resource.exists() && resource.isReadable()) {
|
||||||
|
return ResponseEntity.ok()
|
||||||
|
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + resource.getFilename() + "\"")
|
||||||
|
.body(resource);
|
||||||
|
} else {
|
||||||
|
return new ResponseEntity<>(HttpStatus.NOT_FOUND);
|
||||||
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.cmh.backend.Utils.JwtRequest;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class CourseRequest extends JwtRequest {
|
||||||
|
private String title;
|
||||||
|
private String description;
|
||||||
|
private String orderNo;
|
||||||
|
private String author;
|
||||||
|
private String videoPath;
|
||||||
|
private String imagePath;
|
||||||
|
}
|
||||||
@ -0,0 +1,16 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
import org.cmh.backend.CourseManagement.model.Course;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class GetCourseListResponse {
|
||||||
|
Long courseCount;
|
||||||
|
List<Course> courseList;
|
||||||
|
}
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class MessageResponse {
|
||||||
|
String message;
|
||||||
|
}
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class SearchCourseRequest {
|
||||||
|
private String token;
|
||||||
|
private String title;
|
||||||
|
private String author;
|
||||||
|
private String description;
|
||||||
|
private String sortOrder;
|
||||||
|
private int start;
|
||||||
|
private int end;
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class UploadFileResponse extends MessageResponse {
|
||||||
|
private String url;
|
||||||
|
|
||||||
|
public UploadFileResponse(String message, String url) {
|
||||||
|
super(message);
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.model;
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Entity
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class Course {
|
||||||
|
@Id
|
||||||
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
private String description;
|
||||||
|
private String orderNo;
|
||||||
|
private String author;
|
||||||
|
private String videoPath;
|
||||||
|
private String imagePath;
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.repository;
|
||||||
|
|
||||||
|
import org.cmh.backend.CourseManagement.model.Course;
|
||||||
|
import org.springframework.data.domain.Page;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
|
||||||
|
|
||||||
|
@Repository
|
||||||
|
public interface CourseRepository extends JpaRepository<Course, Long>, JpaSpecificationExecutor<Course> {
|
||||||
|
Page<Course> findAllByOrderByIdDesc(Pageable pageable);
|
||||||
|
}
|
||||||
@ -0,0 +1,82 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.service;
|
||||||
|
|
||||||
|
import org.cmh.backend.CourseManagement.dto.CourseRequest;
|
||||||
|
import org.cmh.backend.CourseManagement.dto.SearchCourseRequest;
|
||||||
|
import org.cmh.backend.CourseManagement.model.Course;
|
||||||
|
import org.cmh.backend.CourseManagement.repository.CourseRepository;
|
||||||
|
import org.cmh.backend.CourseManagement.specification.CourseSpecification;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.data.domain.PageRequest;
|
||||||
|
import org.springframework.data.domain.Pageable;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@Service
|
||||||
|
public class CourseService {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private CourseRepository courseRepository;
|
||||||
|
|
||||||
|
public long getCourseCount() {
|
||||||
|
return courseRepository.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Course> getCoursesByRange(int start, int end) {
|
||||||
|
Pageable pageable = PageRequest.of(start, end - start);
|
||||||
|
return courseRepository.findAll(pageable).getContent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Course getCourseById(Long id) {
|
||||||
|
return courseRepository.findById(id).orElseThrow(() -> new EntityNotFoundException("Course not found"));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void createCourse(CourseRequest request) {
|
||||||
|
Course course = new Course();
|
||||||
|
course.setTitle(request.getTitle());
|
||||||
|
course.setAuthor(request.getAuthor());
|
||||||
|
course.setDescription(request.getDescription());
|
||||||
|
course.setOrderNo(request.getOrderNo());
|
||||||
|
course.setVideoPath(request.getVideoPath()); // 确保保存视频路径
|
||||||
|
course.setImagePath(request.getImagePath()); // 确保保存图片路径
|
||||||
|
courseRepository.save(course);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateCourse(Long id, CourseRequest request) {
|
||||||
|
Course course = courseRepository.findById(id).orElseThrow(() -> new EntityNotFoundException("Course not found"));
|
||||||
|
course.setTitle(request.getTitle());
|
||||||
|
course.setAuthor(request.getAuthor());
|
||||||
|
course.setDescription(request.getDescription());
|
||||||
|
course.setOrderNo(request.getOrderNo());
|
||||||
|
course.setVideoPath(request.getVideoPath()); // 确保更新视频路径
|
||||||
|
course.setImagePath(request.getImagePath()); // 确保更新图片路径
|
||||||
|
courseRepository.save(course);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void deleteCourse(Long id) {
|
||||||
|
courseRepository.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<Course> searchCourses(SearchCourseRequest request) {
|
||||||
|
Pageable pageable = PageRequest.of(request.getStart(), request.getEnd() - request.getStart());
|
||||||
|
return courseRepository.findAll(
|
||||||
|
CourseSpecification.searchCourses(
|
||||||
|
request.getTitle(),
|
||||||
|
request.getAuthor(),
|
||||||
|
request.getDescription(),
|
||||||
|
request.getSortOrder()
|
||||||
|
),
|
||||||
|
pageable
|
||||||
|
).getContent();
|
||||||
|
}
|
||||||
|
public long getCourseCountByCriteria(String title, String author, String description, String sortOrder) {
|
||||||
|
return courseRepository.count(CourseSpecification.searchCourses(title, author, description, sortOrder));
|
||||||
|
}
|
||||||
|
public List<Course> sortCourses(String sortField, String sortDirection, int start, int end) {
|
||||||
|
Pageable pageable = PageRequest.of(start, end - start);
|
||||||
|
return courseRepository.findAll(
|
||||||
|
CourseSpecification.sortCourses(sortField, sortDirection),
|
||||||
|
pageable
|
||||||
|
).getContent();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,44 @@
|
|||||||
|
package org.cmh.backend.CourseManagement.specification;
|
||||||
|
|
||||||
|
import org.cmh.backend.CourseManagement.model.Course;
|
||||||
|
import org.springframework.data.jpa.domain.Specification;
|
||||||
|
|
||||||
|
import jakarta.persistence.criteria.Predicate;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public class CourseSpecification {
|
||||||
|
|
||||||
|
public static Specification<Course> searchCourses(
|
||||||
|
String title, String author, String description, String sortOrder) {
|
||||||
|
|
||||||
|
return (root, query, criteriaBuilder) -> {
|
||||||
|
List<Predicate> predicates = new ArrayList<>();
|
||||||
|
|
||||||
|
if (title != null && !title.isEmpty()) {
|
||||||
|
predicates.add(criteriaBuilder.like(root.get("title"), "%" + title + "%"));
|
||||||
|
}
|
||||||
|
if (author != null && !author.isEmpty()) {
|
||||||
|
predicates.add(criteriaBuilder.like(root.get("author"), "%" + author + "%"));
|
||||||
|
}
|
||||||
|
if (description != null && !description.isEmpty()) {
|
||||||
|
predicates.add(criteriaBuilder.like(root.get("description"), "%" + description + "%"));
|
||||||
|
}
|
||||||
|
if (sortOrder != null && !sortOrder.isEmpty()) {
|
||||||
|
predicates.add(criteriaBuilder.like(root.get("orderNo"), "%" + sortOrder+ "%"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return criteriaBuilder.and(predicates.toArray(new Predicate[0]));
|
||||||
|
};
|
||||||
|
}
|
||||||
|
public static Specification<Course> sortCourses(String sortField, String sortDirection) {
|
||||||
|
return (root, query, cb) -> {
|
||||||
|
if ("asc".equalsIgnoreCase(sortDirection)) {
|
||||||
|
query.orderBy(cb.asc(root.get(sortField)));
|
||||||
|
} else if ("desc".equalsIgnoreCase(sortDirection)) {
|
||||||
|
query.orderBy(cb.desc(root.get(sortField)));
|
||||||
|
}
|
||||||
|
return cb.conjunction();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,13 +0,0 @@
|
|||||||
package org.cmh.backend.authentication.controller;
|
|
||||||
|
|
||||||
|
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
|
||||||
class AuthenticationController {
|
|
||||||
@GetMapping("/hello")
|
|
||||||
public String hello(){
|
|
||||||
return "Hello SpringBoot!";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,23 +1,64 @@
|
|||||||
package org.cmh.backend.authentication.controller;
|
package org.cmh.backend.authentication.controller;
|
||||||
|
|
||||||
|
import org.cmh.backend.Utils.JwtUtil;
|
||||||
|
import org.cmh.backend.authentication.dto.*;
|
||||||
import org.cmh.backend.authentication.model.User;
|
import org.cmh.backend.authentication.model.User;
|
||||||
import org.cmh.backend.authentication.service.UserService;
|
import org.cmh.backend.authentication.service.UserService;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/users")
|
|
||||||
public class UserController {
|
public class UserController {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserService userService;
|
private UserService userService;
|
||||||
|
|
||||||
@GetMapping("/{username}")
|
@PostMapping("/register")
|
||||||
public ResponseEntity<User> getUser(@PathVariable String username) {
|
public ResponseEntity<RegisterResponse> register(@RequestBody User user) {
|
||||||
User user = userService.getUserByUsername(username);
|
User registeredUser = userService.register(user);
|
||||||
return ResponseEntity.ok(user);
|
if (registeredUser == null) {
|
||||||
|
return new ResponseEntity<>(new RegisterResponse("用户已存在"),HttpStatus.BAD_REQUEST);
|
||||||
|
}
|
||||||
|
return new ResponseEntity<>(new RegisterResponse("注册成功"),HttpStatus.OK);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/login")
|
||||||
|
public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest request) {
|
||||||
|
User user = userService.login(request.getUsername(), request.getPassword());
|
||||||
|
if (user != null) {
|
||||||
|
return new ResponseEntity<>(new LoginResponse("登录成功", JwtUtil.generateToken(user.getUsername())), HttpStatus.OK);
|
||||||
|
}
|
||||||
|
return new ResponseEntity<>(new LoginResponse("登录失败", null), HttpStatus.UNAUTHORIZED);
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/update")
|
||||||
|
public ResponseEntity<?> updateUserInfo(@RequestBody UpdateRequest user) {
|
||||||
|
userService.updateUserInfo(user);
|
||||||
|
return ResponseEntity.ok().build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/changePassword")
|
||||||
|
public ResponseEntity<?> changePassword(@RequestParam String username, @RequestParam String oldPassword, @RequestParam String newPassword) {
|
||||||
|
boolean isChanged = userService.changePassword(username, oldPassword, newPassword);
|
||||||
|
if (isChanged) {
|
||||||
|
return ResponseEntity.ok("Password changed successfully");
|
||||||
|
}
|
||||||
|
return ResponseEntity.status(400).body("Old password is incorrect");
|
||||||
|
}
|
||||||
|
|
||||||
|
@PostMapping("/getVerificationCode")
|
||||||
|
public String getVerificationCode(@RequestBody String contact) {
|
||||||
|
return "Verification code sent to " + contact;
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/profile")
|
||||||
|
public ResponseEntity<ProfileResponse> getUserInfo(@RequestParam String token) {
|
||||||
|
if (!JwtUtil.isTokenValid(token)) {
|
||||||
|
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
|
||||||
|
}
|
||||||
|
String username = JwtUtil.extractUsername(token);
|
||||||
|
return new ResponseEntity<>(userService.getUserInfo(username),HttpStatus.OK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
package org.cmh.backend.authentication.dto;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
public class LoginRequest {
|
||||||
|
private String username;
|
||||||
|
private String password;
|
||||||
|
}
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
package org.cmh.backend.authentication.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class LoginResponse {
|
||||||
|
private String message;
|
||||||
|
private String token;
|
||||||
|
}
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
package org.cmh.backend.authentication.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class ProfileResponse {
|
||||||
|
private String username;
|
||||||
|
private String email;
|
||||||
|
private String role;
|
||||||
|
private String phoneNumber;
|
||||||
|
private String company;
|
||||||
|
private LocalDateTime createdDate;
|
||||||
|
}
|
||||||
@ -0,0 +1,12 @@
|
|||||||
|
package org.cmh.backend.authentication.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class RegisterResponse {
|
||||||
|
private String message;
|
||||||
|
}
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
package org.cmh.backend.authentication.dto;
|
||||||
|
|
||||||
|
import lombok.AllArgsConstructor;
|
||||||
|
import lombok.Getter;
|
||||||
|
import lombok.Setter;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
@Setter
|
||||||
|
@AllArgsConstructor
|
||||||
|
public class UpdateRequest {
|
||||||
|
private String username;
|
||||||
|
private String email;
|
||||||
|
private String phoneNumber;
|
||||||
|
private String company;
|
||||||
|
}
|
||||||
@ -1,39 +1,34 @@
|
|||||||
|
// User.java
|
||||||
package org.cmh.backend.authentication.model;
|
package org.cmh.backend.authentication.model;
|
||||||
|
|
||||||
import jakarta.persistence.Entity;
|
import lombok.Data;
|
||||||
import jakarta.persistence.GeneratedValue;
|
|
||||||
import jakarta.persistence.GenerationType;
|
|
||||||
import jakarta.persistence.Id;
|
|
||||||
|
|
||||||
|
import jakarta.persistence.*;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
@Data
|
||||||
@Entity
|
@Entity
|
||||||
|
@Table(name = "Chester")
|
||||||
public class User {
|
public class User {
|
||||||
@Id
|
@Id
|
||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
|
@Column(nullable = false, unique = true)
|
||||||
private String username;
|
private String username;
|
||||||
|
|
||||||
|
@Column(nullable = false)
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
public Long getId() {
|
@Column(nullable = false)
|
||||||
return id;
|
private String email;
|
||||||
}
|
|
||||||
|
|
||||||
public void setId(Long id) {
|
@Column(nullable = false)
|
||||||
this.id = id;
|
private String role;
|
||||||
}
|
|
||||||
|
|
||||||
public String getUsername() {
|
private String phoneNumber;
|
||||||
return username;
|
private String company;
|
||||||
}
|
|
||||||
|
|
||||||
public void setUsername(String username) {
|
@Column(nullable = false)
|
||||||
this.username = username;
|
private LocalDateTime createdDate;
|
||||||
}
|
|
||||||
|
|
||||||
public String getPassword() {
|
|
||||||
return password;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setPassword(String password) {
|
|
||||||
this.password = password;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -2,7 +2,11 @@ package org.cmh.backend.authentication.repository;
|
|||||||
|
|
||||||
import org.cmh.backend.authentication.model.User;
|
import org.cmh.backend.authentication.model.User;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
import org.springframework.stereotype.Repository;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
|
|
||||||
|
@Repository
|
||||||
public interface UserRepository extends JpaRepository<User, Long> {
|
public interface UserRepository extends JpaRepository<User, Long> {
|
||||||
User findByUsername(String username);
|
User findByUsername(String username);
|
||||||
}
|
}
|
||||||
@ -1,16 +1,72 @@
|
|||||||
package org.cmh.backend.authentication.service;
|
package org.cmh.backend.authentication.service;
|
||||||
|
|
||||||
|
import org.cmh.backend.authentication.dto.ProfileResponse;
|
||||||
|
import org.cmh.backend.authentication.dto.UpdateRequest;
|
||||||
import org.cmh.backend.authentication.model.User;
|
import org.cmh.backend.authentication.model.User;
|
||||||
import org.cmh.backend.authentication.repository.UserRepository;
|
import org.cmh.backend.authentication.repository.UserRepository;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
|
||||||
|
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
|
// UserService.java
|
||||||
@Service
|
@Service
|
||||||
public class UserService {
|
public class UserService {
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private UserRepository userRepository;
|
private UserRepository userRepository;
|
||||||
|
|
||||||
public User getUserByUsername(String username) {
|
private final PasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
|
||||||
return userRepository.findByUsername(username);
|
|
||||||
|
public User register(User user) {
|
||||||
|
User existingUser = userRepository.findByUsername(user.getUsername());
|
||||||
|
if (existingUser != null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
user.setPassword(passwordEncoder.encode(user.getPassword()));
|
||||||
|
user.setCreatedDate(LocalDateTime.now());
|
||||||
|
return userRepository.save(user);
|
||||||
|
}
|
||||||
|
|
||||||
|
public User login(String username, String password) {
|
||||||
|
User user = userRepository.findByUsername(username);
|
||||||
|
if (user != null && passwordEncoder.matches(password, user.getPassword())) {
|
||||||
|
return user;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateUserInfo(UpdateRequest newUser) {
|
||||||
|
User user = userRepository.findByUsername(newUser.getUsername());
|
||||||
|
if (user != null) {
|
||||||
|
user.setEmail(newUser.getEmail());
|
||||||
|
user.setPhoneNumber(newUser.getPhoneNumber());
|
||||||
|
user.setCompany(newUser.getCompany());
|
||||||
|
userRepository.save(user);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean changePassword(String username, String oldPassword, String newPassword) {
|
||||||
|
User user = userRepository.findByUsername(username);
|
||||||
|
if (user != null && passwordEncoder.matches(oldPassword, user.getPassword())) {
|
||||||
|
user.setPassword(passwordEncoder.encode(newPassword));
|
||||||
|
userRepository.save(user);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ProfileResponse getUserInfo(String username) {
|
||||||
|
User user = userRepository.findByUsername(username);
|
||||||
|
return new ProfileResponse(
|
||||||
|
user.getUsername(),
|
||||||
|
user.getEmail(),
|
||||||
|
user.getRole(),
|
||||||
|
user.getPhoneNumber(),
|
||||||
|
user.getCompany(),
|
||||||
|
user.getCreatedDate()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -20,5 +20,9 @@ spring.datasource.hikari.connection-timeout=30000
|
|||||||
server.servlet.encoding.enabled=true
|
server.servlet.encoding.enabled=true
|
||||||
server.servlet.encoding.force=true
|
server.servlet.encoding.force=true
|
||||||
server.servlet.encoding.charset=utf-8
|
server.servlet.encoding.charset=utf-8
|
||||||
|
# set the max size of a single file
|
||||||
|
spring.servlet.multipart.max-file-size=500MB
|
||||||
|
# set the max size of the total request
|
||||||
|
spring.servlet.multipart.max-request-size=500MB
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,15 +0,0 @@
|
|||||||
package org.cmh.backend;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.springframework.boot.test.context.SpringBootTest;
|
|
||||||
import org.springframework.context.annotation.Import;
|
|
||||||
|
|
||||||
@Import(TestcontainersConfiguration.class)
|
|
||||||
@SpringBootTest
|
|
||||||
class BackendApplicationTests {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
void contextLoads() {
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package org.cmh.backend;
|
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
|
||||||
|
|
||||||
public class TestBackendApplication {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
SpringApplication.from(BackendApplication::main).with(TestcontainersConfiguration.class).run(args);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,25 +0,0 @@
|
|||||||
package org.cmh.backend;
|
|
||||||
|
|
||||||
import org.springframework.boot.test.context.TestConfiguration;
|
|
||||||
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.testcontainers.containers.MariaDBContainer;
|
|
||||||
import org.testcontainers.containers.MySQLContainer;
|
|
||||||
import org.testcontainers.utility.DockerImageName;
|
|
||||||
|
|
||||||
@TestConfiguration(proxyBeanMethods = false)
|
|
||||||
class TestcontainersConfiguration {
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ServiceConnection
|
|
||||||
MariaDBContainer<?> mariaDbContainer() {
|
|
||||||
return new MariaDBContainer<>(DockerImageName.parse("mariadb:latest"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
@ServiceConnection
|
|
||||||
MySQLContainer<?> mysqlContainer() {
|
|
||||||
return new MySQLContainer<>(DockerImageName.parse("mysql:latest"));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,88 +0,0 @@
|
|||||||
package org.cmh.backend.Utils;
|
|
||||||
|
|
||||||
import org.cmh.backend.authentication.service.UserService;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.BeforeClass;
|
|
||||||
import org.junit.runner.RunWith;
|
|
||||||
import org.mockito.InjectMocks;
|
|
||||||
import org.mockito.Mockito;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
|
||||||
import org.springframework.context.annotation.EnableAspectJAutoProxy;
|
|
||||||
import org.springframework.context.annotation.Import;
|
|
||||||
import org.springframework.test.context.junit4.SpringRunner;
|
|
||||||
|
|
||||||
@RunWith(SpringRunner.class)
|
|
||||||
public class JwtVerifyAspectTest {
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
@EnableAspectJAutoProxy
|
|
||||||
@Import({JwtVerifyAspect.class})
|
|
||||||
static class Config {
|
|
||||||
@Bean
|
|
||||||
public JwtUtil jwtUtil() {
|
|
||||||
return Mockito.mock(JwtUtil.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Bean
|
|
||||||
public UserService userService() {
|
|
||||||
return Mockito.mock(UserService.class);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private JwtUtil jwtUtil = new JwtUtil();
|
|
||||||
|
|
||||||
@InjectMocks
|
|
||||||
private JwtVerifyAspect jwtVerifyAspect;
|
|
||||||
|
|
||||||
@BeforeClass
|
|
||||||
public static void setUpClass() {
|
|
||||||
// Static setup if needed
|
|
||||||
}
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setUp() {
|
|
||||||
Mockito.when(jwtUtil.isTokenValid("validToken")).thenReturn(true);
|
|
||||||
Mockito.when(jwtUtil.isTokenValid("invalidToken")).thenReturn(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO:这个测试跑不动,有问题,先取消掉
|
|
||||||
// @Test
|
|
||||||
// public void testVerify() {
|
|
||||||
// SomeController validTokenController = new SomeController("validToken");
|
|
||||||
// SomeController invalidTokenController = new SomeController("invalidToken");
|
|
||||||
//
|
|
||||||
// Assert.assertTrue("Valid token should pass verification", validTokenController.run());
|
|
||||||
// Assert.assertFalse("Invalid token should fail verification", invalidTokenController.run());
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
class SomeController {
|
|
||||||
private SomeJwtRequest request;
|
|
||||||
|
|
||||||
SomeController(String token) {
|
|
||||||
this.request = new SomeJwtRequest(token, "test");
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean run() {
|
|
||||||
try {
|
|
||||||
return verify(request);
|
|
||||||
} catch (JwtValidationException e) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@JwtVerify
|
|
||||||
public boolean verify(SomeJwtRequest request) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class SomeJwtRequest extends JwtRequest {
|
|
||||||
String msg;
|
|
||||||
|
|
||||||
public SomeJwtRequest(String token, String msg) {
|
|
||||||
super.setToken(token);
|
|
||||||
this.msg = msg;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user