From 778969f1eb3739dfd13d0b53fae93401015450f4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 28 七月 2022 16:21:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- pom.xml | 74 ++++++++++++++++++++++++++----------- 1 files changed, 52 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 991abc6..1209124 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.3.1</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鏁版嵁搴� --> @@ -99,13 +99,6 @@ <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>8.0.22</version> - </dependency> - - <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� --> - <dependency> - <groupId>org.xerial</groupId> - <artifactId>sqlite-jdbc</artifactId> - <version>3.32.3.2</version> </dependency> <!--Mybatis鍒嗛〉鎻掍欢 --> @@ -148,10 +141,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瑙ｆ瀽搴� --> @@ -165,15 +159,9 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>fastjson</artifactId> - <version>1.2.73</version> + <version>1.2.83</version> </dependency> - <!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�--> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>30.0-jre</version> - </dependency> <!-- okhttp --> <dependency> @@ -182,11 +170,20 @@ <version>4.9.0</version> </dependency> + <!-- okhttp 璋冭瘯鏃ュ織 --> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>logging-interceptor</artifactId> + <version>4.9.0</version> + </dependency> + + + <!-- okhttp-digest --> <dependency> - <groupId>com.burgstaller</groupId> + <groupId>io.github.rburgst</groupId> <artifactId>okhttp-digest</artifactId> - <version>2.1</version> + <version>2.5</version> </dependency> <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 --> @@ -210,6 +207,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> @@ -222,6 +226,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> @@ -238,6 +250,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> + <version>2.3.5.RELEASE</version> <configuration> <includeSystemScope>true</includeSystemScope> </configuration> @@ -245,6 +258,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.1</version> <configuration> <source>1.8</source> <target>1.8</target> @@ -254,16 +268,32 @@ <plugin> <groupId>pl.project13.maven</groupId> <artifactId>git-commit-id-plugin</artifactId> + <version>3.0.1</version> + <configuration> + <offline>true</offline> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.2</version> <configuration> <skipTests>true</skipTests> </configuration> </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