From 02722a3f9eca857ce7fffea352e9f7ee692a1b71 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期五, 08 十一月 2024 08:35:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/pom.xml |  208 +++++++++++++++++++++++++++++----------------------
 1 files changed, 118 insertions(+), 90 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/pom.xml b/iailab-module-model/iailab-module-model-biz/pom.xml
index acf19e6..0d9bf13 100644
--- a/iailab-module-model/iailab-module-model-biz/pom.xml
+++ b/iailab-module-model/iailab-module-model-biz/pom.xml
@@ -15,51 +15,35 @@
         <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>
-
         <dependency>
             <groupId>com.iailab</groupId>
             <artifactId>iailab-common-env</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.iailab</groupId>
+            <artifactId>iailab-module-data-api</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
-        <dependency>
-            <groupId>com.iailab</groupId>
-            <artifactId>iailab-common</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-job</artifactId>
-        </dependency>
+<!--        &lt;!&ndash; 依赖服务 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>com.iailab</groupId>-->
+<!--            <artifactId>iailab-module-infra-api</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.iailab</groupId>-->
+<!--            <artifactId>iailab-module-system-api</artifactId>-->
+<!--            <version>${revision}</version>-->
+<!--        </dependency>-->
+
+        <!-- 业务组件 -->
         <dependency>
             <groupId>com.iailab</groupId>
             <artifactId>iailab-common-biz-data-permission</artifactId>
@@ -70,33 +54,60 @@
         </dependency>
         <dependency>
             <groupId>com.iailab</groupId>
-            <artifactId>iailab-module-model-api</artifactId>
-            <version>${revision}</version>
+            <artifactId>iailab-common-biz-ip</artifactId>
         </dependency>
         <dependency>
             <groupId>com.iailab</groupId>
-            <artifactId>iailab-module-data-api</artifactId>
+            <artifactId>iailab-module-model-api</artifactId>
             <version>${revision}</version>
         </dependency>
+
+        <!-- Web 相关 -->
         <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-loadbalancer</artifactId>
+            <groupId>com.iailab</groupId>
+            <artifactId>iailab-common-security</artifactId>
         </dependency>
 
-        <!-- nacos 客户端 -->
+        <!-- DB 相关 -->
+        <dependency>
+            <groupId>com.iailab</groupId>
+            <artifactId>iailab-common-mybatis</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>
+
+        <!-- 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>
-        </dependency>
-        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <version>2.3.2</version>
         </dependency>
 
         <!-- 引用POI -->
@@ -106,41 +117,38 @@
             <version>4.1.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>17.0.0</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.iailab</groupId>
-            <artifactId>iailab-module-data-biz</artifactId>
-            <version>0.0.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-
         <!-- 引用MDK -->
         <dependency>
             <groupId>com.iail</groupId>
             <artifactId>IAILMDK</artifactId>
             <version>0.94.9</version>
         </dependency>
+
+        <!-- MPK -->
         <dependency>
-            <groupId>com.iail</groupId>
-            <artifactId>MDK</artifactId>
-            <version>${mdk.version}</version>
+            <groupId>cn.afterturn</groupId>
+            <artifactId>easypoi-base</artifactId>
+            <version>${easypoi.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.iail</groupId>
-            <artifactId>IAILMDK</artifactId>
-            <version>0.94.9</version>
+            <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>
 
 
@@ -152,23 +160,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> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
-            <!--                        </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