From e0f8acf09f70fdbcf0d8dd912d70cfc6f27bcef6 Mon Sep 17 00:00:00 2001 From: chenjialing <595168663@qq.com> Date: 星期五, 25 二月 2022 09:36:05 +0800 Subject: [PATCH] 添加git的忽略logs --- pom.xml | 33 +++++++++++++++++++++++++++++---- 1 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index edd37d9..809d8db 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>com.genersoft</groupId> <artifactId>wvp-pro</artifactId> - <version>2.0</version> + <version>2.0.2</version> <name>web video platform</name> <description>鍥芥爣28181瑙嗛骞冲彴</description> @@ -90,8 +90,8 @@ <!-- druid鏁版嵁搴撹繛鎺ユ睜 --> <dependency> <groupId>com.alibaba</groupId> - <artifactId>druid</artifactId> - <version>1.2.3</version> + <artifactId>druid-spring-boot-starter</artifactId> + <version>1.1.22</version> </dependency> <!-- mysql鏁版嵁搴� --> @@ -155,7 +155,6 @@ <version>1.7.35</version> </dependency> - <!-- xml瑙ｆ瀽搴� --> <dependency> <groupId>org.dom4j</groupId> @@ -212,6 +211,13 @@ <version>3.0.4</version> </dependency> + <!-- 鑾峰彇绯荤粺淇℃伅 --> + <dependency> + <groupId>com.github.oshi</groupId> + <artifactId>oshi-core</artifactId> + <version>6.1.0</version> + </dependency> + <dependency> <groupId>org.springframework.session</groupId> <artifactId>spring-session-core</artifactId> @@ -224,6 +230,14 @@ <!-- <artifactId>cpdetector</artifactId>--> <!-- <version>1.0.8</version>--> <!-- </dependency>--> + + <!-- https://mvnrepository.com/artifact/com.google.guava/guava --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>31.0.1-jre</version> + </dependency> + <dependency> <groupId>org.springframework.boot</groupId> @@ -271,5 +285,16 @@ </plugin> </plugins> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>src/main/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </resource> + </resources> </build> </project> -- Gitblit v1.8.0