From c83dd750e64c80da47ffe5b9a03ad48ec2ca0d5e Mon Sep 17 00:00:00 2001
From: guo <1716967236@qq.com>
Date: Tue, 9 Jul 2024 22:45:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  6 +++++
 .../controller/LoginController.java           |  4 +--
 .../controller/TaskController.java            | 26 +++++++++++++++++++
 .../controller/TestController.java            |  4 +--
 .../model => dto/request}/LoginBody.java      |  2 +-
 .../{domain => }/entity/BaseEntity.java       |  2 +-
 .../{domain => }/entity/CommonResult.java     |  2 +-
 .../entity/StudyExpectationsEntity.java       |  2 +-
 .../entity/StudyReportFragmentsEntity.java    |  2 +-
 .../entity/StudyReportsEntity.java            |  2 +-
 .../entity/StudySessionsEntity.java           |  2 +-
 .../{domain => }/entity/TasksEntity.java      |  2 +-
 .../{domain => }/entity/TestTableEntity.java  |  2 +-
 .../{domain => }/entity/UserEntity.java       |  2 +-
 .../{domain => }/entity/UserTaskEntity.java   |  2 +-
 .../mapper/StudyExpectationsMapper.java       |  2 +-
 .../mapper/StudyReportFragmentsMapper.java    |  2 +-
 .../mapper/StudyReportsMapper.java            |  2 +-
 .../mapper/StudySessionsMapper.java           |  2 +-
 .../mapper/TasksMapper.java                   |  2 +-
 .../mapper/TestTableMapper.java               |  2 +-
 .../mapper/UserMapper.java                    |  2 +-
 .../mapper/UserTaskMapper.java                |  2 +-
 .../service/StudyExpectationsService.java     |  2 +-
 .../service/StudyReportFragmentsService.java  |  2 +-
 .../service/StudyReportsService.java          |  2 +-
 .../service/StudySessionsService.java         |  2 +-
 .../service/TasksService.java                 |  2 +-
 .../service/TestTableService.java             |  2 +-
 .../service/UserService.java                  |  2 +-
 .../service/UserTaskService.java              |  2 +-
 .../impl/StudyExpectationsServiceImpl.java    |  2 +-
 .../impl/StudyReportFragmentsServiceImpl.java |  2 +-
 .../service/impl/StudyReportsServiceImpl.java |  2 +-
 .../impl/StudySessionsServiceImpl.java        |  2 +-
 .../service/impl/TasksServiceImpl.java        |  2 +-
 .../service/impl/TestTableServiceImpl.java    |  2 +-
 .../service/impl/UserServiceImpl.java         |  2 +-
 .../service/impl/UserTaskServiceImpl.java     |  2 +-
 .../utils/GlobalExceptionHandler.java         |  2 +-
 .../mapper/StudyExpectationsMapper.xml        |  2 +-
 .../mapper/StudyReportFragmentsMapper.xml     |  2 +-
 .../resources/mapper/StudyReportsMapper.xml   |  2 +-
 .../resources/mapper/StudySessionsMapper.xml  |  2 +-
 src/main/resources/mapper/TasksMapper.xml     |  2 +-
 src/main/resources/mapper/TestTableMapper.xml |  2 +-
 src/main/resources/mapper/UserMapper.xml      |  2 +-
 src/main/resources/mapper/UserTaskMapper.xml  |  2 +-
 .../DataSourceTest.java                       |  2 +-
 .../controller/LoginControllerTest.java       |  4 +--
 50 files changed, 83 insertions(+), 51 deletions(-)
 create mode 100644 src/main/java/com/guo/learningprogresstracker/controller/TaskController.java
 rename src/main/java/com/guo/learningprogresstracker/{domain/model => dto/request}/LoginBody.java (74%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/BaseEntity.java (90%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/CommonResult.java (96%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/StudyExpectationsEntity.java (96%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/StudyReportFragmentsEntity.java (96%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/StudyReportsEntity.java (96%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/StudySessionsEntity.java (97%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/TasksEntity.java (97%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/TestTableEntity.java (97%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/UserEntity.java (94%)
 rename src/main/java/com/guo/learningprogresstracker/{domain => }/entity/UserTaskEntity.java (95%)

diff --git a/pom.xml b/pom.xml
index d415785..bcd8df9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+            <version>4.4.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/src/main/java/com/guo/learningprogresstracker/controller/LoginController.java b/src/main/java/com/guo/learningprogresstracker/controller/LoginController.java
index 7e4df88..035908a 100644
--- a/src/main/java/com/guo/learningprogresstracker/controller/LoginController.java
+++ b/src/main/java/com/guo/learningprogresstracker/controller/LoginController.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.controller;
 
-import com.guo.learningprogresstracker.domain.entity.CommonResult;
-import com.guo.learningprogresstracker.domain.model.LoginBody;
+import com.guo.learningprogresstracker.entity.CommonResult;
+import com.guo.learningprogresstracker.dto.request.LoginBody;
 import com.guo.learningprogresstracker.exception.AppException;
 import com.guo.learningprogresstracker.service.LoginService;
 import com.guo.learningprogresstracker.service.UserService;
diff --git a/src/main/java/com/guo/learningprogresstracker/controller/TaskController.java b/src/main/java/com/guo/learningprogresstracker/controller/TaskController.java
new file mode 100644
index 0000000..934d36b
--- /dev/null
+++ b/src/main/java/com/guo/learningprogresstracker/controller/TaskController.java
@@ -0,0 +1,26 @@
+package com.guo.learningprogresstracker.controller;
+
+import com.guo.learningprogresstracker.entity.CommonResult;
+import com.guo.learningprogresstracker.service.TasksService;
+import com.guo.learningprogresstracker.service.impl.TasksServiceImpl;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+/**
+ * 任务控制层
+ */
+@Controller
+public class TaskController {
+
+    private final TasksService tasksService;
+
+    public TaskController(TasksServiceImpl tasksService) {
+        this.tasksService = tasksService;
+    }
+
+    @GetMapping("/tasks/{taskId}")
+    public CommonResult<TaskInfoResult> showTask(@PathVariable("taskId") String taskId) {
+        return CommonResult.success(tasksService.showTask(taskId));
+    }
+}
diff --git a/src/main/java/com/guo/learningprogresstracker/controller/TestController.java b/src/main/java/com/guo/learningprogresstracker/controller/TestController.java
index a31a8f7..9d38a10 100644
--- a/src/main/java/com/guo/learningprogresstracker/controller/TestController.java
+++ b/src/main/java/com/guo/learningprogresstracker/controller/TestController.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.controller;
 
-import com.guo.learningprogresstracker.domain.entity.CommonResult;
-import com.guo.learningprogresstracker.domain.entity.TestTableEntity;
+import com.guo.learningprogresstracker.entity.CommonResult;
+import com.guo.learningprogresstracker.entity.TestTableEntity;
 import com.guo.learningprogresstracker.exception.AppException;
 import com.guo.learningprogresstracker.exception.ErrorParameterException;
 import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/model/LoginBody.java b/src/main/java/com/guo/learningprogresstracker/dto/request/LoginBody.java
similarity index 74%
rename from src/main/java/com/guo/learningprogresstracker/domain/model/LoginBody.java
rename to src/main/java/com/guo/learningprogresstracker/dto/request/LoginBody.java
index 89fb802..42456d6 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/model/LoginBody.java
+++ b/src/main/java/com/guo/learningprogresstracker/dto/request/LoginBody.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.model;
+package com.guo.learningprogresstracker.dto.request;
 
 import lombok.Data;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/BaseEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/BaseEntity.java
similarity index 90%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/BaseEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/BaseEntity.java
index 8b188b9..c7671ad 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/BaseEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/BaseEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/CommonResult.java b/src/main/java/com/guo/learningprogresstracker/entity/CommonResult.java
similarity index 96%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/CommonResult.java
rename to src/main/java/com/guo/learningprogresstracker/entity/CommonResult.java
index 007bdcb..ed43bad 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/CommonResult.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/CommonResult.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 
 import lombok.AllArgsConstructor;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyExpectationsEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/StudyExpectationsEntity.java
similarity index 96%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/StudyExpectationsEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/StudyExpectationsEntity.java
index 4ae74e4..1132b2c 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyExpectationsEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/StudyExpectationsEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportFragmentsEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportFragmentsEntity.java
similarity index 96%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportFragmentsEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/StudyReportFragmentsEntity.java
index 3d03803..f8776f4 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportFragmentsEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportFragmentsEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportsEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java
similarity index 96%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportsEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java
index 9bb4fa4..2dbea5f 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudyReportsEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/StudyReportsEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudySessionsEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/StudySessionsEntity.java
similarity index 97%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/StudySessionsEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/StudySessionsEntity.java
index 33dc4f0..5dae95a 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/StudySessionsEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/StudySessionsEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/TasksEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/TasksEntity.java
similarity index 97%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/TasksEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/TasksEntity.java
index f607664..24b6055 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/TasksEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/TasksEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/TestTableEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/TestTableEntity.java
similarity index 97%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/TestTableEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/TestTableEntity.java
index 58d1077..1e6e9b5 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/TestTableEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/TestTableEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/UserEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/UserEntity.java
similarity index 94%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/UserEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/UserEntity.java
index 8b0deb8..215ed44 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/UserEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/UserEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
diff --git a/src/main/java/com/guo/learningprogresstracker/domain/entity/UserTaskEntity.java b/src/main/java/com/guo/learningprogresstracker/entity/UserTaskEntity.java
similarity index 95%
rename from src/main/java/com/guo/learningprogresstracker/domain/entity/UserTaskEntity.java
rename to src/main/java/com/guo/learningprogresstracker/entity/UserTaskEntity.java
index 4d411df..e529aff 100644
--- a/src/main/java/com/guo/learningprogresstracker/domain/entity/UserTaskEntity.java
+++ b/src/main/java/com/guo/learningprogresstracker/entity/UserTaskEntity.java
@@ -1,4 +1,4 @@
-package com.guo.learningprogresstracker.domain.entity;
+package com.guo.learningprogresstracker.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudyExpectationsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudyExpectationsMapper.java
index d04d89e..57b159a 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudyExpectationsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudyExpectationsMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.StudyExpectationsEntity;
+import com.guo.learningprogresstracker.entity.StudyExpectationsEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
index 543abc2..820cb9d 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportFragmentsMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.StudyReportFragmentsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
index 3d22e20..24e08db 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudyReportsMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.StudyReportsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportsEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/StudySessionsMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/StudySessionsMapper.java
index 906eff0..c793f4f 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/StudySessionsMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/StudySessionsMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.StudySessionsEntity;
+import com.guo.learningprogresstracker.entity.StudySessionsEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
index f76813e..e9e9b3c 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/TasksMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.TasksEntity;
+import com.guo.learningprogresstracker.entity.TasksEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/TestTableMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/TestTableMapper.java
index 179beb8..568f709 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/TestTableMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/TestTableMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.TestTableEntity;
+import com.guo.learningprogresstracker.entity.TestTableEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/UserMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/UserMapper.java
index 7267bc6..f9f0b77 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/UserMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/UserMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.UserEntity;
+import com.guo.learningprogresstracker.entity.UserEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/mapper/UserTaskMapper.java b/src/main/java/com/guo/learningprogresstracker/mapper/UserTaskMapper.java
index 474b7f0..e489fa7 100644
--- a/src/main/java/com/guo/learningprogresstracker/mapper/UserTaskMapper.java
+++ b/src/main/java/com/guo/learningprogresstracker/mapper/UserTaskMapper.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.mapper;
 
-import com.guo.learningprogresstracker.domain.entity.UserTaskEntity;
+import com.guo.learningprogresstracker.entity.UserTaskEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/service/StudyExpectationsService.java b/src/main/java/com/guo/learningprogresstracker/service/StudyExpectationsService.java
index d7cb996..ccde3e4 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/StudyExpectationsService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/StudyExpectationsService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.StudyExpectationsEntity;
+import com.guo.learningprogresstracker.entity.StudyExpectationsEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/StudyReportFragmentsService.java b/src/main/java/com/guo/learningprogresstracker/service/StudyReportFragmentsService.java
index 62f76d3..f81d3fc 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/StudyReportFragmentsService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/StudyReportFragmentsService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.StudyReportFragmentsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/StudyReportsService.java b/src/main/java/com/guo/learningprogresstracker/service/StudyReportsService.java
index ec77440..e664b0e 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/StudyReportsService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/StudyReportsService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.StudyReportsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportsEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/StudySessionsService.java b/src/main/java/com/guo/learningprogresstracker/service/StudySessionsService.java
index e56ad7f..1cb3af0 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/StudySessionsService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/StudySessionsService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.StudySessionsEntity;
+import com.guo.learningprogresstracker.entity.StudySessionsEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/TasksService.java b/src/main/java/com/guo/learningprogresstracker/service/TasksService.java
index 636b42f..6f480c3 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/TasksService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/TasksService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.TasksEntity;
+import com.guo.learningprogresstracker.entity.TasksEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/TestTableService.java b/src/main/java/com/guo/learningprogresstracker/service/TestTableService.java
index 8a4c6c5..0ed1cfe 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/TestTableService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/TestTableService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.TestTableEntity;
+import com.guo.learningprogresstracker.entity.TestTableEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/UserService.java b/src/main/java/com/guo/learningprogresstracker/service/UserService.java
index ccdbbf3..7f01787 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/UserService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/UserService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.UserEntity;
+import com.guo.learningprogresstracker.entity.UserEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.guo.learningprogresstracker.exception.AppException;
 
diff --git a/src/main/java/com/guo/learningprogresstracker/service/UserTaskService.java b/src/main/java/com/guo/learningprogresstracker/service/UserTaskService.java
index 95afed5..05489ba 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/UserTaskService.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/UserTaskService.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.service;
 
-import com.guo.learningprogresstracker.domain.entity.UserTaskEntity;
+import com.guo.learningprogresstracker.entity.UserTaskEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyExpectationsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyExpectationsServiceImpl.java
index ae8b2ab..1123707 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyExpectationsServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyExpectationsServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.StudyExpectationsEntity;
+import com.guo.learningprogresstracker.entity.StudyExpectationsEntity;
 import com.guo.learningprogresstracker.service.StudyExpectationsService;
 import com.guo.learningprogresstracker.mapper.StudyExpectationsMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
index 79826b1..dd9cc26 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportFragmentsServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.StudyReportFragmentsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity;
 import com.guo.learningprogresstracker.service.StudyReportFragmentsService;
 import com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportsServiceImpl.java
index 44b6a95..ba4ecc0 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportsServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudyReportsServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.StudyReportsEntity;
+import com.guo.learningprogresstracker.entity.StudyReportsEntity;
 import com.guo.learningprogresstracker.service.StudyReportsService;
 import com.guo.learningprogresstracker.mapper.StudyReportsMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java
index f283bfa..8bfb9ab 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/StudySessionsServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.StudySessionsEntity;
+import com.guo.learningprogresstracker.entity.StudySessionsEntity;
 import com.guo.learningprogresstracker.service.StudySessionsService;
 import com.guo.learningprogresstracker.mapper.StudySessionsMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/TasksServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/TasksServiceImpl.java
index a43ac04..08c9bb2 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/TasksServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/TasksServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.TasksEntity;
+import com.guo.learningprogresstracker.entity.TasksEntity;
 import com.guo.learningprogresstracker.service.TasksService;
 import com.guo.learningprogresstracker.mapper.TasksMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/TestTableServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/TestTableServiceImpl.java
index 013cc2c..82af22d 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/TestTableServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/TestTableServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.TestTableEntity;
+import com.guo.learningprogresstracker.entity.TestTableEntity;
 import com.guo.learningprogresstracker.mapper.TestTableMapper;
 import com.guo.learningprogresstracker.service.TestTableService;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/UserServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/UserServiceImpl.java
index 1acab94..9baa745 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/UserServiceImpl.java
@@ -2,7 +2,7 @@ package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.UserEntity;
+import com.guo.learningprogresstracker.entity.UserEntity;
 import com.guo.learningprogresstracker.exception.AppException;
 import com.guo.learningprogresstracker.service.UserService;
 import com.guo.learningprogresstracker.mapper.UserMapper;
diff --git a/src/main/java/com/guo/learningprogresstracker/service/impl/UserTaskServiceImpl.java b/src/main/java/com/guo/learningprogresstracker/service/impl/UserTaskServiceImpl.java
index 2ead5d4..71f7e54 100644
--- a/src/main/java/com/guo/learningprogresstracker/service/impl/UserTaskServiceImpl.java
+++ b/src/main/java/com/guo/learningprogresstracker/service/impl/UserTaskServiceImpl.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.guo.learningprogresstracker.domain.entity.UserTaskEntity;
+import com.guo.learningprogresstracker.entity.UserTaskEntity;
 import com.guo.learningprogresstracker.service.UserTaskService;
 import com.guo.learningprogresstracker.mapper.UserTaskMapper;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/guo/learningprogresstracker/utils/GlobalExceptionHandler.java b/src/main/java/com/guo/learningprogresstracker/utils/GlobalExceptionHandler.java
index d56ed01..31a977f 100644
--- a/src/main/java/com/guo/learningprogresstracker/utils/GlobalExceptionHandler.java
+++ b/src/main/java/com/guo/learningprogresstracker/utils/GlobalExceptionHandler.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker.utils;
   
-import com.guo.learningprogresstracker.domain.entity.CommonResult;
+import com.guo.learningprogresstracker.entity.CommonResult;
 import com.guo.learningprogresstracker.exception.AppException;
 import com.guo.learningprogresstracker.exception.ErrorParameterException;
 import com.guo.learningprogresstracker.exception.NotFindEntitiesException;
diff --git a/src/main/resources/mapper/StudyExpectationsMapper.xml b/src/main/resources/mapper/StudyExpectationsMapper.xml
index 4d6a821..e80f7b7 100644
--- a/src/main/resources/mapper/StudyExpectationsMapper.xml
+++ b/src/main/resources/mapper/StudyExpectationsMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.StudyExpectationsMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.StudyExpectationsEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.StudyExpectationsEntity">
             <id property="expectationId" column="expectation_id" jdbcType="INTEGER"/>
             <result property="sessionId" column="session_id" jdbcType="INTEGER"/>
             <result property="description" column="description" jdbcType="VARCHAR"/>
diff --git a/src/main/resources/mapper/StudyReportFragmentsMapper.xml b/src/main/resources/mapper/StudyReportFragmentsMapper.xml
index aa435f7..f39a103 100644
--- a/src/main/resources/mapper/StudyReportFragmentsMapper.xml
+++ b/src/main/resources/mapper/StudyReportFragmentsMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.StudyReportFragmentsMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.StudyReportFragmentsEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.StudyReportFragmentsEntity">
             <id property="fragmentId" column="fragment_id" jdbcType="INTEGER"/>
             <result property="sessionId" column="session_id" jdbcType="INTEGER"/>
             <result property="content" column="content" jdbcType="VARCHAR"/>
diff --git a/src/main/resources/mapper/StudyReportsMapper.xml b/src/main/resources/mapper/StudyReportsMapper.xml
index fe42e8c..bac99eb 100644
--- a/src/main/resources/mapper/StudyReportsMapper.xml
+++ b/src/main/resources/mapper/StudyReportsMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.StudyReportsMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.StudyReportsEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.StudyReportsEntity">
             <id property="reportId" column="report_id" jdbcType="INTEGER"/>
             <result property="sessionId" column="session_id" jdbcType="INTEGER"/>
             <result property="content" column="content" jdbcType="VARCHAR"/>
diff --git a/src/main/resources/mapper/StudySessionsMapper.xml b/src/main/resources/mapper/StudySessionsMapper.xml
index ce58010..1ce2b96 100644
--- a/src/main/resources/mapper/StudySessionsMapper.xml
+++ b/src/main/resources/mapper/StudySessionsMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.StudySessionsMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.StudySessionsEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.StudySessionsEntity">
             <id property="sessionId" column="session_id" jdbcType="INTEGER"/>
             <result property="taskId" column="task_id" jdbcType="INTEGER"/>
             <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
diff --git a/src/main/resources/mapper/TasksMapper.xml b/src/main/resources/mapper/TasksMapper.xml
index c86db87..0f6d723 100644
--- a/src/main/resources/mapper/TasksMapper.xml
+++ b/src/main/resources/mapper/TasksMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.TasksMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.TasksEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.TasksEntity">
             <id property="taskId" column="task_id" jdbcType="INTEGER"/>
             <result property="taskName" column="task_name" jdbcType="VARCHAR"/>
             <result property="materialUrl" column="material_url" jdbcType="VARCHAR"/>
diff --git a/src/main/resources/mapper/TestTableMapper.xml b/src/main/resources/mapper/TestTableMapper.xml
index 6040217..f263e5c 100644
--- a/src/main/resources/mapper/TestTableMapper.xml
+++ b/src/main/resources/mapper/TestTableMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.TestTableMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.TestTableEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.TestTableEntity">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="idName" column="id_name" jdbcType="VARCHAR"/>
     </resultMap>
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index a3d672a..a4690c9 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.UserMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.UserEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.UserEntity">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="userName" column="user_name" jdbcType="VARCHAR"/>
             <result property="userPassword" column="user_password" jdbcType="VARCHAR"/>
diff --git a/src/main/resources/mapper/UserTaskMapper.xml b/src/main/resources/mapper/UserTaskMapper.xml
index 5791bfa..097132d 100644
--- a/src/main/resources/mapper/UserTaskMapper.xml
+++ b/src/main/resources/mapper/UserTaskMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.guo.learningprogresstracker.mapper.UserTaskMapper">
 
-    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.domain.entity.UserTaskEntity">
+    <resultMap id="BaseResultMap" type="com.guo.learningprogresstracker.entity.UserTaskEntity">
             <result property="id" column="id" jdbcType="VARCHAR"/>
             <result property="userId" column="user_id" jdbcType="INTEGER"/>
             <result property="taskId" column="task_id" jdbcType="INTEGER"/>
diff --git a/src/test/java/com/guo/learningprogresstracker/DataSourceTest.java b/src/test/java/com/guo/learningprogresstracker/DataSourceTest.java
index 275e9fd..bec6ac9 100644
--- a/src/test/java/com/guo/learningprogresstracker/DataSourceTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/DataSourceTest.java
@@ -1,6 +1,6 @@
 package com.guo.learningprogresstracker;
 
-import com.guo.learningprogresstracker.domain.entity.TestTableEntity;
+import com.guo.learningprogresstracker.entity.TestTableEntity;
 import com.guo.learningprogresstracker.service.impl.TestTableServiceImpl;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/com/guo/learningprogresstracker/controller/LoginControllerTest.java b/src/test/java/com/guo/learningprogresstracker/controller/LoginControllerTest.java
index 2194d5e..08116ed 100644
--- a/src/test/java/com/guo/learningprogresstracker/controller/LoginControllerTest.java
+++ b/src/test/java/com/guo/learningprogresstracker/controller/LoginControllerTest.java
@@ -1,7 +1,7 @@
 package com.guo.learningprogresstracker.controller;
 
-import com.guo.learningprogresstracker.domain.entity.CommonResult;
-import com.guo.learningprogresstracker.domain.model.LoginBody;
+import com.guo.learningprogresstracker.entity.CommonResult;
+import com.guo.learningprogresstracker.dto.request.LoginBody;
 import com.guo.learningprogresstracker.exception.AppException;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;