From d7ac861cab28bc39f87c1af464ec4d319a0cbb37 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期二, 19 十一月 2024 15:46:15 +0800
Subject: [PATCH] test配置增加deploy.server属性，解决多网卡ip注册错误的问题
---
iailab-module-data/iailab-module-data-biz/pom.xml | 156 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 110 insertions(+), 46 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/pom.xml b/iailab-module-data/iailab-module-data-biz/pom.xml
index 8221109..1944423 100644
--- a/iailab-module-data/iailab-module-data-biz/pom.xml
+++ b/iailab-module-data/iailab-module-data-biz/pom.xml
@@ -22,42 +22,6 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-env</artifactId>
</dependency>
- <!-- 消息队列相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-mq</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-security</artifactId>
- </dependency>
- <!-- RPC 远程调用相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-rpc</artifactId>
- </dependency>
- <!-- 监控相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-monitor</artifactId>
- </dependency>
- <!-- Job 定时任务相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-biz-data-permission</artifactId>
- </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-data-api</artifactId>
@@ -65,9 +29,11 @@
</dependency>
<dependency>
<groupId>com.iailab</groupId>
- <artifactId>iailab-module-model-api</artifactId>
+ <artifactId>iailab-module-data-dahua</artifactId>
<version>${revision}</version>
</dependency>
+
+ <!-- 依赖服务 -->
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-infra-api</artifactId>
@@ -78,22 +44,80 @@
<artifactId>iailab-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
+
+
+ <!-- 业务组件 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-biz-data-permission</artifactId>
+ </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-biz-tenant</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-biz-ip</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-mq</artifactId>
+ </dependency>
+
+ <!-- Web 相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-security</artifactId>
+ </dependency>
+
+ <!-- DB 相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-mybatis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+
+ <!-- RPC 远程调用相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-rpc</artifactId>
+ </dependency>
+ <!-- 监控相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-monitor</artifactId>
+ </dependency>
+
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${java-jwt.version}</version>
</dependency>
- <!-- nacos 客户端 -->
+ <!-- Test 测试相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- 工具类相关 -->
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-common-excel</artifactId>
+ </dependency>
+
+ <!-- Registry 注册中心相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
- <!-- nacos 配置中心 -->
+
+ <!-- Config 配置中心相关 -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
@@ -121,6 +145,12 @@
<groupId>org.openscada.jinterop</groupId>
<artifactId>org.openscada.jinterop.core</artifactId>
<version>2.1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.jinterop</groupId>
@@ -137,16 +167,28 @@
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.dcom</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.openscada.utgard</groupId>
<artifactId>org.openscada.opc.lib</artifactId>
<version>1.5.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.61</version>
+ <version>1.70</version>
</dependency>
<!-- ModBus TCP -->
@@ -180,11 +222,26 @@
<version>6.8.0</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>net.java.dev.jna</groupId>-->
+<!-- <artifactId>jna</artifactId>-->
+<!-- <version>5.4.0</version>-->
+<!-- </dependency>-->
+
<dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <scope>test</scope>
+ <groupId>com.hikvision</groupId>
+ <artifactId>examples</artifactId>
+ <version>1.0</version>
</dependency>
+ <dependency>
+ <groupId>com.hikvision</groupId>
+ <artifactId>jna</artifactId>
+ <version>1.0</version>
+ </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.amqp</groupId>-->
+<!-- <artifactId>spring-rabbit</artifactId>-->
+<!-- </dependency>-->
</dependencies>
@@ -194,9 +251,16 @@
<plugins>
<!-- 打包 -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring.boot.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
--
Gitblit v1.9.3