fix

src/main/java/cn/com/qmth/export/ExportGkProperty.java

@@ -24,6 +24,10 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.export.bean.FileUtil;
+import cn.com.qmth.export.bean.Param;
+import cn.com.qmth.export.bean.PropertyDto;
+
 public class ExportGkProperty {
 
     private static Logger logger = LogManager.getLogger(ExportGkProperty.class);

src/main/java/cn/com/qmth/export/GkExportPaperByCourseCode.java

@@ -6,6 +6,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import cn.com.qmth.export.bean.MyConsumer;
+import cn.com.qmth.export.bean.MyProducer;
+
 /**
  * 网梯按课程导
  * 

src/main/java/cn/com/qmth/export/GkExportPaperByCourseCode2.java

@@ -6,6 +6,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import cn.com.qmth.export.bean.MyConsumer2;
+import cn.com.qmth.export.bean.MyProducer2;
+
 /**
  * 学位英语，不按课程导
  * 

src/main/java/cn/com/qmth/export/GkExportPaperByCourseCode3.java

@@ -8,6 +8,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import cn.com.qmth.export.bean.MyConsumer3;
+import cn.com.qmth.export.bean.MyProducer3;
+
 /**
  * moodle按课程导
  * 

src/main/java/cn/com/qmth/export/GkExportPaperByCourseCode4.java

@@ -6,6 +6,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 
+import cn.com.qmth.export.bean.MyConsumer4;
+import cn.com.qmth.export.bean.MyProducer4;
+
 /**
  * moodle按属性分试卷
  * 

src/main/java/cn/com/qmth/export/SetLevel.java

@@ -11,9 +11,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class SetLevel {
+import cn.com.qmth.export.bean.Knowledge;
+import cn.com.qmth.export.bean.Param;
 
-    private static String dbName = "guangkai241128";
+public class SetLevel {
 
     public static void main(String[] args) {
         System.out.println("开始处理");
@@ -22,12 +23,9 @@ public class SetLevel {
         try {
             Class.forName("com.mysql.cj.jdbc.Driver");
 
-            String url = "jdbc:mysql://localhost:3306/" + dbName + "?serverTimezone=GMT%2B8";
-
-            String user = "root";
+            String url = "jdbc:mysql://localhost:3306/" + Param.dbName + "?serverTimezone=GMT%2B8";
 
-            String password = "123456";
-            connect = DriverManager.getConnection(url, user, password);
+            connect = DriverManager.getConnection(url, Param.dbUser, Param.dbPass);
             List<Knowledge> ks = getKnowledge(connect);
             setLevel(ks);
             if (ks.size() <= 1000) {

src/main/java/cn/com/qmth/export/Answer.java → src/main/java/cn/com/qmth/export/bean/Answer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class Answer {
 	private Long aId;

src/main/java/cn/com/qmth/export/AnswerVo.java → src/main/java/cn/com/qmth/export/bean/AnswerVo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/export/Basket.java → src/main/java/cn/com/qmth/export/bean/Basket.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;

src/main/java/cn/com/qmth/export/BatchGetDataUtil.java → src/main/java/cn/com/qmth/export/bean/BatchGetDataUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/com/qmth/export/Calculator.java → src/main/java/cn/com/qmth/export/bean/Calculator.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.math.BigDecimal;
 import java.util.List;

src/main/java/cn/com/qmth/export/Consumer.java → src/main/java/cn/com/qmth/export/bean/Consumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.Map;
 

src/main/java/cn/com/qmth/export/Course.java → src/main/java/cn/com/qmth/export/bean/Course.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class Course {
 	private String ecCode;

src/main/java/cn/com/qmth/export/CusQuesStructType.java → src/main/java/cn/com/qmth/export/bean/CusQuesStructType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public enum CusQuesStructType {
 	

src/main/java/cn/com/qmth/export/CusQuesStructType3.java → src/main/java/cn/com/qmth/export/bean/CusQuesStructType3.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public enum CusQuesStructType3 {
 	

src/main/java/cn/com/qmth/export/DetailDto.java → src/main/java/cn/com/qmth/export/bean/DetailDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class DetailDto {
 	private String typeId;

src/main/java/cn/com/qmth/export/DetailDto2.java → src/main/java/cn/com/qmth/export/bean/DetailDto2.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class DetailDto2 {
 	private String pname;

src/main/java/cn/com/qmth/export/DetailDto3.java → src/main/java/cn/com/qmth/export/bean/DetailDto3.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class DetailDto3 {
 	private String typeId;

src/main/java/cn/com/qmth/export/EndObject.java → src/main/java/cn/com/qmth/export/bean/EndObject.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 /**
  * 消费结束标识对象

src/main/java/cn/com/qmth/export/FileUtil.java → src/main/java/cn/com/qmth/export/bean/FileUtil.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;

src/main/java/cn/com/qmth/export/FillBlankAnswerVo.java → src/main/java/cn/com/qmth/export/bean/FillBlankAnswerVo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/export/IdBase.java → src/main/java/cn/com/qmth/export/bean/IdBase.java

@@ -5,7 +5,7 @@
  * *************************************************
  */
 
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 
 import java.io.Serializable;

src/main/java/cn/com/qmth/export/KdDetail.java → src/main/java/cn/com/qmth/export/bean/KdDetail.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/export/KdPaper.java → src/main/java/cn/com/qmth/export/bean/KdPaper.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/export/KdQuesOption.java → src/main/java/cn/com/qmth/export/bean/KdQuesOption.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class KdQuesOption {
 	private Long id;

src/main/java/cn/com/qmth/export/KdQuestion.java → src/main/java/cn/com/qmth/export/bean/KdQuestion.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.List;
 

src/main/java/cn/com/qmth/export/Knowledge.java → src/main/java/cn/com/qmth/export/bean/Knowledge.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class Knowledge {
 	/**

src/main/java/cn/com/qmth/export/MD5Util.java → src/main/java/cn/com/qmth/export/bean/MD5Util.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.FileInputStream;

src/main/java/cn/com/qmth/export/MediaNotFoundException.java → src/main/java/cn/com/qmth/export/bean/MediaNotFoundException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class MediaNotFoundException extends RuntimeException{
 

src/main/java/cn/com/qmth/export/MyConsumer.java → src/main/java/cn/com/qmth/export/bean/MyConsumer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,6 +22,8 @@ import org.apache.commons.lang3.StringUtils;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.export.GkExportPaperByCourseCode;
+
 public class MyConsumer extends Consumer<PaperExportDto> {
 
     // private static String[] sucStr = new String[] { "对", "正确", "√", "是",

src/main/java/cn/com/qmth/export/MyConsumer2.java → src/main/java/cn/com/qmth/export/bean/MyConsumer2.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,6 +22,8 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.export.GkExportPaperByCourseCode2;
+
 public class MyConsumer2 extends Consumer<PaperExportDto> {
 
     // private static String[] sucStr = new String[] { "对", "正确", "√", "是",

src/main/java/cn/com/qmth/export/MyConsumer3.java → src/main/java/cn/com/qmth/export/bean/MyConsumer3.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -22,6 +22,9 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.export.GkExportPaperByCourseCode;
+import cn.com.qmth.export.GkExportPaperByCourseCode3;
+
 public class MyConsumer3 extends Consumer<PaperExportDto> {
 
     // private static String[] sucStr = new String[] { "对", "正确", "√", "是",

src/main/java/cn/com/qmth/export/MyConsumer4.java → src/main/java/cn/com/qmth/export/bean/MyConsumer4.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;
@@ -23,6 +23,9 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 
+import cn.com.qmth.export.GkExportPaperByCourseCode;
+import cn.com.qmth.export.GkExportPaperByCourseCode3;
+
 public class MyConsumer4 extends Consumer<PaperExportDto> {
 
     // private static String[] sucStr = new String[] { "对", "正确", "√", "是",

src/main/java/cn/com/qmth/export/MyProducer.java → src/main/java/cn/com/qmth/export/bean/MyProducer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/export/MyProducer2.java → src/main/java/cn/com/qmth/export/bean/MyProducer2.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/export/MyProducer3.java → src/main/java/cn/com/qmth/export/bean/MyProducer3.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/export/MyProducer4.java → src/main/java/cn/com/qmth/export/bean/MyProducer4.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/export/PaperExportDto.java → src/main/java/cn/com/qmth/export/bean/PaperExportDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class PaperExportDto {
 

src/main/java/cn/com/qmth/export/Param.java → src/main/java/cn/com/qmth/export/bean/Param.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class Param {
 

src/main/java/cn/com/qmth/export/PicCompress.java → src/main/java/cn/com/qmth/export/bean/PicCompress.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/cn/com/qmth/export/Producer.java → src/main/java/cn/com/qmth/export/bean/Producer.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/com/qmth/export/PropertyDto.java → src/main/java/cn/com/qmth/export/bean/PropertyDto.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/cn/com/qmth/export/QuesStructType.java → src/main/java/cn/com/qmth/export/bean/QuesStructType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public enum QuesStructType {
 

src/main/java/cn/com/qmth/export/QuestionProp.java → src/main/java/cn/com/qmth/export/bean/QuestionProp.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class QuestionProp {
 	private Long questionId;

src/main/java/cn/com/qmth/export/QuestionVo.java → src/main/java/cn/com/qmth/export/bean/QuestionVo.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class QuestionVo {
 	private String pname;

src/main/java/cn/com/qmth/export/QuestionVo3.java → src/main/java/cn/com/qmth/export/bean/QuestionVo3.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class QuestionVo3 {
 	private Long qid;

src/main/java/cn/com/qmth/export/QuestionVo4.java → src/main/java/cn/com/qmth/export/bean/QuestionVo4.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public class QuestionVo4 {
 	private Long qid;

src/main/java/cn/com/qmth/export/StatusException.java → src/main/java/cn/com/qmth/export/bean/StatusException.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 /**
  * 状态异常类<br>

src/main/java/cn/com/qmth/export/YunkaiDifficulty.java → src/main/java/cn/com/qmth/export/bean/YunkaiDifficulty.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.export;
+package cn.com.qmth.export.bean;
 
 public enum YunkaiDifficulty {