fix

pom.xml

@@ -6,13 +6,15 @@
 	<artifactId>yunkai-import</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<properties>
-		<java.version>1.8</java.version>
-		<spring-boot.version>2.1.13.RELEASE</spring-boot.version>
-		<druid.version>1.1.14</druid.version>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<spring-cloud.version>Greenwich.SR3</spring-cloud.version>
+		<spring-boot.version>2.3.12.RELEASE</spring-boot.version>
+		<mybatis-plus.version>3.4.3.3</mybatis-plus.version>
+		<maven-compiler-version>3.8.1</maven-compiler-version>
+		<maven-surefire-version>2.22.2</maven-surefire-version>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<examcloud.version>2019-SNAPSHOT</examcloud.version>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<qmth-boot-version>1.0.4</qmth-boot-version>
 	</properties>
 	<dependencies>
 		<!-- https://mvnrepository.com/artifact/com.ibm.icu/icu4j -->
@@ -113,96 +115,17 @@
 			<version>1.9</version>
 		</dependency>
 	</dependencies>
-	<repositories>
-		<repository>
-			<id>aliyun-repos</id>
-			<url>https://maven.aliyun.com/repository/public</url>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>atlassian</id>
-			<name>Central Repository</name>
-			<url>https://packages.atlassian.com/maven-3rdparty/</url>
-			<layout>default</layout>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
 	<build>
+		<finalName>${project.artifactId}</finalName>
+
 		<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
-					<testFailureIgnore>true</testFailureIgnore>
-					<skipTests>true</skipTests>
+					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-					<compilerArgument>-proc:none</compilerArgument>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<configuration>
-					<attach>true</attach>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>compile</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addClasspath>true</addClasspath>
-							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>cn.com.qmth.export.Export</mainClass>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<version>2.10</version>
-				<executions>
-					<execution>
-						<id>copy-dependencies</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/lib</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 

src/main/java/cn/com/qmth/importpaper/ClearProp.java

