From e8ad669f7c97d45cd23630dc101180a130d6c17e Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期二, 05 十一月 2024 10:04:57 +0800 Subject: [PATCH] tag当前值开发 --- iailab-module-data/iailab-module-data-biz/pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/iailab-module-data/iailab-module-data-biz/pom.xml b/iailab-module-data/iailab-module-data-biz/pom.xml index a55d2ee..d44daff 100644 --- a/iailab-module-data/iailab-module-data-biz/pom.xml +++ b/iailab-module-data/iailab-module-data-biz/pom.xml @@ -66,6 +66,10 @@ <groupId>com.iailab</groupId> <artifactId>iailab-common-mybatis</artifactId> </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> <!-- RPC 远程调用相关 --> <dependency> @@ -76,10 +80,6 @@ <dependency> <groupId>com.iailab</groupId> <artifactId>iailab-common-monitor</artifactId> - </dependency> - <dependency> - <groupId>com.iailab</groupId> - <artifactId>iailab-common-biz-data-permission</artifactId> </dependency> <dependency> @@ -135,6 +135,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> @@ -151,16 +157,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 --> @@ -194,6 +212,23 @@ <version>6.8.0</version> </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>5.4.0</version> + </dependency> + + <dependency> + <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> + </dependencies> <build> @@ -202,9 +237,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