From 0b6587b1ad7371e993904c1b7f4baa67e3495bf4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 20 二月 2022 17:29:03 +0800
Subject: [PATCH] 增加配置将国标录像与其他录像分开
---
pom.xml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 364e6b9..9331de3 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>
@@ -148,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瑙ｆ瀽搴� -->
@@ -161,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>
@@ -203,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>
@@ -221,10 +236,14 @@
<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>
@@ -258,5 +277,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