调整部分依赖版本

basic-util/pom.xml

@@ -122,11 +122,18 @@
 
         <!-- dom4j start -->
         <dependency>
-            <groupId>dom4j</groupId>
+            <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
         </dependency>
         <!-- dom4j end -->
 
+        <!-- jsoup start -->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+        </dependency>
+        <!-- jsoup end -->
+
         <!-- http client start -->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -147,6 +154,7 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <!-- wgink end -->
+
     </dependencies>
 
 </project>

common/src/main/java/ink/wgink/common/service/api/impl/ApiInfoServiceImpl.java

@@ -22,11 +22,11 @@ import io.swagger.models.properties.RefProperty;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
 import springfox.documentation.service.Documentation;
 import springfox.documentation.spring.web.DocumentationCache;
 import springfox.documentation.swagger2.mappers.ServiceModelToSwagger2Mapper;
 
+import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedWriter;
@@ -57,8 +57,12 @@ public class ApiInfoServiceImpl extends DefaultBaseService implements IApiInfoSe
     private ServiceModelToSwagger2Mapper serviceModelToSwagger2Mapper;
     @Autowired
     private ServerProperties serverProperties;
-    @Autowired
-    private FreeMarkerConfigurer freeMarkerConfigurer;
+    private Configuration configuration = new Configuration(Configuration.getVersion());
+
+    @PostConstruct
+    private void init() {
+        configuration.setClassForTemplateLoading(ApiInfoServiceImpl.class, "/templates");
+    }
 
     @Override
     public SystemApiDTO getSystemApi(String group, String apiType, HttpServletRequest request) {
@@ -476,14 +480,8 @@ public class ApiInfoServiceImpl extends DefaultBaseService implements IApiInfoSe
         return subRefProperty;
     }
 
-    private Configuration getConfiguration() {
-        Configuration configuration = freeMarkerConfigurer.getConfiguration();
-        configuration.setClassForTemplateLoading(ApiInfoServiceImpl.class, "/templates");
-        return configuration;
-    }
-
     private Template getTemplate(String fileName) throws IOException {
-        return getConfiguration().getTemplate(fileName, ISystemConstant.CHARSET_UTF8);
+        return configuration.getTemplate(fileName, ISystemConstant.CHARSET_UTF8);
     }
 
 }

pom.xml

@@ -60,7 +60,7 @@
         <mysql.version>5.1.47</mysql.version>
         <durid.version>1.1.9</durid.version>
         <pagehelper.version>5.1.1</pagehelper.version>
-        <dom4j.version>1.6.1</dom4j.version>
+        <dom4j.version>2.1.3</dom4j.version>
         <quartz.version>2.3.0</quartz.version>
         <ehcache.version>2.10.4</ehcache.version>
         <servletApi.version>3.1.0</servletApi.version>
@@ -100,6 +100,7 @@
         <redis.version>2.5.5</redis.version>
         <freemarker.version>2.3.31</freemarker.version>
         <gson.version>2.8.5</gson.version>
+        <jsoup.version>1.14.3</jsoup.version>
     </properties>
 
     <dependencyManagement>
@@ -238,7 +239,7 @@
 
             <!-- dom4j start -->
             <dependency>
-                <groupId>dom4j</groupId>
+                <groupId>org.dom4j</groupId>
                 <artifactId>dom4j</artifactId>
                 <version>${dom4j.version}</version>
             </dependency>
@@ -556,6 +557,14 @@
                 <version>${gson.version}</version>
             </dependency>
             <!-- gson end -->
+
+            <!-- jsoup start -->
+            <dependency>
+                <groupId>org.jsoup</groupId>
+                <artifactId>jsoup</artifactId>
+                <version>${jsoup.version}</version>
+            </dependency>
+            <!-- jsoup end -->
         </dependencies>
 
     </dependencyManagement>

redis-cache/pom.xml

@@ -26,6 +26,12 @@
         </dependency>
         <!-- netty end -->
 
+        <dependency>
+            <groupId>ink.wgink</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>ink.wgink</groupId>
             <artifactId>basic-exception</artifactId>