From 205f1f1f6025bc812ccb7cf2408336d956c65d1a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 08 十月 2023 15:41:24 +0800
Subject: [PATCH] 优化国标级联心跳失败再次注册的逻辑
---
pom.xml | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2943343..9899d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,10 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.6.7</version>
+ <version>2.6.9</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
+ <packaging>${project.packaging}</packaging>
<repositories>
<repository>
@@ -56,6 +57,42 @@
<asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
</properties>
+ <profiles>
+ <profile>
+ <id>jar</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <project.packaging>jar</project.packaging>
+ </properties>
+ </profile>
+ <profile>
+ <id>war</id>
+ <properties>
+ <project.packaging>war</project.packaging>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -86,11 +123,9 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>1.2.11</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<!-- mysql鏁版嵁搴� -->
@@ -100,11 +135,30 @@
<version>8.0.30</version>
</dependency>
+ <!--postgresql-->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.5.1</version>
+ </dependency>
+
+ <!-- kingbase浜哄ぇ閲戜粨 -->
+ <!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
+ <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+ <dependency>
+ <groupId>com.kingbase</groupId>
+ <artifactId>kingbase8</artifactId>
+ <version>8.6.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+ </dependency>
+
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.4.3</version>
+ <version>1.4.6</version>
</dependency>
<!--鍦ㄧ嚎鏂囨。 -->
@@ -153,6 +207,12 @@
<version>2.1.3</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+
<!-- json瑙ｆ瀽搴揻astjson2 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
@@ -179,8 +239,6 @@
<version>4.10.0</version>
</dependency>
-
-
<!-- okhttp-digest -->
<dependency>
<groupId>io.github.rburgst</groupId>
@@ -189,10 +247,17 @@
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
+<!-- <dependency>-->
+<!-- <groupId>net.sf.kxml</groupId>-->
+<!-- <artifactId>kxml2</artifactId>-->
+<!-- <version>2.3.0</version>-->
+<!-- </dependency>-->
+
+ <!-- jwt瀹炵幇 -->
<dependency>
- <groupId>net.sf.kxml</groupId>
- <artifactId>kxml2</artifactId>
- <version>2.3.0</version>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.3</version>
</dependency>
<!--鍙嶅悜浠ｇ悊-->
@@ -252,7 +317,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.3.5.RELEASE</version>
+ <version>2.7.2</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
--
Gitblit v1.8.0