知学知考v3.0.1代码合并

distributed-print-business/pom.xml

@@ -39,11 +39,6 @@
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-            <version>1.1.0</version>
-        </dependency>
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/BasicExamDto.java

@@ -1,16 +0,0 @@
-package com.qmth.distributed.print.business.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.distributed.print.business.entity.BasicVerifyCode;
-
-/**
- * <p>
- * 短信验证码记录表 Mapper 接口
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicVerifyCodeMapper extends BaseMapper<BasicVerifyCode> {
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamPaperGroupMapper.java

@@ -1,142 +0,0 @@
-package com.qmth.distributed.print.business.service.impl;
-
-import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.IAcsClient;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
-import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
-import com.aliyuncs.exceptions.ClientException;
-import com.aliyuncs.http.MethodType;
-import com.aliyuncs.profile.DefaultProfile;
-import com.aliyuncs.profile.IClientProfile;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qmth.distributed.print.business.entity.BasicVerifyCode;
-import com.qmth.distributed.print.business.mapper.BasicVerifyCodeMapper;
-import com.qmth.distributed.print.business.service.BasicVerifyCodeService;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
-import com.qmth.teachcloud.common.entity.SysConfig;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.service.SysConfigService;
-import com.qmth.teachcloud.common.service.SysUserService;
-import com.qmth.teachcloud.common.util.ServletUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * <p>
- * 短信验证码记录表 服务实现类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@Service
-public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMapper, BasicVerifyCode> implements BasicVerifyCodeService {
-
-    @Autowired
-    private DictionaryConfig dictionaryConfig;
-
-    @Autowired
-    private SysConfigService sysConfigService;
-
-    @Override
-    public void sendVeirfyCode(String mobileNumber, SysUser sysUser) {
-        SysConfig sysConfig = sysConfigService.getByKey("sys.code.enable");
-        if (sysConfig.getConfigValue() == null) {
-            throw ExceptionResultEnum.ERROR.exception("短信验证码启用开关未设置");
-        }
-        if (sysConfig.getConfigValue().equals("false")) {
-            throw ExceptionResultEnum.ERROR.exception("短信验证码已关闭");
-        }
-        QueryWrapper<BasicVerifyCode> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(BasicVerifyCode::getMobileNumber, mobileNumber).eq(BasicVerifyCode::getUserId, sysUser.getId());
-        BasicVerifyCode basicVerifyCode = this.getOne(wrapper);
-        if (basicVerifyCode != null) {
-            Date oldCreateTime = new Date(basicVerifyCode.getCreateTime());
-            Integer sendInterval = dictionaryConfig.smsDomain().getCodeSendInterval();
-            if ((System.currentTimeMillis() - oldCreateTime.getTime()) < sendInterval * 1000) {
-                throw ExceptionResultEnum.ERROR.exception("发送验证码过于频繁，请" + sendInterval + "秒之后再试");
-            }
-        }
-        try {
-            StringBuilder sb = new StringBuilder();
-            sb.append((int) ((Math.random() * 9 + 1) * 1000));
-            String verifyCode = sb.toString();
-            System.setProperty("sun.net.client.defaultConnectTimeout", "180000");
-            System.setProperty("sun.net.client.defaultReadTimeout", "18000");
-            // 初始化ascClient需要的几个参数
-            final String product = "Dysmsapi";// 短信API产品名称（短信产品名固定，无需修改）
-            final String domain = "dysmsapi.aliyuncs.com";// 短信API产品域名（接口地址固定，无需修改）
-            // 替换成你的AK
-            final String accessKeyId = dictionaryConfig.smsDomain().getAliyunSMSKey();// 你的accessKeyId,参考本文档步骤2
-            final String accessKeySecret = dictionaryConfig.smsDomain().getAliyunSMSSecret();// 你的accessKeySecret，参考本文档步骤2
-            // 初始化ascClient,暂时不支持多region（请勿修改）
-            IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
-            DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", product, domain);
-            IAcsClient acsClient = new DefaultAcsClient(profile);
-            // 组装请求对象
-            SendSmsRequest request = new SendSmsRequest();
-            // 使用post提交
-            request.setMethod(MethodType.POST);
-            // 必填:待发送手机号。支持以逗号分隔的形式进行批量调用，批量上限为1000个手机号码,批量调用相对于单条调用及时性稍有延迟,验证码类型的短信推荐使用单条调用的方式；发送国际/港澳台消息时，接收号码格式为00+国际区号+号码，如“0085200000000”
-            request.setPhoneNumbers(mobileNumber);
-            // 必填:短信签名-可在短信控制台中找到
-            request.setSignName(dictionaryConfig.smsDomain().getAliyunSMSSignName());
-            // 必填:短信模板-可在短信控制台中找到
-            request.setTemplateCode(dictionaryConfig.smsDomain().getAliyunSMSTplCode());
-            // 可选:模板中的变量替换JSON串,如模板内容为"亲爱的${name},您的验证码为${code}"时,此处的值为
-            // 友情提示:如果JSON中需要带换行符,请参照标准的JSON协议对换行符的要求,比如短信内容中包含\r\n的情况在JSON中需要表示成\\r\\n,否则会导致JSON在服务端解析失败
-            request.setTemplateParam("{\"code\":\"" + verifyCode + "\"}");
-            // 可选-上行短信扩展码(扩展码字段控制在7位或以下，无特殊需求用户请忽略此字段)
-            // request.setSmsUpExtendCode("90997");
-            // 可选:outId为提供给业务方扩展字段,最终在短信回执消息中将此值带回给调用者
-            // request.setOutId("yourOutId");
-            // 请求失败这里会抛ClientException异常
-            SendSmsResponse sendSmsResponse = acsClient.getAcsResponse(request);
-            if (sendSmsResponse.getCode() != null && sendSmsResponse.getCode().equals("OK")) {
-                // 请求成功
-                Integer codeExpiredTime = dictionaryConfig.smsDomain().getCodeExpiredTime();
-                if (basicVerifyCode == null) {
-                    basicVerifyCode = new BasicVerifyCode();
-                    basicVerifyCode.setUserId(sysUser.getId());
-                    basicVerifyCode.setSchoolId(sysUser.getSchoolId());
-                    basicVerifyCode.setMobileNumber(mobileNumber);
-                    basicVerifyCode.setExpireTime(processMiniute(new Date(), codeExpiredTime));
-                    basicVerifyCode.setValidPeriod(codeExpiredTime);
-                    basicVerifyCode.setVerifyCode(verifyCode);
-                    basicVerifyCode.setCreateId(sysUser.getId());
-                    basicVerifyCode.setCreateTime(System.currentTimeMillis());
-                    this.save(basicVerifyCode);
-                } else {
-                    basicVerifyCode.setExpireTime(processMiniute(new Date(), codeExpiredTime));
-                    basicVerifyCode.setValidPeriod(codeExpiredTime);
-                    basicVerifyCode.setVerifyCode(verifyCode);
-                    basicVerifyCode.setUpdateId(sysUser.getId());
-                    basicVerifyCode.setUpdateTime(System.currentTimeMillis());
-                    this.updateById(basicVerifyCode);
-                }
-            } else {
-                if("isv.MOBILE_NUMBER_ILLEGAL".equals(sendSmsResponse.getCode())){
-                    throw ExceptionResultEnum.ERROR.exception("非法手机号");
-                }else {
-                    throw ExceptionResultEnum.ERROR.exception(sendSmsResponse.getMessage());
-                }
-            }
-        } catch (ClientException e) {
-            String error = e.getMessage();
-            throw ExceptionResultEnum.ERROR.exception("请重新获取验证码");
-        }
-    }
-
-    private static Long processMiniute(Date oldTime, int m) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(oldTime);
-        calendar.add(Calendar.MINUTE, m);
-        return calendar.getTime().getTime();
-    }
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DownloadServiceImpl.java

@@ -114,6 +114,7 @@ prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu
 prefix.url.customFlow=admin/custom/flow
 prefix.url.teach=admin/teach
+prefix.url.auth=admin/auth
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

distributed-print/src/main/resources/application-dev.properties

@@ -114,6 +114,7 @@ prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu
 prefix.url.customFlow=admin/custom/flow
 prefix.url.teach=admin/teach
+prefix.url.auth=admin/auth
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

distributed-print/src/main/resources/application-release.properties

@@ -119,6 +119,7 @@ prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu
 prefix.url.customFlow=admin/custom/flow
 prefix.url.teach=admin/teach
+prefix.url.auth=admin/auth
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

distributed-print/src/main/resources/application-test.properties

@@ -114,6 +114,7 @@ prefix.url.sync=admin/sync
 prefix.url.menu=admin/menu
 prefix.url.customFlow=admin/custom/flow
 prefix.url.teach=admin/teach
+prefix.url.auth=admin/auth
 
 #\u65E5\u671F\u683C\u5F0F\u5316
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

distributed-print/src/test/java/com/qmth/distributed/print/ServiceTest.java

@@ -17,6 +17,7 @@ import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.BasicPrintConfig;
 import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.BasicVerifyCodeService;
 import com.qmth.teachcloud.common.util.ConvertUtil;
 import org.junit.Test;
 import org.junit.runner.RunWith;

teachcloud-common/pom.xml

@@ -148,5 +148,10 @@
             <artifactId>pdfbox</artifactId>
             <version>2.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            <version>1.1.0</version>
+        </dependency>
     </dependencies>
 </project>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/SignatureEntityTest.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/SignatureEntityTest.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.entity;
+package com.qmth.teachcloud.common.entity;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/PushUserError.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/PushUserError.java

@@ -1,7 +1,7 @@
-package com.qmth.teachcloud.report.business.mapper;
+package com.qmth.teachcloud.common.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qmth.teachcloud.report.business.entity.BasicVerifyCode;
+import com.qmth.teachcloud.common.entity.BasicVerifyCode;
 
 /**
  * <p>

teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/PushUserErrorMapper.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/mapper/PushUserErrorMapper.java

@@ -1,7 +1,7 @@
-package com.qmth.distributed.print.business.service;
+package com.qmth.teachcloud.common.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.distributed.print.business.entity.BasicVerifyCode;
+import com.qmth.teachcloud.common.entity.BasicVerifyCode;
 import com.qmth.teachcloud.common.entity.SysUser;
 
 /**

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/PushUserErrorService.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/PushUserErrorService.java

@@ -1,4 +1,4 @@
-package com.qmth.teachcloud.report.business.service.impl;
+package com.qmth.teachcloud.common.service.impl;
 
 import com.aliyuncs.DefaultAcsClient;
 import com.aliyuncs.IAcsClient;
@@ -11,13 +11,13 @@ import com.aliyuncs.profile.IClientProfile;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
+import com.qmth.teachcloud.common.entity.BasicVerifyCode;
 import com.qmth.teachcloud.common.entity.SysConfig;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.mapper.BasicVerifyCodeMapper;
+import com.qmth.teachcloud.common.service.BasicVerifyCodeService;
 import com.qmth.teachcloud.common.service.SysConfigService;
-import com.qmth.teachcloud.report.business.entity.BasicVerifyCode;
-import com.qmth.teachcloud.report.business.mapper.BasicVerifyCodeMapper;
-import com.qmth.teachcloud.report.business.service.BasicVerifyCodeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -118,9 +118,9 @@ public class BasicVerifyCodeServiceImpl extends ServiceImpl<BasicVerifyCodeMappe
                     this.updateById(basicVerifyCode);
                 }
             } else {
-                if ("isv.MOBILE_NUMBER_ILLEGAL".equals(sendSmsResponse.getCode())) {
+                if("isv.MOBILE_NUMBER_ILLEGAL".equals(sendSmsResponse.getCode())){
                     throw ExceptionResultEnum.ERROR.exception("非法手机号");
-                } else {
+                }else {
                     throw ExceptionResultEnum.ERROR.exception(sendSmsResponse.getMessage());
                 }
             }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/PushUserErrorServiceImpl.java → teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/PushUserErrorServiceImpl.java

@@ -1,9 +1,9 @@
 <?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.distributed.print.business.mapper.BasicVerifyCodeMapper">
+<mapper namespace="com.qmth.teachcloud.common.mapper.BasicVerifyCodeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.distributed.print.business.entity.BasicVerifyCode">
+    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.common.entity.BasicVerifyCode">
     <result column="id" property="id" />
         <result column="user_id" property="userId" />
         <result column="mobile_number" property="mobileNumber" />

teachcloud-report-business/pom.xml

@@ -75,11 +75,6 @@
 			<groupId>org.jetbrains</groupId>
 			<artifactId>annotations</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.aliyun</groupId>
-			<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-			<version>1.1.0</version>
-		</dependency>
 		<dependency>
 			<groupId>com.itextpdf</groupId>
 			<artifactId>itextpdf</artifactId>

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/BasicVerifyCode.java

@@ -1,123 +0,0 @@
-package com.qmth.teachcloud.report.business.entity;
-
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.common.base.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 短信验证码记录表
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-@TableName("basic_verify_code")
-public class BasicVerifyCode extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "学校id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("school_id")
-    private Long schoolId;
-
-    @ApiModelProperty(value = "机构id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "org_id", updateStrategy = FieldStrategy.IGNORED)
-    private Long orgId;
-
-    /**
-     * 用户ID
-     */
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField("user_id")
-    private Long userId;
-    /**
-     * 手机号
-     */
-    @TableField("mobile_number")
-    private String mobileNumber;
-    /**
-     * 到期时间
-     */
-    @TableField("expire_time")
-    private Long expireTime;
-    /**
-     * 单位（秒）
-     */
-    @TableField("valid_period")
-    private Integer validPeriod;
-    /**
-     * 4位数字
-     */
-    @TableField("verify_code")
-    private String verifyCode;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    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 Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getMobileNumber() {
-        return mobileNumber;
-    }
-
-    public void setMobileNumber(String mobileNumber) {
-        this.mobileNumber = mobileNumber;
-    }
-
-    public Long getExpireTime() {
-        return expireTime;
-    }
-
-    public void setExpireTime(Long expireTime) {
-        this.expireTime = expireTime;
-    }
-
-    public Integer getValidPeriod() {
-        return validPeriod;
-    }
-
-    public void setValidPeriod(Integer validPeriod) {
-        this.validPeriod = validPeriod;
-    }
-
-    public String getVerifyCode() {
-        return verifyCode;
-    }
-
-    public void setVerifyCode(String verifyCode) {
-        this.verifyCode = verifyCode;
-    }
-
-}

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/BasicVerifyCodeService.java

