fix

pom.xml

@@ -3,11 +3,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gk-college-export</groupId>
-	<artifactId>gk-college-export</artifactId>
+	<artifactId>yunkai-export</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+		<maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -98,115 +100,17 @@
 	</dependencies>
 
 	<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>
-				</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>
-			<plugin>
-				<groupId>io.github.swagger2markup</groupId>
-				<artifactId>swagger2markup-maven-plugin</artifactId>
-				<version>1.2.0</version>
-				<configuration>
-					<!--此处端口一定要是当前项目启动所用的端口 -->
-					<swaggerInput>http://192.168.1.91:8090/v2/api-docs</swaggerInput>
-					<outputDir>src/docs/asciidoc/generated</outputDir>
-					<config>
-						<!-- 除了ASCIIDOC之外，还有MARKDOWN和CONFLUENCE_MARKUP可选 -->
-						<swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage>
-					</config>
+					<includeSystemScope>true</includeSystemScope>
 				</configuration>
 			</plugin>
 		</plugins>
 	</build>
 
-	<repositories>
-		<repository>
-			<id>nexus</id>
-			<name>Nexus</name>
-			<url>http://nexus-host:8081/repository/maven-public/</url>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>nexus</id>
-			<name>Nexus</name>
-			<url>http://nexus-host:8081/repository/maven-public/</url>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<distributionManagement>
-		<repository>
-			<id>releases</id>
-			<url>http://nexus-host:8081/repository/maven-releases/</url>
-		</repository>
-		<snapshotRepository>
-			<id>snapshots</id>
-			<url>http://nexus-host:8081/repository/maven-snapshots/</url>
-		</snapshotRepository>
-	</distributionManagement>
 </project>

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

