武大考务数据对接-同步学生成绩

src/main/java/com/qmth/eds/EdsServiceApplication.java

@@ -1,9 +1,9 @@
 package com.qmth.eds;
 
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
-import com.qmth.eds.auth.EdsAuthenticationService;
-import com.qmth.eds.base.CustomizedSqlInjector;
-import com.qmth.eds.threadPool.MyThreadPool;
+import com.qmth.eds.core.auth.EdsAuthenticationService;
+import com.qmth.eds.core.base.CustomizedSqlInjector;
+import com.qmth.eds.core.threadPool.MyThreadPool;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/qmth/eds/api/BasicSchoolController.java

@@ -1,9 +1,9 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.service.BasicSchoolService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,4 +31,5 @@ public class BasicSchoolController {
     public Result list() {
         return ResultUtil.ok(basicSchoolService.list());
     }
+
 }

src/main/java/com/qmth/eds/api/CloudMarkingExamController.java

@@ -0,0 +1,46 @@
+package com.qmth.eds.api;
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
+import com.qmth.eds.service.CloudMarkingExamService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 学校表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2022-05-14
+ */
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/cloud_marking/exam")
+public class CloudMarkingExamController {
+
+    @Resource
+    private CloudMarkingExamService cloudMarkingExamService;
+
+    /**
+     * 查询云阅卷考试
+     */
+    @ApiOperation(value = "查询云阅卷考试")
+    @PostMapping("/list_exam")
+    public Result listExam() {
+        return ResultUtil.ok(cloudMarkingExamService.listExam());
+    }
+
+    /**
+     * 同步云阅卷考试
+     */
+    @ApiOperation(value = "同步云阅卷考试")
+    @PostMapping("/sync_exam")
+    public Result syncExam() {
+        return ResultUtil.ok(cloudMarkingExamService.syncExam());
+    }
+}

src/main/java/com/qmth/eds/api/CloudMarkingScoreController.java

@@ -0,0 +1,75 @@
+package com.qmth.eds.api;
+
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
+import com.qmth.eds.job.service.JobService;
+import com.qmth.eds.service.CloudMarkingScoreService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+
+/**
+ * <p>
+ * 学校表 前端控制器
+ * </p>
+ *
+ * @author wangliang
+ * @since 2022-05-14
+ */
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/cloud_marking/score")
+public class CloudMarkingScoreController {
+
+    @Resource
+    private CloudMarkingScoreService cloudMarkingScoreService;
+
+    @Resource
+    private JobService jobService;
+
+    /**
+     * 同步云阅卷考试
+     */
+    @ApiOperation(value = "同步考生成绩")
+    @PostMapping("/sync_student_score")
+    public Result syncStudentScore(Long semesterId, Long examTypeId, Integer examId) {
+        if (semesterId == null) {
+            throw ExceptionResultEnum.ERROR.exception("请选择学期");
+        }
+        if (examTypeId == null) {
+            throw ExceptionResultEnum.ERROR.exception("请选择考试类型");
+        }
+        if (examId == null) {
+            throw ExceptionResultEnum.ERROR.exception("请选择云阅卷考试");
+        }
+        jobService.syncStudentScore(semesterId, examTypeId, examId);
+        return ResultUtil.success(true);
+    }
+
+    /**
+     * 查询
+     *
+     * @param semesterId 学期ID
+     * @param examTypeId 考试类型ID
+     * @param examId     云阅卷考试ID
+     * @param pageNumber 分页参数
+     * @param pageSize   分页参数
+     */
+    @ApiOperation(value = "查询")
+    @PostMapping("/page")
+    public Result page(@RequestParam(value = "semesterId", required = false) Long semesterId,
+                       @RequestParam(value = "examTypeId", required = false) Long examTypeId,
+                       @RequestParam(value = "useScene", required = false) String examId,
+                       @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(cloudMarkingScoreService.pageData(semesterId, examTypeId, examId, pageNumber, pageSize));
+    }
+}

src/main/java/com/qmth/eds/api/EasyExcelController.java

@@ -11,8 +11,8 @@ import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.eds.bean.dto.EasyExcelStudentDto;
 import com.qmth.eds.bean.dto.EasyTestSheetDto;
 import com.qmth.eds.bean.dto.ToolsPoiExcelStudentDto;
-import com.qmth.eds.util.JacksonUtil;
-import com.qmth.eds.util.excel.BasicExcelListener;
+import com.qmth.eds.common.util.JacksonUtil;
+import com.qmth.eds.common.util.excel.BasicExcelListener;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;

src/main/java/com/qmth/eds/api/ExamDownloadRecordController.java

@@ -1,11 +1,11 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.UseSceneEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.UseSceneEnum;
 import com.qmth.eds.service.ExamDownloadRecordService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/qmth/eds/api/ExamScheduleTaskController.java

@@ -1,11 +1,11 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.entity.ExamScheduleTask;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.ExamScheduleTask;
 import com.qmth.eds.service.ExamScheduleTaskService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.validation.BindingResult;

src/main/java/com/qmth/eds/api/ExamSemesterController.java

