代码精简

README.md

@@ -1,25 +1,19 @@
-逸教云平台
+试卷电子化平台
 
 项目模块：
-1.distributed-print
-分布式印刷项目
+1.paper-library
+试卷电子化项目
    
-2.distributed-print-business
-分布式印刷业务
+2.paper-library-business
+试卷电子化业务
 
-3.teachcloud-print-common
-项目公用
+3.paper-library-common
+试卷电子化项目公用
 
-4.teachcloud-print-common-api
-项目公用api
+4.paper-library-common-api
+试卷电子化项目公用api
 
-5.teachcloud-report
-教研分析报告
-
-6.teachcloud-report-business
-教研分析报告业务
-
-7.teachcloud-task
+5.paper-library
 分布式job
 
 项目框架：

paper-library-business/pom.xml

@@ -43,23 +43,6 @@
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itext-asian</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>javase</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>

paper-library-business/src/main/java/com/qmth/paper/library/business/bean/result/EditResult.java

@@ -3,7 +3,6 @@ package com.qmth.paper.library.business.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.paper.library.common.enums.PageSizeEnum;
 import com.qmth.paper.library.common.util.ServletUtil;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -35,17 +34,6 @@ public class EditResult implements Serializable {
     @ApiModelProperty(value = "pdf总页数")
     Integer pages;
 
-    @ApiModelProperty(value = "pdf格式")
-    PageSizeEnum pageSize;
-
-    public PageSizeEnum getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(PageSizeEnum pageSize) {
-        this.pageSize = pageSize;
-    }
-
     public String getUrl() {
         return url;
     }
@@ -110,13 +98,6 @@ public class EditResult implements Serializable {
         this.pages = pages;
     }
 
-    public EditResult(Long id, String url, Integer pages, PageSizeEnum pageSize) {
-        this.id = id;
-        this.url = url;
-        this.pages = pages;
-        this.pageSize = pageSize;
-    }
-
     public EditResult(String url) {
         this.url = url;
     }

paper-library-business/src/main/java/com/qmth/paper/library/business/enums/EnumType.java

@@ -6,28 +6,9 @@ package com.qmth.paper.library.business.enums;
 public enum EnumType {
 
     BACKUP_METHOD("备份方式"),
-    CLASSIFY("模板类型"),
-    DRAW_RULE("抽卷规则"),
-    EXAM_NUMBER_STYLE("考号版式"),
-    EXAM_STATUS("命题状态类型"),
-    PAPER_TYPE("AB卷版式"),
-    PRINT_METHOD("印刷方式"),
     PRIVILEGE_TYPE("菜单类型"),
-    REQUIRED_FIELDS("考务必选字段"),
-    REVIEW_STATUS("审核状态类型"),
     ROLE_TYPE("内置角色类型"),
-    STORAGE_LEVEL("附件存储级别"),
-    STORAGE_TYPE("附件存储方式"),
-    TEMPLATE_TYPE("模板类型"),
-    CARD_REQUIRED_FIELDS("题卡规则必选字段"),
-    ORG_CENTER_TYPE_ENUM("机构用户中心类型"),
-    MAKE_METHOD("题卡制作方式"),
-    PRINT_PLAN_STATUS_ENUM("印刷计划状态类型"),
-    EXAM_DETAIL_STATUS_ENUM("考场状态类型"),
-    EXAMINATION_DB_FIELDS_ENUM("考务数据导入-数据库所必须字段枚举"),
-    CARD_TYPE("题卡类型"),
     SYSTEM_CODE_ENUM("系统编码类型"),
-    PUSH_TYPE_ENUM("同步云阅卷类型"),
     TB_TASK_STATUS("同步云阅卷日志表状态类型");
 
     EnumType(String desc) {

paper-library-business/src/main/java/com/qmth/paper/library/business/service/PaperLibraryCommonService.java

@@ -59,15 +59,6 @@ public interface PaperLibraryCommonService {
      */
     boolean sysOrgRemove(Long id);
 
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    public void resetCreatePdfTask() throws IOException;
-
-
     /**
      * 保存任务
      *
@@ -93,6 +84,4 @@ public interface PaperLibraryCommonService {
      * @return
      */
     public String saveTaskAttachment(ByteArrayOutputStream fos, boolean oss) throws IOException;
-
-
 }

paper-library-business/src/main/java/com/qmth/paper/library/business/service/impl/PaperLibraryCommonServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.itextpdf.text.pdf.PdfReader;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.paper.library.business.service.PaperLibraryCommonService;
-import com.qmth.paper.library.common.bean.dto.MqDto;
 import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.config.DictionaryConfig;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
@@ -239,47 +238,6 @@ public class PaperLibraryCommonServiceImpl implements PaperLibraryCommonService
         if (sysOrgs != null && sysOrgs.size() > 0) {
             throw ExceptionResultEnum.ERROR.exception("该机构下有子机构，不能删除");
         }
-
-//        QueryWrapper<BasicTemplateOrg> queryWrapper = new QueryWrapper<>();
-//        queryWrapper.lambda().eq(BasicTemplateOrg::getOrgId, id);
-//        List<BasicTemplateOrg> basicTemplateOrgs = basicTemplateOrgService.list(queryWrapper);
-//        if (basicTemplateOrgs != null && basicTemplateOrgs.size() > 0) {
-//            throw ExceptionResultEnum.ERROR.exception("机构已绑定，不能删除");
-//        }
-    }
-
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    @Override
-    @Transactional
-    public void resetCreatePdfTask() throws IOException {
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().eq(TBTask::getType, TaskTypeEnum.CREATE_PDF)
-                .eq(TBTask::getStatus, TaskStatusEnum.FINISH).isNotNull(TBTask::getStatus)
-                .eq(TBTask::getResult, TaskResultEnum.ERROR).last("limit 0,100");
-        List<TBTask> tbTasks = tbTaskService.list(tbTaskQueryWrapper);
-        if (Objects.nonNull(tbTasks) && tbTasks.size() > 0) {
-            for (TBTask tbTask : tbTasks) {
-                if (tbTask.getResetCount() < dictionaryConfig.sysDomain().getAutoCreatePdfResetMaxCount()) {
-                    Map<String, Object> map = new HashMap<>();
-//                    tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
-                    if (Objects.nonNull(tbTask.getRemark())) {
-                        JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
-                        ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));
-                        map.computeIfAbsent("examDetailCourseIds", v -> Arrays.asList(arraysParams.getIds()));
-                    }
-                    map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
-                    map.computeIfAbsent(SystemConstant.USER, v -> sysUserService.getById(tbTask.getCreateId()));
-//                    asyncCreatePdfTempleteService.createPdf(map, null);
-                    MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(tbTask.getId()));
-                    redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-                }
-            }
-        }
     }
 
     /**

paper-library-business/src/main/java/com/qmth/paper/library/business/templete/importData/AsyncImportTaskTemplete.java

@@ -122,9 +122,9 @@ public abstract class AsyncImportTaskTemplete {
             byte[] bookByteAry = out.toByteArray();
             inputStream = new ByteArrayInputStream(bookByteAry);
             StringJoiner stringJoiner = new StringJoiner("");
-            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
-                path = path.replaceAll(UploadFileEnum.PDF.getTitle(), UploadFileEnum.FILE.getTitle());
-            }
+//            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
+//                path = path.replaceAll(UploadFileEnum.PDF.getTitle(), UploadFileEnum.FILE.getTitle());
+//            }
 
             path = path.substring(0, path.lastIndexOf("/") + 1);
             stringJoiner.add(path).add(SystemConstant.getUuid()).add(TXT_PREFIX).toString();
@@ -176,12 +176,12 @@ public abstract class AsyncImportTaskTemplete {
                 log.error(SystemConstant.LOG_ERROR, e);
             }
             tbTask.setStatus(TaskStatusEnum.FINISH);
-            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
-                tbTask.setResultFilePath(tbTask.getImportFilePath());
-                tbTask.setImportFileName(null);
-                tbTask.setImportFilePath(null);
-                tbTask.setErrorMessage(null);
-            }
+//            if (tbTask.getType() == TaskTypeEnum.CREATE_PDF) {
+//                tbTask.setResultFilePath(tbTask.getImportFilePath());
+//                tbTask.setImportFileName(null);
+//                tbTask.setImportFilePath(null);
+//                tbTask.setErrorMessage(null);
+//            }
             tbTaskService.updateById(tbTask);
         }
     }

paper-library-common-api/src/test/java/com/qmth/paper/library/common/api/TeachcloudCommonApiApplicationTests.java

@@ -1,13 +0,0 @@
-package com.qmth.paper.library.common.api;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class TeachcloudCommonApiApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

paper-library-common/pom.xml

@@ -18,10 +18,6 @@
             <groupId>com.qmth.boot</groupId>
             <artifactId>starter-api</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.qmth.boot</groupId>-->
-<!--            <artifactId>core-cache</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>com.qmth.boot</groupId>
             <artifactId>data-redis</artifactId>
@@ -110,10 +106,6 @@
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.github.xiaoymin</groupId>-->
-<!--            <artifactId>swagger-bootstrap-ui</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>com.aliyun.oss</groupId>
             <artifactId>aliyun-sdk-oss</artifactId>

paper-library-common/src/main/java/com/qmth/paper/library/common/annotation/OperationLogDetail.java

@@ -38,7 +38,7 @@ public @interface OperationLogDetail {
     OperationUnitEnum operationUnit() default OperationUnitEnum.UN_KNOW;
 
     /**
-     * 日志记录 - 被记录日志的系统（默认为'分布式印刷系统'）
+     * 日志记录 - 被记录日志的系统（默认为'试卷电子化系统日志'）
      */
-    SystemEnum system() default SystemEnum.DISTRIBUTED_PRINT;
+    SystemEnum system() default SystemEnum.PAPER_LIBRARY;
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/dto/CloudUserPushStatusDto.java