@@ -1,8 +1,6 @@
 package cn.com.qmth.export;
 
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.log4j.LogManager;
@@ -10,10 +8,6 @@ import org.apache.log4j.Logger;
 
 public class ExportPaperByCourseCode {
 	private static Logger logger = LogManager.getLogger(ExportPaperByCourseCode.class);
-	//试卷前缀
-	private static String paperPrefix = "(240612)";
-	//数据库名
-	private static String dbName="yunkai_240612";
 	private static AtomicInteger count=new AtomicInteger(0);
 	
 	public static void main(String[] args) {
@@ -21,10 +15,7 @@ public class ExportPaperByCourseCode {
 		Date start=new Date();
 		try {
 			MyProducer pro=new MyProducer();
-			Map<String, Object> param=new HashMap<>();
-			param.put("paperSuff", paperPrefix);
-			param.put("dbName", dbName);
-			pro.startDispose(MyConsumer.class, 8, param);
+			pro.startDispose(MyConsumer.class, 8, null);
 		} catch (Exception e) {
 			logger.error(e.getCause(), e);
 		}

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

@@ -26,8 +26,6 @@ import com.alibaba.fastjson.JSONObject;
 
 public class ExportProperty {
 	private static Logger logger = LogManager.getLogger(ExportProperty.class);
-	private static String dbName="yunkai_240612";
-	private final static String sourceDir = "d:/yunkai/";
 	public static void main(String[] args) {
 		logger.debug("导出开始");
 		try {
@@ -39,9 +37,9 @@ public class ExportProperty {
 	}
 	
 	private static void dispose() {
-		File dir=new File(sourceDir+"prop/");
+		File dir=new File(Param.dataDir+"/prop/");
 		if(dir.exists()) {
-			FileUtil.clearDirectory(sourceDir+"prop/");
+			FileUtil.clearDirectory(Param.dataDir+"/prop/");
 		}else {
 			dir.mkdirs();
 		}
@@ -50,11 +48,11 @@ public class ExportProperty {
 		try {
 			Class.forName("com.mysql.cj.jdbc.Driver");
 
-			String url = "jdbc:mysql://localhost:3306/"+dbName+"?serverTimezone=GMT%2B8";
+			String url = "jdbc:mysql://localhost:3306/"+Param.dbName+"?serverTimezone=GMT%2B8";
 
-			String user = "root";
+			String user = Param.dbUser;
 
-			String password = "123456";
+			String password = Param.dbPass;
 			connect = DriverManager.getConnection(url, user, password);
 			exportProperty(connect);
 		} catch (Exception e) {
@@ -80,7 +78,7 @@ public class ExportProperty {
 			List<PropertyDto> props=getProperty(connect, code);
 			if(CollectionUtils.isNotEmpty(props)) {
 				total++;
-				FileUtil.writeFile(sourceDir+"prop/", code+".json", JSONObject.toJSONString(props));
+				FileUtil.writeFile(Param.dataDir+"/prop/", code+".json", JSONObject.toJSONString(props));
 			}else {
 				System.out.println("无文件："+code);
 			}
@@ -91,7 +89,7 @@ public class ExportProperty {
 		Set<String> list = new HashSet<>();
 		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++) {
@@ -112,6 +110,10 @@ public class ExportProperty {
 		return list;
 	}
 	
+//	private static String formatCode(String code) {
+//		return code.replaceAll("-", "*");
+//	}
+	
 	private static List<PropertyDto> getProperty(Connection connect, String subjectCode) throws SQLException, IOException {
 		List<PropertyDto> as = new ArrayList<>();
 		PreparedStatement preState = null;

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

@@ -27,23 +27,21 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 //	private static String paperSuff = "(231205)";
 	private int maxqc = 200;
 
-	private static String paperDir = "d:/yunkai/paper/";
-
 	private Pattern imgPat = Pattern.compile("<img[^<]+src=\"([^<\"]+)\"[^<]*>");
 
 	@Override
 	public void consume(PaperExportDto dto) {
 		Connection connect = null;
-		File sub = new File(paperDir + dto.getCourseCode() + "/");
+		File sub = new File(Param.dataDir+"/paper/" + dto.getCourseCode() + "/");
 		sub.mkdir();
 		try {
 			Class.forName("com.mysql.cj.jdbc.Driver");
 
-			String url = "jdbc:mysql://localhost:3306/" + dto.getDbName() + "?serverTimezone=GMT%2B8";
+			String url = "jdbc:mysql://localhost:3306/" + Param.dbName + "?serverTimezone=GMT%2B8";
 
-			String user = "root";
+			String user = Param.dbUser;
 
-			String password = "123456";
+			String password = Param.dbPass;
 			connect = DriverManager.getConnection(url, user, password);
 			exportPaper(connect, dto);
 			ExportPaperByCourseCode.addDisposeCount();
@@ -115,7 +113,7 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 			if (imgSrc.toLowerCase().trim().startsWith("http")) {
 				if (srcMap.get(imgSrc) == null) {
 					String suff = imgSrc.substring(imgSrc.lastIndexOf(".") + 1).toLowerCase();
-					File img = new File(paperDir + courseCode + "/" + UUID.randomUUID() + "." + suff);
+					File img = new File(Param.dataDir+"/paper/" + courseCode + "/" + UUID.randomUUID() + "." + suff);
 					FileUtil.saveUrlAs(imgSrc, img.getAbsolutePath());
 					String base64 = FileUtil.fileToBase64Src(img);
 					img.delete();
@@ -423,7 +421,7 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 		paper.setDetailCount(1);
 		paper.setUnitCount(qs.size());
 		paper.setTotalScore((double) qs.size());
-		paper.setName(dto.getPaperSuff() + detailName + "_" + indx);
+		paper.setName(Param.paperPrefix + detailName + "_" + indx);
 		paper.setCourseCode(dto.getCourseCode());
 		List<KdDetail> des = new ArrayList<>();
 		KdDetail d = new KdDetail();
@@ -436,7 +434,7 @@ public class MyConsumer extends Consumer<PaperExportDto> {
 		paper.setDetails(des);
 		paper.setDetailCount(1);
 		paper.setUnitCount(qs.size());
-		File paperdir = new File(paperDir + dto.getCourseCode() + "/" + qt.getYunKaiType() + "/");
+		File paperdir = new File(Param.dataDir+"/paper/" + dto.getCourseCode() + "/" + qt.getYunKaiType() + "/");
 		paperdir.mkdirs();
 		try {
 			FileUtil.writeFile(paperdir.getAbsolutePath(), "/paper_" + indx + ".json", JSONObject.toJSONString(paper));

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

@@ -15,17 +15,13 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 public class MyProducer extends Producer {
 	private static Logger logger = LogManager.getLogger(MyProducer.class);
-	private static String dir = "d:/yunkai/";
-	private static String paperDir = "d:/yunkai/paper/";
 
 	@Override
 	protected void produce(Map<String, Object> param) throws Exception {
 		logger.info("***************************任务生产开始");
-		String paperSuff = (String)param.get("paperSuff");
-		String dbName = (String)param.get("dbName");
-		File excelFolder = new File(paperDir);
+		File excelFolder = new File(Param.dataDir+"/paper/");
 		if (excelFolder.exists()) {
-			FileUtil.clearDirectory(paperDir);
+			FileUtil.clearDirectory(Param.dataDir+"/paper/");
 		} else {
 			excelFolder.mkdirs();
 		}
@@ -37,7 +33,7 @@ public class MyProducer extends Producer {
 			logger.debug(cs.size() + "个课程");
 		}
 		for (String c : cs) {
-			offer(new PaperExportDto(c, paperSuff,dbName));
+			offer(new PaperExportDto(c));
 		}
 		logger.info("***************************任务生产结束");
 	}
@@ -47,7 +43,7 @@ public class MyProducer extends Producer {
 		LinkedHashSet<String> list = new LinkedHashSet<>();
 		XSSFWorkbook wb = null;
 		try {
-			wb = new XSSFWorkbook(dir + "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++) {

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

@@ -2,32 +2,15 @@ package cn.com.qmth.export;
 
 public class PaperExportDto {
 	private String courseCode;
-	private String paperSuff;
-	private String dbName;
 	public String getCourseCode() {
 		return courseCode;
 	}
 	public void setCourseCode(String courseCode) {
 		this.courseCode = courseCode;
 	}
-	public String getPaperSuff() {
-		return paperSuff;
-	}
-	public void setPaperSuff(String paperSuff) {
-		this.paperSuff = paperSuff;
-	}
-	
-	public String getDbName() {
-		return dbName;
-	}
-	public void setDbName(String dbName) {
-		this.dbName = dbName;
-	}
-	public PaperExportDto(String courseCode, String paperSuff, String dbName) {
+	public PaperExportDto(String courseCode) {
 		super();
 		this.courseCode = courseCode;
-		this.paperSuff = paperSuff;
-		this.dbName = dbName;
 	}
 	
 }

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

@@ -0,0 +1,11 @@
+package cn.com.qmth.export;
+
+public class Param {
+	
+	public static String dbUser="root";
+	public static String dbPass="123456";
+	
+	public static String dbName="yunkai_240618";
+	public static String dataDir="d:/yunkai";
+	public static String paperPrefix ="(240618)";
+}

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

@@ -12,7 +12,6 @@ import java.util.List;
 import java.util.Map;
 
 public class SetRootId {
-	private static String dbName="yunkai_240612";
 	public static void main(String[] args) {
 		System.out.println("开始处理");
 		Connection connect = null;
@@ -20,11 +19,11 @@ public class SetRootId {
 		try {
 			Class.forName("com.mysql.cj.jdbc.Driver");
 
-			String url = "jdbc:mysql://localhost:3306/"+dbName+"?serverTimezone=GMT%2B8";
+			String url = "jdbc:mysql://localhost:3306/"+Param.dbName+"?serverTimezone=GMT%2B8";
 
-			String user = "root";
+			String user = Param.dbUser;
 
-			String password = "123456";
+			String password = Param.dbPass;
 			connect = DriverManager.getConnection(url, user, password);
 			List<Knowledge> ks=getKnowledge(connect);
 			setRootId(ks);