merge from release_v4.0.2

pom.xml

@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud</groupId>
     <artifactId>examcloud-parent</artifactId>
-    <version>v4.0.1-RELEASE</version>
+    <version>v4.0.2-RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
         <!-- 云平台版本 -->
-        <examcloud.version>v4.0.1-RELEASE</examcloud.version>
-        <spring-boot.version>2.1.16.RELEASE</spring-boot.version>
+        <examcloud.version>v4.0.2-RELEASE</examcloud.version>
+        <spring-boot.version>2.1.18.RELEASE</spring-boot.version>
         <spring-cloud.version>Greenwich.SR6</spring-cloud.version>
-        <druid.version>1.1.23</druid.version>
+        <druid.version>1.1.24</druid.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
@@ -40,7 +40,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>29.0-jre</version>
+                <version>30.0-jre</version>
             </dependency>
             <dependency>
                 <groupId>com.squareup.okhttp3</groupId>
@@ -50,12 +50,12 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.12</version>
+                <version>4.5.13</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpmime</artifactId>
-                <version>4.5.12</version>
+                <version>4.5.13</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -75,12 +75,12 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.7</version>
+                <version>2.8.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.14</version>
+                <version>1.15</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -95,7 +95,7 @@
             <dependency>
                 <groupId>commons-net</groupId>
                 <artifactId>commons-net</artifactId>
-                <version>3.6</version>
+                <version>3.7.2</version>
             </dependency>
             <dependency>
                 <groupId>commons-fileupload</groupId>
@@ -148,7 +148,7 @@
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
-                <version>1.2.73</version>
+                <version>1.2.74</version>
             </dependency>
             <dependency>
                 <groupId>org.json</groupId>
@@ -254,6 +254,11 @@
                 <artifactId>docx4j-ImportXHTML</artifactId>
                 <version>6.1.0</version>
             </dependency>
+            <dependency>
+                <groupId>dom4j</groupId>
+                <artifactId>dom4j</artifactId>
+                <version>1.6.1</version>
+            </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>