@@ -1,9 +1,11 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.ExamSemester;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.service.ExamSemesterService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_semester")
@@ -22,12 +26,45 @@ public class ExamSemesterController {
     /**
      * 查询
      *
-     * @param schoolId 学校ID
+     * @param pageNumber 分页参数
+     * @param pageSize   分页参数
+     */
+    @ApiOperation(value = "分页")
+    @PostMapping("/page")
+    public Result page(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(examSemesterService.pageData(pageNumber, pageSize));
+    }
+
+    /**
+     * 查询
      */
     @ApiOperation(value = "查询")
     @PostMapping("/list")
-    public Result list(@RequestParam(value = "schoolId", required = false) Long schoolId) {
-        return ResultUtil.ok(examSemesterService.listBySchoolId(schoolId));
+    public Result list() {
+        return ResultUtil.ok(examSemesterService.listBySchoolId());
+    }
+
+    /**
+     * 新增/修改
+     *
+     * @param examSemester 学期
+     */
+    @ApiOperation(value = "新增/修改")
+    @PostMapping("/save")
+    public Result save(@RequestParam(value = "examSemester", required = false) ExamSemester examSemester) {
+        return ResultUtil.ok(examSemesterService.saveData(examSemester));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id ID
+     */
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete")
+    public Result list(@RequestParam(value = "id", required = false) Long id) {
+        return ResultUtil.ok(examSemesterService.delete(id));
     }
 
 }

src/main/java/com/qmth/eds/api/ExamSyncTotalController.java

@@ -3,11 +3,11 @@ package com.qmth.eds.api;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import com.qmth.eds.job.service.JobService;
 import com.qmth.eds.service.ExamSyncTotalService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -68,5 +68,4 @@ public class ExamSyncTotalController {
         jobService.getExamData(false);
         return ResultUtil.success(true);
     }
-
 }

src/main/java/com/qmth/eds/api/ExamTypeController.java

@@ -1,15 +1,21 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.ExamSemester;
+import com.qmth.eds.common.entity.ExamType;
 import com.qmth.eds.service.ExamTypeService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
 
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/exam_type")
@@ -18,6 +24,19 @@ public class ExamTypeController {
     @Resource
     private ExamTypeService examTypeService;
 
+    /**
+     * 查询
+     *
+     * @param pageNumber 分页参数
+     * @param pageSize   分页参数
+     */
+    @ApiOperation(value = "分页")
+    @PostMapping("/page")
+    public Result page(@RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
+                       @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
+        return ResultUtil.ok(examTypeService.pageData(pageNumber, pageSize));
+    }
+
     /**
      * 查询
      */
@@ -27,4 +46,25 @@ public class ExamTypeController {
         return ResultUtil.ok(examTypeService.list());
     }
 
+    /**
+     * 新增/修改
+     *
+     * @param examType 学期
+     */
+    @ApiOperation(value = "新增/修改")
+    @PostMapping("/save")
+    public Result save(@RequestParam(value = "examType", required = false) ExamType examType) {
+        return ResultUtil.ok(examTypeService.saveData(examType));
+    }
+
+    /**
+     * 删除
+     *
+     * @param id ID
+     */
+    @ApiOperation(value = "删除")
+    @PostMapping("/delete")
+    public Result list(@RequestParam(value = "id", required = false) Long id) {
+        return ResultUtil.ok(examTypeService.delete(id));
+    }
 }

src/main/java/com/qmth/eds/api/SysController.java

@@ -7,14 +7,14 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.eds.bean.params.LoginParam;
 import com.qmth.eds.bean.result.EditResult;
 import com.qmth.eds.bean.result.LoginResult;
-import com.qmth.eds.entity.SysUser;
-import com.qmth.eds.enums.AppSourceEnum;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.entity.SysUser;
+import com.qmth.eds.common.enums.AppSourceEnum;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.service.SysUserService;
 import com.qmth.eds.service.TeachcloudCommonService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
-import com.qmth.eds.util.ServletUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
+import com.qmth.eds.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.BindingResult;

src/main/java/com/qmth/eds/api/SysRoleController.java

@@ -1,10 +1,10 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.eds.enums.RoleTypeEnum;
+import com.qmth.eds.common.enums.RoleTypeEnum;
 import com.qmth.eds.service.SysRoleService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/qmth/eds/api/SysUserController.java

@@ -1,11 +1,11 @@
 package com.qmth.eds.api;
 
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.entity.SysUser;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.SysUser;
 import com.qmth.eds.service.SysUserService;
-import com.qmth.eds.util.Result;
-import com.qmth.eds.util.ResultUtil;
+import com.qmth.eds.common.util.Result;
+import com.qmth.eds.common.util.ResultUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.validation.BindingResult;

src/main/java/com/qmth/eds/bean/auth/AuthBean.java

@@ -1,8 +1,8 @@
 package com.qmth.eds.bean.auth;
 
-import com.qmth.eds.entity.BasicSchool;
-import com.qmth.eds.entity.SysOrg;
-import com.qmth.eds.entity.SysRole;
+import com.qmth.eds.common.entity.BasicSchool;
+import com.qmth.eds.common.entity.SysOrg;
+import com.qmth.eds.common.entity.SysRole;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/bean/dto/CloudMarkingScoreDto.java

@@ -0,0 +1,161 @@
+package com.qmth.eds.bean.dto;
+
+import java.io.Serializable;
+
+/**
+ * 云阅卷成绩表
+ */
+public class CloudMarkingScoreDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer examId;
+
+    private String examCode;
+
+    private String examNumber;
+
+    private String studentCode;
+
+    private String name;
+
+    private String subjectCode;
+
+    private String subjectName;
+
+    private String paperType;
+
+    private String college;
+
+    private String className;
+
+    private String teacher;
+
+    private Integer status;
+
+    private String totalScore;
+
+    private String objectiveScore;
+
+    private String subjectiveScore;
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public String getExamCode() {
+        return examCode;
+    }
+
+    public void setExamCode(String examCode) {
+        this.examCode = examCode;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getCollege() {
+        return college;
+    }
+
+    public void setCollege(String college) {
+        this.college = college;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(String teacher) {
+        this.teacher = teacher;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(String totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public String getObjectiveScore() {
+        return objectiveScore;
+    }
+
+    public void setObjectiveScore(String objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public String getSubjectiveScore() {
+        return subjectiveScore;
+    }
+
+    public void setSubjectiveScore(String subjectiveScore) {
+        this.subjectiveScore = subjectiveScore;
+    }
+}

src/main/java/com/qmth/eds/bean/dto/EasyExcelStudentDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.alibaba.excel.annotation.write.style.HeadStyle;
-import com.qmth.eds.util.excel.BasicExcelRow;
+import com.qmth.eds.common.util.excel.BasicExcelRow;
 
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/bean/dto/EasyTestSheetDto.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.HeadFontStyle;
 import com.alibaba.excel.annotation.write.style.HeadStyle;
-import com.qmth.eds.util.excel.BasicExcelRow;
+import com.qmth.eds.common.util.excel.BasicExcelRow;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.DecimalMin;

src/main/java/com/qmth/eds/bean/dto/ExamDownloadRecordDto.java

@@ -2,7 +2,7 @@ package com.qmth.eds.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.entity.ExamDownloadRecord;
+import com.qmth.eds.common.entity.ExamDownloadRecord;
 
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/bean/dto/ExamSyncTotalDownloadDto.java

@@ -1,6 +1,6 @@
 package com.qmth.eds.bean.dto;
 
-import com.qmth.eds.entity.ExamSyncTotal;
+import com.qmth.eds.common.entity.ExamSyncTotal;
 
 public class ExamSyncTotalDownloadDto extends ExamSyncTotal {
 

src/main/java/com/qmth/eds/bean/dto/MenuDto.java

@@ -2,7 +2,7 @@ package com.qmth.eds.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.enums.PrivilegeEnum;
+import com.qmth.eds.common.enums.PrivilegeEnum;
 
 import java.io.Serializable;
 import java.util.Objects;

src/main/java/com/qmth/eds/bean/dto/PrivilegeCacheDto.java

@@ -2,8 +2,8 @@ package com.qmth.eds.bean.dto;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.enums.RoleTypeEnum;
-import com.qmth.eds.enums.PrivilegeEnum;
+import com.qmth.eds.common.enums.RoleTypeEnum;
+import com.qmth.eds.common.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/bean/result/EditResult.java

@@ -3,7 +3,7 @@ package com.qmth.eds.bean.result;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.util.ServletUtil;
+import com.qmth.eds.common.util.ServletUtil;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/bean/result/LoginResult.java

@@ -2,11 +2,11 @@ package com.qmth.eds.bean.result;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.enums.AppSourceEnum;
-import com.qmth.eds.util.ServletUtil;
-import com.qmth.eds.entity.BasicSchool;
-import com.qmth.eds.entity.SysOrg;
-import com.qmth.eds.entity.SysUser;
+import com.qmth.eds.common.enums.AppSourceEnum;
+import com.qmth.eds.common.util.ServletUtil;
+import com.qmth.eds.common.entity.BasicSchool;
+import com.qmth.eds.common.entity.SysOrg;
+import com.qmth.eds.common.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/bean/result/PrivilegeResult.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.eds.bean.dto.PrivilegeCacheDto;
-import com.qmth.eds.enums.PrivilegeEnum;
+import com.qmth.eds.common.enums.PrivilegeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/annotation/ApiJsonObject.java → src/main/java/com/qmth/eds/common/annotation/ApiJsonObject.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.annotation;
+package com.qmth.eds.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/qmth/eds/annotation/ApiJsonProperty.java → src/main/java/com/qmth/eds/common/annotation/ApiJsonProperty.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.annotation;
+package com.qmth.eds.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/qmth/eds/contant/SpringContextHolder.java → src/main/java/com/qmth/eds/common/contant/SpringContextHolder.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.contant;
+package com.qmth.eds.common.contant;
 
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

src/main/java/com/qmth/eds/contant/SystemConstant.java → src/main/java/com/qmth/eds/common/contant/SystemConstant.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.contant;
+package com.qmth.eds.common.contant;
 
 import com.qmth.boot.core.uid.service.UidService;
-import com.qmth.eds.util.ServletUtil;
-import com.qmth.eds.entity.SysUser;
+import com.qmth.eds.common.util.ServletUtil;
+import com.qmth.eds.common.entity.SysUser;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -56,7 +56,7 @@ public class SystemConstant {
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
     public static final int PAGE_NUMBER = 1;
     public static final int PAGE_NUMBER_MIN = 1;
-    public static final int PAGE_SIZE = 10000000;
+    public static final int PAGE_SIZE = 100;
     public static final int PAGE_SIZE_MIN = 10;
     public static final int PAGE_SIZE_MAX = 500;
     public static final int IN_SIZE_MAX = 1000;

src/main/java/com/qmth/eds/entity/BasicAttachment.java → src/main/java/com/qmth/eds/common/entity/BasicAttachment.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/BasicMessage.java → src/main/java/com/qmth/eds/common/entity/BasicMessage.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/BasicSchool.java → src/main/java/com/qmth/eds/common/entity/BasicSchool.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/BasicVerifyCode.java → src/main/java/com/qmth/eds/common/entity/BasicVerifyCode.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/common/entity/CloudMarkingExam.java

@@ -0,0 +1,81 @@
+package com.qmth.eds.common.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 云阅卷考试表
+ */
+@ApiModel(value = "CloudMarkingExam对象", description = "云阅卷考试表")
+public class CloudMarkingExam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "考试id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer examId;
+
+    @ApiModelProperty(value = "名称")
+    private String examName;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("create_id")
+    @ApiModelProperty(value = "创建人")
+    private Long createId;
+
+    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
+    @ApiModelProperty(value = "创建时间")
+    private Long createTime;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
+    public Long getCreateId() {
+        return createId;
+    }
+
+    public void setCreateId(Long createId) {
+        this.createId = createId;
+    }
+
+    public Long getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Long createTime) {
+        this.createTime = createTime;
+    }
+}

src/main/java/com/qmth/eds/common/entity/CloudMarkingScore.java

@@ -0,0 +1,279 @@
+package com.qmth.eds.common.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 云阅卷成绩表
+ */
+@ApiModel(value = "CloudMarkingScore对象", description = "云阅卷成绩表")
+public class CloudMarkingScore implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "学校ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long schoolId;
+
+    @ApiModelProperty(value = "学期ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long semesterId;
+
+    @ApiModelProperty(value = "考试类型ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long examTypeId;
+
+    @ApiModelProperty(value = "云阅卷考试id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer examId;
+
+    @ApiModelProperty(value = "云阅卷考试Code")
+    private String examCode;
+
+    @ApiModelProperty(value = "准考证号")
+    private String examNumber;
+
+    @ApiModelProperty(value = "学号")
+    private String studentCode;
+
+    @ApiModelProperty(value = "学生姓名")
+    private String name;
+
+    @ApiModelProperty(value = "课程代码")
+    private String subjectCode;
+
+    @ApiModelProperty(value = "课程名称")
+    private String subjectName;
+
+    @ApiModelProperty(value = "试卷类型")
+    private String paperType;
+
+    @ApiModelProperty(value = "学院")
+    private String college;
+
+    @ApiModelProperty(value = "班级")
+    private String className;
+
+    @ApiModelProperty(value = "老师")
+    private String teacher;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "原卷地址")
+    private String sheetUrls;
+
+    @ApiModelProperty(value = "总分")
+    private String totalScore;
+
+    @ApiModelProperty(value = "客观题总分")
+    private String objectiveScore;
+
+    @ApiModelProperty(value = "主观题总分")
+    private String subjectiveScore;
+
+    @ApiModelProperty(value = "客观题小题分")
+    private String objectiveScoreDetail;
+
+    @ApiModelProperty(value = "主观题小题分")
+    private String subjectiveScoreDetail;
+
+    @ApiModelProperty(value = "阅卷轨迹")
+    private String markTags;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSemesterId() {
+        return semesterId;
+    }
+
+    public void setSemesterId(Long semesterId) {
+        this.semesterId = semesterId;
+    }
+
+    public Long getExamTypeId() {
+        return examTypeId;
+    }
+
+    public void setExamTypeId(Long examTypeId) {
+        this.examTypeId = examTypeId;
+    }
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public String getExamCode() {
+        return examCode;
+    }
+
+    public void setExamCode(String examCode) {
+        this.examCode = examCode;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getSubjectCode() {
+        return subjectCode;
+    }
+
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+
+    public String getCollege() {
+        return college;
+    }
+
+    public void setCollege(String college) {
+        this.college = college;
+    }
+
+    public String getClassName() {
+        return className;
+    }
+
+    public void setClassName(String className) {
+        this.className = className;
+    }
+
+    public String getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(String teacher) {
+        this.teacher = teacher;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getSheetUrls() {
+        return sheetUrls;
+    }
+
+    public void setSheetUrls(String sheetUrls) {
+        this.sheetUrls = sheetUrls;
+    }
+
+    public String getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(String totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public String getObjectiveScore() {
+        return objectiveScore;
+    }
+
+    public void setObjectiveScore(String objectiveScore) {
+        this.objectiveScore = objectiveScore;
+    }
+
+    public String getSubjectiveScore() {
+        return subjectiveScore;
+    }
+
+    public void setSubjectiveScore(String subjectiveScore) {
+        this.subjectiveScore = subjectiveScore;
+    }
+
+    public String getObjectiveScoreDetail() {
+        return objectiveScoreDetail;
+    }
+
+    public void setObjectiveScoreDetail(String objectiveScoreDetail) {
+        this.objectiveScoreDetail = objectiveScoreDetail;
+    }
+
+    public String getSubjectiveScoreDetail() {
+        return subjectiveScoreDetail;
+    }
+
+    public void setSubjectiveScoreDetail(String subjectiveScoreDetail) {
+        this.subjectiveScoreDetail = subjectiveScoreDetail;
+    }
+
+    public String getMarkTags() {
+        return markTags;
+    }
+
+    public void setMarkTags(String markTags) {
+        this.markTags = markTags;
+    }
+}

src/main/java/com/qmth/eds/common/entity/CloudMarkingScoreForeign.java

@@ -0,0 +1,173 @@
+package com.qmth.eds.common.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * 对外输出成绩表
+ */
+@ApiModel(value = "CloudMarkingScoreForeign对象", description = "对外输出成绩表")
+public class CloudMarkingScoreForeign implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private Long id;
+
+    @ApiModelProperty(value = "学校ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long schoolId;
+
+    @ApiModelProperty(value = "学期ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long semesterId;
+
+    @ApiModelProperty(value = "考试类型ID")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long examTypeId;
+
+    @ApiModelProperty(value = "云阅卷考试id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Integer examId;
+
+    @ApiModelProperty(value = "学年")
+    private String xnm;
+
+    @ApiModelProperty(value = "学期")
+    private String xqm;
+
+    @ApiModelProperty(value = "教学班ID")
+    private String jxbId;
+
+    @ApiModelProperty(value = "课程号")
+    private String kch;
+
+    @ApiModelProperty(value = "课程名称")
+    private String kcmc;
+
+    @ApiModelProperty(value = "学号")
+    private String xh;
+
+    @ApiModelProperty(value = "成绩")
+    private String xmcj;
+
+    public CloudMarkingScoreForeign() {
+    }
+
+    public CloudMarkingScoreForeign(Long schoolId, Long semesterId, Long examTypeId, Integer examId, String xnm, String xqm, String jxbId, String kch, String kcmc, String xh, String xmcj) {
+        this.schoolId = schoolId;
+        this.semesterId = semesterId;
+        this.examTypeId = examTypeId;
+        this.examId = examId;
+        this.xnm = xnm;
+        this.xqm = xqm;
+        this.jxbId = jxbId;
+        this.kch = kch;
+        this.kcmc = kcmc;
+        this.xh = xh;
+        this.xmcj = xmcj;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getSemesterId() {
+        return semesterId;
+    }
+
+    public void setSemesterId(Long semesterId) {
+        this.semesterId = semesterId;
+    }
+
+    public Long getExamTypeId() {
+        return examTypeId;
+    }
+
+    public void setExamTypeId(Long examTypeId) {
+        this.examTypeId = examTypeId;
+    }
+
+    public Integer getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Integer examId) {
+        this.examId = examId;
+    }
+
+    public String getXnm() {
+        return xnm;
+    }
+
+    public void setXnm(String xnm) {
+        this.xnm = xnm;
+    }
+
+    public String getXqm() {
+        return xqm;
+    }
+
+    public void setXqm(String xqm) {
+        this.xqm = xqm;
+    }
+
+    public String getJxbId() {
+        return jxbId;
+    }
+
+    public void setJxbId(String jxbId) {
+        this.jxbId = jxbId;
+    }
+
+    public String getKch() {
+        return kch;
+    }
+
+    public void setKch(String kch) {
+        this.kch = kch;
+    }
+
+    public String getKcmc() {
+        return kcmc;
+    }
+
+    public void setKcmc(String kcmc) {
+        this.kcmc = kcmc;
+    }
+
+    public String getXh() {
+        return xh;
+    }
+
+    public void setXh(String xh) {
+        this.xh = xh;
+    }
+
+    public String getXmcj() {
+        return xmcj;
+    }
+
+    public void setXmcj(String xmcj) {
+        this.xmcj = xmcj;
+    }
+}

src/main/java/com/qmth/eds/entity/ExamDownloadRecord.java → src/main/java/com/qmth/eds/common/entity/ExamDownloadRecord.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/ExamScheduleTask.java → src/main/java/com/qmth/eds/common/entity/ExamScheduleTask.java

@@ -1,13 +1,12 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/entity/ExamSemester.java → src/main/java/com/qmth/eds/common/entity/ExamSemester.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/ExamSyncStudent.java → src/main/java/com/qmth/eds/common/entity/ExamSyncStudent.java

@@ -1,9 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/ExamSyncStudentTemp.java → src/main/java/com/qmth/eds/common/entity/ExamSyncStudentTemp.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

src/main/java/com/qmth/eds/entity/ExamSyncTotal.java → src/main/java/com/qmth/eds/common/entity/ExamSyncTotal.java

@@ -1,8 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/ExamType.java → src/main/java/com/qmth/eds/common/entity/ExamType.java

@@ -1,6 +1,8 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
-import com.qmth.eds.base.BaseEntity;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,9 +16,21 @@ public class ExamType extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long schoolId;
+
     @ApiModelProperty(value = "名称")
     private String name;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public String getName() {
         return name;
     }

src/main/java/com/qmth/eds/entity/SysConfig.java → src/main/java/com/qmth/eds/common/entity/SysConfig.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/SysOrg.java → src/main/java/com/qmth/eds/common/entity/SysOrg.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/SysPrivilege.java → src/main/java/com/qmth/eds/common/entity/SysPrivilege.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

src/main/java/com/qmth/eds/entity/SysRole.java → src/main/java/com/qmth/eds/common/entity/SysRole.java

@@ -1,11 +1,11 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
-import com.qmth.eds.enums.RoleTypeEnum;
+import com.qmth.eds.core.base.BaseEntity;
+import com.qmth.eds.common.enums.RoleTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/SysRolePrivilege.java → src/main/java/com/qmth/eds/common/entity/SysRolePrivilege.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/entity/SysUser.java → src/main/java/com/qmth/eds/common/entity/SysUser.java

@@ -1,11 +1,11 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

src/main/java/com/qmth/eds/entity/SysUserRole.java → src/main/java/com/qmth/eds/common/entity/SysUserRole.java

@@ -1,11 +1,11 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/TBSession.java → src/main/java/com/qmth/eds/common/entity/TBSession.java

@@ -1,11 +1,11 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.enums.AppSourceEnum;
-import com.qmth.eds.util.ServletUtil;
+import com.qmth.eds.common.enums.AppSourceEnum;
+import com.qmth.eds.common.util.ServletUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/TBSyncTask.java → src/main/java/com/qmth/eds/common/entity/TBSyncTask.java

@@ -1,12 +1,13 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
-import com.qmth.eds.enums.TaskResultEnum;
-import com.qmth.eds.enums.TaskStatusEnum;
+import com.qmth.eds.common.enums.TaskTypeEnum;
+import com.qmth.eds.core.base.BaseEntity;
+import com.qmth.eds.common.enums.TaskResultEnum;
+import com.qmth.eds.common.enums.TaskStatusEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -37,6 +38,10 @@ public class TBSyncTask extends BaseEntity implements Serializable {
     @TableField("exam_type_id")
     private Long examTypeId;
 
+    @ApiModelProperty(value = "任务类型")
+    @TableField(value = "type")
+    private TaskTypeEnum type;
+
     @ApiModelProperty(value = "执行时间")
     @TableField(value = "sync_time")
     private Long syncTime;
@@ -60,10 +65,12 @@ public class TBSyncTask extends BaseEntity implements Serializable {
     public TBSyncTask() {
     }
 
-    public TBSyncTask(Long schoolId, Long semesterId, Long examTypeId, Long createId) {
+    public TBSyncTask(Long schoolId, Long semesterId, Long examTypeId, TaskTypeEnum type, String remark, Long createId) {
         this.schoolId = schoolId;
         this.semesterId = semesterId;
         this.examTypeId = examTypeId;
+        this.type = type;
+        this.remark = remark;
         this.status = TaskStatusEnum.INIT;
         this.syncTime = System.currentTimeMillis();
         this.setCreateId(createId);
@@ -94,6 +101,14 @@ public class TBSyncTask extends BaseEntity implements Serializable {
         this.examTypeId = examTypeId;
     }
 
+    public TaskTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(TaskTypeEnum type) {
+        this.type = type;
+    }
+
     public Long getSyncTime() {
         return syncTime;
     }

src/main/java/com/qmth/eds/entity/TBTask.java → src/main/java/com/qmth/eds/common/entity/TBTask.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.base.BaseEntity;
+import com.qmth.eds.core.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/entity/TGError.java → src/main/java/com/qmth/eds/common/entity/TGError.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.entity;
+package com.qmth.eds.common.entity;
 
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/enums/AppSourceEnum.java → src/main/java/com/qmth/eds/common/enums/AppSourceEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.Objects;
 

src/main/java/com/qmth/eds/enums/EnumResult.java → src/main/java/com/qmth/eds/common/enums/EnumResult.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 /**
  * @Date: 2021/3/23.

src/main/java/com/qmth/eds/enums/ExceptionResultEnum.java → src/main/java/com/qmth/eds/common/enums/ExceptionResultEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import com.qmth.boot.api.exception.ApiException;
 import org.springframework.http.HttpStatus;

src/main/java/com/qmth/eds/enums/JobEnum.java → src/main/java/com/qmth/eds/common/enums/JobEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.Objects;
 

src/main/java/com/qmth/eds/enums/MessageEnum.java → src/main/java/com/qmth/eds/common/enums/MessageEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/qmth/eds/enums/PrivilegeEnum.java → src/main/java/com/qmth/eds/common/enums/PrivilegeEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/qmth/eds/enums/PrivilegePropertyEnum.java → src/main/java/com/qmth/eds/common/enums/PrivilegePropertyEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.Objects;
 

src/main/java/com/qmth/eds/enums/RoleTypeEnum.java → src/main/java/com/qmth/eds/common/enums/RoleTypeEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/qmth/eds/enums/TaskResultEnum.java → src/main/java/com/qmth/eds/common/enums/TaskResultEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.Objects;
 

src/main/java/com/qmth/eds/enums/TaskStatusEnum.java → src/main/java/com/qmth/eds/common/enums/TaskStatusEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/qmth/eds/common/enums/TaskTypeEnum.java

@@ -0,0 +1,53 @@
+package com.qmth.eds.common.enums;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 任务类型enum
+ */
+public enum TaskTypeEnum {
+
+    WHU_TEACH_DATA("同步武大考务数据"),
+
+    CLOUD_MARKING_STUDENT_SCORE("同步云阅卷考生成绩");
+
+    private String title;
+
+    private TaskTypeEnum(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 状态转换 toName
+     *
+     * @param title
+     * @return
+     */
+    public static String convertToName(String title) {
+        for (TaskTypeEnum e : TaskTypeEnum.values()) {
+            if (Objects.equals(title, e.getTitle())) {
+                return e.name();
+            }
+        }
+        return null;
+    }
+
+    public static List<EnumResult> listTypes() {
+        List<EnumResult> list = new ArrayList<>();
+        for (TaskTypeEnum value : TaskTypeEnum.values()) {
+            EnumResult result = new EnumResult();
+            result.setName(value.name());
+            result.setOrdinal(value.ordinal());
+            result.setCode(null);
+            result.setDesc(value.getTitle());
+            list.add(result);
+        }
+        return list;
+    }
+}

src/main/java/com/qmth/eds/enums/UploadFileEnum.java → src/main/java/com/qmth/eds/common/enums/UploadFileEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.Objects;
 

src/main/java/com/qmth/eds/enums/UseSceneEnum.java → src/main/java/com/qmth/eds/common/enums/UseSceneEnum.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.enums;
+package com.qmth.eds.common.enums;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/qmth/eds/common/tools/CloudMarkingUtil.java

@@ -0,0 +1,172 @@
+package com.qmth.eds.common.tools;
+
+import com.alibaba.fastjson.JSONObject;
+import com.qmth.boot.tools.signature.SignatureEntity;
+import com.qmth.boot.tools.signature.SignatureType;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.util.HttpKit;
+import com.qmth.eds.core.config.DictionaryConfig;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 云阅卷接口工具类
+ */
+@Service
+public class CloudMarkingUtil {
+
+    private static final String SUCCESS = "success";
+
+    private static final String EXAMID = "examId";
+    private static final String EXAM_NUMBER = "examNumber";
+    private static final String STUDENT_CODE = "studentCode";
+    private static final String COLLEGE = "college";
+    private static final String CLASS_NAME = "className";
+    private static final String TEACHER = "teacher";
+    private static final String SUBJECT_CODE = "subjectCode";
+
+
+    @Resource
+    DictionaryConfig dictionaryConfig;
+
+    /**
+     * 考试成绩考生查询接口
+     *
+     * @param pageNo   分页参数
+     * @param pageSize 分页参数
+     */
+    public List<JSONObject> getExam(int pageNo, int pageSize) {
+        Map<String, String> paramMap = new HashMap<>();
+        paramMap.put("pageNumber", String.valueOf(pageNo));
+        paramMap.put("pageSize", String.valueOf(pageSize));
+
+        String yyjRootUrl = dictionaryConfig.cloudMarkingDomain().getRootUrl();
+        String examUrl = dictionaryConfig.cloudMarkingDomain().getExamUrl();
+
+        if (StringUtils.isAnyBlank(yyjRootUrl, examUrl)) {
+            throw ExceptionResultEnum.ERROR.exception("考试查询接口url未设置");
+        }
+
+        Map<String, String> header = createHeader(examUrl);
+        //请求
+        String examObject;
+        try {
+            examObject = HttpKit.sendPost(yyjRootUrl + examUrl, paramMap, header);
+        } catch (Exception e) {
+            throw ExceptionResultEnum.ERROR.exception("查询考试接口调用异常");
+        }
+        return JSONObject.parseArray(JSONObject.toJSON(examObject).toString(), JSONObject.class);
+    }
+
+    /**
+     * 考试成绩考生数量查询接口
+     *
+     * @param mapSource 参数
+     */
+    public int getStudentCount(Map<String, String> mapSource) {
+        Map<String, String> map = paramMap(mapSource);
+
+        String yyjRootUrl = dictionaryConfig.cloudMarkingDomain().getRootUrl();
+        String studentCountUrl = dictionaryConfig.cloudMarkingDomain().getStudentCountUrl();
+
+        if (StringUtils.isAnyBlank(yyjRootUrl, studentCountUrl)) {
+            throw ExceptionResultEnum.ERROR.exception("考试成绩考生数量查询接口url未设置");
+        }
+
+        //header
+        Map<String, String> headerMap = createHeader(studentCountUrl);
+        //请求
+        String res = HttpKit.sendPost(yyjRootUrl + studentCountUrl, map, headerMap);
+        if (StringUtils.isNotBlank(res)) {
+            JSONObject object = JSONObject.parseObject(res);
+            return Integer.parseInt(object.get("totalCount").toString());
+        }
+        return 0;
+    }
+
+    /**
+     * 考试成绩考生查询接口
+     *
+     * @param map      参数
+     * @param pageNo   分页参数
+     * @param pageSize 分页参数
+     */
+    public List<JSONObject> getStudentScore(Map<String, String> map, int pageNo, int pageSize) {
+        Map<String, String> paramMap = paramMap(map);
+
+        paramMap.put("pageNumber", String.valueOf(pageNo));
+        paramMap.put("pageSize", String.valueOf(pageSize));
+
+        String yyjRootUrl = dictionaryConfig.cloudMarkingDomain().getRootUrl();
+        String studentScoreUrl = dictionaryConfig.cloudMarkingDomain().getStudentScoreUrl();
+
+        if (StringUtils.isAnyBlank(yyjRootUrl, studentScoreUrl)) {
+            throw ExceptionResultEnum.ERROR.exception("考试成绩查询接口url未设置");
+        }
+
+        Map<String, String> header = createHeader(studentScoreUrl);
+        //请求
+        String studentObject = HttpKit.sendPost(yyjRootUrl + studentScoreUrl, paramMap, header);
+        return JSONObject.parseArray(JSONObject.toJSON(studentObject).toString(), JSONObject.class);
+    }
+
+    /**
+     * 云阅卷接口请求header
+     *
+     * @param url url
+     */
+    private Map<String, String> createHeader(String url) {
+        long time = System.currentTimeMillis();
+        Map<String, String> headerMap = new HashMap<>();
+        headerMap.put("time", String.valueOf(time));
+        String accessKey = dictionaryConfig.cloudMarkingDomain().getAccessKey();
+        String accessSecret = dictionaryConfig.cloudMarkingDomain().getAccessSecret();
+        String signature = SignatureEntity.build(SignatureType.SECRET, "POST", url, time, accessKey, accessSecret);
+        headerMap.put("authorization", signature);
+
+        return headerMap;
+    }
+
+    private Map<String, String> paramMap(Map<String, String> mapSource) {
+        Map<String, String> map = new HashMap<>();
+        Integer examId = Integer.valueOf(mapSource.get(EXAMID));
+        if (Objects.nonNull(examId)) {
+            map.put(EXAMID, String.valueOf(examId));
+        }
+        String examCode = mapSource.get("examCode");
+        if (StringUtils.isNotBlank(examCode)) {
+            map.put("examCode", examCode);
+        }
+        String examNumber = mapSource.get(EXAM_NUMBER);
+        if (StringUtils.isNotBlank(examNumber)) {
+            map.put(EXAM_NUMBER, examNumber);
+        }
+        String studentCode = mapSource.get(STUDENT_CODE);
+        if (StringUtils.isNotBlank(studentCode)) {
+            map.put(STUDENT_CODE, studentCode);
+        }
+        String subjectCode = mapSource.get(SUBJECT_CODE);
+        if (StringUtils.isNotBlank(subjectCode)) {
+            map.put(SUBJECT_CODE, subjectCode);
+        }
+        String college = mapSource.get(COLLEGE);
+        if (StringUtils.isNotBlank(college)) {
+            map.put(COLLEGE, college);
+        }
+        String className = mapSource.get(CLASS_NAME);
+        if (StringUtils.isNotBlank(className)) {
+            map.put(CLASS_NAME, className);
+        }
+        String teacher = mapSource.get(TEACHER);
+        if (StringUtils.isNotBlank(teacher)) {
+            map.put(TEACHER, teacher);
+        }
+        return map;
+    }
+}

src/main/java/com/qmth/eds/util/WuhanUniversityUtils.java → src/main/java/com/qmth/eds/common/tools/WuhanUniversityUtils.java

@@ -1,10 +1,11 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.tools;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.qmth.eds.config.DictionaryConfig;
-import com.qmth.eds.entity.ExamSyncStudentTemp;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.util.HttpKit;
+import com.qmth.eds.core.config.DictionaryConfig;
+import com.qmth.eds.common.entity.ExamSyncStudentTemp;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.service.impl.DataSyncServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;

src/main/java/com/qmth/eds/util/AesUtil.java → src/main/java/com/qmth/eds/common/util/AesUtil.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/qmth/eds/util/AuthUtil.java → src/main/java/com/qmth/eds/common/util/AuthUtil.java

@@ -1,18 +1,19 @@
-package com.qmth.eds.util;//package com.qmth.teachcloud.data.store.util;
+package com.qmth.eds.common.util;//package com.qmth.teachcloud.data.store.util;
 
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.core.enums.Platform;
+import com.qmth.boot.tools.signature.SignatureEntity;
 import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.eds.enums.RoleTypeEnum;
 import com.qmth.eds.bean.auth.AuthBean;
 import com.qmth.eds.bean.auth.ExpireTimeBean;
-import com.qmth.eds.contant.SpringContextHolder;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.entity.SysUser;
-import com.qmth.eds.entity.TBSession;
-import com.qmth.eds.enums.ExceptionResultEnum;
-import com.qmth.eds.enums.PrivilegePropertyEnum;
+import com.qmth.eds.common.contant.SpringContextHolder;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.SysUser;
+import com.qmth.eds.common.entity.TBSession;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.enums.PrivilegePropertyEnum;
+import com.qmth.eds.common.enums.RoleTypeEnum;
 import com.qmth.eds.service.CommonCacheService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,9 +92,9 @@ public class AuthUtil {
 //            throw new BusinessException(ExceptionResultEnum.AUTHORIZATION_ERROR);
 //        }
         //测试
-        final SignatureEntityTest info = SignatureEntityTest.parse(authorization);
+//        final SignatureEntityTest info = SignatureEntityTest.parse(authorization);
         //校验签名信息
-//        final SignatureInfo info = SignatureInfo.parse(method.toLowerCase(), url, time, authorization);
+        final SignatureEntity info = SignatureEntity.parse(authorization, method.toLowerCase(), url, time);
         if (info == null) {
             log.warn("Authorization faile: signature decode error");
             throw ExceptionResultEnum.AUTHORIZATION_ERROR.exception();

src/main/java/com/qmth/eds/util/Base64Util.java → src/main/java/com/qmth/eds/common/util/Base64Util.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 
 import java.util.Base64;
 

src/main/java/com/qmth/eds/util/FileStoreUtil.java → src/main/java/com/qmth/eds/common/util/FileStoreUtil.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import com.qmth.boot.core.fss.service.FileService;
 import com.qmth.boot.core.fss.store.FileStore;
-import com.qmth.eds.enums.ExceptionResultEnum;
-import com.qmth.eds.enums.UploadFileEnum;
-import com.qmth.eds.config.DictionaryConfig;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.enums.UploadFileEnum;
+import com.qmth.eds.core.config.DictionaryConfig;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;

src/main/java/com/qmth/eds/util/FileUtil.java → src/main/java/com/qmth/eds/common/util/FileUtil.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/main/java/com/qmth/eds/util/HexUtils.java → src/main/java/com/qmth/eds/common/util/HexUtils.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;

src/main/java/com/qmth/eds/util/HttpKit.java → src/main/java/com/qmth/eds/common/util/HttpKit.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/qmth/eds/util/HttpUtil.java → src/main/java/com/qmth/eds/common/util/HttpUtil.java

@@ -1,7 +1,7 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import org.apache.commons.io.FileUtils;
 import org.apache.http.Consts;
 import org.apache.http.HttpEntity;

src/main/java/com/qmth/eds/util/IpUtil.java → src/main/java/com/qmth/eds/common/util/IpUtil.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/qmth/eds/util/JacksonUtil.java → src/main/java/com/qmth/eds/common/util/JacksonUtil.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/com/qmth/eds/util/MD5Util.java → src/main/java/com/qmth/eds/common/util/MD5Util.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

src/main/java/com/qmth/eds/util/RSAUtils.java → src/main/java/com/qmth/eds/common/util/RSAUtils.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;

src/main/java/com/qmth/eds/util/RedisUtil.java → src/main/java/com/qmth/eds/common/util/RedisUtil.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 

src/main/java/com/qmth/eds/util/Result.java → src/main/java/com/qmth/eds/common/util/Result.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import java.io.Serializable;
 

src/main/java/com/qmth/eds/util/ResultUtil.java → src/main/java/com/qmth/eds/common/util/ResultUtil.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import cn.hutool.http.HttpStatus;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 
 import java.util.Collections;
 

src/main/java/com/qmth/eds/util/ServletUtil.java → src/main/java/com/qmth/eds/common/util/ServletUtil.java

@@ -1,9 +1,9 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.enums.ExceptionResultEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.context.request.RequestContextHolder;

src/main/java/com/qmth/eds/util/SessionUtil.java → src/main/java/com/qmth/eds/common/util/SessionUtil.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.Objects;

src/main/java/com/qmth/eds/util/ShaUtils.java → src/main/java/com/qmth/eds/common/util/ShaUtils.java

@@ -1,6 +1,6 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 
 import java.security.MessageDigest;
 

src/main/java/com/qmth/eds/util/SmsUtils.java → src/main/java/com/qmth/eds/common/util/SmsUtils.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util;
+package com.qmth.eds.common.util;
 
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -8,8 +8,8 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import com.qmth.eds.config.DictionaryConfig;
-import com.qmth.eds.enums.MessageEnum;
+import com.qmth.eds.core.config.DictionaryConfig;
+import com.qmth.eds.common.enums.MessageEnum;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

src/main/java/com/qmth/eds/util/excel/BasicExcelListener.java → src/main/java/com/qmth/eds/common/util/excel/BasicExcelListener.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util.excel;
+package com.qmth.eds.common.util.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.context.AnalysisContext;

src/main/java/com/qmth/eds/util/excel/BasicExcelRow.java → src/main/java/com/qmth/eds/common/util/excel/BasicExcelRow.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.util.excel;
+package com.qmth.eds.common.util.excel;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/qmth/eds/aspect/ApiControllerAspect.java → src/main/java/com/qmth/eds/core/aspect/ApiControllerAspect.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.aspect;
+package com.qmth.eds.core.aspect;
 
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.util.JacksonUtil;
-import com.qmth.eds.util.ResultUtil;
-import com.qmth.eds.util.ServletUtil;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.util.JacksonUtil;
+import com.qmth.eds.common.util.ResultUtil;
+import com.qmth.eds.common.util.ServletUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

src/main/java/com/qmth/eds/auth/EdsAuthenticationService.java → src/main/java/com/qmth/eds/core/auth/EdsAuthenticationService.java

@@ -1,20 +1,20 @@
-package com.qmth.eds.auth;
+package com.qmth.eds.core.auth;
 
 import com.qmth.boot.core.enums.Platform;
 import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.boot.core.security.service.AuthorizationService;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.eds.bean.auth.AuthBean;
-import com.qmth.eds.contant.SystemConstant;
-import com.qmth.eds.entity.SysUser;
-import com.qmth.eds.entity.TBSession;
-import com.qmth.eds.enums.ExceptionResultEnum;
-import com.qmth.eds.enums.PrivilegePropertyEnum;
-import com.qmth.eds.enums.RoleTypeEnum;
+import com.qmth.eds.common.contant.SystemConstant;
+import com.qmth.eds.common.entity.SysUser;
+import com.qmth.eds.common.entity.TBSession;
+import com.qmth.eds.common.enums.ExceptionResultEnum;
+import com.qmth.eds.common.enums.PrivilegePropertyEnum;
+import com.qmth.eds.common.enums.RoleTypeEnum;
 import com.qmth.eds.service.CommonCacheService;
-import com.qmth.eds.util.RedisUtil;
-import com.qmth.eds.util.ServletUtil;
-import com.qmth.eds.config.DictionaryConfig;
+import com.qmth.eds.common.util.RedisUtil;
+import com.qmth.eds.common.util.ServletUtil;
+import com.qmth.eds.core.config.DictionaryConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;

src/main/java/com/qmth/eds/auth/EdsSession.java → src/main/java/com/qmth/eds/core/auth/EdsSession.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.auth;
+package com.qmth.eds.core.auth;
 
 import com.qmth.boot.core.security.model.AccessEntity;
 import com.qmth.boot.tools.signature.SignatureType;
-import com.qmth.eds.contant.SpringContextHolder;
-import com.qmth.eds.entity.TBSession;
-import com.qmth.eds.util.RedisUtil;
+import com.qmth.eds.common.contant.SpringContextHolder;
+import com.qmth.eds.common.entity.TBSession;
+import com.qmth.eds.common.util.RedisUtil;
 
 import java.util.Collection;
 

src/main/java/com/qmth/eds/base/BaseEntity.java → src/main/java/com/qmth/eds/core/base/BaseEntity.java

@@ -1,11 +1,11 @@
-package com.qmth.eds.base;
+package com.qmth.eds.core.base;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.eds.contant.SystemConstant;
+import com.qmth.eds.common.contant.SystemConstant;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

src/main/java/com/qmth/eds/base/BaseListPage.java → src/main/java/com/qmth/eds/core/base/BaseListPage.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base;
+package com.qmth.eds.core.base;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/base/BasePage.java → src/main/java/com/qmth/eds/core/base/BasePage.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base;
+package com.qmth.eds.core.base;
 
 import io.swagger.annotations.ApiModelProperty;
 

src/main/java/com/qmth/eds/base/CustomBaseMapper.java → src/main/java/com/qmth/eds/core/base/CustomBaseMapper.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base;
+package com.qmth.eds.core.base;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/qmth/eds/base/CustomizedSqlInjector.java → src/main/java/com/qmth/eds/core/base/CustomizedSqlInjector.java

@@ -1,10 +1,10 @@
-package com.qmth.eds.base;
+package com.qmth.eds.core.base;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
-import com.qmth.eds.base.method.InsertBatch;
-import com.qmth.eds.base.method.InsertOrUpdateBath;
-import com.qmth.eds.base.method.UpdateBatch;
+import com.qmth.eds.core.base.method.InsertBatch;
+import com.qmth.eds.core.base.method.InsertOrUpdateBath;
+import com.qmth.eds.core.base.method.UpdateBatch;
 
 import java.util.List;
 

src/main/java/com/qmth/eds/base/method/InsertBatch.java → src/main/java/com/qmth/eds/core/base/method/InsertBatch.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base.method;
+package com.qmth.eds.core.base.method;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;

src/main/java/com/qmth/eds/base/method/InsertOrUpdateBath.java → src/main/java/com/qmth/eds/core/base/method/InsertOrUpdateBath.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base.method;
+package com.qmth.eds.core.base.method;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;

src/main/java/com/qmth/eds/base/method/UpdateBatch.java → src/main/java/com/qmth/eds/core/base/method/UpdateBatch.java

@@ -1,4 +1,4 @@
-package com.qmth.eds.base.method;
+package com.qmth.eds.core.base.method;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;