From 54d78017f02eb95b5cccaf1377b884941954e548 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期五, 20 九月 2024 16:12:15 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.8.100:29418/iailab-plat
---
iailab-module-model/iailab-module-model-biz/pom.xml | 185 +++++++++++++++++++++++----------------------
1 files changed, 94 insertions(+), 91 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/pom.xml b/iailab-module-model/iailab-module-model-biz/pom.xml
index 5627af3..6395271 100644
--- a/iailab-module-model/iailab-module-model-biz/pom.xml
+++ b/iailab-module-model/iailab-module-model-biz/pom.xml
@@ -15,6 +15,10 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <mdk.version>MDK.taisteel.202308231710</mdk.version>
+ <easypoi.version>4.1.0</easypoi.version>
+ <commons.io.version>2.11.0</commons.io.version>
+ <velocity.version>1.7</velocity.version>
</properties>
<dependencies>
@@ -54,14 +58,14 @@
<groupId>com.iailab</groupId>
<artifactId>iailab-common-monitor</artifactId>
</dependency>
- <!-- Job 定时任务相关 -->
- <dependency>
- <groupId>com.iailab</groupId>
- <artifactId>iailab-common-job</artifactId>
- </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>
+ <version>${revision}</version>
</dependency>
<dependency>
<groupId>com.iailab</groupId>
@@ -71,6 +75,11 @@
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-data-api</artifactId>
+ <version>${revision}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.iailab</groupId>
+ <artifactId>iailab-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
@@ -94,37 +103,6 @@
<version>2.3.2</version>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.quartz-scheduler</groupId>-->
-<!-- <artifactId>quartz</artifactId>-->
-<!-- <version>${quartz.version}</version>-->
-<!-- <exclusions>-->
-<!-- <exclusion>-->
-<!-- <groupId>com.mchange</groupId>-->
-<!-- <artifactId>c3p0</artifactId>-->
-<!-- </exclusion>-->
-<!-- <exclusion>-->
-<!-- <groupId>com.zaxxer</groupId>-->
-<!-- <artifactId>HikariCP-java6</artifactId>-->
-<!-- </exclusion>-->
-<!-- </exclusions>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>cn.afterturn</groupId>-->
-<!-- <artifactId>easypoi-base</artifactId>-->
-<!-- <version>${easypoi.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>cn.afterturn</groupId>-->
-<!-- <artifactId>easypoi-web</artifactId>-->
-<!-- <version>${easypoi.version}</version>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>cn.afterturn</groupId>-->
-<!-- <artifactId>easypoi-annotation</artifactId>-->
-<!-- <version>${easypoi.version}</version>-->
-<!-- </dependency>-->
-
<!-- 引用POI -->
<dependency>
<groupId>org.apache.poi</groupId>
@@ -139,46 +117,6 @@
<scope>compile</scope>
</dependency>
- <!-- ModBus TCP -->
- <dependency>
- <groupId>com.infiniteautomation</groupId>
- <artifactId>modbus4j</artifactId>
- <version>3.0.4</version>
- </dependency>
-
- <!-- OPC UA -->
- <dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
- <version>0.6.9</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-server</artifactId>
- <version>0.6.9</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
- </dependency>
- <dependency>
- <groupId>org.quartz-scheduler</groupId>
- <artifactId>quartz</artifactId>
- <version>2.3.2</version>
- </dependency>
- <!-- influxdb -->
- <dependency>
- <groupId>com.influxdb</groupId>
- <artifactId>influxdb-client-java</artifactId>
- <version>6.8.0</version>
- </dependency>
-
- <!-- websocket -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-module-data-biz</artifactId>
@@ -192,6 +130,51 @@
<scope>test</scope>
</dependency>
+ <!-- 引用MDK -->
+ <dependency>
+ <groupId>com.iail</groupId>
+ <artifactId>IAILMDK</artifactId>
+ <version>0.94.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.iail</groupId>
+ <artifactId>MDK</artifactId>
+ <version>${mdk.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.iail</groupId>
+ <artifactId>IAILMDK</artifactId>
+ <version>0.94.9</version>
+ </dependency>
+
+ <!-- MPK -->
+ <dependency>
+ <groupId>cn.afterturn</groupId>
+ <artifactId>easypoi-base</artifactId>
+ <version>${easypoi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.afterturn</groupId>
+ <artifactId>easypoi-web</artifactId>
+ <version>${easypoi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>cn.afterturn</groupId>
+ <artifactId>easypoi-annotation</artifactId>
+ <version>${easypoi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>velocity</artifactId>
+ <groupId>org.apache.velocity</groupId>
+ <version>${velocity.version}</version>
+ </dependency>
+
+
</dependencies>
<build>
@@ -200,23 +183,43 @@
<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>
- <!-- <plugin>-->
- <!-- <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>-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>flatten-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <configuration>
+ <updatePomFile>true</updatePomFile>
+ <flattenMode>resolveCiFriendliesOnly</flattenMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>flatten</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>flatten</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>flatten.clean</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
--
Gitblit v1.9.3