@@ -1,18 +0,0 @@
-package com.qmth.teachcloud.report.business.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.report.business.entity.BasicVerifyCode;
-
-/**
- * <p>
- * 短信验证码记录表 服务类
- * </p>
- *
- * @author xf
- * @since 2021-03-23
- */
-public interface BasicVerifyCodeService extends IService<BasicVerifyCode> {
-
-    void sendVeirfyCode(String mobileNumber, SysUser sysUser);
-}

teachcloud-report-business/src/main/resources/mapper/BasicVerifyCodeMapper.xml

@@ -1,23 +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.teachcloud.report.business.mapper.BasicVerifyCodeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qmth.teachcloud.report.business.entity.BasicVerifyCode">
-    <result column="id" property="id" />
-        <result column="user_id" property="userId" />
-        <result column="mobile_number" property="mobileNumber" />
-        <result column="expire_time" property="expireTime" />
-        <result column="valid_period" property="validPeriod" />
-        <result column="verify_code" property="verifyCode" />
-        <result column="create_id" property="createId" />
-        <result column="create_time" property="createTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,
-        user_id, mobile_number, expire_time, valid_period, verify_code, create_id, create_time
-    </sql>
-
-</mapper>

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysController.java

@@ -18,8 +18,6 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.params.LoginParam;
 import com.qmth.teachcloud.report.business.bean.result.EditResult;
-import com.qmth.teachcloud.report.business.entity.BasicVerifyCode;
-import com.qmth.teachcloud.report.business.service.BasicVerifyCodeService;
 import com.qmth.teachcloud.report.business.service.ReportCommonService;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.StringUtils;