@@ -16,16 +16,6 @@ public class ClearProp {
 	private static Logger logger = LogManager.getLogger(ClearProp.class);
 	private static String batch = "230821";
 	
-//	private static String host = "http://192.168.1.249:8008";
-//	private static String rootOrgId = "17351";
-//	private static String key = "$SS:C_17351_646523";
-//	private static String token = "44c75d3e15fa4f2ea5d2f52237d06199";
-	
-	private static String host = "http://localhost:8008";
-	private static String rootOrgId = "156";
-	private static String key = "$SS:C_156_177";
-	private static String token = "a12d8d9916054595ba9c22b7e7e5b9e4";
-
 	public static void main(String[] args) {
 		logger.debug("**********************开始");
 		clear();
@@ -35,15 +25,14 @@ public class ClearProp {
 
 	private static void clear() {
 		Map<String, String> params = Maps.newHashMap();
-		params.put("rootOrgId", rootOrgId);
+		params.put("rootOrgId", Param.rootOrgId);
 		params.put("batch", batch);
 		Map<String, String> headers = Maps.newHashMap();
-		headers.put("key", key);
-		headers.put("token", token);
+		headers.put("key", Param.key);
+		headers.put("token", Param.token);
 		Response resp = null;
 		try {
-//			OKHttpUtil.initOkHttpClient();
-			resp = OKHttpUtil.call(HttpMethod.POST, host+"/api/ecs_ques/importYunkaiProp/clear", headers, params);
+			resp = OKHttpUtil.call(HttpMethod.POST, Param.host+"/api/ecs_ques/importYunkaiProp/clear", headers, params);
 			if (resp.code() != 200) {
 				throw new RuntimeException("body:" + resp.body().string());
 			}

src/main/java/cn/com/qmth/importpaper/ConsumerDto.java

@@ -1,62 +1,16 @@
 package cn.com.qmth.importpaper;
 
 public class ConsumerDto {
-	private ImportCourse ic;
-	private String sourceDir;
-	private String host;
+	private CourseDto ic;
 	private String batch;
-	private String rootOrgId;
 
-	private String key;
 
-	private String token;
 
-
-	public String getSourceDir() {
-		return sourceDir;
-	}
-
-	public void setSourceDir(String sourceDir) {
-		this.sourceDir = sourceDir;
-	}
-
-	public String getHost() {
-		return host;
-	}
-
-	public void setHost(String host) {
-		this.host = host;
-	}
-
-	public String getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(String rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getToken() {
-		return token;
-	}
-
-	public void setToken(String token) {
-		this.token = token;
-	}
-
-	public ImportCourse getIc() {
+	public CourseDto getIc() {
 		return ic;
 	}
 
-	public void setIc(ImportCourse ic) {
+	public void setIc(CourseDto ic) {
 		this.ic = ic;
 	}
 	
@@ -70,14 +24,9 @@ public class ConsumerDto {
 		this.batch = batch;
 	}
 
-	public ConsumerDto(ImportCourse ic, String sourceDir, String host, String rootOrgId, String key, String token,String batch) {
+	public ConsumerDto(CourseDto ic,String batch) {
 		super();
 		this.ic = ic;
-		this.sourceDir = sourceDir;
-		this.host = host;
-		this.rootOrgId = rootOrgId;
-		this.key = key;
-		this.token = token;
 		this.batch = batch;
 	}
 

src/main/java/cn/com/qmth/importpaper/ImportCourse.java → src/main/java/cn/com/qmth/importpaper/CourseDto.java

@@ -3,7 +3,7 @@ package cn.com.qmth.importpaper;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ImportCourse {
+public class CourseDto {
 
 	private String subjectCode;
 

src/main/java/cn/com/qmth/importpaper/DeleteImportPaperQuestion.java

@@ -20,17 +20,6 @@ import okhttp3.Response;
 public class DeleteImportPaperQuestion {
 
 	private static Logger logger = LogManager.getLogger(DeleteImportPaperQuestion.class);
-	private final static String sourceDir = "d:/yunkai/";
-
-//	private static String batch = "230517";
-//	private static String host = "http://localhost:8008";
-//	private static String rootOrgId = "149";
-//	private static String key = "U_C_149_170";
-//	private static String token = "cac2f518a68346fe860fcb8a616bb458";
-
-	private static String host = "http://192.168.1.249:8008";
-	private static String key = "$SS:C_17351_646523";
-	private static String token = "95c77664d77f4ba6b58b940ab5e633c8";
 
 	public static void main(String[] args){
 		logger.debug("**********************删除开始");
@@ -58,7 +47,7 @@ public class DeleteImportPaperQuestion {
 		List<QuestionId> list = new ArrayList<>();
 		XSSFWorkbook wb = null;
 		try {
-			wb = new XSSFWorkbook(sourceDir + "question.xlsx");
+			wb = new XSSFWorkbook(Param.dataDir + "/question.xlsx");
 			XSSFSheet sheet = wb.getSheetAt(0);
 			int rows = sheet.getLastRowNum();
 			for (int i = 1; i <= rows; i++) {
@@ -86,12 +75,12 @@ public class DeleteImportPaperQuestion {
 	private static void submit(QuestionId ic) throws IOException{
 		Map<String, String> params = Maps.newHashMap();
 		Map<String, String> headers = Maps.newHashMap();
-		headers.put("key", key);
-		headers.put("token", token);
+		headers.put("key", Param.key);
+		headers.put("token", Param.token);
 		Response resp = null;
 		try {
 			resp = OKHttpUtil.call(HttpMethod.DELETE,
-					host + "/api/ecs_ques/paper/deleteQuestion/" + ic.getUnitId() + "/" + ic.getQuestionId(), headers,
+					Param.host + "/api/ecs_ques/paper/deleteQuestion/" + ic.getUnitId() + "/" + ic.getQuestionId(), headers,
 					params);
 			if (resp.code() != 200) {
 				logger.error(ic.getUnitId() + " | " + ic.getQuestionId() + ":body:" + resp.body().string());

src/main/java/cn/com/qmth/importpaper/ImportPaperByCourse.java

@@ -11,23 +11,11 @@ import org.apache.logging.log4j.Logger;
 public class ImportPaperByCourse {
 
 	private static Logger logger = LogManager.getLogger(ImportPaperByCourse.class);
-//	private final static String sourceDir = "d:/guangkai/";
-	private final static String sourceDir = "d:/yunkai/";
 	//课程属性批次号
 	//不要修改
 	//此值不要修改。因为第一次导入230517批次的时候未保存批次信息，所以230517批次的不能共用。第二次导入230821批次的保存了批次值，可以后续公用。
 	private final static String batch = "230821";
 	
-//	private static String host = "http://192.168.10.145:8008";
-//	private static String rootOrgId = "149";
-//	private static String key = "$SS:C_149_170";
-//	private static String token = "83540688f3ff4aebbaf1f98e1e77f17c";
-	
-	private static String host = "http://192.168.1.249:8008";
-	private static String rootOrgId = "17351";
-	private static String key = "$SS:C_17351_646523";
-	private static String token = "95c77664d77f4ba6b58b940ab5e633c8";
-	
 	private static AtomicInteger count=new AtomicInteger(0);
 
 	public static void main(String[] args) {
@@ -35,11 +23,6 @@ public class ImportPaperByCourse {
 		Date start=new Date();
 		try {
 			Map<String,Object> param=new HashMap<>();
-			param.put("sourceDir", sourceDir);
-			param.put("host", host);
-			param.put("rootOrgId", rootOrgId);
-			param.put("key", key);
-			param.put("token", token);
 			param.put("batch", batch);
 			MyProducer pro=new MyProducer();
 			pro.startDispose(MyConsumer.class, 2, param);

src/main/java/cn/com/qmth/importpaper/ImportPropByCourse.java

@@ -24,23 +24,12 @@ import okhttp3.Response;
 public class ImportPropByCourse {
 
 	private static Logger logger = LogManager.getLogger(ImportPropByCourse.class);
-	private final static String sourceDir = "d:/yunkai/";
 
 	//课程属性批次号
 	//批次号相同时，同一数据可执行重复导入
 	//此值不要修改。因为第一次导入230517批次的时候未保存批次信息，所以230517批次的不能共用。第二次导入230821批次的保存了批次值，可以后续公用。
 	private final static String batch = "230821";
 	
-//	private static String host = "http://192.168.10.145:8008";
-//	private static String rootOrgId = "149";
-//	private static String key = "$SS:C_149_170";
-//	private static String token = "83540688f3ff4aebbaf1f98e1e77f17c";
-
-	private static String host = "http://192.168.1.249:8008";
-	private static String rootOrgId = "17351";
-	private static String key = "$SS:C_17351_646523";
-	private static String token = "95c77664d77f4ba6b58b940ab5e633c8";
-	
 
 	public static void main(String[] args) {
 		logger.debug("**********************导入开始");
@@ -50,9 +39,9 @@ public class ImportPropByCourse {
 
 		int num = 0;
 //		List<Course> cs = readSubject();
-		Map<String,ImportCourse> ics=readSubjectCodes();
-		for (ImportCourse ic : ics.values()) {
-			File file = new File(sourceDir + "/prop/" + ic.getSubjectCode() + ".json");
+		Map<String,CourseDto> ics=readSubjectCodes();
+		for (CourseDto ic : ics.values()) {
+			File file = new File(Param.dataDir + "/prop/" + ic.getSubjectCode() + ".json");
 			if(!file.exists()) {
 				continue;
 			}
@@ -81,11 +70,11 @@ public class ImportPropByCourse {
 		OKHttpUtil.close();
 	}
 
-	private static Map<String,ImportCourse> readSubjectCodes() {
-		Map<String,ImportCourse> map=new HashMap<>();
+	private static Map<String,CourseDto> readSubjectCodes() {
+		Map<String,CourseDto> map=new HashMap<>();
 		XSSFWorkbook wb = null;
 		try {
-			wb = new XSSFWorkbook(sourceDir + "subject_info.xlsx");
+			wb = new XSSFWorkbook(Param.dataDir + "/subject_info.xlsx");
 			XSSFSheet sheet = wb.getSheetAt(0);
 			int rows = sheet.getLastRowNum();
 			for (int i = 1; i <= rows; i++) {
@@ -101,9 +90,9 @@ public class ImportPropByCourse {
 				String name = row.getCell(2).getStringCellValue().trim();
 				c.setCode(ecCode);
 				c.setName(name);
-				ImportCourse ic=map.get(yunCode);
+				CourseDto ic=map.get(yunCode);
 				if(ic==null) {
-					ic=new ImportCourse();
+					ic=new CourseDto();
 					ic.setSubjectCode(yunCode);
 					map.put(yunCode,ic);
 				}
@@ -154,21 +143,21 @@ public class ImportPropByCourse {
 //		return list;
 //	}
 
-	private static void submit(ImportCourse ic, File zfile) throws Exception {
+	private static void submit(CourseDto ic, File zfile) throws Exception {
 		List<String> cs=ic.getCourses().stream().map(e->e.getCode()).collect(Collectors.toList());
 		Map<String, String> params = Maps.newHashMap();
-		params.put("rootOrgId", rootOrgId);
+		params.put("rootOrgId", Param.rootOrgId);
 		params.put("batch", batch);
 		params.put("courseCodes", StringUtils.join(cs,","));
 		Map<String, String> headers = Maps.newHashMap();
-		headers.put("key", key);
-		headers.put("token", token);
+		headers.put("key", Param.key);
+		headers.put("token", Param.token);
 		List<FormFilePart> fileList = Lists.newArrayList();
 		fileList.add(new FormFilePart("dataFile", zfile.getName(), zfile));
 		Response resp = null;
 		try {
 //			OKHttpUtil.initOkHttpClient();
-			resp = OKHttpUtil.call(HttpMethod.POST, host + "/api/ecs_ques/importYunkaiProp", headers, params, fileList);
+			resp = OKHttpUtil.call(HttpMethod.POST, Param.host + "/api/ecs_ques/importYunkaiProp", headers, params, fileList);
 			if (resp.code() != 200) {
 				throw new Exception(zfile.getName() + ":body:" + resp.body().string());
 			}

src/main/java/cn/com/qmth/importpaper/MyConsumer.java

@@ -25,11 +25,11 @@ public class MyConsumer extends Consumer<ConsumerDto> {
 		ImportPaperByCourse.addDisposeCount();
 	}
 	private  void importCoursePaper(ConsumerDto dto){
-		File file = new File(dto.getSourceDir() + "paper/" + dto.getIc().getSubjectCode() + "/");
+		File file = new File(Param.dataDir + "/paper/" + dto.getIc().getSubjectCode() + "/");
 		if(!file.exists()) {
 			return;
 		}
-		File zfile = new File(dto.getSourceDir()+"paper/"+dto.getIc().getSubjectCode()+ ".zip");
+		File zfile = new File(Param.dataDir+"/paper/"+dto.getIc().getSubjectCode()+ ".zip");
 		try {
 			List<File> files = new ArrayList<>();
 			getPaperFile(file, files);
@@ -69,18 +69,18 @@ public class MyConsumer extends Consumer<ConsumerDto> {
 		List<String> cs=dto.getIc().getCourses().stream().map(e->e.getCode()).collect(Collectors.toList());
 		Map<String, String> params = Maps.newHashMap();
 		String courseCodes=StringUtils.join(cs,",");
-		params.put("rootOrgId", dto.getRootOrgId());
+		params.put("rootOrgId", Param.rootOrgId);
 		params.put("batch", dto.getBatch());
 		params.put("courseCodes",courseCodes);
 		Map<String, String> headers = Maps.newHashMap();
-		headers.put("key", dto.getKey());
-		headers.put("token", dto.getToken());
+		headers.put("key", Param.key);
+		headers.put("token", Param.token);
 		List<FormFilePart> fileList = Lists.newArrayList();
 		fileList.add(new FormFilePart("dataFile", zfile.getName(), zfile));
 		Response resp = null;
 		try {
 //			OKHttpUtil.initOkHttpClient();
-			resp = OKHttpUtil.call(HttpMethod.POST, dto.getHost()+"/api/ecs_ques/importYunkaiPaper", headers, params, fileList);
+			resp = OKHttpUtil.call(HttpMethod.POST, Param.host+"/api/ecs_ques/importYunkaiPaper", headers, params, fileList);
 			if (resp.code() != 200) {
 				throw new Exception(zfile.getName() +"| courseCodes:"+courseCodes+ "| body:" + resp.body().string());
 			}else {

src/main/java/cn/com/qmth/importpaper/MyProducer.java

@@ -19,28 +19,24 @@ public class MyProducer extends Producer {
 	@Override
 	protected void produce(Map<String, Object> param) throws Exception {
 		logger.info("***************************任务生产开始");
-		String sourceDir=param.get("sourceDir").toString();
-		String host=param.get("host").toString();
-		String rootOrgId=param.get("rootOrgId").toString();
-		String key=param.get("key").toString();
-		String token=param.get("token").toString();
+		String sourceDir=Param.dataDir+"/";
 		String batch=param.get("batch").toString();
 //		List<Course> cs = readSubject();
-		Map<String,ImportCourse> ics=readSubjectCodes(sourceDir);
+		Map<String,CourseDto> ics=readSubjectCodes(sourceDir);
 		if (ics.size()==0) {
 			logger.debug("无数据导入");
 			return;
 		} else {
 			logger.debug(ics.size() + "个课程");
 		}
-		for (ImportCourse ic : ics.values()) {
-			offer(new ConsumerDto(ic, sourceDir, host, rootOrgId, key, token,batch));
+		for (CourseDto ic : ics.values()) {
+			offer(new ConsumerDto(ic,batch));
 		}
 		logger.info("***************************任务生产结束");
 	}
 	
-	private static Map<String,ImportCourse> readSubjectCodes(String sourceDir) {
-		Map<String,ImportCourse> map=new LinkedHashMap<>();
+	private static Map<String,CourseDto> readSubjectCodes(String sourceDir) {
+		Map<String,CourseDto> map=new LinkedHashMap<>();
 		XSSFWorkbook wb = null;
 		try {
 			wb = new XSSFWorkbook(sourceDir + "subject_info.xlsx");
@@ -59,9 +55,9 @@ public class MyProducer extends Producer {
 				String name = row.getCell(2).getStringCellValue().trim();
 				c.setCode(ecCode);
 				c.setName(name);
-				ImportCourse ic=map.get(yunCode);
+				CourseDto ic=map.get(yunCode);
 				if(ic==null) {
-					ic=new ImportCourse();
+					ic=new CourseDto();
 					ic.setSubjectCode(yunCode);
 					map.put(yunCode,ic);
 				}

src/main/java/cn/com/qmth/importpaper/Param.java

@@ -0,0 +1,15 @@
+package cn.com.qmth.importpaper;
+
+public class Param {
+	public static String host = "http://192.168.1.249:8008";
+	public static String rootOrgId = "17351";
+	public static String key = "$SS:C_17351_646523";
+	public static String token = "95c77664d77f4ba6b58b940ab5e633c8";
+	
+//	public static String host = "http://192.168.1.249:8008";
+//	public static String rootOrgId = "17351";
+//	public static String key = "$SS:C_17351_646523";
+//	public static String token = "44c75d3e15fa4f2ea5d2f52237d06199";
+	
+	public static String dataDir="d:/yunkai";
+}