@@ -1,69 +0,0 @@
-package com.qmth.paper.library.common.bean.dto;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 云阅卷用户推送状态
- * @Author: CaoZixuan
- * @Date: 2022-08-08
- */
-public class CloudUserPushStatusDto {
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    @ApiModelProperty(value = "用户id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "评卷员推送状态")
-    private String markerStatus;
-
-    @ApiModelProperty(value = "科组长推送状态")
-    private String markerLeaderStatus;
-
-    @ApiModelProperty(value = "同步状态")
-    private String syncStatus;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getMarkerStatus() {
-        return markerStatus;
-    }
-
-    public void setMarkerStatus(String markerStatus) {
-        this.markerStatus = markerStatus;
-    }
-
-    public String getMarkerLeaderStatus() {
-        return markerLeaderStatus;
-    }
-
-    public void setMarkerLeaderStatus(String markerLeaderStatus) {
-        this.markerLeaderStatus = markerLeaderStatus;
-    }
-
-    public String getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(String syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/dto/MqDto.java

@@ -1,167 +0,0 @@
-package com.qmth.paper.library.common.bean.dto;
-
-import com.qmth.paper.library.common.enums.MqTagEnum;
-import com.qmth.paper.library.common.contant.SystemConstant;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @Description: mq dto
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/1
- */
-public class MqDto implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    private String id;//消息id
-    private String topic;//消息topic
-    private String tag;//消息tag
-    private Long timestamp;//时间戳
-    private Object body;//消息体
-    private MqTagEnum type;//消息类型
-    private String objId;//关联业务id
-    private String objName;//关联业务名称
-    private Integer ack;//ack
-    private Integer sequence;//序号
-    private Map<String, Object> properties;//扩展类型
-    private Integer reconsume = SystemConstant.REDIS_MQ_MAX_RECONSUME;//重试次数
-
-    public MqDto() {
-
-    }
-
-
-    public MqDto(String topic, String tag, String objId, Long timestamp) {
-        this.topic = topic;
-        this.tag = tag;
-        this.body = tag;
-        this.type = MqTagEnum.valueOf(tag);
-        this.objId = objId;
-        this.timestamp = timestamp;
-        this.id = SystemConstant.getUuid();
-    }
-
-    public MqDto(String topic, Object body, String objId) {
-        this.topic = topic;
-        this.tag = topic;
-        this.body = body;
-        this.type = MqTagEnum.valueOf(MqTagEnum.convertToName(tag));
-        this.objId = objId;
-        this.timestamp = System.currentTimeMillis();
-        this.id = SystemConstant.getUuid();
-    }
-
-    public MqDto(String topic, String tag, Object body, MqTagEnum type, String objId, Map properties) {
-        this.topic = topic;
-        this.tag = tag;
-        this.body = body;
-        this.type = type;
-        this.objId = objId;
-        this.timestamp = System.currentTimeMillis();
-        this.id = SystemConstant.getUuid();
-        this.properties = properties;
-    }
-
-    public Integer getReconsume() {
-        return reconsume;
-    }
-
-    public void setReconsume(Integer reconsume) {
-        this.reconsume = reconsume;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public MqTagEnum getType() {
-        return type;
-    }
-
-    public void setType(MqTagEnum type) {
-        this.type = type;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public Long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public Object getBody() {
-        return body;
-    }
-
-    public void setBody(Object body) {
-        this.body = body;
-    }
-
-    public String getObjId() {
-        return objId;
-    }
-
-    public void setObjId(String objId) {
-        this.objId = objId;
-    }
-
-    public String getObjName() {
-        return objName;
-    }
-
-    public void setObjName(String objName) {
-        this.objName = objName;
-    }
-
-    public Map<String, Object> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, Object> properties) {
-        this.properties = properties;
-    }
-
-    public Integer getAck() {
-        return ack;
-    }
-
-    public void setAck(Integer ack) {
-        this.ack = ack;
-    }
-
-    public Integer getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(Integer sequence) {
-        this.sequence = sequence;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/dto/UserDto.java

@@ -1,10 +1,7 @@
 package com.qmth.paper.library.common.bean.dto;
 
-
-import com.qmth.paper.library.common.enums.userPush.UserPushResultEnum;
 import com.qmth.paper.library.common.entity.BasicCourse;
 import com.qmth.paper.library.common.entity.SysRole;
-import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
 
@@ -23,15 +20,7 @@ public class UserDto {
     private String orgId;
     private String orgName;
     private String code;
-
-    @ApiModelProperty(value = "评卷员推送状态")
-    private UserPushResultEnum markerStatus;
-
-    @ApiModelProperty(value = "科组长推送状态")
-    private UserPushResultEnum markerLeaderStatus;
-
     private List<SysRole> roles;
-
     private List<BasicCourse> courses;
 
     public void setCode(String code) {
@@ -129,20 +118,4 @@ public class UserDto {
     public String getCode() {
         return code;
     }
-
-    public UserPushResultEnum getMarkerStatus() {
-        return markerStatus;
-    }
-
-    public void setMarkerStatus(UserPushResultEnum markerStatus) {
-        this.markerStatus = markerStatus;
-    }
-
-    public UserPushResultEnum getMarkerLeaderStatus() {
-        return markerLeaderStatus;
-    }
-
-    public void setMarkerLeaderStatus(UserPushResultEnum markerLeaderStatus) {
-        this.markerLeaderStatus = markerLeaderStatus;
-    }
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/CloudUserPushParams.java

@@ -1,41 +0,0 @@
-package com.qmth.paper.library.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.annotation.DBVerify;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 推送云阅卷用户参数
- * @Author: CaoZixuan
- * @Date: 2022-08-02
- */
-public class CloudUserPushParams {
-    @ApiModelProperty(value = "系统用户id")
-    @DBVerify(value = "系统用户id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "登录名")
-    @DBVerify(value = "登录名",required = true)
-    private String loginName;
-
-    @ApiModelProperty(value = "真实名称")
-    private String realName;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-
-
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "科组长关联科目，科目代码用,分割，例如ASC,WED")
-    private String subjectCodes;
-
-    @ApiModelProperty(value = "学校id")
-    @DBVerify(value = "学校id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/PushBeforeRoleParam.java

@@ -1,43 +0,0 @@
-package com.qmth.paper.library.common.bean.params;
-
-import com.qmth.paper.library.common.enums.userPush.BeforeJudgeEnum;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.Set;
-
-/**
- * @Description: 推送前用户角色权限判断参数
- * @Author: CaoZixuan
- * @Date: 2021-10-30
- */
-public class PushBeforeRoleParam {
-    @ApiModelProperty(value = "更新前用户角色idSet")
-    private Set<Long> roleIdSet;
-
-    @ApiModelProperty(value = "更新前后对比策略枚举")
-    private BeforeJudgeEnum beforeJudgeEnum;
-
-    public PushBeforeRoleParam(Set<Long> roleIdSet, BeforeJudgeEnum beforeJudgeEnum) {
-        this.roleIdSet = roleIdSet;
-        this.beforeJudgeEnum = beforeJudgeEnum;
-    }
-
-    public PushBeforeRoleParam() {
-    }
-
-    public Set<Long> getRoleIdSet() {
-        return roleIdSet;
-    }
-
-    public void setRoleIdSet(Set<Long> roleIdSet) {
-        this.roleIdSet = roleIdSet;
-    }
-
-    public BeforeJudgeEnum getBeforeJudgeEnum() {
-        return beforeJudgeEnum;
-    }
-
-    public void setBeforeJudgeEnum(BeforeJudgeEnum beforeJudgeEnum) {
-        this.beforeJudgeEnum = beforeJudgeEnum;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/UserPushParam.java

@@ -1,111 +0,0 @@
-package com.qmth.paper.library.common.bean.params;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.enums.userPush.SpecialPrivilegeEnum;
-import com.qmth.paper.library.common.annotation.DBVerify;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Description: 用户同步参数对象
- * @Author: CaoZixuan
- * @Date: 2021-10-27
- */
-public class UserPushParam {
-    @ApiModelProperty(value = "系统用户id")
-    @DBVerify(value = "系统用户id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long userId;
-
-    @ApiModelProperty(value = "关联名称（唯一标识）")
-    @DBVerify(value = "关联名称（唯一标识）",required = true)
-    private String account;
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-    @ApiModelProperty(value = "特殊角色权限")
-    @DBVerify(value = "特殊角色权限",required = true)
-    private SpecialPrivilegeEnum role;
-
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enable;
-
-    @ApiModelProperty(value = "科组长关联科目，科目代码用,分割，例如ASC,WED")
-    private String subjectCodes;
-
-    @ApiModelProperty(value = "学校id")
-    @DBVerify(value = "学校id",required = true)
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long schoolId;
-
-    public UserPushParam() {
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getAccount() {
-        return account;
-    }
-
-    public void setAccount(String account) {
-        this.account = account;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public SpecialPrivilegeEnum getRole() {
-        return role;
-    }
-
-    public void setRole(SpecialPrivilegeEnum role) {
-        this.role = role;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getSubjectCodes() {
-        return subjectCodes;
-    }
-
-    public void setSubjectCodes(String subjectCodes) {
-        this.subjectCodes = subjectCodes;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/bean/params/UserSaveReportParams.java

@@ -1,272 +0,0 @@
-package com.qmth.paper.library.common.bean.params;
-
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.paper.library.common.enums.userPush.SyncStatusEnum;
-import com.qmth.paper.library.common.util.Base64Util;
-import com.qmth.paper.library.common.base.BaseEntity;
-import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysConfig;
-import com.qmth.paper.library.common.service.SysConfigService;
-import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
-/**
- * @Description: 用户保存/编辑params
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/3/24
- */
-public class UserSaveReportParams extends BaseEntity implements Serializable {
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-    /**
-     * 用户名
-     */
-    @TableField("login_name")
-    @NotBlank(message = "请输入登录名")
-    @Length(message = "登录名不能超过{max}个字符", max = 50)
-    private String loginName;
-    /**
-     * 姓名
-     */
-    @TableField("real_name")
-    @NotBlank(message = "请输入姓名")
-    @Length(message = "姓名不能超过{max}个字符", max = 50)
-    private String realName;
-
-    /**
-     * 姓名
-     */
-    @TableField("code")
-    private String code;
-    /**
-     * 密码
-     */
-    private String password;
-    /**
-     * 手机号
-     */
-    @TableField("mobile_number")
-//    @NotBlank(message = "请输入手机号码")
-    @Length(message = "手机号码不能超过{max}个字符", max = 25)
-    private String mobileNumber;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "是否启用，0：停用，1：启用")
-    private Boolean enable = true;
-
-    /**
-     * 密码修改次数
-     */
-    @TableField("pwd_count")
-    private Integer pwdCount;
-
-    /**
-     * 密码修改时间
-     */
-    @TableField("pwd_update_time")
-    private Long pwdUpdateTime;
-    /**
-     * 备注
-     */
-    private String remark;
-
-    @TableField(exist = false)
-    private String oldPassword;
-
-    @TableField(exist = false)
-    @ApiModelProperty(value = "前端传的修改手机号码时的验证码")
-    private String verifyCode;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(exist = false)
-    @NotNull(message = "请选择角色")
-    private Long[] roleIds;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(exist = false)
-    private Long[] courseIds;
-
-    @ApiModelProperty(value = "同步状态")
-    @TableField("sync_status")
-    private SyncStatusEnum syncStatus;
-
-    @ApiModelProperty("历史用户名")
-    private String historicName;
-
-    public String getHistoricName() {
-        return historicName;
-    }
-
-    public void setHistoricName(String historicName) {
-        this.historicName = historicName;
-    }
-
-    public UserSaveReportParams() {
-
-    }
-
-    public UserSaveReportParams(Long schoolId, String loginName, String realName, String mobileNumber) {
-        setId(SystemConstant.getDbUuid());
-        this.schoolId = schoolId;
-        this.loginName = loginName;
-        this.realName = realName;
-        this.mobileNumber = mobileNumber;
-        this.pwdCount = 1;
-        this.password = SystemConstant.DEFAULT_PASSWORD;
-        this.enable = true;
-    }
-
-    @Override
-    public void insertInfo(Long userId) {
-        super.insertInfo(userId);
-        SysConfigService sysConfigService = SpringContextHolder.getBean(SysConfigService.class);
-        SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
-        setPassword(Base64Util.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes()));
-    }
-
-    public SyncStatusEnum getSyncStatus() {
-        return syncStatus;
-    }
-
-    public void setSyncStatus(SyncStatusEnum syncStatus) {
-        this.syncStatus = syncStatus;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getMobileNumber() {
-        return mobileNumber;
-    }
-
-    public void setMobileNumber(String mobileNumber) {
-        this.mobileNumber = mobileNumber;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public Boolean getEnable() {
-        return enable;
-    }
-
-    public void setEnable(Boolean enable) {
-        this.enable = enable;
-    }
-
-    public Integer getPwdCount() {
-        return pwdCount;
-    }
-
-    public void setPwdCount(Integer pwdCount) {
-        this.pwdCount = pwdCount;
-    }
-
-    public Long getPwdUpdateTime() {
-        return pwdUpdateTime;
-    }
-
-    public void setPwdUpdateTime(Long pwdUpdateTime) {
-        this.pwdUpdateTime = pwdUpdateTime;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long[] getRoleIds() {
-        return roleIds;
-    }
-
-    public void setRoleIds(Long[] roleIds) {
-        this.roleIds = roleIds;
-    }
-
-    public Long[] getCourseIds() {
-        return courseIds;
-    }
-
-    public void setCourseIds(Long[] courseIds) {
-        this.courseIds = courseIds;
-    }
-
-    public String getOldPassword() {
-        return oldPassword;
-    }
-
-    public void setOldPassword(String oldPassword) {
-        this.oldPassword = oldPassword;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getVerifyCode() {
-        return verifyCode;
-    }
-
-    public void setVerifyCode(String verifyCode) {
-        this.verifyCode = verifyCode;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/cache/RedisKeyHelper.java

@@ -1,27 +0,0 @@
-package com.qmth.paper.library.common.cache;
-
-/**
- * @Description: redis cache helper
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/26
- */
-public class RedisKeyHelper {
-
-    private static String thirdUserAuthFix = "third_user_auth:";
-    private static String thirdUserAuthReturnUrlFix = "third_user_auth_return_url:";
-    private static String thirdUserAuthRoleFix = "third_user_auth_role:";
-
-    public static String thirdUserAuth(String key) {
-        return thirdUserAuthFix + key;
-    }
-
-    public static String thirdUserAuthReturnUrl(String key) {
-        return thirdUserAuthReturnUrlFix + key;
-    }
-
-    public static String thirdUserAuthRole(String key) {
-        return thirdUserAuthRoleFix + key;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/cache/ThirdUserAuthCacheUtil.java

@@ -1,52 +0,0 @@
-package com.qmth.paper.library.common.cache;
-
-import com.qmth.paper.library.common.bean.dto.UserAuthenticationDto;
-import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.service.CommonCacheService;
-import com.qmth.paper.library.common.util.RedisUtil;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Description: 武大开发鉴权用户临时授权cache
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/6/29
- */
-public class ThirdUserAuthCacheUtil {
-    private static RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
-
-    public static void setAuthCode(UserAuthenticationDto userAuthenticationDto) {
-        redisUtil.set(RedisKeyHelper.thirdUserAuth(userAuthenticationDto.getUid()), userAuthenticationDto.getCode(), SystemConstant.REDIS_THIRD_USER_AUTH_EXPIRE_TIME, TimeUnit.SECONDS);
-    }
-
-    public static String getAuthCode(String key) {
-        return (String) redisUtil.get(RedisKeyHelper.thirdUserAuth(key));
-    }
-
-    public static void deleteAuthCode(String key) {
-        redisUtil.delete(RedisKeyHelper.thirdUserAuth(key));
-    }
-
-    public static void setAuthReturnUrl(String key, String url) {
-        redisUtil.set(RedisKeyHelper.thirdUserAuthReturnUrl(key), url, SystemConstant.REDIS_DEFAULT_EXPIRE_TIME + 180L, TimeUnit.SECONDS);
-    }
-
-    public static String getAuthReturnUrl(String key) {
-        return (String) redisUtil.get(RedisKeyHelper.thirdUserAuthReturnUrl(key));
-    }
-
-//    public static void deleteAuthReturnUrl(String key) {
-//        redisUtil.delete(RedisKeyHelper.thirdUserAuthReturnUrl(key));
-//    }
-
-    public static void deleteCache(Long userId) {
-        CommonCacheService commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
-        commonCacheService.removeUserCache(userId);
-        commonCacheService.removeUserAuthCache(userId);
-        commonCacheService.removeUserMenuCache(userId);
-        commonCacheService.removeUserRolePrivilegeCache(userId);
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/contant/SystemConstant.java

@@ -49,83 +49,46 @@ public class SystemConstant {
     public static final String MD5 = "MD5";
     public static final String SUCCESS = "success";
     public static final String EXTEND_COLUMN = "extendColumn";
-    public static final String USER_DIR = "user.dir";
     public static final String PDF_TEMP = "pdf-temp";
     public static final String FILE_TEMP = "file-temp";
     public static final String SESSION = "session:";
     public static final String TASK = "task";
     public static final String TB_TASK_ID = "tbTaskId";
-    public static final String TB_SYNC_TASK = "tbSyncTask";
-    public static final String TB_SYNC_TASK_ID = "tbSyncTaskId";
     public static final String USER = "account";
     public static final String SCHOOL_ID = "schoolId";
     public static final String SCHOOL = "school";
     public static final String ORG = "org";
     public static final String ERROR = "/error";
-    public static final String METHOD = "post";
     public static final String DEFAULT_PASSWORD = "MTIzNDU2";
     public static final String UPDATE_TIME = "updateTime";
     public static final String PATH = "path";
     public static final String PDF_PATH = "pdfPath";
-    public static final String HTML_PATH = "htmlPath";
     public static final String TYPE = "type";
     public static final String LOCAL = "local";
     public static final String OSS = "oss";
     public static final String LOGO = "logo";
     public static final String UPLOAD_TYPE = "uploadType";
     public static final String ID = "id";
-    public static final String MODEL = "model";
-    public static final String VERSION = "version";
-    public static final String FLOW_ENTITY_ID = "flowEntityId";
-    public static final String CUSTOM_FLOW_ID = "customFlowId";
-    public static final String ACT_FLOW_ID = "actFlowId";
-    public static final String FLOW_PROCESS_VAR_MAP = "flowProcessVarMap";
-    public static final String PROCESS_DEFINITION_ID = "processDefinitionId";
     public static final String FILE = "file";
-    public static final String SIZE = "size";
     public static final String HTML_PREFIX = ".html";
     public static final String PDF_PREFIX = ".pdf";
     public static final String FTL_PREFIX = ".ftl";
-    public static final String ZIP_PREFIX = ".zip";
-    //    public static final String JPG_PREFIX = ".jpg";
     public static final String DEFAULT_DATE_PATTERN = "yyyy-MM-dd HH:mm:ss";
-    public static final String DATE_PATTERN = "yyyy-MM-dd";
-    public static final String TIME_PATTERN = "HH:mm";
-    public static final int PAGE_NUMBER = 0;
-    public static final int PAGE_SIZE = 10000000;
     public static final int PAGE_SIZE_MIN = 10;
     public static final int PAGE_SIZE_MAX = 500;
     public static final int PAGE_NUMBER_MIN = 1;
     public static final int IN_SIZE_MAX = 1000;
-    public static final int ALL_CARD = -1;
     public static final String MANUAL = "manual";
-    public static final String DELIMITER = ":";
     public static final String COMMA = ",";
-    public static final int FINAL_SCALE = 1;
-    public static final int CALCULATE_SCALE = 4;
-    //    public static final int OPER_SCALE = 8;
-    public static final BigDecimal PERCENT = new BigDecimal(100);
-    public static final String HYPHEN = "-";
-    public static final String DEFAULT_SIGN = "#";
     public static final String PARENT_ORG = "教务处";
-    public static final String SCHOOL_CODE = "wdfx";
     public static final String ADMIN_CODE = "admin";
     public static final String AUTH = "auth";//命题老师id
     //    public static final int MAX_RETRY_CREATE_PDF_COUNT = 5;
     //英文字母、数字、中文括号、英文括号、下划线(_)、减号(-)、中文横线(—)
-    public static final String REGULAR_EXPRESSION_OF_CODE = "[a-zA-Z0-9](\\w+)?-?(\\w+)?—?(\\w+)?(\\((\\w+)?-?(\\w+)?—?(\\w+)?\\))?(\\（(\\w+)?-?(\\w+)?—?(\\w+)?\\）)?(\\w+)?";
-    public static final String REGULAR_EXPRESSION_OF_PHONE = "((\\d{3,4})|(\\(\\d{3,4}\\)-))?\\d{7,8}";
-    public static final String REGULAR_EXPRESSION_OF_CODE_PRIMARY_DIMENSION = "[A-Z]";
-    public static final String REGULAR_EXPRESSION_OF_CODE_SECOND_DIMENSION = "[A-Z][1-9][0-9]*";
     public static final String SYS_USER = "sysUser";
-    public static final String DATA_COUNT = "dataCount";
     public static final List<Long> MENU_MANAGE = Arrays.asList(507L, 508L, 530L, 531L, 675L, 676L);
     public static final float PAPER_DEVIATION = 2;
-    public static final String COMMA_OF_ENGLISH = ",";
-    public static final String COMMA_OF_CHINESE = "，";
-    public static final String PAUSE_SIGN = "、";
     public static final String ORG_SPLIT = "/";
-    public static final String PUSH_OPERATE_NOTICE = "操作成功，请去基础配置 -> 系统设置 -> 同步管理中查看结果";
     public static final String EXCEL_PROTECT_KEY = "Qmth87863577";
     public static final String ZIP_ENCRYPT_PWD = "qmthzip";
 
@@ -150,19 +113,8 @@ public class SystemConstant {
     public static final String AUTH_INFO_CACHE = "auth:info:cache";
     public static final String SYS_CONFIG_CACHE = "sys:config:cache";
     public static final String CUSTOM_PRIVILEGE_CACHE = "custom:privilege:cache";
-    public static final String NUMBER_CACHE = "school:number:cache:";
     public static final String ORG_COLLEGE_LEVEL_CACHE = "org:college:level:cache";
 
-    /**
-     * 报表缓存
-     */
-    public static final String EXAM_STUDENT_REPORT = "report:cache:examStudent";
-    public static final String COLLEGE_DEAN_REPORT = "report:cache:collegeDean";
-    public static final String COLLEGE_COURSE_REPORT = "report:cache:collegeCourse";
-    public static final String SURVEY_TEACHER_VIEW_REPORT = "report:cache:surveyTeacherView";
-    public static final String TEACHER_VIEW_REPORT = "report:cache:teacherView";
-    public static final String TEACHER_ANSWER_VIEW_REPORT = "report:cache:teacherAnswerView";
-
     /**
      * 鉴权
      */
@@ -178,25 +130,12 @@ public class SystemConstant {
      */
     public static final int DEFAULT_SESSION_EXPIRE = 1;//过期时间1天
     public static final long REDIS_DEFAULT_EXPIRE_TIME = 24 * 60L * 60L;//过期时间24小时
-    public static final long REDIS_THIRD_USER_AUTH_EXPIRE_TIME = 2 * 60L;//过期时间2分钟
 
     /**
      * redis mq
      */
-    public static final String REDIS_LOCK_MQ_PREFIX = "redis:lock:mq:";
     public static final int REDIS_MQ_MAX_RECONSUME = 5;
     public static final String MQ_TOPIC_BUFFER_LIST = "mq:topic:buffer:list";
-    public static final String REDIS_LOCK_BATCH_NO_PREFIX = "redis:lock:batchNo:";//
-    public static final String REDIS_LOCK_GRADE_COURSE_DELETE_PREFIX = "redis:lock:courseInfo:";
-    public static final String REDIS_LOCK_GRADE_EXAM_DELETE_PREFIX = "redis:lock:exam:";
-
-    /**
-     * redis lock
-     */
-    public static final int MAX_RETRY_COUNT = 30;
-    public static final long REDIS_CACHE_TIME_OUT = 60L;
-    public static final long REDIS_LOCK_MQ_TIME_OUT = 60L;
-    public static final long REDIS_LOCK_BATCH_NO_TIME_OUT = 60L * 30;
 
     /**
      * aes相关
@@ -206,12 +145,6 @@ public class SystemConstant {
     public static final String AES_MODE_PKCS7 = "AES/CBC/PKCS7Padding";//用这个模式，规则必须为16位
     public static final String AES_RULE = "1234567890123456";//aes密钥
 
-    /**
-     * 变量
-     */
-//    public static String TEMP_FILES_DIR;
-//    public static String PDF_TEMP_FILES_DIR;
-
     /**
      * excel相关
      */
@@ -238,48 +171,6 @@ public class SystemConstant {
     public static final int UNMATCHED_ACK_TYPE = 5;//BROKER间转发消息时,接收端"拒绝"消息
     public static final int UNSEND_ACK_TYPE = 6;//消息未发出
 
-    /**
-     * activiti
-     */
-    public static final String APPROVE_ID = "approveId";//审批id
-    public static final String FLOW_SUBMIT = "flowSubmit";//命题提交申请
-    public static final String FLOW_JOIN_TYPE = "flowJoinType";//流程关联类型
-    public static final String OLD_FLOW_ID = "oldFlowId";//旧流程id
-    public static final String FLOW_TYPE = "flowType";//流程类型
-    public static final String FLOW_ID = "flowId";//流程id
-    public static final String FLOW_TASK_ID = "flowTaskId";//流程任务id
-    public static final String APPROVE = "approve";//流程审核变量
-    public static final String AGGINESS_MAP = "agginessMap";//流程审批人变量
-    public static final String APPROVE_PASS_MAP = "approvePassMap";//流程审批通过变量
-    public static final String APPROVE_REJECT_MAP = "approveRejectMap";//流程审批驳回变量
-    public static final String APPROVE_USER_IDS = "approveUserIds";//流程审批人列表
-    public static final String SETUP_MAP = "setupMap";//流程步骤变量
-    public static final String APPROVE_SETUP = "approveSetup";//流程节点
-    public static final String APPROVE_OPERATION = "approveOperation";//流程操作
-    public static final String FLOW_STATUS = "flowStatus";//流程状态
-    public static final String APPROVE_REMARK = "approveRemark";//流程审批意见
-    public static final String OBJECT_ID = "objectId";
-    public static final String OBJECT_DATA = "objectData";
-    public static final String APPROVE_TF_FLOW_LOG = "TFFlowLog";//流程院长自动审批
-    public static final String PAPAER_ATTACHMENT_IDS = "paperAttachmentIds";//命题附件ids
-    public static final String REDIS_LOCK_FLOW_TASK_PREFIX = "redis:lock:flow:task:";//流程节点锁
-    public static final String REDIS_LOCK_EXAM_TASK_FLOW_PREFIX = "redis:lock:exam:task:flow:";//考试任务流程节点锁
-    public static final long REDIS_LOCK_FLOW_TASK_TIME_OUT = 60L * 2;
-    public static final long REDIS_LOCK_EXAM_TASK_FLOW_TIME_OUT = 60L * 2;
-    public static final String REDIS_LOCK_FLOW_PREFIX = "redis:lock:flow:";//流程锁
-    public static final long REDIS_LOCK_FLOW_TIME_OUT = 60L * 2;
-    public static final String REDIS_LOCK_CUSTOM_FLOW_PREFIX = "redis:lock:custom:flow:";//自定义流程锁
-    public static final long REDIS_LOCK_CUSTOM_FLOW_TIME_OUT = 60L * 2;
-    public static final String REDIS_LOCK_CALCULATE_PREFIX = "redis:lock:calculate:";//计算锁
-    public static final long REDIS_LOCK_CALCULATE_TIME_OUT = 60L * 60;
-
-    /**
-     * 机器心跳
-     */
-    public static final String CURRENT_TASK_MACHINE_ID = "current_task_machine_id";//当前机器id
-    public static final String TASK_MACHINE_ID = "task_machine_id:";//任务机器id
-    public static final String TASK_MACHINE_ID_LIKE = "task_machine_id*";//任务机器like
-
     public static final String LOG_ERROR = "请求出错:{}";
 
     /**
@@ -288,38 +179,6 @@ public class SystemConstant {
     public static final int CONNECT_TIME_OUT = 1000 * 60 * 2;//请求超时
     public static final int SOCKET_CONNECT_TIME_OUT = 1000 * 60 * 30;//读取数据超时
 
-//    /**
-//     * 初始化附件文件路径
-//     */
-//    public static void initTempFiles() {
-//        File fileTempDir = null, pdfTempDir = null;
-//        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
-//
-//        if (Objects.nonNull(dictionaryConfig.sysDomain().getFileTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getFileTempPath())) {
-//            fileTempDir = new File(dictionaryConfig.sysDomain().getFileTempPath().trim());
-//        } else {
-//            StringJoiner fileTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
-//            String mkdir = fileTempLocalPath.toString().substring(0, fileTempLocalPath.toString().lastIndexOf(File.separator));
-//            fileTempDir = new File(new StringBuffer(mkdir).append(File.separator).append(FILE_TEMP).toString());
-//        }
-//        if (Objects.nonNull(fileTempDir) && !fileTempDir.exists()) {
-//            fileTempDir.mkdirs();
-//        }
-//
-//        if (Objects.nonNull(dictionaryConfig.sysDomain().getPdfTempPath()) && !Objects.equals("", dictionaryConfig.sysDomain().getPdfTempPath())) {
-//            pdfTempDir = new File(dictionaryConfig.sysDomain().getPdfTempPath().trim());
-//        } else {
-//            StringJoiner pdfTempLocalPath = new StringJoiner("").add(System.getProperty(USER_DIR));
-//            String mkdir = pdfTempLocalPath.toString().substring(0, pdfTempLocalPath.toString().lastIndexOf(File.separator));
-//            pdfTempDir = new File(new StringBuffer(mkdir).append(File.separator).append(PDF_TEMP).toString());
-//        }
-//        if (Objects.nonNull(pdfTempDir) && !pdfTempDir.exists()) {
-//            pdfTempDir.mkdirs();
-//        }
-//        TEMP_FILES_DIR = fileTempDir.getPath();
-//        PDF_TEMP_FILES_DIR = pdfTempDir.getPath();
-//    }
-
     /**
      * id转换为long
      *
@@ -472,18 +331,6 @@ public class SystemConstant {
         return new DBVerifyResult(true, "成功");
     }
 
-//    /**
-//     * 获取流程学校code
-//     *
-//     * @return
-//     */
-//    public static Map<String, List<String>> getFlowSchoolCodeMap() {
-//        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
-//        Map<String, List<String>> flowSchoolCodeMap = dictionaryConfig.sysDomain().getFlowSchoolCodeMap();
-//        Optional.ofNullable(flowSchoolCodeMap).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置学校流程code"));
-//        return flowSchoolCodeMap;
-//    }
-
     /**
      * 验证参数任意一个为空
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/domain/AliYunOssDomain.java

@@ -1,74 +0,0 @@
-//packagecom.qmth.paper.library.common.domain;
-//
-//import java.io.Serializable;
-//
-///**
-// * @Description: 阿里云oss config
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2020/3/30
-// */
-//public class AliYunOssDomain implements Serializable {
-//
-//    private String endpoint;
-//
-//    private String name;
-//
-//    private String accessKeyId;
-//
-//    private String accessKeySecret;
-//
-//    private String bucket;
-//
-//    private String url;
-//
-//    public String getEndpoint() {
-//        return endpoint;
-//    }
-//
-//    public void setEndpoint(String endpoint) {
-//        this.endpoint = endpoint;
-//    }
-//
-//    public String getName() {
-//        return name;
-//    }
-//
-//    public void setName(String name) {
-//        this.name = name;
-//    }
-//
-//    public String getAccessKeyId() {
-//        return accessKeyId;
-//    }
-//
-//    public void setAccessKeyId(String accessKeyId) {
-//        this.accessKeyId = accessKeyId;
-//    }
-//
-//    public String getAccessKeySecret() {
-//        return accessKeySecret;
-//    }
-//
-//    public void setAccessKeySecret(String accessKeySecret) {
-//        this.accessKeySecret = accessKeySecret;
-//    }
-//
-//    public String getBucket() {
-//        return bucket;
-//    }
-//
-//    public void setBucket(String bucket) {
-//        this.bucket = bucket;
-//    }
-//
-//    public String getUrl() {
-//        return url;
-//    }
-//
-//    public void setUrl(String url) {
-//        this.url = url;
-//    }
-//}
-//

paper-library-common/src/main/java/com/qmth/paper/library/common/domain/SysDomain.java

@@ -25,28 +25,14 @@ public class SysDomain implements Serializable {
 
     String adminLogoUrl;
 
-    String htmlToPdfUrl;
-
     Integer autoCreatePdfResetMaxCount;
 
     Integer threadPoolCoreSize;
 
     boolean customThreadPoolCoreSize;
 
-    String reportUrl;
-
     Duration sessionActive;
 
-    String loginAuthenUrl;
-
-    public String getLoginAuthenUrl() {
-        return loginAuthenUrl;
-    }
-
-    public void setLoginAuthenUrl(String loginAuthenUrl) {
-        this.loginAuthenUrl = loginAuthenUrl;
-    }
-
     public Duration getSessionActive() {
         return sessionActive;
     }
@@ -55,14 +41,6 @@ public class SysDomain implements Serializable {
         this.sessionActive = sessionActive;
     }
 
-    public String getReportUrl() {
-        return reportUrl;
-    }
-
-    public void setReportUrl(String reportUrl) {
-        this.reportUrl = reportUrl;
-    }
-
     public boolean isCustomThreadPoolCoreSize() {
         return customThreadPoolCoreSize;
     }
@@ -87,14 +65,6 @@ public class SysDomain implements Serializable {
         this.threadPoolCoreSize = threadPoolCoreSize;
     }
 
-    public String getHtmlToPdfUrl() {
-        return htmlToPdfUrl;
-    }
-
-    public void setHtmlToPdfUrl(String htmlToPdfUrl) {
-        this.htmlToPdfUrl = htmlToPdfUrl;
-    }
-
     public String getAdminLogoUrl() {
         return adminLogoUrl;
     }

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/TGError.java

@@ -1,117 +0,0 @@
-package com.qmth.paper.library.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 com.qmth.paper.library.common.contant.SystemConstant;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 全局异常错误信息表
- * </p>
- *
- * @author wangliang
- * @since 2021-03-24
- */
-@ApiModel(value = "TGError对象", description = "全局异常错误信息表")
-public class TGError implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    @TableField(value = "school_id")
-    private Long schoolId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "机构id")
-    @TableField(value = "org_id")
-    private Long orgId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "实体id")
-    @TableField("obj_id")
-    private Long objId;
-
-    @ApiModelProperty(value = "实时摘要信息")
-    @TableField("summary")
-    private String summary;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(value = "create_time", fill = FieldFill.INSERT)//新增执行
-    private Long createTime;
-
-    public TGError() {
-
-    }
-
-    public TGError(Long objId, String summary) {
-        this.id = SystemConstant.getDbUuid();
-        this.objId = objId;
-        this.summary = summary;
-        this.createTime = System.currentTimeMillis();
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getObjId() {
-        return objId;
-    }
-
-    public void setObjId(Long objId) {
-        this.objId = objId;
-    }
-
-    public String getSummary() {
-        return summary;
-    }
-
-    public void setSummary(String summary) {
-        this.summary = summary;
-    }
-
-    public Long getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Long createTime) {
-        this.createTime = createTime;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/entity/TMMqMessage.java

@@ -1,185 +0,0 @@
-package com.qmth.paper.library.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.paper.library.common.base.BaseEntity;
-import com.qmth.paper.library.common.enums.MqTagEnum;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-import java.util.Map;
-
-/**
- * @Description: mq消息
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/9
- */
-@ApiModel(value = "t_m_mq_message", description = "mq消息")
-public class TMMqMessage extends BaseEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "学校id")
-    @TableField(value = "school_id")
-    private Long schoolId;
-
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "机构id")
-    @TableField(value = "org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "消息topic")
-    @TableField(value = "topic")
-    private String topic;
-
-    @ApiModelProperty(value = "消息tag")
-    @TableField(value = "tag")
-    private String tag;
-
-    @ApiModelProperty(value = "消息内容")
-    @TableField(value = "body")
-    private Object body;
-
-    @ApiModelProperty(value = "消息类型")
-    @TableField(value = "type")
-    private MqTagEnum type;
-
-    @ApiModelProperty(value = "关联业务id")
-    @TableField(value = "obj_id")
-    private String objId;
-
-    @ApiModelProperty(value = "关联业务名称")
-    @TableField(value = "obj_name")
-    private String objName;
-
-    @ApiModelProperty(value = "消息ack")
-    @TableField(value = "ack")
-    private Integer ack;
-
-    @ApiModelProperty(value = "消息序号")
-    @TableField(value = "sequence")
-    private Integer sequence;
-
-    @ApiModelProperty(value = "扩展类型")
-    @TableField(exist = false)
-    private Map<String, Object> properties;
-
-    @TableField(value = "properties")
-    private String prop;
-
-    @ApiModelProperty(value = "时间戳")
-    @TableField(value = "timestamp")
-    private Long timestamp;
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getProp() {
-        return prop;
-    }
-
-    public void setProp(String prop) {
-        this.prop = prop;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getTopic() {
-        return topic;
-    }
-
-    public void setTopic(String topic) {
-        this.topic = topic;
-    }
-
-    public String getTag() {
-        return tag;
-    }
-
-    public void setTag(String tag) {
-        this.tag = tag;
-    }
-
-    public String getObjId() {
-        return objId;
-    }
-
-    public void setObjId(String objId) {
-        this.objId = objId;
-    }
-
-    public String getObjName() {
-        return objName;
-    }
-
-    public void setObjName(String objName) {
-        this.objName = objName;
-    }
-
-    public Integer getAck() {
-        return ack;
-    }
-
-    public void setAck(Integer ack) {
-        this.ack = ack;
-    }
-
-    public Integer getSequence() {
-        return sequence;
-    }
-
-    public void setSequence(Integer sequence) {
-        this.sequence = sequence;
-    }
-
-    public Object getBody() {
-        return body;
-    }
-
-    public void setBody(Object body) {
-        this.body = body;
-    }
-
-    public MqTagEnum getType() {
-        return type;
-    }
-
-    public void setType(MqTagEnum type) {
-        this.type = type;
-    }
-
-    public Map<String, Object> getProperties() {
-        return properties;
-    }
-
-    public void setProperties(Map<String, Object> properties) {
-        this.properties = properties;
-    }
-
-    public Long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Long timestamp) {
-        this.timestamp = timestamp;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/ExceptionResultEnum.java

@@ -61,20 +61,10 @@ public enum ExceptionResultEnum {
 
     SCHOOL_ENABLE(HttpStatus.INTERNAL_SERVER_ERROR, 5000021, "学校已停用"),
 
-    PAPER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 50000022, "当前没有未曝光的卷型"),
-
     PAPER_TYPE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 50000023, "未获取到试卷类型"),
 
     ATTACHMENT_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000024, "找不到附件"),
 
-    EXAM_PRINT_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000025, "印刷计划为空"),
-
-    EXAM_RULE_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000026, "考务规则为空"),
-
-    EXAM_DETAIL_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000027, "考场数据为空"),
-
-    EXAM_CARD_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000028, "题卡为空"),
-
     EXAM_TASK_IS_NULL(HttpStatus.INTERNAL_SERVER_ERROR, 50000029, "命题任务为空"),
 
     NO_DATA(HttpStatus.INTERNAL_SERVER_ERROR, 5000030, "没有数据"),

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/FieldUniqueEnum.java

@@ -17,24 +17,16 @@ public enum FieldUniqueEnum {
 
     org_schoolId_name_idx("机构名称"),
 
-    flow_schoolId_name_idx("流程名称"),
-
     role_schoolId_name_idx("角色名"),
 
     uq_school_id_mobile_number("手机号码"),
 
-    campus_schoolId_code_idx("校区编码"),
-
     clazz_schoolId_name_idx("班级名称"),
 
-    major_schoolId_name_idx("专业名称"),
-
     semester_schoolId_name_idx("学期名称"),
 
     student_schoolId_code_orgId_idx("学生学号"),
 
-    custom_flow_schoolId_type_idx("流程类型"),
-
     role_group_roleId_memberId_idx("角色成员数据重复，同角色其它用户已绑定");
 
     private String title;

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/MqTagEnum.java

@@ -1,61 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: mq topic enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/28
- */
-public enum MqTagEnum {
-
-    PDF("创建pdf标签", "pdf", "normal", 0);
-
-    private MqTagEnum(String desc, String code, String type, int id) {
-        this.desc = desc;
-        this.code = code;
-        this.type = type;
-        this.id = id;
-    }
-
-    private String code;//留痕描述
-
-    private String desc;//标签
-
-    private String type;//消息类型，normal：正常消息，delay：延时消息，transactional：事务消息，broadcast：广播消息
-
-    private int id;
-
-    /**
-     * 状态转换 toName
-     *
-     * @param value
-     * @return
-     */
-    public static String convertToName(String value) {
-        for (MqTagEnum e : MqTagEnum.values()) {
-            if (Objects.equals(value.trim(), e.getCode())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public int getId() {
-        return id;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/OrgTypeEnum.java

@@ -15,10 +15,6 @@ public enum OrgTypeEnum {
 
     COLLEGE("学院"),
 
-//    FACULTY("院系"),
-
-//    TEACHING_ROOM("教研室"),
-
     PRINTING_HOUSE("印刷厂"),;
 
     private String title;

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/PageSizeEnum.java

@@ -1,122 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import com.qmth.paper.library.common.contant.SystemConstant;
-
-/**
- * @Description: pdf格式 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/4/7
- */
-public enum PageSizeEnum {
-    A0(2384.0F, 3370.0F),
-    A1(1684.0F, 2384.0F),
-    A2(1191.0F, 1684.0F),
-    A3(842.0F, 1191.0F),
-    K8(737.0F, 1043.0F),
-    A4(595.0F, 842.0F),
-    A5(420.0F, 595.0F),
-    A6(297.0F, 420.0F),//8K
-    A7(210.0F, 297.0F),
-    A8(148.0F, 210.0F),
-    A9(105.0F, 148.0F),
-    A10(73.0F, 105.0F),
-    B0(2834.0F, 4008.0F),
-    B1(2004.0F, 2834.0F),
-    B2(1417.0F, 2004.0F),
-    B3(1000.0F, 1417.0F),
-    B4(708.0F, 1000.0F),
-    B5(498.0F, 708.0F),
-    B6(354.0F, 498.0F),
-    B7(249.0F, 354.0F),
-    B8(175.0F, 249.0F),
-    B9(124.0F, 175.0F),
-    B10(87.0F, 124.0F),
-    ARCH_E(2592.0F, 3456.0F),
-    ARCH_D(1728.0F, 2592.0F),
-    ARCH_C(1296.0F, 1728.0F),
-    ARCH_B(864.0F, 1296.0F),
-    ARCH_A(648.0F, 864.0F),
-    FLSA(612.0F, 936.0F),
-    FLSE(648.0F, 936.0F),
-    HALFLETTER(396.0F, 612.0F),
-    _11X17(792.0F, 1224.0F),
-    ID_1(242.65F, 153.0F),
-    ID_2(297.0F, 210.0F),
-    ID_3(354.0F, 249.0F),
-    LEDGER(1224.0F, 792.0F),
-    CROWN_QUARTO(535.0F, 697.0F),
-    LARGE_CROWN_QUARTO(569.0F, 731.0F),
-    DEMY_QUARTO(620.0F, 782.0F),
-    ROYAL_QUARTO(671.0F, 884.0F),
-    CROWN_OCTAVO(348.0F, 527.0F),
-    LARGE_CROWN_OCTAVO(365.0F, 561.0F),
-    DEMY_OCTAVO(391.0F, 612.0F),
-    ROYAL_OCTAVO(442.0F, 663.0F),
-    SMALL_PAPERBACK(314.0F, 504.0F),
-    PENGUIN_SMALL_PAPERBACK(314.0F, 513.0F),
-    PENGUIN_LARGE_PAPERBACK(365.0F, 561.0F);
-
-    private float width;
-
-    private float height;
-
-    private PageSizeEnum(float width, float height) {
-        this.width = width;
-        this.height = height;
-    }
-
-    public float getWidth() {
-        return width;
-    }
-
-    public float getHeight() {
-        return height;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param width
-     * @param height
-     * @return
-     */
-    public static String convertToName(float width, float height) {
-        float deviation = SystemConstant.PAPER_DEVIATION;
-        for (PageSizeEnum e : PageSizeEnum.values()) {
-            float standardWidth = e.getWidth();
-            float standardHeight = e.getHeight();
-            if (standardWidth - deviation <= width && width <= standardWidth + deviation && standardHeight - deviation <= height && height <= standardHeight + deviation){
-                return e.name();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 状态转换 toEnum
-     *
-     * @param width
-     * @param height
-     * @return
-     */
-    public static PageSizeEnum convertToEnum(float width, float height) {
-        for (PageSizeEnum e : PageSizeEnum.values()) {
-            float deviation = SystemConstant.PAPER_DEVIATION;
-            if (PageSizeEnum.A3.equals(e)){
-                deviation = 2 * SystemConstant.PAPER_DEVIATION;
-            }
-            float standardWidth = e.getWidth();
-            float standardHeight = e.getHeight();
-            if (standardWidth - deviation <= width && width <= standardWidth + deviation && standardHeight - deviation <= height && height <= standardHeight + deviation){
-                return e;
-            }
-            if (standardWidth - deviation <= height && height <= standardWidth + deviation && standardHeight - deviation <= width && width <= standardHeight + deviation){
-//                throw ExceptionResultEnum.ERROR.exception("请检查上传的【"+ e.name() + "】纸张字体方向是否反了");
-                return e;
-            }
-        }
-        throw ExceptionResultEnum.ERROR.exception("pdf格式不符合标准规范，请提供标准的pdf（可使用wps、office的word转换）");
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/RoleSourceEnum.java

@@ -9,9 +9,7 @@ import java.util.List;
  */
 public enum RoleSourceEnum {
 
-    SYS("系统自带"),
-    ANALYSIS("教研分析"),
-    CLOUD_MARK("云阅卷");
+    SYS("系统自带");
 
     RoleSourceEnum(String desc) {
         this.desc = desc;

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/RoleTypeEnum.java

@@ -16,8 +16,7 @@ public enum RoleTypeEnum {
     PRESIDENT("学院院长"),
     TEACHER("任课老师"),
     MARKER("评卷员"),
-    MARKER_LEADER("科组长")
-    ;
+    MARKER_LEADER("科组长");
 
     RoleTypeEnum(String desc) {
         this.desc = desc;

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/TFCustomModelTypeEnum.java

@@ -1,42 +0,0 @@
-package com.qmth.paper.library.common.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 自定义流程类型enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2022/1/24
- */
-public enum TFCustomModelTypeEnum {
-
-    USER_FIXED("指定人员"),
-
-    APPROVE_SET("发起人指定");
-
-    private String title;
-
-    private TFCustomModelTypeEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (TFCustomModelTypeEnum e : TFCustomModelTypeEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/TaskTypeEnum.java

@@ -12,39 +12,7 @@ import java.util.Objects;
 public enum TaskTypeEnum {
     ORG_IMPORT("机构导入"),
 
-    USER_IMPORT("用户导入"),
-
-    STUDENT_IMPORT("学生导入"),
-
-    COURSE_IMPORT("课程导入"),
-
-    CLAZZ_IMPORT("班级导入"),
-
-    QUESTION_MISSION_BATCH_CREATE("批量新建命题任务"),
-
-    SAMPLE_EXPORT("导出审核样本"),
-
-    EXAMINATION_IMPORT("考务数据导入"),
-
-    EXAMINATION_EXPORT("考务数据导出"),
-
-    PRINT_PDF_DOWNLOAD("批量下载pdf"),
-
-    PAPER_AND_CARD_PDF_DOWNLOAD("卷库查询管理试卷、空白题卡批量下载pdf"),
-
-    CREATE_PDF("生成pdf"),
-
-    DATA_CALCULATE("数据计算"),
-
-    CREATE_TASK_PRINT("发布印刷任务"),
-
-    STATISTICS_IMPORT("命题统计导入"),
-
-    SCORE_EXPORT("成绩导出"),
-
-    SCORE_DOWNLOAD("成绩轨迹下载"),
-
-    DOWNLOAD_PAPER_FILE_BATCH("批量下载试卷文件");
+    USER_IMPORT("用户导入");
 
     private String title;
 

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/log/SystemEnum.java

@@ -8,9 +8,8 @@ import java.util.Objects;
  * @Date: 2022-02-14
  */
 public enum SystemEnum {
-    DISTRIBUTED_PRINT("分布式印刷系统日志"),
-    TEACH_CLOUD_REPORT("教研分析系统日志"),
-    ;
+    PAPER_LIBRARY("试卷电子化系统日志");
+
     private final String desc;
 
     SystemEnum(String desc) {

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/paperGroup/MarkModeEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.paper.library.common.enums.paperGroup;
-
-/**
- * @Description: 评卷模式枚举类
- * @Author: CaoZixuan
- * @Date: 2022-04-12
- */
-public enum MarkModeEnum {
-    COMMON("普通"),
-    TRACK("轨迹");
-    private final String desc;
-
-    MarkModeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/paperGroup/ScorePolicyEnum.java

@@ -1,27 +0,0 @@
-package com.qmth.paper.library.common.enums.paperGroup;
-
-/**
- * @Description: 合分策略枚举类
- * @Author: CaoZixuan
- * @Date: 2022-04-12
- */
-public enum ScorePolicyEnum {
-    AVG("平均分", 1),
-    MAX("最高分", 2),
-    MIN("最低分", 3);
-    private final String desc;
-    private final int value;
-
-    ScorePolicyEnum(String desc, int value) {
-        this.desc = desc;
-        this.value = value;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public int getValue() {
-        return value;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/userPush/BeforeJudgeEnum.java

@@ -1,27 +0,0 @@
-package com.qmth.paper.library.common.enums.userPush;
-
-/**
- * @Description: 是否要根据同步之前用户状态判断是否发送禁用推送枚举类
- * @Author: CaoZixuan
- * @Date: 2021-10-30
- */
-public enum BeforeJudgeEnum {
-    FORBIDDEN_NO_NEED("只根据更新后角色权限判断,更新后即使没有特殊权限，也不发送禁用推送"),
-    FORBIDDEN_BY_BEFORE_ROLE("根据用户更新前的角色权限和更新后的对比（更新前如果特殊权限，更新后没有特殊权限则发送两条禁用推送）"),
-    FORBIDDEN_NECESSARY("不根据更新前的角色权限判断，只要更新后没有特殊权限，直接发送两条禁用推送"),
-    ;
-
-    BeforeJudgeEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public void setDesc(String desc) {
-        this.desc = desc;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/userPush/SyncStatusEnum.java

@@ -1,20 +0,0 @@
-package com.qmth.paper.library.common.enums.userPush;
-
-/**
- * @Description: 用户同步云阅卷同步状态枚举类
- * @Author: CaoZixuan
- * @Date: 2021-10-27
- */
-public enum SyncStatusEnum {
-    ALREADY_PUSH("已经完成推送"),
-    NEED_PUSH_AGAIN("需要重新推送"),
-    ;
-    SyncStatusEnum(String desc) {
-        this.desc = desc;
-    }
-    private final String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/userPush/UserPushResultEnum.java

@@ -1,29 +0,0 @@
-package com.qmth.paper.library.common.enums.userPush;
-
-/**
- * @Description: 用户推送结果枚举
- * @Author: CaoZixuan
- * @Date: 2022-08-03
- */
-public enum UserPushResultEnum {
-    BIND_SUCCESS("绑定成功", true),
-    BIND_FAILED("绑定失败", false),
-    UNBIND_SUCCESS("解绑成功", true),
-    UNBIND_FAILED("解绑失败", false),
-    ;
-    private final String desc;
-    private final boolean success;
-
-    UserPushResultEnum(String desc, boolean success) {
-        this.desc = desc;
-        this.success = success;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-
-    public boolean isSuccess() {
-        return success;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/enums/userPush/UserPushTrackEnum.java

@@ -1,39 +0,0 @@
-package com.qmth.paper.library.common.enums.userPush;
-
-import java.util.Objects;
-
-/**
- * @Description: 用户推送轨迹枚举
- * @Author: CaoZixuan
- * @Date: 2021-11-04
- */
-public enum UserPushTrackEnum {
-    BIND("绑定"),
-    UNBIND("解绑"),
-    ;
-
-    UserPushTrackEnum(String desc) {
-        this.desc = desc;
-    }
-
-    private final String desc;
-
-    public String getDesc() {
-        return desc;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param desc desc
-     * @return 名称
-     */
-    public static String convertToName(String desc) {
-        for (UserPushTrackEnum e : UserPushTrackEnum.values()) {
-            if (Objects.equals(desc, e.getDesc())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/mapper/BasicStudentMapper.java

@@ -31,15 +31,6 @@ public interface BasicStudentMapper extends BaseMapper<BasicStudent> {
                                                    @Param("majorId") Long majorId,
                                                    @Param("clazzIdList") Set<Long> clazzIdList,
                                                    @Param("orgIds") Set<Long> orgIds);
-
-    /**
-     * 根据基础学生主键同步删除教学学生信息
-     *
-     * @param idSet 基础学生id集合
-     * @return 删除的行数
-     */
-    int deleteTeachStudentByBasicStudentIdSet(@Param("idSet") Set<Long> idSet);
-
     /**
      * 根据id查找学生信息
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/mapper/SysUserMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.paper.library.common.bean.dto.BlurryUserDto;
-import com.qmth.paper.library.common.bean.dto.CloudUserPushStatusDto;
 import com.qmth.paper.library.common.bean.dto.UserDto;
 import com.qmth.paper.library.common.bean.dto.VerifyCodeCheckDto;
 import com.qmth.paper.library.common.bean.params.ApproveUserResult;
@@ -114,6 +113,4 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @return
      */
     List<ApproveUserResult> findByRoldIdAndMemberName(@Param("roleId") Long roleId, @Param("name") String name, @Param("schoolId") Long schoolId);
-
-    List<CloudUserPushStatusDto> findCloudUserPushStatus(@Param("userId") Long userId, @Param("schoolId") Long schoolId);
 }

paper-library-common/src/main/java/com/qmth/paper/library/common/mapper/TGErrorMapper.java

@@ -1,16 +0,0 @@
-package com.qmth.paper.library.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.paper.library.common.entity.TGError;
-
-/**
- * <p>
- * 全局异常错误信息表 Mapper 接口
- * </p>
- *
- * @author wangliang
- * @since 2021-03-24
- */
-public interface TGErrorMapper extends BaseMapper<TGError> {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/mapper/TMMqMessageMapper.java

@@ -1,15 +0,0 @@
-package com.qmth.paper.library.common.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.paper.library.common.entity.TMMqMessage;
-
-/**
- * @Description: mq消息 Mapper 接口
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/9
- */
-public interface TMMqMessageMapper extends BaseMapper<TMMqMessage> {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/service/CommonCacheService.java

@@ -274,68 +274,6 @@ public interface CommonCacheService {
      */
     public void removeUserRolePrivilegeCache(Long userId);
 
-    /**
-     * 删除考生个人报告缓存
-     */
-    public void removeExamStudentReportCache();
-
-    /**
-     * 删除院长缓存
-     */
-    public void removeCollegeDeanCache();
-
-    /**
-     * 删除学院学科缓存
-     */
-    public void removeCollegeCourseCache();
-
-    /**
-     * 删除开课课程考试总览图表缓存
-     */
-    public void removeSurveyTeacherViewCache();
-
-    /**
-     * 删除考生个人报告缓存
-     *
-     * @param schoolId
-     * @param studentCode
-     * @param examId
-     * @param courseCode
-     */
-    public void removeExamStudentReportCache(Long schoolId, String studentCode, String examId, String courseCode);
-
-    /**
-     * 删除院长缓存
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param collegeId
-     */
-    public void removeCollegeDeanCache(Long schoolId, Long semesterId, Long examId, Long collegeId);
-
-    /**
-     * 删除考察院长课程详情报告
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param courseCode
-     * @param collegeId
-     */
-    public void removeCollegeCourseCache(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId);
-
-    /**
-     * 删除开课课程考试总览图表缓存
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param courseCode
-     * @param collegeId
-     */
-    public void removeSurveyTeacherViewCache(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId);
-
     /**
      * 添加鉴权缓存
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/service/SysOrgService.java

@@ -2,9 +2,9 @@ package com.qmth.paper.library.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.paper.library.common.bean.dto.OrgDto;
-import com.qmth.paper.library.common.enums.userPush.SpecialPrivilegeEnum;
 import com.qmth.paper.library.common.entity.SysOrg;
 import com.qmth.paper.library.common.entity.SysUser;
+import com.qmth.paper.library.common.enums.userPush.SpecialPrivilegeEnum;
 
 import java.util.List;
 import java.util.Map;
@@ -23,7 +23,7 @@ public interface SysOrgService extends IService<SysOrg> {
     /**
      * 机构树
      *
-     * @param specialPrivilegeEnum 特殊权限
+     * @param specialPrivilegeEnum
      * @param withoutPrintingRoom  是否去除印刷室机构
      * @return 查询到的机构
      */

paper-library-common/src/main/java/com/qmth/paper/library/common/service/SysUserService.java

@@ -1,21 +1,17 @@
 package com.qmth.paper.library.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.paper.library.common.bean.dto.LoginDto;
 import com.qmth.paper.library.common.bean.params.ApproveUserResult;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
-import com.qmth.paper.library.common.bean.params.UserSaveReportParams;
 import com.qmth.paper.library.common.bean.result.LoginResult;
 import com.qmth.paper.library.common.bean.result.SysUserResult;
 import com.qmth.paper.library.common.bean.result.UserRoleNameResult;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.enums.RoleTypeEnum;
 import com.qmth.paper.library.common.enums.userPush.SpecialPrivilegeEnum;
-import org.springframework.util.LinkedMultiValueMap;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -27,20 +23,18 @@ import java.util.Map;
  */
 public interface SysUserService extends IService<SysUser> {
 
-
-    Long saveUser(UserSaveParams userSaveParams) throws IllegalAccessException;
-
     /**
-     * 保存用户
+     * 根据用户id查询当前用户的特殊权限
      *
-     * @param userSaveReportParams
-     * @return
+     * @param userId   用户id
+     * @param schoolId 学校id
+     * @return 用户特殊权限身份
      */
-    boolean saveUserReport(UserSaveReportParams userSaveReportParams);
+    SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId);
 
-    boolean enable(SysUser user) throws NoSuchAlgorithmException, IllegalAccessException;
+    Long saveUser(UserSaveParams userSaveParams) throws IllegalAccessException;
 
-    boolean enableReport(SysUser user) throws NoSuchAlgorithmException;
+    boolean enable(SysUser user) throws NoSuchAlgorithmException, IllegalAccessException;
 
     boolean resetPassword(Long id) throws NoSuchAlgorithmException;
 
@@ -64,21 +58,10 @@ public interface SysUserService extends IService<SysUser> {
 
     boolean bindRoles(SysUser sysUser);
 
-    LoginDto getUserRoles(SysUser sysUser);
-
     List<SysUser> listByOrgId(Long id);
 
     boolean saveCustomer(UserSaveParams userSaveParams);
 
-    /**
-     * 根据外键查找教师信息
-     *
-     * @param schoolId    学校id
-     * @param teacherCode 教师编号
-     * @return 学院数据
-     */
-    SysUser findByForeignKey(Long schoolId, String teacherCode);
-
     /**
      * 临时-不鉴权保存用户 （默认创建用户角色为该学校管理员）
      *
@@ -87,15 +70,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     boolean saveUserNoAuth(UserSaveParams userSaveParams);
 
-    /**
-     * 执行批量导入用户逻辑
-     *
-     * @param finalList 基础课程数据集合
-     * @param map       参数
-     * @return 结果
-     */
-    Map<String, Object> executeSysUserImportLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) throws NoSuchAlgorithmException;
-
     /**
      * 根据id获取
      *
@@ -129,23 +103,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     void expiredVerifyCode(Long userId, String mobileNumber);
 
-    /**
-     * 获取教研室id底下的人数量
-     *
-     * @param orgId
-     * @return
-     */
-    public int countByTeachingRoomId(Long orgId);
-
-    /**
-     * 根据用户id查询当前用户的特殊权限
-     *
-     * @param userId   用户id
-     * @param schoolId 学校id
-     * @return 用户特殊权限身份
-     */
-    SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId);
-
     /**
      * 查找用户角色名
      *
@@ -170,14 +127,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     List<Long> findOrgIdListByUserId(Long userId);
 
-    /**
-     * 用户是管理员数据权限？ 没有schoolId的用户和机构中包含 orgType为‘SCHOOL’
-     *
-     * @param userId 用户id
-     * @return true：是管理员权限、false：不是
-     */
-    boolean isAdminDataAuth(Long userId);
-
     /**
      * 查找机构树下所有用户集合
      *
@@ -194,8 +143,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     public List<ApproveUserResult> findByRoldIdAndMemberName(Long roleId, String name);
 
-    List<SysUser> findBySchoolIdAndCode(Long schoolId, String code);
-
     /**
      * 查询某用户是否包含系统特定角色
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/service/TBTaskService.java

@@ -111,16 +111,6 @@ public interface TBTaskService extends IService<TBTask> {
                                        TaskTypeEnum type,
                                        TaskResultEnum result);
 
-    /**
-     * 获取任务是否完成
-     *
-     * @param schoolId
-     * @param printPlanId
-     * @param entityIds
-     * @return
-     */
-    public boolean countByPrintPlanIdAndEntityId(Long schoolId, Long printPlanId, List<Long> entityIds);
-
     /**
      * 保存task
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/service/TGErrorService.java

@@ -1,16 +0,0 @@
-package com.qmth.paper.library.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.paper.library.common.entity.TGError;
-
-/**
- * <p>
- * 全局异常错误信息表 服务类
- * </p>
- *
- * @author wangliang
- * @since 2021-03-24
- */
-public interface TGErrorService extends IService<TGError> {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/service/TMMqMessageService.java

@@ -1,15 +0,0 @@
-package com.qmth.paper.library.common.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.paper.library.common.entity.TMMqMessage;
-
-/**
- * @Description: mq消息 服务类
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/9
- */
-public interface TMMqMessageService extends IService<TMMqMessage> {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/AuthInfoServiceImpl.java

@@ -128,7 +128,6 @@ public class AuthInfoServiceImpl implements AuthInfoService {
         if (Objects.nonNull(code)) {
             AuthOrgInfoDto authOrgInfoDto = commonCacheService.authInfoCache(code);
             if (Objects.isNull(authOrgInfoDto) || (Objects.nonNull(authOrgInfoDto) && authOrgInfoDto.getControl().hasExpired())) {
-                //TODO因授权文件失败暂时开发去掉
                 throw ExceptionResultEnum.AUTH_INFO_ERROR.exception();
             }
         }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/BasicStudentServiceImpl.java

@@ -148,8 +148,6 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         }
         // 删除基础学生
         this.remove(new QueryWrapper<BasicStudent>().lambda().in(BasicStudent::getId, idList));
-        // 同步删除教学学生
-        this.baseMapper.deleteTeachStudentByBasicStudentIdSet(new HashSet<>(idList));
         return true;
     }
 
@@ -175,8 +173,6 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         if (willDeleteStudent.size() > 0) {
             Set<Long> idSet = willDeleteStudent.stream().map(BaseEntity::getId).collect(Collectors.toSet());
             this.removeByIds(idSet);
-            // 同步删除教学学生
-            this.baseMapper.deleteTeachStudentByBasicStudentIdSet(idSet);
         }
         return true;
     }

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/CommonCacheServiceImpl.java

@@ -7,9 +7,9 @@ import com.qmth.boot.core.solar.service.SolarService;
 import com.qmth.paper.library.common.bean.auth.AuthBean;
 import com.qmth.paper.library.common.bean.dto.AuthOrgInfoDto;
 import com.qmth.paper.library.common.bean.result.MenuResult;
+import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.enums.PrivilegePropertyEnum;
-import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -444,100 +444,6 @@ public class CommonCacheServiceImpl implements CommonCacheService {
 
     }
 
-    /**
-     * 删除考生个人报告缓存
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.EXAM_STUDENT_REPORT, allEntries = true)
-    public void removeExamStudentReportCache() {
-
-    }
-
-    /**
-     * 删除院长缓存
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_DEAN_REPORT, allEntries = true)
-    public void removeCollegeDeanCache() {
-
-    }
-
-    /**
-     * 删除学院学科缓存
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, allEntries = true)
-    public void removeCollegeCourseCache() {
-
-    }
-
-    /**
-     * 删除开课课程考试总览图表缓存
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, allEntries = true)
-    public void removeSurveyTeacherViewCache() {
-
-    }
-
-    /**
-     * 删除考生个人报告缓存
-     *
-     * @param schoolId
-     * @param studentCode
-     * @param examId
-     * @param courseCode
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.EXAM_STUDENT_REPORT, key = "#schoolId + '-' + #studentCode + '-' + #examId + '-' + #courseCode")
-    public void removeExamStudentReportCache(Long schoolId, String studentCode, String examId, String courseCode) {
-
-    }
-
-    /**
-     * 删除院长缓存
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param collegeId
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_DEAN_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' +#collegeId")
-    public void removeCollegeDeanCache(Long schoolId, Long semesterId, Long examId, Long collegeId) {
-
-    }
-
-    /**
-     * 删除学院学科缓存
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param courseCode
-     * @param collegeId
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
-    public void removeCollegeCourseCache(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId) {
-
-    }
-
-    /**
-     * 删除开课课程考试分析图表缓存
-     *
-     * @param schoolId
-     * @param semesterId
-     * @param examId
-     * @param courseCode
-     * @param collegeId
-     */
-    @Override
-    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
-    public void removeSurveyTeacherViewCache(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId) {
-
-    }
-
     @Override
     @Cacheable(value = SystemConstant.AUTH_INFO_CACHE, key = "#p0", unless = "#result == null")
     public AuthOrgInfoDto authInfoCache(String code) {

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/LibraryCommonServiceImpl.java

@@ -14,12 +14,12 @@ import com.qmth.paper.library.common.bean.dto.MenuPrivilegeDto;
 import com.qmth.paper.library.common.bean.dto.OrgDto;
 import com.qmth.paper.library.common.bean.result.*;
 import com.qmth.paper.library.common.config.DictionaryConfig;
+import com.qmth.paper.library.common.contant.SpringContextHolder;
+import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.*;
 import com.qmth.paper.library.common.enums.*;
 import com.qmth.paper.library.common.service.*;
 import com.qmth.paper.library.common.util.*;
-import com.qmth.paper.library.common.contant.SpringContextHolder;
-import com.qmth.paper.library.common.contant.SystemConstant;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -683,7 +683,7 @@ public class LibraryCommonServiceImpl implements LibraryCommonService {
         if (orgId == null) {
             return null;
         }
-        List<OrgDto> orgDtos = sysOrgService.listOrgTree(null,false);
+        List<OrgDto> orgDtos = sysOrgService.listOrgTree(null, false);
         Set<Long> stringSet = new HashSet<>();
         stringSet.add(orgId);
         stringSet = getOrgIds(stringSet, orgDtos, orgId);

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysOrgServiceImpl.java

@@ -74,13 +74,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
                 }).collect(Collectors.toList());
 
         List<OrgDto> orgList = this.listOrgAll(schoolId);
-        if (withoutPrintingRoom){
+        if (withoutPrintingRoom) {
             orgList = orgList.stream().filter(e -> !OrgTypeEnum.PRINTING_HOUSE.name().equals(e.getType())).collect(Collectors.toList());
         }
         Map<Long, OrgDto> map = orgList.stream()
                 .peek(e -> {
                     // 加入机构下所有人员查询
-                    e.setSysUserList(finalSysUserResultList.stream().filter(f -> Objects.nonNull(f.getOrgId()) && f.getOrgId().equals(e.getId())).collect(Collectors.toList()));
+                    e.setSysUserList(sysUserResultList.stream().filter(f -> Objects.nonNull(f.getOrgId()) && f.getOrgId().equals(e.getId())).collect(Collectors.toList()));
                 })
                 .collect(Collectors.toMap(OrgDto::getId, Function.identity(), (dto1, dto2) -> dto1));
 
@@ -408,13 +408,13 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
         List<SysOrg> orgList = this.findParentsByOrgId(orgId).stream().distinct().collect(Collectors.toList());
         List<SysOrg> schoolOrgList = orgList.stream().filter(e -> OrgTypeEnum.SCHOOL.equals(e.getType())).collect(Collectors.toList());
-        if (schoolOrgList.size() != 1){
+        if (schoolOrgList.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception("学校信息异常");
         }
         SysOrg schoolOrg = schoolOrgList.get(0);
         Long schoolOrgId = schoolOrg.getId();
         List<SysOrg> collegeOrgList = orgList.stream().filter(e -> schoolOrgId.equals(e.getParentId())).collect(Collectors.toList());
-        if (collegeOrgList.size() != 1){
+        if (collegeOrgList.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception("开课学院异常");
         }
         return collegeOrgList.get(0);
@@ -424,15 +424,15 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     public List<SysOrg> findCollegeLevelOrgList(Long schoolId) {
         SysOrg schoolOrg = this.getOne(new QueryWrapper<SysOrg>()
                 .lambda()
-                .eq(SysOrg::getSchoolId,schoolId)
-                .eq(SysOrg::getType,OrgTypeEnum.SCHOOL));
+                .eq(SysOrg::getSchoolId, schoolId)
+                .eq(SysOrg::getType, OrgTypeEnum.SCHOOL));
 
         Long schoolOrgId = schoolOrg.getId();
 
         return this.list(new QueryWrapper<SysOrg>()
-                .lambda()
-                .eq(SysOrg::getSchoolId,schoolId)
-                .eq(SysOrg::getParentId,schoolOrgId))
+                        .lambda()
+                        .eq(SysOrg::getSchoolId, schoolId)
+                        .eq(SysOrg::getParentId, schoolOrgId))
                 .stream()
                 .filter(e -> !OrgTypeEnum.PRINTING_HOUSE.equals(e.getType()))
                 .collect(Collectors.toList());

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/SysUserServiceImpl.java

@@ -6,33 +6,28 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.gson.Gson;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.paper.library.common.bean.auth.AuthBean;
-import com.qmth.paper.library.common.bean.dto.CloudUserPushStatusDto;
-import com.qmth.paper.library.common.bean.dto.LoginDto;
 import com.qmth.paper.library.common.bean.dto.VerifyCodeCheckDto;
-import com.qmth.paper.library.common.bean.dto.excel.DescribeImportDto;
-import com.qmth.paper.library.common.bean.dto.excel.SysUserImportDto;
 import com.qmth.paper.library.common.bean.params.ApproveUserResult;
 import com.qmth.paper.library.common.bean.params.UserSaveParams;
-import com.qmth.paper.library.common.bean.params.UserSaveReportParams;
 import com.qmth.paper.library.common.bean.result.*;
 import com.qmth.paper.library.common.config.DictionaryConfig;
 import com.qmth.paper.library.common.contant.SpringContextHolder;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.*;
-import com.qmth.paper.library.common.enums.*;
+import com.qmth.paper.library.common.enums.AppSourceEnum;
+import com.qmth.paper.library.common.enums.ExceptionResultEnum;
+import com.qmth.paper.library.common.enums.FieldUniqueEnum;
+import com.qmth.paper.library.common.enums.RoleTypeEnum;
 import com.qmth.paper.library.common.enums.userPush.SpecialPrivilegeEnum;
-import com.qmth.paper.library.common.enums.userPush.UserPushResultEnum;
 import com.qmth.paper.library.common.mapper.SysUserMapper;
 import com.qmth.paper.library.common.service.*;
 import com.qmth.paper.library.common.util.Base64Util;
 import com.qmth.paper.library.common.util.ResultUtil;
 import com.qmth.paper.library.common.util.ServletUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
 import java.security.NoSuchAlgorithmException;
@@ -90,6 +85,50 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Resource
     SysRoleGroupMemberService sysRoleGroupMemberService;
 
+    @Override
+    public SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId) {
+
+
+        // 知学知考评卷员-科组长角色
+        boolean markerRole = this.includeSysRole(userId, RoleTypeEnum.MARKER);
+        boolean leaderRole = this.includeSysRole(userId, RoleTypeEnum.MARKER_LEADER);
+
+        // 记录的云阅卷应该的状态（云阅卷自己不改）
+        boolean cloudMarker = true;
+        boolean cloudLeader = true;
+//        List<CloudUserPushStatusDto> userPushDtoList = this.baseMapper.findCloudUserPushStatus(userId, schoolId);
+//        if (userPushDtoList != null) {
+//            if (userPushDtoList.size() > 1) {
+//                String userName = this.getById(userId).getLoginName();
+//                throw ExceptionResultEnum.ERROR.exception("用户【" + userName + "】存在多条推送状态记录异常");
+//            }
+//            if (userPushDtoList.size() == 1) {
+//                CloudUserPushStatusDto pushStatusDto = userPushDtoList.get(0);
+//                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerStatus()))) {
+//                    // 有推送记录但推送状态不是评卷员绑定成功
+//                    cloudMarker = false;
+//                }
+//                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerLeaderStatus()))) {
+//                    // 有推送记录但推送状态不是科组长绑定成功
+//                    cloudLeader = false;
+//                }
+//            }
+//        }
+        boolean marker = markerRole && cloudMarker;
+        boolean leader = leaderRole && cloudLeader;
+
+        SpecialPrivilegeEnum result;
+        if (marker && leader) {
+            result = SpecialPrivilegeEnum.COMPOSITE;
+        } else if (marker) {
+            result = SpecialPrivilegeEnum.MARKER;
+        } else if (leader) {
+            result = SpecialPrivilegeEnum.SUBJECT_HEADER;
+        } else {
+            result = SpecialPrivilegeEnum.UNIDENTIFIED;
+        }
+        return result;
+    }
 
     @Transactional
     @Override
@@ -97,19 +136,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return saveUserCommon(userSaveParams, null);
     }
 
-    /**
-     * 保存用户
-     *
-     * @return 结果
-     */
-    @Override
-    public boolean saveUserReport(UserSaveReportParams userSaveReportParams) {
-        Gson gson = new Gson();
-        UserSaveParams userSaveParams = gson.fromJson(gson.toJson(userSaveReportParams), UserSaveParams.class);
-        saveUserCommon(userSaveParams, null);
-        return true;
-    }
-
     @Transactional
     @Override
     public boolean enable(SysUser user) throws NoSuchAlgorithmException, IllegalAccessException {
@@ -124,19 +150,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return success;
     }
 
-    @Override
-    public boolean enableReport(SysUser user) throws NoSuchAlgorithmException {
-        UpdateWrapper<SysUser> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.lambda().set(SysUser::getEnable, user.getEnable()).eq(SysUser::getId, user.getId());
-
-        boolean success = this.update(updateWrapper);
-        //如果状态为禁用，需要踢下线重新登录
-        if (!user.getEnable()) {
-            commonService.removeUserInfo(user.getId(), true);
-        }
-        return success;
-    }
-
     @Override
     public boolean resetPassword(Long id) throws NoSuchAlgorithmException {
         SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
@@ -296,28 +309,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUserRoleService.saveBatch(list);
     }
 
-    @Override
-    public LoginDto getUserRoles(SysUser sysUser) {
-        LoginDto loginDto = new LoginDto();
-        loginDto.setId(String.valueOf(sysUser.getId()));
-        loginDto.setSchoolId(String.valueOf(sysUser.getSchoolId()));
-        loginDto.setLoginName(sysUser.getLoginName());
-        loginDto.setRealName(sysUser.getRealName());
-        loginDto.setOrgId(String.valueOf(sysUser.getOrgId()));
-        loginDto.setEnable(sysUser.getEnable());
-        loginDto.setPwdUpdateTime(sysUser.getPwdUpdateTime());
-
-        if ("admin".equals(sysUser.getLoginName())) {
-            loginDto.setRoles(Arrays.asList("ADMIN"));
-        } else {
-            List<SysRole> list = sysUserRoleService.listRoleByUserId(sysUser.getId());
-            List<String> roles = list.stream().map(m -> m.getType().name()).collect(Collectors.toList());
-            loginDto.setRoles(roles);
-        }
-        return loginDto;
-    }
-
-
     @Override
     public List<SysUser> listByOrgId(Long id) {
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
@@ -332,19 +323,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return SystemConstant.longNotNull(upUserId);
     }
 
-    @Override
-    public SysUser findByForeignKey(Long schoolId, String teacherCode) {
-        List<SysUser> tbSchoolTeacherList = this.list(new QueryWrapper<SysUser>().lambda()
-                .eq(SysUser::getSchoolId, schoolId)
-                .eq(SysUser::getLoginName, teacherCode));
-        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().lambda().eq(SysRole::getType, RoleTypeEnum.TEACHER));
-//        tbSchoolTeacherList = tbSchoolTeacherList.stream().filter(e -> Arrays.asList(e.getRoleIds()).contains(sysRole.getId())).collect(Collectors.toList());
-        if (tbSchoolTeacherList.size() != 1) {
-            throw ExceptionResultEnum.ERROR.exception("教师基础数据信息异常");
-        }
-        return tbSchoolTeacherList.get(0);
-    }
-
     /**
      * 保存用户公用
      *
@@ -550,78 +528,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return isSuccess;
     }
 
-    @Transactional
-    @Override
-    public Map<String, Object> executeSysUserImportLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<String, Object> map) {
-        SysUser requestUser = (SysUser) map.get(SystemConstant.SYS_USER);
-        Long schoolId = requestUser.getSchoolId();
-        List<Long> userIdList = new ArrayList<>();
-        for (int i = 0; i < finalList.size(); i++) {
-            LinkedMultiValueMap<Integer, Object> excelMap = finalList.get(i);
-            List<Object> sysUserImportDtoList = excelMap.get(i);
-            assert sysUserImportDtoList != null;
-            if (sysUserImportDtoList.get(0) instanceof DescribeImportDto) {
-                continue;
-            }
-
-            //  处理机构
-            if (sysUserImportDtoList.get(0) instanceof SysUserImportDto) {
-                List<SysUserImportDto> datasource = sysUserImportDtoList.stream().map(e -> {
-                    SysUserImportDto sysUserImportDto = new SysUserImportDto();
-                    BeanUtils.copyProperties(e, sysUserImportDto);
-                    return sysUserImportDto;
-                }).collect(Collectors.toList());
-                // 机构信息
-                List<String> orgInfoList = datasource.stream().map(SysUserImportDto::getOrgName).distinct().collect(Collectors.toList());
-                // 提前创建或获取机构信息并存入map
-                Map<String, Long> orgInfoMap = sysOrgService.createOrGetOrgByOrgInfo(orgInfoList, requestUser);
-                for (SysUserImportDto sysUserImportDto : datasource) {
-                    String name = sysUserImportDto.getName();
-                    String code = sysUserImportDto.getCode();
-                    String phoneNumber = sysUserImportDto.getPhoneNumber();
-                    String orgName = sysUserImportDto.getOrgName();
-                    if (!orgInfoMap.containsKey(orgName)) {
-                        throw ExceptionResultEnum.ERROR.exception("在解析的机构map集合中，没有找到excel数据中的用户机构名称【" + orgName + "】");
-                    }
-                    // 直接解析机构id
-                    Long orgId = orgInfoMap.get(orgName);
-                    String roleName = sysUserImportDto.getRoleName();
-
-                    UserSaveParams userSaveParams = new UserSaveParams();
-
-                    LinkedHashSet<Long> roleIdList = this.analyzeRoleName(schoolId, roleName);
-
-                    SysUser oldUser = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getCode, code).eq(SysUser::getSchoolId, schoolId));
-                    Long oldUserId = null;
-                    Set<Long> oldRoleIdSet = new HashSet<>();
-                    if (Objects.nonNull(oldUser)) {
-                        oldUserId = oldUser.getId();
-                        oldRoleIdSet = new HashSet<>(sysRoleService.getUserRoles(oldUserId));
-                    }
-                    String loginName = code;
-                    if (SystemConstant.longNotNull(oldUserId)) {
-                        // 编辑
-                        userSaveParams.setId(oldUserId);
-                        loginName = oldUser.getLoginName();
-                    }
-                    userSaveParams.setOrgId(orgId);
-                    userSaveParams.setRealName(name);
-                    userSaveParams.setLoginName(loginName);
-                    userSaveParams.setRoleIds(roleIdList.toArray(new Long[0]));
-                    if (SystemConstant.strNotNull(phoneNumber)) {
-                        userSaveParams.setMobileNumber(phoneNumber);
-                    }
-                    userSaveParams.setCode(code);
-                    userSaveParams.setSchoolId(schoolId);
-                    Long upUserId = this.saveUserCommon(userSaveParams, requestUser.getId());
-                    userIdList.add(upUserId);
-                }
-            }
-        }
-        map.put("userIdList", userIdList);
-        return map;
-    }
-
     /**
      * 根据id获取
      *
@@ -680,65 +586,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
-
-    /**
-     * 获取教研室id底下的人数量
-     *
-     * @param orgId
-     * @return
-     */
-    @Override
-    public int countByTeachingRoomId(Long orgId) {
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-        sysUserQueryWrapper.lambda().eq(SysUser::getOrgId, orgId);
-        return sysUserService.count(sysUserQueryWrapper);
-    }
-
-    @Override
-    public SpecialPrivilegeEnum findUserSpecialPrivilegeByUserId(Long userId, Long schoolId) {
-
-
-        // 知学知考评卷员-科组长角色
-        boolean markerRole = this.includeSysRole(userId, RoleTypeEnum.MARKER);
-        boolean leaderRole = this.includeSysRole(userId, RoleTypeEnum.MARKER_LEADER);
-
-        // 记录的云阅卷应该的状态（云阅卷自己不改）
-        boolean cloudMarker = true;
-        boolean cloudLeader = true;
-        List<CloudUserPushStatusDto> userPushDtoList = this.baseMapper.findCloudUserPushStatus(userId, schoolId);
-        if (userPushDtoList != null) {
-            if (userPushDtoList.size() > 1) {
-                String userName = this.getById(userId).getLoginName();
-                throw ExceptionResultEnum.ERROR.exception("用户【" + userName + "】存在多条推送状态记录异常");
-            }
-            if (userPushDtoList.size() == 1) {
-                CloudUserPushStatusDto pushStatusDto = userPushDtoList.get(0);
-                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerStatus()))) {
-                    // 有推送记录但推送状态不是评卷员绑定成功
-                    cloudMarker = false;
-                }
-                if (!UserPushResultEnum.BIND_SUCCESS.equals(UserPushResultEnum.valueOf(pushStatusDto.getMarkerLeaderStatus()))) {
-                    // 有推送记录但推送状态不是科组长绑定成功
-                    cloudLeader = false;
-                }
-            }
-        }
-        boolean marker = markerRole && cloudMarker;
-        boolean leader = leaderRole && cloudLeader;
-
-        SpecialPrivilegeEnum result;
-        if (marker && leader) {
-            result = SpecialPrivilegeEnum.COMPOSITE;
-        } else if (marker) {
-            result = SpecialPrivilegeEnum.MARKER;
-        } else if (leader) {
-            result = SpecialPrivilegeEnum.SUBJECT_HEADER;
-        } else {
-            result = SpecialPrivilegeEnum.UNIDENTIFIED;
-        }
-        return result;
-    }
-
     /**
      * 查找用户角色名
      *
@@ -771,26 +618,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return orgIdList.stream().distinct().collect(Collectors.toList());
     }
 
-    @Override
-    public boolean isAdminDataAuth(Long userId) {
-        boolean result = false;
-        List<SysOrg> sysOrgList = sysOrgService.list();
-        SysUser user = this.getById(userId);
-        if (Objects.isNull(user)) {
-            throw ExceptionResultEnum.ERROR.exception("用户不存在");
-        }
-        Long schoolId = user.getSchoolId();
-        if (SystemConstant.longNotNull(schoolId)) {
-            List<Long> orgIdList = this.findOrgIdListByUserId(userId);
-            if (sysOrgList.stream().anyMatch(e -> orgIdList.contains(e.getId()) && OrgTypeEnum.SCHOOL.equals(e.getType()))) {
-                result = true;
-            }
-        } else {
-            result = true;
-        }
-        return result;
-    }
-
     @Override
     public List<SysUserResult> findSysUserResultList() {
         Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
@@ -833,13 +660,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return sysUserMapper.findByRoldIdAndMemberName(roleId, name, sysUser.getSchoolId());
     }
 
-    @Override
-    public List<SysUser> findBySchoolIdAndCode(Long schoolId, String code) {
-        QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getCode, code);
-        return sysUserMapper.selectList(queryWrapper);
-    }
-
     @Override
     public boolean includeSysRole(Long userId, RoleTypeEnum defaultRole) {
         SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().lambda().eq(SysRole::getType, defaultRole));

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/TBTaskServiceImpl.java

@@ -1,24 +1,23 @@
 package com.qmth.paper.library.common.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.bean.result.TaskListResult;
-import com.qmth.paper.library.common.enums.TaskResultEnum;
-import com.qmth.paper.library.common.enums.TaskStatusEnum;
-import com.qmth.paper.library.common.enums.TaskTypeEnum;
-import com.qmth.paper.library.common.util.JacksonUtil;
-import com.qmth.paper.library.common.util.ResultUtil;
-import com.qmth.paper.library.common.util.ServletUtil;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import com.qmth.paper.library.common.entity.BasicAttachment;
 import com.qmth.paper.library.common.entity.SysUser;
 import com.qmth.paper.library.common.entity.TBTask;
+import com.qmth.paper.library.common.enums.TaskResultEnum;
+import com.qmth.paper.library.common.enums.TaskStatusEnum;
+import com.qmth.paper.library.common.enums.TaskTypeEnum;
 import com.qmth.paper.library.common.mapper.TBTaskMapper;
-import com.qmth.paper.library.common.service.TBTaskService;
 import com.qmth.paper.library.common.service.LibraryCommonService;
+import com.qmth.paper.library.common.service.TBTaskService;
+import com.qmth.paper.library.common.util.JacksonUtil;
+import com.qmth.paper.library.common.util.ResultUtil;
+import com.qmth.paper.library.common.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -26,7 +25,10 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 /**
  * <p>
@@ -201,38 +203,10 @@ public class TBTaskServiceImpl extends ServiceImpl<TBTaskMapper, TBTask> impleme
     @Override
     public IPage<TaskListResult> query(IPage<Map> iPage, Long schoolId, Long printPlanId, TaskStatusEnum status, TaskTypeEnum type, TaskResultEnum result) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Set<Long> orgIds = null;
-        if (TaskTypeEnum.CREATE_PDF.equals(type)) {
-            orgIds = libraryCommonService.listSubOrgIds(null);
-        }
+        Set<Long> orgIds = libraryCommonService.listSubOrgIds(null);
         return tbTaskMapper.query(iPage, schoolId, printPlanId, Objects.nonNull(status) ? status.name() : null, Objects.nonNull(type) ? type.name() : null, Objects.nonNull(result) ? result.name() : null, sysUser.getId(), orgIds);
     }
 
-    /**
-     * 获取任务是否完成
-     *
-     * @param schoolId
-     * @param printPlanId
-     * @param entityIds
-     * @return
-     */
-    @Override
-    public boolean countByPrintPlanIdAndEntityId(Long schoolId, Long printPlanId, List<Long> entityIds) {
-        QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-        tbTaskQueryWrapper.lambda().ne(TBTask::getStatus, TaskStatusEnum.FINISH).isNotNull(TBTask::getStatus)
-                .eq(TBTask::getType, TaskTypeEnum.CREATE_PDF);
-        if (Objects.nonNull(schoolId)) {
-            tbTaskQueryWrapper.lambda().eq(TBTask::getSchoolId, schoolId);
-        }
-        if (Objects.nonNull(printPlanId)) {
-            tbTaskQueryWrapper.lambda().eq(TBTask::getPrintPlanId, printPlanId);
-        }
-        if (Objects.nonNull(entityIds)) {
-            tbTaskQueryWrapper.lambda().in(TBTask::getEntityId, entityIds);
-        }
-        return this.count(tbTaskQueryWrapper) == 0 ? true : false;
-    }
-
     /**
      * 保存task
      *

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/TGErrorServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qmth.paper.library.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.paper.library.common.entity.TGError;
-import com.qmth.paper.library.common.mapper.TGErrorMapper;
-import com.qmth.paper.library.common.service.TGErrorService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 全局异常错误信息表 服务实现类
- * </p>
- *
- * @author wangliang
- * @since 2021-03-24
- */
-@Service
-public class TGErrorServiceImpl extends ServiceImpl<TGErrorMapper, TGError> implements TGErrorService {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/service/impl/TMMqMessageServiceImpl.java

@@ -1,19 +0,0 @@
-package com.qmth.paper.library.common.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.paper.library.common.entity.TMMqMessage;
-import com.qmth.paper.library.common.mapper.TMMqMessageMapper;
-import com.qmth.paper.library.common.service.TMMqMessageService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: mq消息 服务实现类
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/9
- */
-@Service
-public class TMMqMessageServiceImpl extends ServiceImpl<TMMqMessageMapper, TMMqMessage> implements TMMqMessageService {
-
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/threadPool/MyThreadPool.java

@@ -1,66 +1,66 @@
-package com.qmth.paper.library.common.threadPool;//package com.qmth.themis.business.threadPool;
-
-import com.qmth.paper.library.common.contant.SystemConstant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.Objects;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ThreadPoolExecutor;
-
-/**
- * @Description: 线程池应用配置
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2019/3/21
- */
-@Configuration
-public class MyThreadPool extends ThreadPoolTaskExecutor {
-    private final static Logger log = LoggerFactory.getLogger(MyThreadPool.class);
-    private MyThreadPool threadPoolTaskExecutor = null;
-    static final int cpuNum = Runtime.getRuntime().availableProcessors();
-
-    @Value("${sys.config.threadPoolCoreSize}")
-    Integer threadPoolCoreSize;
-
-    @Value("${sys.config.customThreadPoolCoreSize}")
-    boolean customThreadPoolCoreSize;
-
-    /**
-     * 线程池
-     *
-     * @return
-     */
-    @Bean
-    @Primary
-    public Executor taskThreadPool() {
-        if (Objects.isNull(threadPoolTaskExecutor)) {
-            log.info("cpuNum:{}", cpuNum);
-            threadPoolTaskExecutor = new MyThreadPool();
-            if (!customThreadPoolCoreSize && cpuNum > 0) {
-                threadPoolTaskExecutor.setCorePoolSize(cpuNum);//核心线程数
-                threadPoolTaskExecutor.setMaxPoolSize(cpuNum * 2);//最大线程数
-            } else {
-                threadPoolTaskExecutor.setCorePoolSize(threadPoolCoreSize);//核心线程数
-                threadPoolTaskExecutor.setMaxPoolSize(threadPoolCoreSize * 2);//最大线程数
-            }
-            threadPoolTaskExecutor.setKeepAliveSeconds(SystemConstant.THREAD_POOL_KEEP_ALIVE_SECONDS);//线程空闲时间
-            threadPoolTaskExecutor.setQueueCapacity(SystemConstant.THREAD_POOL_QUEUE_CAPACITY);//队列容量
-            threadPoolTaskExecutor.setThreadNamePrefix(SystemConstant.THREAD_POOL_NAME);
-            threadPoolTaskExecutor.setAllowCoreThreadTimeOut(true);//设置是否允许核心线程超时。若允许，核心线程超时后，会被销毁。默认为不允许（fasle）
-            threadPoolTaskExecutor.setWaitForTasksToCompleteOnShutdown(true);//设置shutdown时是否等到所有任务完成再真正关闭
-            threadPoolTaskExecutor.setAwaitTerminationSeconds(60);//当setWaitForTasksToCompleteOnShutdown(true)时，setAwaitTerminationSeconds 设置在 shutdown 之后最多等待多长时间后再真正关闭线程池
-            // rejection-policy：当pool已经达到max size的时候，如何处理新任务
-            // CALLER_RUNS：不在新线程中执行任务，而是由调用者所在的线程来执行
-            threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
-            threadPoolTaskExecutor.initialize();
-        }
-        return threadPoolTaskExecutor;
-    }
-}
+//package com.qmth.paper.library.common.threadPool;//package com.qmth.themis.business.threadPool;
+//
+//import com.qmth.paper.library.common.contant.SystemConstant;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+//
+//import java.util.Objects;
+//import java.util.concurrent.Executor;
+//import java.util.concurrent.ThreadPoolExecutor;
+//
+///**
+// * @Description: 线程池应用配置
+// * @Param:
+// * @return:
+// * @Author: wangliang
+// * @Date: 2019/3/21
+// */
+//@Configuration
+//public class MyThreadPool extends ThreadPoolTaskExecutor {
+//    private final static Logger log = LoggerFactory.getLogger(MyThreadPool.class);
+//    private MyThreadPool threadPoolTaskExecutor = null;
+//    static final int cpuNum = Runtime.getRuntime().availableProcessors();
+//
+//    @Value("${sys.config.threadPoolCoreSize}")
+//    Integer threadPoolCoreSize;
+//
+//    @Value("${sys.config.customThreadPoolCoreSize}")
+//    boolean customThreadPoolCoreSize;
+//
+//    /**
+//     * 线程池
+//     *
+//     * @return
+//     */
+//    @Bean
+//    @Primary
+//    public Executor taskThreadPool() {
+//        if (Objects.isNull(threadPoolTaskExecutor)) {
+//            log.info("cpuNum:{}", cpuNum);
+//            threadPoolTaskExecutor = new MyThreadPool();
+//            if (!customThreadPoolCoreSize && cpuNum > 0) {
+//                threadPoolTaskExecutor.setCorePoolSize(cpuNum);//核心线程数
+//                threadPoolTaskExecutor.setMaxPoolSize(cpuNum * 2);//最大线程数
+//            } else {
+//                threadPoolTaskExecutor.setCorePoolSize(threadPoolCoreSize);//核心线程数
+//                threadPoolTaskExecutor.setMaxPoolSize(threadPoolCoreSize * 2);//最大线程数
+//            }
+//            threadPoolTaskExecutor.setKeepAliveSeconds(SystemConstant.THREAD_POOL_KEEP_ALIVE_SECONDS);//线程空闲时间
+//            threadPoolTaskExecutor.setQueueCapacity(SystemConstant.THREAD_POOL_QUEUE_CAPACITY);//队列容量
+//            threadPoolTaskExecutor.setThreadNamePrefix(SystemConstant.THREAD_POOL_NAME);
+//            threadPoolTaskExecutor.setAllowCoreThreadTimeOut(true);//设置是否允许核心线程超时。若允许，核心线程超时后，会被销毁。默认为不允许（fasle）
+//            threadPoolTaskExecutor.setWaitForTasksToCompleteOnShutdown(true);//设置shutdown时是否等到所有任务完成再真正关闭
+//            threadPoolTaskExecutor.setAwaitTerminationSeconds(60);//当setWaitForTasksToCompleteOnShutdown(true)时，setAwaitTerminationSeconds 设置在 shutdown 之后最多等待多长时间后再真正关闭线程池
+//            // rejection-policy：当pool已经达到max size的时候，如何处理新任务
+//            // CALLER_RUNS：不在新线程中执行任务，而是由调用者所在的线程来执行
+//            threadPoolTaskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+//            threadPoolTaskExecutor.initialize();
+//        }
+//        return threadPoolTaskExecutor;
+//    }
+//}

paper-library-common/src/main/java/com/qmth/paper/library/common/util/ImageTrajectoryUtil.java

@@ -1,78 +0,0 @@
-package com.qmth.paper.library.common.util;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.color.ColorSpace;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorConvertOp;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.Objects;
-import java.util.StringJoiner;
-
-/**
- * @Description: 图片轨迹坐标生成
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/11/2
- */
-public class ImageTrajectoryUtil {
-    private final static Logger log = LoggerFactory.getLogger(ImageTrajectoryUtil.class);
-    private final static String FONT_FORMAT = "微软雅黑";
-    private final static int FONT_SIZE = 30;
-
-    /**
-     * 生成图片
-     *
-     * @param imgFile
-     * @param targetFile
-     * @param jsonArray
-     * @throws IOException
-     */
-    public static void createImage(File imgFile, File targetFile, JSONArray jsonArray) throws IOException {
-        FileOutputStream output = null;
-        try {
-            BufferedImage image = ImageIO.read(new FileInputStream(imgFile));
-            image = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_sRGB), null).filter(image, null);
-            Graphics2D g = image.createGraphics();// 得到图形上下文
-            g.setColor(Color.red); // 设置画笔颜色
-            // 设置字体
-            g.setFont(new Font(FONT_FORMAT, Font.LAYOUT_LEFT_TO_RIGHT, FONT_SIZE));
-            // 写入签名
-            if (jsonArray != null && !jsonArray.isEmpty()) {
-                for (int i = 0; i < jsonArray.size(); i++) {
-                    JSONObject jsonObject = jsonArray.getJSONObject(i);
-                    JSONArray contentJsonArray = (JSONArray) jsonObject.get("content");
-                    StringJoiner stringJoiner = new StringJoiner(",");
-                    for (int k = 0; k < contentJsonArray.size(); k++) {
-                        stringJoiner.add(contentJsonArray.get(k).toString());
-                    }
-                    BigDecimal left = new BigDecimal(jsonObject.get("left").toString());
-                    BigDecimal top = new BigDecimal(jsonObject.get("top").toString());
-                    g.drawString(stringJoiner.toString(), left.intValue(), top.intValue());
-                }
-            }
-            g.dispose();
-
-            output = new FileOutputStream(targetFile);
-            ImageIO.write(image, "jpg", output);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-        } finally {
-            if (Objects.nonNull(output)) {
-                output.flush();
-                output.close();
-            }
-        }
-    }
-}

paper-library-common/src/main/java/com/qmth/paper/library/common/util/OssUtil.java

@@ -1,175 +0,0 @@
-//packagecom.qmth.paper.library.common.util;
-//
-//import com.aliyun.oss.OSS;
-//import com.aliyun.oss.OSSClientBuilder;
-//import com.aliyun.oss.model.*;
-//import com.qmth.paper.library.common.contant.SystemConstant;
-//import com.qmth.paper.library.common.domain.AliYunOssDomain;
-//import org.apache.commons.io.IOUtils;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.stereotype.Component;
-//
-//import java.io.ByteArrayInputStream;
-//import java.io.File;
-//import java.io.IOException;
-//import java.io.InputStream;
-//import java.util.Calendar;
-//import java.util.Date;
-//import java.util.List;
-//import java.util.Objects;
-//
-///**
-// * @Description: oss工具
-// * @Param:
-// * @return:
-// * @Author: wangliang
-// * @Date: 2020/4/4
-// */
-//@Component
-//public class OssUtil {
-//    private final static Logger log = LoggerFactory.getLogger(OssUtil.class);
-//
-//    AliYunOssDomain aliYunOssDomain;
-//
-//    OSS ossClient;
-//
-//    @Bean
-//    public AliYunOssDomain ossDomain(AliYunOssDomain aliYunOssDomain) {
-//        this.aliYunOssDomain = aliYunOssDomain;
-//        this.ossClient = new OSSClientBuilder().build(this.aliYunOssDomain.getEndpoint(), this.aliYunOssDomain.getAccessKeyId(), this.aliYunOssDomain.getAccessKeySecret());
-//        return this.aliYunOssDomain;
-//    }
-//
-//    /**
-//     * oss上传文件
-//     *
-//     * @param dirName
-//     * @param inputStream
-//     * @param md5
-//     */
-//    public void ossUpload(String dirName, InputStream inputStream, String md5) throws IOException {
-//        log.info("ossUpload is come in");
-//        ObjectMetadata meta = new ObjectMetadata();
-//        if (Objects.nonNull(md5)) {
-//            // 设置MD5校验。
-//            meta.setContentMD5(md5);
-//        }
-//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, inputStream, meta);
-//        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
-//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-//    }
-//
-//    /**
-//     * oss上传文件
-//     *
-//     * @param dirName
-//     * @param file
-//     * @param md5
-//     */
-//    public void ossUpload(String dirName, File file, String md5) {
-//        log.info("ossUpload is come in");
-//        ObjectMetadata meta = new ObjectMetadata();
-//        if (Objects.nonNull(md5)) {
-//            // 设置MD5校验。
-//            meta.setContentMD5(md5);
-//        }
-//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, file);
-//        PutObjectResult por = this.ossClient.putObject(putObjectRequest);
-//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-//    }
-//
-//    /**
-//     * oss上传文件
-//     *
-//     * @param dirName
-//     * @param content
-//     */
-//    public void ossUpload(String dirName, String content) {
-//        log.info("ossUpload is come in");
-//        PutObjectRequest putObjectRequest = new PutObjectRequest(this.aliYunOssDomain.getBucket(), dirName, new ByteArrayInputStream(content.getBytes()));
-//        PutObjectResult por = ossClient.putObject(putObjectRequest);
-//        log.info("dirName:{},requestid:{}", dirName, por.getRequestId());
-//    }
-//
-//    /**
-//     * oss copy
-//     *
-//     * @param dirName
-//     * @param dirNewName
-//     */
-//    public void ossCopy(String dirName, String dirNewName) {
-//        log.info("ossCopy is come in");
-//        CopyObjectResult result = ossClient.copyObject(this.aliYunOssDomain.getBucket(), dirName, this.aliYunOssDomain.getBucket(), dirNewName);
-//        log.info("ETag:{},LastModified:{}", result.getETag(), result.getLastModified());
-//    }
-//
-//    /**
-//     * 从oss上下载文件到本地
-//     *
-//     * @param dirName
-//     * @param localPath
-//     * @throws IOException
-//     */
-//    public File ossDownload(String dirName, String localPath) throws IOException {
-//        log.info("ossDownload is come in");
-//        // 下载OSS文件到本地文件。如果指定的本地文件存在会覆盖，不存在则新建。
-//        File localFile = new File(localPath);
-//        if (!localFile.getParentFile().exists()) {
-//            localFile.getParentFile().mkdirs();
-//        }
-//        ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), dirName), localFile);
-//        return localFile;
-//    }
-//
-//    /**
-//     * 从oss上下载文件到byte[]
-//     *
-//     * @param objectName
-//     * @throws IOException
-//     */
-//    public byte[] ossDownload(String objectName) throws IOException {
-//        log.info("oss Download is come in");
-//        OSSObject obj = ossClient.getObject(new GetObjectRequest(this.aliYunOssDomain.getBucket(), objectName));
-//        byte[] data = IOUtils.toByteArray(obj.getObjectContent());
-//        obj.close();
-//        return data;
-//    }
-//
-//    /**
-//     * oss删除文件
-//     *
-//     * @param dirName
-//     */
-//    public void ossDelete(String dirName) {
-//        ossClient.deleteObject(this.aliYunOssDomain.getBucket(), dirName);
-//    }
-//
-//    /**
-//     * oss批量删除文件
-//     *
-//     * @param paths
-//     */
-//    public void ossBatchDelete(List<String> paths) {
-//        // 删除文件。key等同于ObjectName，表示删除OSS文件时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
-//        DeleteObjectsResult deleteObjectsResult = ossClient.deleteObjects(new DeleteObjectsRequest(this.aliYunOssDomain.getBucket()).withKeys(paths));
-//        deleteObjectsResult.getDeletedObjects();
-//    }
-//
-//    /**
-//     * 获取私有bucket文件访问url
-//     *
-//     * @param objectPath
-//     * @return
-//     */
-//    public String getPrivateUrl(String objectPath) {
-//        Calendar calendar = Calendar.getInstance();
-//        calendar.setTime(new Date());
-//        calendar.add(Calendar.MILLISECOND, SystemConstant.OSS_URL_EXPIRE);
-//        GeneratePresignedUrlRequest generatePresignedUrlRequest;
-//        generatePresignedUrlRequest = new GeneratePresignedUrlRequest(this.aliYunOssDomain.getBucket(), objectPath);
-//        generatePresignedUrlRequest.setExpiration(calendar.getTime());
-//        return ossClient.generatePresignedUrl(generatePresignedUrlRequest).toString();
-//    }
-//}

paper-library-common/src/main/java/com/qmth/paper/library/common/util/RedisUtil.java

@@ -1,6 +1,5 @@
 package com.qmth.paper.library.common.util;
 
-import com.qmth.paper.library.common.bean.dto.MqDto;
 import com.qmth.paper.library.common.contant.SystemConstant;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -264,16 +263,4 @@ public class RedisUtil {
     public void expire(String key, long timeOut, TimeUnit timeUnit) {
         redisTemplate.expire(key, timeOut, timeUnit);
     }
-
-    /**
-     * 发送消息
-     *
-     * @param topic
-     * @param mqDto
-     */
-    public void sendMessage(String topic, MqDto mqDto) {
-        mqDto.setAck(SystemConstant.DELIVERED_ACK_TYPE);
-        redisTemplate.convertAndSend(topic, JacksonUtil.parseJson(mqDto));
-        this.set(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId(), mqDto);
-    }
 }

paper-library-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.paper.library.common.mapper.BasicStudentMapper">
-    <delete id="deleteTeachStudentByBasicStudentIdSet">
-        DELETE FROM teach_student WHERE
-            <if test="idSet != null and idSet != '' and idSet.size > 0">
-                student_id IN
-                <foreach collection="idSet" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
-            </if>
-    </delete>
-
     <select id="listByClass" resultType="com.qmth.paper.library.common.bean.dto.TaskPrintClassDto">
         SELECT
             s.clazz_id classId,

paper-library-common/src/main/resources/mapper/SysUserMapper.xml

@@ -353,24 +353,4 @@
             and srgm.enable = 1
         </where>
     </select>
-    <select id="findCloudUserPushStatus"
-            resultType="com.qmth.paper.library.common.bean.dto.CloudUserPushStatusDto">
-        SELECT
-            school_id AS schoolId,
-            user_id AS userId,
-            marker_status AS markerStatus,
-            marker_leader_status AS markerLeaderStatus,
-            sync_status AS syncStatus
-        FROM
-            cloud_user_push_status
-        <where>
-            <if test="schoolId != null and schoolId != ''">
-                AND school_id = #{schoolId}
-            </if>
-            <if test="userId != null and userId != ''">
-                AND user_id = #{userId}
-            </if>
-        </where>
-    </select>
-
 </mapper>

paper-library-common/src/main/resources/mapper/TGErrorMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.paper.library.common.mapper.TGErrorMapper">
-
-</mapper>

paper-library-common/src/main/resources/mapper/TMMqMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qmth.paper.library.common.mapper.TMMqMessageMapper">
-
-</mapper>

paper-library-task/pom.xml

@@ -18,10 +18,6 @@
             <groupId>com.qmth.paper.library.business</groupId>
             <artifactId>paper-library-business</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.qmth.teachcloud.report.business</groupId>-->
-<!--            <artifactId>teachcloud-report-business</artifactId>-->
-<!--        </dependency>-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-quartz</artifactId>
@@ -54,7 +50,7 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <version>1.4.12</version>
                 <configuration>
-                    <repository>registry.cn-shenzhen.aliyuncs.com/teachcloud_task</repository>
+                    <repository>registry.cn-shenzhen.aliyuncs.com/paper-library-task</repository>
                     <tag>${project.version}</tag>
                     <contextDirectory>${project.baseDir}</contextDirectory>
                     <useMavenSettingsForAuth>true</useMavenSettingsForAuth>

paper-library-task/src/main/java/com/qmth/paper/library/task/PaperLibraryTaskApplication.java

@@ -1,21 +1,20 @@
 package com.qmth.paper.library.task;
 
-import com.qmth.paper.library.common.threadPool.MyThreadPool;
+//import com.qmth.paper.library.common.threadPool.MyThreadPool;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @SpringBootApplication(scanBasePackages = "com.qmth.*")
-@MapperScan({"com.qmth.paper.library.business.mapper","com.qmth.paper.library.common.mapper"})
+@MapperScan({"com.qmth.paper.library.business.mapper", "com.qmth.paper.library.common.mapper"})
 //主要就是定义扫描的路径从中找出标识了需要装配的类自动装配到spring的bean容器中,做过web开发的同学一定都有用过@Controller，@Service，@Repository注解，查看其源码你会发现，他们中有一个共同的注解@Component，没错@ComponentScan注解默认就会装配标识了@Controller，@Service，@Repository，@Component注解的类到spring容器中
-@EntityScan(basePackages = {"com.qmth.paper.library.business.entity","com.qmth.paper.library.common.entity"}) // 用来扫描和发现指定包及其子包中的Entity定义
+@EntityScan(basePackages = {"com.qmth.paper.library.business.entity", "com.qmth.paper.library.common.entity"})
+// 用来扫描和发现指定包及其子包中的Entity定义
 @EnableTransactionManagement // spring开启事务支持
 @EnableAsync // 开启异步任务
 @EnableCaching // 开启缓存注解
@@ -25,9 +24,9 @@ public class PaperLibraryTaskApplication {
         SpringApplication.run(PaperLibraryTaskApplication.class, args);
     }
 
-    @Primary
-    @Bean
-    public TaskExecutor primaryTaskExecutor() {
-        return new MyThreadPool();
-    }
+//    @Primary
+//    @Bean
+//    public TaskExecutor primaryTaskExecutor() {
+//        return new MyThreadPool();
+//    }
 }

paper-library-task/src/main/java/com/qmth/paper/library/task/config/RedisListenerConfig.java

@@ -1,47 +0,0 @@
-package com.qmth.paper.library.task.config;
-
-import com.qmth.paper.library.common.enums.MqTagEnum;
-import com.qmth.paper.library.common.threadPool.MyThreadPool;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.listener.ChannelTopic;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.listener.Topic;
-
-import javax.annotation.Resource;
-
-/**
- * @Description: redis消息队列
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/7/9
- */
-@Configuration
-public class RedisListenerConfig {
-
-    @Resource
-    private RedisConnectionFactory redisConnectionFactory;
-
-    @Resource
-    private MessageListener messageListener;
-
-    @Resource
-    MyThreadPool myThreadPool;
-
-    @Bean
-    public RedisMessageListenerContainer initRedisContainer() {
-        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-        //redis连接工厂
-        container.setConnectionFactory(redisConnectionFactory);
-        //设置运行任务池
-        container.setTaskExecutor(myThreadPool);
-        //定义监听渠道名称为
-        Topic topic = new ChannelTopic(MqTagEnum.PDF.getCode());
-        //定义监听器监听的Redis的消息
-        container.addMessageListener(messageListener, topic);
-        return container;
-    }
-}

paper-library-task/src/main/java/com/qmth/paper/library/task/config/RedisMessageListener.java

@@ -1,120 +0,0 @@
-package com.qmth.paper.library.task.config;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.Gson;
-import com.qmth.boot.redis.uid.RedisMachineService;
-import com.qmth.paper.library.common.bean.dto.MqDto;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysUser;
-import com.qmth.paper.library.common.entity.TBTask;
-import com.qmth.paper.library.common.entity.TMMqMessage;
-import com.qmth.paper.library.common.service.TMMqMessageService;
-import com.qmth.paper.library.common.util.JacksonUtil;
-import com.qmth.paper.library.common.util.RedisUtil;
-import org.apache.commons.text.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.connection.MessageListener;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.time.Duration;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @Description: redis消息监听
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/7/9
- */
-@Component
-public class RedisMessageListener implements MessageListener {
-    private final static Logger log = LoggerFactory.getLogger(RedisMessageListener.class);
-
-    @Resource
-    RedisUtil redisUtil;
-
-    @Resource
-    TMMqMessageService tmMqMessageService;
-
-//    @Resource
-//    AsyncCreatePdfTempleteService asyncCreatePdfTempleteService;
-
-    @Resource
-    RedisMachineService redisMachineService;
-
-    @Override
-    public void onMessage(Message message, byte[] bytes) {
-        if (Objects.nonNull(redisUtil.get(SystemConstant.CURRENT_TASK_MACHINE_ID))) {
-            Set<Integer> set = (Set<Integer>) redisUtil.getKeyPatterns(SystemConstant.TASK_MACHINE_ID_LIKE);
-            if (Objects.nonNull(set) && set.size() > 1) {
-                int currentMachineId = (int) redisUtil.get(SystemConstant.CURRENT_TASK_MACHINE_ID);
-                if (currentMachineId == redisMachineService.getMachineId()) {
-                    return;
-                }
-            }
-        }
-        MqDto mqDto = null;
-        AtomicInteger integer = new AtomicInteger(0);
-        try {
-            //消息
-            String body = StringEscapeUtils.unescapeJson(new String(message.getBody(), SystemConstant.CHARSET_NAME));
-            if (Objects.nonNull(body)) {
-                mqDto = JacksonUtil.readJson(body.substring(1, body.length() - 1), MqDto.class);
-                for (; integer.get() < mqDto.getReconsume(); integer.incrementAndGet()) {
-                    log.info("reconsume:{}", integer.get());
-                    if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE
-                            && Objects.nonNull(redisUtil.get(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId()))
-                            && redisUtil.lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(),
-                            SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
-                        try {
-                            //通道
-                            String topic = new String(message.getChannel(), SystemConstant.CHARSET_NAME);
-                            log.info("mqDto:{},topic:{}", JacksonUtil.parseJson(mqDto), JacksonUtil.parseJson(topic));
-                            Map<String, Object> map = (Map<String, Object>) mqDto.getBody();
-                            Map<String, Object> finalMap = new HashMap<>();
-                            map.forEach((k, v) -> {
-                                if (Objects.equals(k, SystemConstant.TASK)) {
-                                    v = JSONObject.parseObject(JSON.toJSONString(v), TBTask.class);
-                                } else if (Objects.equals(k, SystemConstant.USER)) {
-                                    v = JSONObject.parseObject(JSON.toJSONString(v), SysUser.class);
-                                }
-                                Object finalV = v;
-                                finalMap.computeIfAbsent(k, v1 -> finalV);
-                            });
-//                            asyncCreatePdfTempleteService.createPdf(finalMap, null);
-                            redisUtil.set(SystemConstant.CURRENT_TASK_MACHINE_ID, redisMachineService.getMachineId());
-                            redisUtil.delete(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId());
-                            mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
-                            break;
-                        } finally {
-                            if (Objects.nonNull(mqDto)) {
-                                redisUtil.releaseLock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId());
-                            }
-                        }
-                    } else {
-                        if (Objects.isNull(redisUtil.get(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId()))) {
-                            break;
-                        }
-                        mqDto.setAck(SystemConstant.REDELIVERED_ACK_TYPE);
-                        Thread.sleep(Duration.ofSeconds(SystemConstant.REDIS_MQ_MAX_RECONSUME).toMillis() * (integer.get() == 0 ? 1 : integer.get()));
-                    }
-                }
-            }
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-            if (Objects.nonNull(mqDto)) {//存入库
-                Gson gson = new Gson();
-                mqDto.setAck(SystemConstant.POSION_ACK_TYPE);
-                TMMqMessage tmMqMessage = gson.fromJson(gson.toJson(mqDto), TMMqMessage.class);
-                tmMqMessage.setBody(JacksonUtil.parseJson(tmMqMessage.getBody()));
-                tmMqMessageService.saveOrUpdate(tmMqMessage);
-                redisUtil.releaseLock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId());
-            }
-        }
-    }
-}

paper-library-task/src/main/java/com/qmth/paper/library/task/enums/JobEnum.java

@@ -11,10 +11,6 @@ import java.util.Objects;
  */
 public enum JobEnum {
 
-    RESET_CREATE_PDF_JOB("重新生成pdf定时任务"),
-
-    RESET_CREATE_PDF_JOB_GROUP("重新生成pdfjob组"),
-
     SMS_NOTICE_TASK_EXPIRE_JOB("任务到期提醒定时任务"),
 
     SMS_NOTICE_TASK_EXPIRE_JOB_GROUP("任务到期提醒定时任务job组"),
@@ -25,11 +21,7 @@ public enum JobEnum {
 
     SMS_NOTICE_TASK_RESEND_JOB("短信发送失败重发定时任务"),
 
-    SMS_NOTICE_TASK_RESEND_JOB_GROUP("短信发送失败重发定时任务job组"),
-
-    REDIS_MQ_JOB("学校信息同步定时任务"),
-
-    REDIS_MQ_JOB_GROUP("学校信息同步定时任务组"),;
+    SMS_NOTICE_TASK_RESEND_JOB_GROUP("短信发送失败重发定时任务job组");
 
     private String title;
 

paper-library-task/src/main/java/com/qmth/paper/library/task/job/RedisMqSyncJob.java

@@ -1,34 +1,34 @@
-package com.qmth.paper.library.task.job;
-
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.task.job.service.JobService;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import javax.annotation.Resource;
-
-/**
- * @Description: redis mq消息同步
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/7/9
- */
-public class RedisMqSyncJob extends QuartzJobBean {
-    private final static Logger log = LoggerFactory.getLogger(RedisMqSyncJob.class);
-
-    @Resource
-    JobService jobService;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            jobService.assembleJob(SystemConstant.MQ_TOPIC_BUFFER_LIST);
-        } catch (Exception e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-        }
-    }
-}
+//package com.qmth.paper.library.task.job;
+//
+//import com.qmth.paper.library.common.contant.SystemConstant;
+//import com.qmth.paper.library.task.job.service.JobService;
+//import org.quartz.JobExecutionContext;
+//import org.quartz.JobExecutionException;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.scheduling.quartz.QuartzJobBean;
+//
+//import javax.annotation.Resource;
+//
+///**
+// * @Description: redis mq消息同步
+// * @Param:
+// * @return:
+// * @Author: wangliang
+// * @Date: 2021/7/9
+// */
+//public class RedisMqSyncJob extends QuartzJobBean {
+//    private final static Logger log = LoggerFactory.getLogger(RedisMqSyncJob.class);
+//
+//    @Resource
+//    JobService jobService;
+//
+//    @Override
+//    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+//        try {
+//            jobService.assembleJob(SystemConstant.MQ_TOPIC_BUFFER_LIST);
+//        } catch (Exception e) {
+//            log.error(SystemConstant.LOG_ERROR, e);
+//        }
+//    }
+//}

paper-library-task/src/main/java/com/qmth/paper/library/task/job/ResetCreatePdfJob.java

@@ -1,35 +0,0 @@
-package com.qmth.paper.library.task.job;
-
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.task.job.service.JobService;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import javax.annotation.Resource;
-import java.io.IOException;
-
-/**
- * @Description: 重新生成pdf job
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/5/6
- */
-public class ResetCreatePdfJob extends QuartzJobBean {
-    private final static Logger log = LoggerFactory.getLogger(ResetCreatePdfJob.class);
-
-    @Resource
-    JobService jobService;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        try {
-            jobService.resetCreatePdfTask();
-        } catch (IOException e) {
-            log.error(SystemConstant.LOG_ERROR, e);
-        }
-    }
-}

paper-library-task/src/main/java/com/qmth/paper/library/task/job/service/JobService.java

@@ -11,13 +11,6 @@ import java.io.IOException;
  */
 public interface JobService {
 
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    void resetCreatePdfTask() throws IOException;
-
     /**
      * 发送即将到期数据
      */
@@ -32,16 +25,4 @@ public interface JobService {
      * 重发失败短信
      */
     void resendSmsTask();
-
-    /**
-     * 组装job
-     *
-     * @param redisKey
-     */
-    public void assembleJob(String redisKey);
-
-    /**
-     * 机器心跳
-     */
-    void machineHeart();
 }

paper-library-task/src/main/java/com/qmth/paper/library/task/job/service/impl/JobServiceImpl.java

@@ -1,21 +1,10 @@
 package com.qmth.paper.library.task.job.service.impl;
 
-import com.qmth.boot.redis.uid.RedisMachineService;
-import com.qmth.paper.library.business.service.PaperLibraryCommonService;
-import com.qmth.paper.library.common.bean.dto.MqDto;
-import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.util.RedisUtil;
 import com.qmth.paper.library.task.job.service.JobService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @Description: job service impl
  * @Param:
@@ -27,60 +16,18 @@ import java.util.concurrent.TimeUnit;
 public class JobServiceImpl implements JobService {
     private final static Logger log = LoggerFactory.getLogger(JobServiceImpl.class);
 
-    @Resource
-    PaperLibraryCommonService paperLibraryCommonService;
-
-    @Resource
-    RedisUtil redisUtil;
-
-    @Resource
-    RedisMachineService redisMachineService;
-
-    /**
-     * 重新生成pdf失败任务
-     *
-     * @throws IOException
-     */
-    @Override
-    public void resetCreatePdfTask() throws IOException {
-        paperLibraryCommonService.resetCreatePdfTask();
-    }
-
     @Override
     public void sendSmsExpireTask() {
-//        examTaskService.sendSmsExpireTask();
+
     }
 
     @Override
     public void sendSmsOverdueTask() {
-//        examTaskService.sendSmsOverdueTask();
-    }
 
-    @Override
-    public void resendSmsTask() {
-//        basicMessageService.resendSmsTask();
     }
 
     @Override
-    public void machineHeart() {
-        redisUtil.set(SystemConstant.TASK_MACHINE_ID + redisMachineService.getMachineId(), redisMachineService.getMachineId(), 30, TimeUnit.SECONDS);
-    }
+    public void resendSmsTask() {
 
-    /**
-     * 组装job
-     *
-     * @param redisKey
-     */
-    @Override
-    public void assembleJob(String redisKey) {
-        Long size = redisUtil.getHashSize(redisKey);
-        if (Objects.nonNull(size) && size.longValue() > 0) {
-            log.info("redisKey:{}缓冲区的消息数为:{}", redisKey, size);
-            Map map = redisUtil.getHashEntries(redisKey);
-            map.forEach((k, v) -> {
-                MqDto mqDto = (MqDto) v;
-                redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-            });
-        }
     }
 }

paper-library-task/src/main/java/com/qmth/paper/library/task/quartz/ScheduledTask.java

@@ -1,39 +0,0 @@
-package com.qmth.paper.library.task.quartz;
-
-import com.qmth.paper.library.task.job.service.JobService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * @Description: 定时任务
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/9/1
- */
-@Component
-public class ScheduledTask implements InitializingBean {
-    private final static Logger log = LoggerFactory.getLogger(ScheduledTask.class);
-
-    @Resource
-    JobService jobService;
-
-    /**
-     * 机器心跳
-     */
-    @Scheduled(cron = "0/15 * * * * ?")
-    public void machineHeart() {
-        log.info("machineHeart is come in");
-        jobService.machineHeart();
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        this.machineHeart();
-    }
-}

paper-library-task/src/main/java/com/qmth/paper/library/task/start/StartRunning.java

@@ -1,12 +1,5 @@
 package com.qmth.paper.library.task.start;
 
-import com.qmth.paper.library.business.service.PaperLibraryCommonService;
-import com.qmth.paper.library.task.enums.JobEnum;
-import com.qmth.paper.library.task.job.RedisMqSyncJob;
-import com.qmth.paper.library.task.job.ResendSmsJob;
-import com.qmth.paper.library.task.job.SendSmsExpireJob;
-import com.qmth.paper.library.task.job.SendSmsOverdueJob;
-import com.qmth.paper.library.task.job.service.JobService;
 import com.qmth.paper.library.task.service.QuartzService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,8 +7,6 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @Description: 服务启动时初始化运行，哪个微服务模块需要则拿此模版去用
@@ -31,56 +22,33 @@ public class StartRunning implements CommandLineRunner {
     @Resource
     QuartzService quartzService;
 
-    @Resource
-    JobService jobService;
-
-    @Resource
-    PaperLibraryCommonService paperLibraryCommonService;
-
     @Override
     public void run(String... args) throws Exception {
         log.info("服务器启动时执行 start");
-        jobService.machineHeart();
-
-//        log.info("增加重新生成pdf定时任务 start");
-//        Map taskJobMap = new HashMap();
-//        schoolJobMap.computeIfAbsent("name", v -> ResetCreatePdfJob.class.getName());
-//        quartzService.deleteJob(JobEnum.RESET_CREATE_PDF_JOB.name(), JobEnum.RESET_CREATE_PDF_JOB_GROUP.name());
-//         //每天0点定时任务
-//        quartzService.addJob(ResetCreatePdfJob.class, JobEnum.RESET_CREATE_PDF_JOB.name(), JobEnum.RESET_CREATE_PDF_JOB_GROUP.name(), "0 0/1 * * * ?", taskJobMap);
-//        log.info("增加重新生成pdf定时任务 end");
-
-        log.info("增加任务到期提醒定时任务 start");
-        Map expireJobMap = new HashMap();
-        expireJobMap.computeIfAbsent("name", v -> SendSmsExpireJob.class.getName());
-        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB.name(), JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB_GROUP.name());
-        // 每天15点定时任务
-        quartzService.addJob(SendSmsExpireJob.class, JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB.name(), JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB_GROUP.name(), "0 0 15 * * ?", expireJobMap);
-        log.info("增加任务到期提醒定时任务 end");
-
-        log.info("增加任务逾期提醒定时任务 start");
-        Map orverdueJobMap = new HashMap();
-        orverdueJobMap.computeIfAbsent("name", v -> SendSmsOverdueJob.class.getName());
-        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB.name(), JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB_GROUP.name());
-        // 每天9点定时任务
-        quartzService.addJob(SendSmsOverdueJob.class, JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB.name(), JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB_GROUP.name(), "0 0 9 * * ?", orverdueJobMap);
-        log.info("增加任务逾期提醒定时任务 end");
-
-        log.info("增加短信发送失败重发定时任务 start");
-        Map rensendJobMap = new HashMap();
-        rensendJobMap.computeIfAbsent("name", v -> ResendSmsJob.class.getName());
-        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_RESEND_JOB.name(), JobEnum.SMS_NOTICE_TASK_RESEND_JOB_GROUP.name());
-        // 每隔1小时定时任务
-        quartzService.addJob(ResendSmsJob.class, JobEnum.SMS_NOTICE_TASK_RESEND_JOB.name(), JobEnum.SMS_NOTICE_TASK_RESEND_JOB_GROUP.name(), "0 0/30 * * * ?", rensendJobMap);
-        log.info("增加短信发送失败重发定时任务 end");
 
-        log.info("增加mq信息同步定时任务 start");
-        Map redisMqJobMap = new HashMap();
-        redisMqJobMap.computeIfAbsent("name", v -> RedisMqSyncJob.class.getName());
-        quartzService.deleteJob(JobEnum.REDIS_MQ_JOB.name(), JobEnum.REDIS_MQ_JOB_GROUP.name());
-        // 每分钟定时任务
-        quartzService.addJob(RedisMqSyncJob.class, JobEnum.REDIS_MQ_JOB.name(), JobEnum.REDIS_MQ_JOB_GROUP.name(), "0 0/1 * * * ?", redisMqJobMap);
-        log.info("增加mq信息同步定时任务 end");
+//        log.info("增加任务到期提醒定时任务 start");
+//        Map expireJobMap = new HashMap();
+//        expireJobMap.computeIfAbsent("name", v -> SendSmsExpireJob.class.getName());
+//        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB.name(), JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB_GROUP.name());
+//        // 每天15点定时任务
+//        quartzService.addJob(SendSmsExpireJob.class, JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB.name(), JobEnum.SMS_NOTICE_TASK_EXPIRE_JOB_GROUP.name(), "0 0 15 * * ?", expireJobMap);
+//        log.info("增加任务到期提醒定时任务 end");
+//
+//        log.info("增加任务逾期提醒定时任务 start");
+//        Map orverdueJobMap = new HashMap();
+//        orverdueJobMap.computeIfAbsent("name", v -> SendSmsOverdueJob.class.getName());
+//        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB.name(), JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB_GROUP.name());
+//        // 每天9点定时任务
+//        quartzService.addJob(SendSmsOverdueJob.class, JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB.name(), JobEnum.SMS_NOTICE_TASK_OVERDUE_JOB_GROUP.name(), "0 0 9 * * ?", orverdueJobMap);
+//        log.info("增加任务逾期提醒定时任务 end");
+//
+//        log.info("增加短信发送失败重发定时任务 start");
+//        Map rensendJobMap = new HashMap();
+//        rensendJobMap.computeIfAbsent("name", v -> ResendSmsJob.class.getName());
+//        quartzService.deleteJob(JobEnum.SMS_NOTICE_TASK_RESEND_JOB.name(), JobEnum.SMS_NOTICE_TASK_RESEND_JOB_GROUP.name());
+//        // 每隔1小时定时任务
+//        quartzService.addJob(ResendSmsJob.class, JobEnum.SMS_NOTICE_TASK_RESEND_JOB.name(), JobEnum.SMS_NOTICE_TASK_RESEND_JOB_GROUP.name(), "0 0/30 * * * ?", rensendJobMap);
+//        log.info("增加短信发送失败重发定时任务 end");
 
         log.info("服务器启动时执行 end");
     }

paper-library-task/src/main/resources/application-task.properties

@@ -1,5 +1,5 @@
 #\u7AEF\u53E3\u914D\u7F6E
-server.port=7011
+server.port=9011
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -8,19 +8,19 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=teachcloud-task
+spring.application.name=paper-library-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
 db.host=localhost
 db.port=3306
-db.name=distributed-v3.2.0
+db.name=paper-library-v1.0.0
 db.username=root
 db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=1
+com.qmth.redis.db=2
 #com.qmth.redis.password
 
 #mysql\u914D\u7F6E
@@ -29,25 +29,6 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
@@ -64,11 +45,10 @@ sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=4h
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -77,7 +57,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/Users/king/Downloads/distributed-task.log
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore
@@ -114,14 +94,4 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 # \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 # \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-
-#\u914D\u7F6E\u6587\u4EF6
-#spring.profiles=task
-sync.config.hostUrl=http://192.168.10.224:80
-#sync.config.hostUrl=http://192.168.10.225:8000
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
+spring.quartz.properties.org.quartz.threadPool.threadPriority=5

paper-library-task/src/main/resources/application-task_36dev.properties

@@ -1,5 +1,5 @@
 #\u7AEF\u53E3\u914D\u7F6E
-server.port=7871
+server.port=9012
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -8,20 +8,20 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=teachcloud-task
+spring.application.name=paper-library-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
+db.host=localhost
 db.port=3306
-db.name=distributed-print-v3.0.1
+db.name=paper-library-v1.0.0
 db.username=root
-db.password=Qmth87863577!
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=13
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -29,46 +29,26 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
 com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
-com.qmth.fss.localfile.server=http://127.0.0.1:7871
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
 com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.localpdf.server=http://127.0.0.1:7871
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=4h
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -77,7 +57,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/ONLINE_EXAM/distributed/task_tomcat/logs/distributed-task.log
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore
@@ -114,14 +94,4 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 # \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 # \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-
-#\u914D\u7F6E\u6587\u4EF6
-#spring.profiles=task
-#sync.config.hostUrl=http://192.168.10.224:80
-sync.config.hostUrl=http://192.168.10.225:8000
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
+spring.quartz.properties.org.quartz.threadPool.threadPriority=5

paper-library-task/src/main/resources/application-task_offline.properties

@@ -1,5 +1,5 @@
 #\u7AEF\u53E3\u914D\u7F6E
-server.port=7782
+server.port=9013
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -8,20 +8,20 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=teachcloud-task
+spring.application.name=paper-library-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
-db.port=3307
-db.name=dps-offline
-db.username=dps-offline
-db.password=dps-offline
+db.host=localhost
+db.port=3306
+db.name=paper-library-v1.0.0
+db.username=root
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=11
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -29,33 +29,14 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
-com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-private
-com.qmth.fss.localfile.config=/file-temp
-com.qmth.fss.localfile.server=http://192.168.10.138:7781
-com.qmth.fss.localpdf.config=/pdf-temp
-com.qmth.fss.localpdf.server=http://192.168.10.138:7781
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
@@ -64,11 +45,10 @@ sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
-sys.config.sessionActive=4h
+sys.config.customThreadPoolCoreSize=true
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -77,7 +57,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/opt/logs/distributed-task.log
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore
@@ -114,13 +94,4 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 # \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 # \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-
-#\u914D\u7F6E\u6587\u4EF6
-#spring.profiles=task
-sync.config.hostUrl=http://192.168.10.225:8000
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
+spring.quartz.properties.org.quartz.threadPool.threadPriority=5

paper-library-task/src/main/resources/application-task_test.properties

@@ -1,5 +1,5 @@
 #\u7AEF\u53E3\u914D\u7F6E
-server.port=7701
+server.port=9014
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -8,20 +8,20 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=teachcloud-task
+spring.application.name=paper-library-task
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
-db.port=3307
-db.name=dps-v3.0.1-test
-db.username=dps_test
-db.password=dps_test
+db.host=localhost
+db.port=3306
+db.name=paper-library-v1.0.0
+db.username=root
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=15
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -29,46 +29,26 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
-com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-dps-dev-private
-com.qmth.fss.localfile.config=/file-temp
-com.qmth.fss.localfile.server=https://*.teach-cloud-test.com
-com.qmth.fss.localpdf.config=/pdf-temp
-com.qmth.fss.localpdf.server=https://*.teach-cloud-test.com
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=http://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
-sys.config.sessionActive=4h
+sys.config.customThreadPoolCoreSize=true
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #\u65E5\u671F\u683C\u5F0F\u5316
@@ -77,7 +57,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/opt/logs/distributed-task.log
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library-task.log
 
 #============================================================================
 # \u914D\u7F6EJobStore
@@ -114,13 +94,4 @@ spring.quartz.properties.org.quartz.threadPool.class=org.quartz.simpl.SimpleThre
 # \u6307\u5B9A\u7EBF\u7A0B\u6570\uFF0C\u4E00\u822C\u8BBE\u7F6E\u4E3A1-100\u76F4\u63A5\u7684\u6574\u6570\uFF0C\u6839\u636E\u7CFB\u7EDF\u8D44\u6E90\u914D\u7F6E
 spring.quartz.properties.org.quartz.threadPool.threadCount=10
 # \u8BBE\u7F6E\u7EBF\u7A0B\u7684\u4F18\u5148\u7EA7(\u53EF\u4EE5\u662FThread.MIN_PRIORITY\uFF08\u53731\uFF09\u548CThread.MAX_PRIORITY\uFF08\u8FD9\u662F10\uFF09\u4E4B\u95F4\u7684\u4EFB\u4F55int \u3002\u9ED8\u8BA4\u503C\u4E3AThread.NORM_PRIORITY\uFF085\uFF09\u3002)
-spring.quartz.properties.org.quartz.threadPool.threadPriority=5
-
-#\u914D\u7F6E\u6587\u4EF6
-#spring.profiles=task
-sync.config.hostUrl=http://192.168.10.225:8000
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
+spring.quartz.properties.org.quartz.threadPool.threadPriority=5

paper-library-task/src/test/java/com/qmth/paper/library/task/DistributedPrintTaskApplicationTests.java

@@ -1,13 +0,0 @@
-package com.qmth.paper.library.task;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-class DistributedPrintTaskApplicationTests {
-
-	@Test
-	void contextLoads() {
-	}
-
-}

paper-library/pom.xml

@@ -56,7 +56,7 @@
                 <artifactId>dockerfile-maven-plugin</artifactId>
                 <version>1.4.12</version>
                 <configuration>
-                    <repository>registry.cn-shenzhen.aliyuncs.com/distributed_print</repository>
+                    <repository>registry.cn-shenzhen.aliyuncs.com/paper-library</repository>
                     <tag>${project.version}</tag>
                     <contextDirectory>${project.baseDir}</contextDirectory>
                     <useMavenSettingsForAuth>true</useMavenSettingsForAuth>

paper-library/src/main/java/com/qmth/paper/library/PaperLibraryApplication.java

@@ -3,15 +3,12 @@ package com.qmth.paper.library;
 import com.qmth.boot.core.security.service.CustomizeAuthorizationService;
 import com.qmth.paper.library.auth.PaperLibraryAuthenticationService;
 import com.qmth.paper.library.common.base.CustomizedSqlInjector;
-import com.qmth.paper.library.common.threadPool.MyThreadPool;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
@@ -41,11 +38,11 @@ public class PaperLibraryApplication {
         };
     }
 
-    @Primary
-    @Bean
-    public TaskExecutor primaryTaskExecutor() {
-        return new MyThreadPool();
-    }
+//    @Primary
+//    @Bean
+//    public TaskExecutor primaryTaskExecutor() {
+//        return new MyThreadPool();
+//    }
 
     @Bean
     public CustomizedSqlInjector customizedSqlInjector() {

paper-library/src/main/java/com/qmth/paper/library/api/SysController.java

@@ -476,26 +476,4 @@ public class SysController {
         }
         return ResultUtil.ok(dictionaryResultList);
     }
-
-    /**
-     * 获取用户阅卷角色
-     *
-     * @return
-     */
-    @ApiOperation(value = "获取用户阅卷角色")
-    @RequestMapping(value = "/get_open_role", method = RequestMethod.POST)
-    public Result getOpenRole() {
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        SpecialPrivilegeEnum userSpecialPrivilege = sysUserService.findUserSpecialPrivilegeByUserId(sysUser.getId(), sysUser.getSchoolId());
-        List<SpecialPrivilegeEnum> list = new ArrayList<>();
-        if (!SpecialPrivilegeEnum.UNIDENTIFIED.equals(userSpecialPrivilege)) {
-            if (SpecialPrivilegeEnum.COMPOSITE.equals(userSpecialPrivilege)) {
-                list.add(SpecialPrivilegeEnum.MARKER);
-                list.add(SpecialPrivilegeEnum.SUBJECT_HEADER);
-            } else {
-                list.add(userSpecialPrivilege);
-            }
-        }
-        return ResultUtil.ok(list);
-    }
 }

paper-library/src/main/java/com/qmth/paper/library/api/SysOrgController.java

@@ -55,7 +55,7 @@ public class SysOrgController {
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(@RequestParam(value = "specialPrivilege", required = false) SpecialPrivilegeEnum specialPrivilege,
                        @RequestParam(value = "withoutPrintingRoom", required = false) boolean withoutPrintingRoom) {
-        return ResultUtil.ok(sysOrgService.listOrgTree(specialPrivilege,withoutPrintingRoom));
+        return ResultUtil.ok(sysOrgService.listOrgTree(specialPrivilege, withoutPrintingRoom));
     }
 
     /**

paper-library/src/main/java/com/qmth/paper/library/api/TBTaskController.java

@@ -1,17 +1,10 @@
 package com.qmth.paper.library.api;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.paper.library.business.bean.result.EditResult;
-import com.qmth.paper.library.common.bean.dto.MqDto;
-import com.qmth.paper.library.common.bean.params.ArraysParams;
 import com.qmth.paper.library.common.bean.result.TaskListResult;
 import com.qmth.paper.library.common.contant.SystemConstant;
-import com.qmth.paper.library.common.entity.SysUser;
-import com.qmth.paper.library.common.entity.TBTask;
-import com.qmth.paper.library.common.enums.MqTagEnum;
 import com.qmth.paper.library.common.enums.TaskResultEnum;
 import com.qmth.paper.library.common.enums.TaskStatusEnum;
 import com.qmth.paper.library.common.enums.TaskTypeEnum;
@@ -32,8 +25,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
-import java.io.IOException;
-import java.util.*;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * <p>
@@ -66,58 +59,17 @@ public class TBTaskController {
                             @ApiParam(value = "分页页码", required = true) @RequestParam @Min(SystemConstant.PAGE_NUMBER_MIN) Integer pageNumber,
                             @ApiParam(value = "分页数", required = true) @RequestParam @Min(SystemConstant.PAGE_SIZE_MIN) @Max(SystemConstant.PAGE_SIZE_MAX) Integer pageSize) {
         IPage<TaskListResult> taskListResultIPage = tbTaskService.query(new Page<>(pageNumber, pageSize), Objects.nonNull(ServletUtil.getRequestHeaderSchoolId()) ? Long.parseLong(ServletUtil.getRequestHeaderSchoolId().toString()) : null, SystemConstant.convertIdToLong(printPlanId), status, type, result);
-        if (Objects.nonNull(taskListResultIPage) && Objects.nonNull(taskListResultIPage.getRecords()) && taskListResultIPage.getRecords().size() > 0) {
-            List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();
-            for (TaskListResult taskListResult : taskListResultList) {
-                if (Objects.equals(taskListResult.getStatus(), TaskStatusEnum.FINISH.getTitle()) && Objects.equals(taskListResult.getResult(), TaskResultEnum.ERROR.getTitle())
+//        if (Objects.nonNull(taskListResultIPage) && Objects.nonNull(taskListResultIPage.getRecords()) && taskListResultIPage.getRecords().size() > 0) {
+//            List<TaskListResult> taskListResultList = taskListResultIPage.getRecords();
+//            for (TaskListResult taskListResult : taskListResultList) {
+//                if (Objects.equals(taskListResult.getStatus(), TaskStatusEnum.FINISH.getTitle()) && Objects.equals(taskListResult.getResult(), TaskResultEnum.ERROR.getTitle())
 //                        && taskListResult.getResetCount() >= dictionaryConfig.sysDomain().getAutoCreatePdfResetMaxCount()
-                        && Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())
-                        && Objects.isNull(taskListResult.getErrorMessage())) {
-                    taskListResult.setResetCreatePdf(true);
-                }
-            }
-        }
+//                        && Objects.equals(taskListResult.getType(), TaskTypeEnum.CREATE_PDF.getTitle())
+//                        && Objects.isNull(taskListResult.getErrorMessage())) {
+//                    taskListResult.setResetCreatePdf(true);
+//                }
+//            }
+//        }
         return ResultUtil.ok(taskListResultIPage);
     }
-
-    @ApiOperation(value = "重新生成pdf")
-    @RequestMapping(value = "/task/reset_create_pdf", method = RequestMethod.POST)
-    @ApiResponses({@ApiResponse(code = 200, message = "重新生成pdf", response = EditResult.class)})
-    public Result resetCreatePdf(@ApiParam(value = "任务id", required = true) @RequestParam String id) throws IOException {
-        Long taskId = Long.parseLong(id);
-        TBTask tbTask = tbTaskService.getById(taskId);
-//        tbTask.setVersion(new AtomicInteger(tbTask.getVersion()).incrementAndGet());
-        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        Map<String, Object> map = new HashMap<>();
-        if (Objects.nonNull(tbTask.getRemark())) {
-            JSONArray jsonArray = JSONArray.parseArray(tbTask.getRemark());
-            ArraysParams arraysParams = new ArraysParams(jsonArray.toArray(new Long[jsonArray.size()]));
-            map.computeIfAbsent("examDetailCourseIds", v -> Arrays.asList(arraysParams.getIds()));
-        }
-        map.computeIfAbsent(SystemConstant.TASK, v -> tbTask);
-        map.computeIfAbsent(SystemConstant.USER, v -> sysUser);
-        map.computeIfAbsent(SystemConstant.MANUAL, v -> true);
-//        asyncCreatePdfTempleteService.createPdf(map, null);
-        MqDto mqDto = new MqDto(MqTagEnum.PDF.getCode(), map, String.valueOf(tbTask.getId()));
-        redisUtil.sendMessage(mqDto.getTopic(), mqDto);
-        return ResultUtil.ok(new EditResult());
-    }
-
-//    @ApiOperation(value = "任务管理_批量删除&清空接口")
-//    @RequestMapping(value = "/task/delete", method = RequestMethod.POST)
-//    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
-//    @Transactional
-//    public Result taskDelete(@ApiParam(value = "数组id和选择类型", required = true) @RequestBody ChooseParams chooseParams) {
-//        if ((Objects.isNull(chooseParams.getIds()) || chooseParams.getIds().length == 0) && Objects.isNull(chooseParams.getType())) {
-//            throw ExceptionResultEnum.PARAMS_ERROR.exception("数据id或选择类型必须选一个");
-//        }
-//        if (Objects.nonNull(chooseParams.getType())) {
-//            QueryWrapper<TBTask> tbTaskQueryWrapper = new QueryWrapper<>();
-//            tbTaskQueryWrapper.lambda().eq(TBTask::getStatus, TaskStatusEnum.FINISH);
-//            tbTaskService.remove(tbTaskQueryWrapper);
-//        } else {
-//            tbTaskService.removeByIds(Arrays.asList(chooseParams.getIds()));
-//        }
-//        return ResultUtil.ok();
-//    }
 }

paper-library/src/main/resources/application-36dev.properties

@@ -1,4 +1,4 @@
-server.port=7771
+server.port=8011
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -7,20 +7,20 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=distributed-print
+spring.application.name=paper-library
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
+db.host=localhost
 db.port=3306
-db.name=distributed-print-v3.0.1
+db.name=paper-library-v1.0.0
 db.username=root
-db.password=Qmth87863577!
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=13
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password=
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
@@ -28,48 +28,28 @@ com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
 com.qmth.mybatis.log-level=debug
 
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
-com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
-com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
-com.qmth.fss.localfile.server=http://127.0.0.1:7001
-com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
-com.qmth.fss.localpdf.server=http://127.0.0.1:7001
-
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=4h
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
+
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
@@ -99,42 +79,11 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/ONLINE_EXAM/distributed/tomcat/logs/distributed-print.log
-
-#\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
-#spring.profiles.include=task
-
-#\uFFFD\uFFFD\uFFFD\u013E\uFFFD\uFFFD\uFFFD\uFFFDurl
-sync.config.hostUrl=http://192.168.10.225:8000
-\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.examSaveUrl=/api/exam/save
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentSaveUrl=/api/exam/student/save
-#\u036C\uFFFD\uFFFD\uFFFD\u2FE8
-sync.config.fileUploadUrl=/api/file/{type}/upload
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\u046F\uFFFD\u04FF\uFFFD
-sync.config.queryPaperStructure=/api/exam/paper/query
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00BC
-sync.config.markLoginUrl=/open/mark/login
-#\uFFFD\uFFFD\uFFFD\u9CE4\uFFFD\uFFFD\u00BC
-sync.config.markLeaderLoginUrl=/open/subject_header/login
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentCountUrl=/api/exam/student/count
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD
-sync.config.studentScoreUrl=/api/exam/student/score
-# \u036C\uFFFD\uFFFD\uFFFD\u053E\uFFFD\u1E79
-sync.config.structureUrl=/api/exam/paper/save
-# \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
-sync.config.markLeaderSaveUrl=/api/exam/subject_header/save
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library.log
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-#com.qmth.solar.license=/Users/king/Downloads/tc-dev-wl.lic
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
 sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
@@ -145,40 +94,4 @@ sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
-sms.config.aliyunSMSAuditPassCode=SMS_216425141
-sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSExamTaskCreatedCode=SMS_217436292
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSExamTaskWillExpireCode=SMS_217436295
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSExamTaskOverdueCode=SMS_217426313
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSAllocationWillExpireCode=SMS_217406305
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAllocationOverdueCode=SMS_217406308
-#\u5BA1\u6838\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSAuditCreatedCode=SMS_237216000
-#\u5BA1\u6838\u5F85\u529E\u4FEE\u6539\u7533\u8BF7\u901A\u77E5
-sms.config.aliyunSMSAuditReviewCode=SMS_237216002
-#\u5BA1\u6838\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5\uFF08\u672A\u901A\u8FC7\uFF09
-sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
-#\u5BA1\u6838\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
-#\uFFFD\uFFFD\uFFFD\uFFFD
-sms.config.aliyunSMSAuditRejectCode=SMS_237206063
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
-sms.config.aliyunSMSUploadStructureCode=SMS_237201068
-sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
-
-report.open.hostUrl=http://192.168.10.86:7004
-report.open.semesterApi=/api/report/open/semester_edit
-report.open.examApi=/api/report/open/exam_edit
-report.open.examDeleteApi=/api/report/open/exam_delete
-report.open.courseEditApi=/api/report/open/course_edit
-report.open.courseDelApi=/api/report/open/course_del
-report.open.calculateApi=/api/report/open/calculate
-report.open.publishApi=/api/report/open/publish
-report.open.ssoLoginApi=/api/report/sso/login
-
-print.open.callbackPwd=123456
+sms.config.aliyunSMSAuditPassCode=SMS_216425141

paper-library/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=7001
+server.port=8001
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -14,12 +14,12 @@ db.host=localhost
 db.port=3306
 db.name=paper-library-v1.0.0
 db.username=root
-db.password=root
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
 com.qmth.redis.port=6379
-com.qmth.redis.db=1
+com.qmth.redis.db=2
 #com.qmth.redis.password=
 
 #mysql\u914D\u7F6E
@@ -35,14 +35,12 @@ sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
 sys.config.customThreadPoolCoreSize=true
-sys.config.sessionActive=4h
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
-
 com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
 com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
 com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
@@ -81,11 +79,7 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/Users/king/Downloads/distributed-print.log
-
-#\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
-#spring.profiles.include=task
-
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library.log
 
 com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
 com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr

paper-library/src/main/resources/application-offline.properties

@@ -1,4 +1,4 @@
-server.port=7781
+server.port=8101
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -7,54 +7,26 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=distributed-print
+spring.application.name=paper-library
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
-db.port=3307
-db.name=dps-offline
-db.username=dps-offline
-db.password=dps-offline
+db.host=localhost
+db.port=3306
+db.name=paper-library-v1.0.0
+db.username=root
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=11
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password=
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
 com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
-com.qmth.mysql.log-level=debug
-
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
-com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
-com.qmth.fss.localfile.config=/file-temp
-com.qmth.fss.localfile.server=http://192.168.10.138:7781
-com.qmth.fss.localpdf.config=/pdf-temp
-com.qmth.fss.localpdf.server=http://192.168.10.138:7781
+com.qmth.mybatis.log-level=debug
 
 #\u7CFB\u7EDF\u914D\u7F6E
 sys.config.oss=false
@@ -63,13 +35,21 @@ sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
-sys.config.sessionActive=4h
+sys.config.customThreadPoolCoreSize=true
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
+
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
@@ -99,44 +79,13 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/opt/logs/distributed-print.log
-
-#\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
-#spring.profiles.include=task
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library.log
 
-#\u4E91\u9605\u5377\u76F8\u5173url
-sync.config.hostUrl=http://192.168.10.225:8000
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.examSaveUrl=/api/exam/save
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentSaveUrl=/api/exam/student/save
-#\u036C\uFFFD\uFFFD\uFFFD\u2FE8
-sync.config.fileUploadUrl=/api/file/{type}/upload
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\u046F\uFFFD\u04FF\uFFFD
-sync.config.queryPaperStructure=/api/exam/paper/query
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00BC
-sync.config.markLoginUrl=/open/mark/login
-#\uFFFD\uFFFD\uFFFD\u9CE4\uFFFD\uFFFD\u00BC
-sync.config.markLeaderLoginUrl=/open/subject_header/login
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentCountUrl=/api/exam/student/count
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD
-sync.config.studentScoreUrl=/api/exam/student/score
-# \u036C\uFFFD\uFFFD\uFFFD\u053E\uFFFD\u1E79
-sync.config.structureUrl=/api/exam/paper/save
-# \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
-sync.config.markLeaderSaveUrl=/api/exam/subject_header/save
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
-#com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
-#com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
-#com.qmth.solar.license=/Users/king/Downloads/tc-dev-wl.lic
-
-sms.config.smsNormalCode=8635
+sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
 sms.config.codeSendInterval=60
 #aliyun SMS key
@@ -145,40 +94,4 @@ sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
-sms.config.aliyunSMSAuditPassCode=SMS_216425141
-sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSExamTaskCreatedCode=SMS_217436292
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSExamTaskWillExpireCode=SMS_217436295
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSExamTaskOverdueCode=SMS_217426313
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSAllocationWillExpireCode=SMS_217406305
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAllocationOverdueCode=SMS_217406308
-#\u5BA1\u6838\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSAuditCreatedCode=SMS_237216000
-#\u5BA1\u6838\u5F85\u529E\u4FEE\u6539\u7533\u8BF7\u901A\u77E5
-sms.config.aliyunSMSAuditReviewCode=SMS_237216002
-#\u5BA1\u6838\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5\uFF08\u672A\u901A\u8FC7\uFF09
-sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
-#\u5BA1\u6838\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
-#\uFFFD\uFFFD\uFFFD\uFFFD
-sms.config.aliyunSMSAuditRejectCode=SMS_237206063
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
-sms.config.aliyunSMSUploadStructureCode=SMS_237201068
-sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
-
-report.open.hostUrl=http://192.168.10.136:7783
-report.open.semesterApi=/api/report/open/semester_edit
-report.open.examApi=/api/report/open/exam_edit
-report.open.examDeleteApi=/api/report/open/exam_delete
-report.open.courseEditApi=/api/report/open/course_edit
-report.open.courseDelApi=/api/report/open/course_del
-report.open.calculateApi=/api/report/open/calculate
-report.open.publishApi=/api/report/open/publish
-report.open.ssoLoginApi=/api/report/sso/login
-
-print.open.callbackPwd=123456
+sms.config.aliyunSMSAuditPassCode=SMS_216425141

paper-library/src/main/resources/application-test.properties

@@ -1,4 +1,4 @@
-server.port=7771
+server.port=8111
 #tomcat\u6700\u5927\u7EBF\u7A0B\u6570\uFF0C\u9ED8\u8BA4\u4E3A200
 server.tomcat.threads.max=2500
 #tomcat\u6700\u5927\u8FDE\u63A5\u6570
@@ -7,69 +7,49 @@ server.tomcat.max-connections=2500
 server.tomcat.uri-encoding=UTF-8
 
 #\u9879\u76EE\u540D\u79F0
-spring.application.name=distributed-print
+spring.application.name=paper-library
 
 #\u6570\u636E\u6E90\u914D\u7F6E
-db.host=192.168.10.136
-db.port=3307
-db.name=dps-v3.0.1-test
-db.username=dps_test
-db.password=dps_test
+db.host=localhost
+db.port=3306
+db.name=paper-library-v1.0.0
+db.username=root
+db.password=123456789
 
 #redis\u6570\u636E\u6E90\u914D\u7F6E
 com.qmth.redis.host=${db.host}
-com.qmth.redis.db=15
 com.qmth.redis.port=6379
-com.qmth.redis.password=123456
+com.qmth.redis.db=2
+#com.qmth.redis.password=
 
 #mysql\u914D\u7F6E
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.name}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
 com.qmth.datasource.username=${db.username}
 com.qmth.datasource.password=${db.password}
-com.qmth.mysql.log-level=debug
-
-#activiti\u914D\u7F6E
-#activiti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u8868\u8FDB\u884C\u66F4\u65B0\u64CD\u4F5C\u3002\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219\u81EA\u52A8\u521B\u5EFA
-#false\uFF1Afalse\u4E3A\u9ED8\u8BA4\u503C\uFF0C\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u5728\u542F\u52A8\u65F6\uFF0C\u4F1A\u5BF9\u6BD4\u6570\u636E\u5E93\u8868\u4E2D\u4FDD\u5B58\u7684\u7248\u672C\uFF0C\u5982\u679C\u6CA1\u6709\u8868\u6216\u8005\u7248\u672C\u4E0D\u5339\u914D\u65F6\uFF0C\u5C06\u5728\u542F\u52A8\u65F6\u629B\u51FA\u5F02\u5E38\u3002
-#true\uFF1A\u8BBE\u7F6E\u4E3A\u8BE5\u503C\u540E\uFF0CActiviti\u4F1A\u5BF9\u6570\u636E\u5E93\u4E2D\u6240\u6709\u7684\u8868\u8FDB\u884C\u66F4\u65B0\uFF0C\u5982\u679C\u8868\u4E0D\u5B58\u5728\uFF0C\u5219Activiti\u4F1A\u81EA\u52A8\u521B\u5EFA\u3002
-#create-drop\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\uFF0C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u3002
-#drop-create\uFF1AActiviti\u542F\u52A8\u65F6\uFF0C\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u5220\u9664\u64CD\u4F5C\u5728Activiti\u5173\u95ED\u65F6\uFF0C\u4F1A\u6267\u884C\u6570\u636E\u5E93\u8868\u7684\u521B\u5EFA\u64CD\u4F5C\u3002
-spring.activiti.database-schema-update=true
-#\u68C0\u6D4B\u5386\u53F2\u8868\u662F\u5426\u5B58\u5728
-spring.activiti.db-history-used=true
-#\u81EA\u52A8\u90E8\u7F72\u9A8C\u8BC1\u8BBE\u7F6E:true-\u5F00\u542F\uFF08\u9ED8\u8BA4\uFF09\u3001false-\u5173\u95ED
-spring.activiti.check-process-definitions=false
-#spring.activiti.process-definition-location-prefix=classpath:/processes/
-#\u5BF9\u4E8E\u5386\u53F2\u6570\u636E\uFF0C\u4FDD\u5B58\u5230\u4F55\u79CD\u7C92\u5EA6\uFF0CActiviti\u63D0\u4F9B\u4E86history-level\u5C5E\u6027\u5BF9\u5176\u8FDB\u884C\u914D\u7F6E\u3002history-level\u5C5E\u6027\u6709\u70B9\u50CFlog4j\u7684\u65E5\u5FD7\u8F93\u51FA\u7EA7\u522B\uFF0C\u8BE5\u5C5E\u6027\u6709\u4EE5\u4E0B\u56DB\u4E2A\u503C\uFF1A
-#none\uFF1A\u4E0D\u4FDD\u5B58\u4EFB\u4F55\u7684\u5386\u53F2\u6570\u636E\uFF0C\u56E0\u6B64\uFF0C\u5728\u6D41\u7A0B\u6267\u884C\u8FC7\u7A0B\u4E2D\uFF0C\u8FD9\u662F\u6700\u9AD8\u6548\u7684\u3002
-#activity\uFF1A\u7EA7\u522B\u9AD8\u4E8Enone\uFF0C\u4FDD\u5B58\u6D41\u7A0B\u5B9E\u4F8B\u4E0E\u6D41\u7A0B\u884C\u4E3A\uFF0C\u5176\u4ED6\u6570\u636E\u4E0D\u4FDD\u5B58\u3002
-#audit\uFF1A\u9664activity\u7EA7\u522B\u4F1A\u4FDD\u5B58\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5168\u90E8\u7684\u6D41\u7A0B\u4EFB\u52A1\u53CA\u5176\u5C5E\u6027\u3002audit\u4E3Ahistory\u7684\u9ED8\u8BA4\u503C\u3002
-#full\uFF1A\u4FDD\u5B58\u5386\u53F2\u6570\u636E\u7684\u6700\u9AD8\u7EA7\u522B\uFF0C\u9664\u4E86\u4F1A\u4FDD\u5B58audit\u7EA7\u522B\u7684\u6570\u636E\u5916\uFF0C\u8FD8\u4F1A\u4FDD\u5B58\u5176\u4ED6\u5168\u90E8\u6D41\u7A0B\u76F8\u5173\u7684\u7EC6\u8282\u6570\u636E\uFF0C\u5305\u62EC\u4E00\u4E9B\u6D41\u7A0B\u53C2\u6570\u7B49\u3002
-spring.activiti.history-level=audit
-
-com.qmth.fss.public.config=oss://key:secret@teachcloud-dps-dev-public.oss-api.qmth.com.cn
-com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-public
-com.qmth.fss.private.config=oss://key:secret@teachcloud-dps-dev-private.oss-api.qmth.com.cn
-com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-dps-dev-private
-com.qmth.fss.localfile.config=/file-temp
-com.qmth.fss.localfile.server=https://*.teach-cloud-test.com
-com.qmth.fss.localpdf.config=/pdf-temp
-com.qmth.fss.localpdf.server=https://*.teach-cloud-test.com
+com.qmth.mybatis.log-level=debug
 
 #\u7CFB\u7EDF\u914D\u7F6E
-sys.config.oss=true
+sys.config.oss=false
 sys.config.attachmentType=.xlsx,.xls,.doc,.docx,.pdf,.jpg,.jpeg,.png,.html,.zip,.mp3,.wav,.dll,.exe,.ftl,.bpmn,.xml
 sys.config.attachmentLength=100
 sys.config.attachmentSize=200
 sys.config.serverUpload=
 sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
-sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=false
-sys.config.sessionActive=4h
+sys.config.customThreadPoolCoreSize=true
+sys.config.sessionActive=24h
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
+com.qmth.fss.public.config=oss://key:secret@teachcloud-print-dev-public.oss-api.qmth.com.cn
+com.qmth.fss.public.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-public
+com.qmth.fss.private.config=oss://key:secret@teachcloud-print-dev-private.oss-api.qmth.com.cn
+com.qmth.fss.private.server=https://oss-file.qmth.com.cn/teachcloud-print-dev-private
+com.qmth.fss.localfile.config=/Users/king/Downloads/file-temp
+com.qmth.fss.localfile.server=http://127.0.0.1:7001
+com.qmth.fss.localpdf.config=/Users/king/Downloads/pdf-temp
+com.qmth.fss.localpdf.server=http://127.0.0.1:7001
+
 #com.qmth.api.uri-prefix=/aaa
 #\u7EDF\u8BA1\u9875\u9762\u914D\u7F6E
 com.qmth.api.metrics-endpoint=/metrics-count
@@ -99,44 +79,13 @@ spring.jackson.time-zone=GMT+8
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=/opt/logs/distributed-print.log
-
-#\u5F15\u5165task\u914D\u7F6E\u6587\u4EF6
-#spring.profiles.include=task
+com.qmth.logging.file-path=/Users/king/Downloads/paper-library.log
 
-#\u4E91\u9605\u5377\u76F8\u5173url
-sync.config.hostUrl=http://192.168.10.225:8000
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.examSaveUrl=/api/exam/save
-#\u036C\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentSaveUrl=/api/exam/student/save
-#\u036C\uFFFD\uFFFD\uFFFD\u2FE8
-sync.config.fileUploadUrl=/api/file/{type}/upload
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\u046F\uFFFD\u04FF\uFFFD
-sync.config.queryPaperStructure=/api/exam/paper/query
-#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u00BC
-sync.config.markLoginUrl=/open/mark/login
-#\uFFFD\uFFFD\uFFFD\u9CE4\uFFFD\uFFFD\u00BC
-sync.config.markLeaderLoginUrl=/open/subject_header/login
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
-sync.config.studentCountUrl=/api/exam/student/count
-#\uFFFD\u027C\uFFFD\uFFFD\u0634\uFFFD
-sync.config.studentScoreUrl=/api/exam/student/score
-# \u036C\uFFFD\uFFFD\uFFFD\u053E\uFFFD\u1E79
-sync.config.structureUrl=/api/exam/paper/save
-# \uFFFD\u00FB\uFFFD\u036C\uFFFD\uFFFD
-sync.config.userSaveUrl=/api/user/external/save
-sync.config.groupSaveUrl=/api/exam/mark_group/save
-sync.config.groupCountUrl=/api/exam/mark_group/count
-sync.config.groupDeleteUrl=/api/exam/mark_group/delete
-sync.config.markerSaveUrl=/api/exam/marker/save
-sync.config.markLeaderSaveUrl=/api/exam/subject_header/save
+com.qmth.solar.access-key=274f823e5f59410f8b3bb6edcd8e2b6e
+com.qmth.solar.access-secret=y7AO6W0TOdTF8HpWBwGHbp3wfIHsmUKr
+#com.qmth.solar.license=/Volumes/extend/\u542F\u660E/\u5206\u5E03\u5F0F\u5370\u5237/\u5206\u5E03\u5F0F\u5370\u5237&\u6559\u7814\u5206\u6790v3.1.0/tc-dev-wl.lic
 
-com.qmth.solar.access-key=918d0878ee7944beb448980b011ff804
-com.qmth.solar.access-secret=IY3NB9FXtd7OQHWH5YHl6mbrU9ch33QC
-#com.qmth.solar.license=/Users/king/Downloads/tc-dev-wl.lic
-
-sms.config.smsNormalCode=8635
+sms.config.smsNormalCode=qmth
 sms.config.codeExpiredTime=2
 sms.config.codeSendInterval=60
 #aliyun SMS key
@@ -145,40 +94,4 @@ sms.config.aliyunSMSKey=LTAI4Fi8jVRYT49QBXU9x5QX
 sms.config.aliyunSMSSecret=97aBLBfkQR5mzCiQa82yWLAH57eUd8
 sms.config.aliyunSMSSignName=\u9038\u6559\u4E91
 sms.config.aliyunSMSTplCode=SMS_147416565
-sms.config.aliyunSMSAuditPassCode=SMS_216425141
-sms.config.aliyunSMSAuditNotPassCode=SMS_216275156
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSExamTaskCreatedCode=SMS_217436292
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSExamTaskWillExpireCode=SMS_217436295
-#\u547D\u9898\u4EFB\u52A1\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSExamTaskOverdueCode=SMS_217426313
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5
-sms.config.aliyunSMSAllocationWillExpireCode=SMS_217406305
-#\u547D\u9898\u5206\u914D\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAllocationOverdueCode=SMS_217406308
-#\u5BA1\u6838\u5F85\u529E\u751F\u6210\u901A\u77E5
-sms.config.aliyunSMSAuditCreatedCode=SMS_237216000
-#\u5BA1\u6838\u5F85\u529E\u4FEE\u6539\u7533\u8BF7\u901A\u77E5
-sms.config.aliyunSMSAuditReviewCode=SMS_237216002
-#\u5BA1\u6838\u5F85\u529E\u5230\u671F\u9884\u8B66\u901A\u77E5\uFF08\u672A\u901A\u8FC7\uFF09
-sms.config.aliyunSMSAuditWillExpireCode=SMS_217436302
-#\u5BA1\u6838\u5F85\u529E\u903E\u671F\u901A\u77E5
-sms.config.aliyunSMSAuditOverdueCode=SMS_217416271
-#\uFFFD\uFFFD\uFFFD\uFFFD
-sms.config.aliyunSMSAuditRejectCode=SMS_237206063
-# \uFFFD\u053E\uFFFD\u1E79\uFFFD\uFFFD\uFFFD\uFFFD\u03F4\uFFFD\u0368\u05AA
-sms.config.aliyunSMSUploadStructureCode=SMS_237201068
-sms.config.aliyunSMSAuditCopyUserCode=SMS_237206065
-
-report.open.hostUrl=https://*.teachcloud-report-test.work
-report.open.semesterApi=/api/report/open/semester_edit
-report.open.examApi=/api/report/open/exam_edit
-report.open.examDeleteApi=/api/report/open/exam_delete
-report.open.courseEditApi=/api/report/open/course_edit
-report.open.courseDelApi=/api/report/open/course_del
-report.open.calculateApi=/api/report/open/calculate
-report.open.publishApi=/api/report/open/publish
-report.open.ssoLoginApi=/api/report/sso/login
-
-print.open.callbackPwd=123456
+sms.config.aliyunSMSAuditPassCode=SMS_216425141

pom.xml

@@ -265,26 +265,6 @@
                 <artifactId>itextpdf</artifactId>
                 <version>${itextpdf.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.itextpdf</groupId>
-                <artifactId>itext-asian</artifactId>
-                <version>${itextasian.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>core</artifactId>
-                <version>${googleBar.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.zxing</groupId>
-                <artifactId>javase</artifactId>
-                <version>${googleBar.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.freemarker</groupId>
-                <artifactId>freemarker</artifactId>
-                <version>${freemarker.version}</version>
-            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>