Merge remote-tracking branch 'origin/master'

2020-07-24 12:57:19 +08:00
parent 7fd6db2758 ee627cee44
commit c7395e4a74
76 changed files with 2863 additions and 220 deletions
@@ -30,6 +30,13 @@
 			<artifactId>fastjson</artifactId>
 			<version>${fastjson.version}</version>
 		</dependency>
+		<!-- 兼容 JDK 9+ 后的maven环境编译 -->
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.2.11</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>