Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整部分依赖版本

Browse Source
This commit is contained in:
wanggeng 2022-04-12 11:49:05 +08:00
parent 021200587c
commit 7313fd52f2
4 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basic-util/pom.xml
View File

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

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

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

13
pom.xml
View File

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

6
redis-cache/pom.xml
View File

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