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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3336bb3..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>
@@ -50,7 +50,6 @@
<jedis-version>3.1.0</jedis-version>
<!-- 渚濊禆鐗堟湰 -->
- <pagehelper.version>5.2.0</pagehelper.version>
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
<asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
<generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
@@ -91,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鏁版嵁搴� -->
@@ -113,7 +112,7 @@
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.2.10</version>
+ <version>1.4.1</version>
</dependency>
<!--Swagger3 -->
@@ -149,10 +148,11 @@
<version>1.3.0-91</version>
</dependency>
+ <!-- 鍙栦唬log4j -->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.7.35</version>
</dependency>
<!-- xml瑙ｆ瀽搴� -->
@@ -162,7 +162,7 @@
<version>2.1.3</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+ <!-- json瑙ｆ瀽搴揻astjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
@@ -204,6 +204,20 @@
<version>1.12</version>
</dependency>
+ <!--excel瑙ｆ瀽搴�-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <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>
@@ -217,15 +231,27 @@
<!-- <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>
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
</dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
</dependencies>
-
+
<build>
<finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
<plugins>
@@ -259,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