From 15732a55b862cdc423475f4fb6b45fb8a7b55ed3 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期五, 29 十一月 2024 09:02:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pom.xml | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8089c92..32a18a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,24 +4,24 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.iailab</groupId>
- <artifactId>iailab-platform</artifactId>
+ <artifactId>iailab-plat</artifactId>
<version>${revision}</version>
<packaging>pom</packaging>
<modules>
-<!-- <module>iailab-server</module>-->
-<!-- <module>iailab-dependencies</module>-->
<module>iailab-framework</module>
+ <module>iailab-cloud</module>
<!-- 各种 module 拓展 -->
<module>iailab-module-system</module>
<module>iailab-module-infra</module>
<module>iailab-module-bpm</module>
<module>iailab-module-report</module>
- <module>iailab-cloud</module>
+ <module>iailab-module-data</module>
+ <module>iailab-module-model</module>
</modules>
<name>${project.artifactId}</name>
<description>平台项目基础脚手架</description>
- <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+ <url>http://172.16.8.100:8888/summary/iailab-plat.git</url>
<properties>
<revision>0.0.1</revision>
@@ -34,28 +34,29 @@
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
<!-- 统一依赖管理 -->
<spring.boot.version>2.7.18</spring.boot.version>
- <spring.cloud.version>2021.0.5</spring.cloud.version>
- <spring.cloud.alibaba.version>2021.0.5.0</spring.cloud.alibaba.version>
+ <spring.cloud.version>2021.0.9</spring.cloud.version>
+ <spring.cloud.alibaba.version>2021.0.6.1</spring.cloud.alibaba.version>
<!-- Web 相关 -->
<servlet.versoin>2.5</servlet.versoin>
- <springdoc.version>1.6.15</springdoc.version>
- <knife4j.version>4.3.0</knife4j.version>
+ <springdoc.version>1.7.0</springdoc.version>
+ <knife4j.version>4.5.0</knife4j.version>
<!-- DB 相关 -->
- <druid.version>1.2.21</druid.version>
- <mybatis-plus.version>3.5.5</mybatis-plus.version>
- <mybatis-plus-generator.version>3.5.5</mybatis-plus-generator.version>
- <dynamic-datasource.version>4.3.0</dynamic-datasource.version>
- <mybatis-plus-join.version>1.4.10</mybatis-plus-join.version>
- <easy-trans.version>2.2.11</easy-trans.version>
+ <druid.version>1.2.23</druid.version>
+ <mybatis.version>3.5.16</mybatis.version>
+ <mybatis-plus.version>3.5.7</mybatis-plus.version>
+ <mybatis-plus-generator.version>3.5.7</mybatis-plus-generator.version>
+ <dynamic-datasource.version>4.3.1</dynamic-datasource.version>
+ <mybatis-plus-join.version>1.4.13</mybatis-plus-join.version>
+ <easy-trans.version>3.0.5</easy-trans.version>
<redisson.version>3.18.0</redisson.version> <!-- Spring Boot 2.X 最多使用 3.18.0 版本，否则会报 Tuple NoClassDefFoundError -->
<dm8.jdbc.version>8.1.3.62</dm8.jdbc.version>
<!-- 消息队列 -->
- <rocketmq-spring.version>2.2.3</rocketmq-spring.version>
+ <rocketmq-spring.version>2.3.0</rocketmq-spring.version>
<!-- RPC 相关 -->
<!-- Config 配置中心相关 -->
<apollo.version>1.9.2</apollo.version>
<!-- Job 定时任务相关 -->
- <xxl-job.version>2.3.1</xxl-job.version>
+ <xxl-job.version>2.4.0</xxl-job.version>
<!-- 服务保障相关 -->
<lock4j.version>2.2.7</lock4j.version>
<!-- 监控相关 -->
@@ -70,20 +71,21 @@
<flowable.version>6.8.0</flowable.version>
<!-- 工具类相关 -->
<captcha-plus.version>1.0.8</captcha-plus.version>
- <jsoup.version>1.17.2</jsoup.version>
- <lombok.version>1.18.30</lombok.version>
+ <jsoup.version>1.18.1</jsoup.version>
+ <lombok.version>1.18.34</lombok.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <hutool.version>5.8.25</hutool.version>
- <easyexcel.verion>3.3.3</easyexcel.verion>
+ <hutool.version>5.8.29</hutool.version>
+ <joda.time.version>2.10.14</joda.time.version>
+ <easyexcel.verion>3.3.4</easyexcel.verion>
<velocity.version>2.3</velocity.version>
- <screw.version>1.0.5</screw.version>
+<!-- <screw.version>1.0.5</screw.version>-->
<fastjson.version>1.2.83</fastjson.version>
- <guava.version>33.0.0-jre</guava.version>
- <guice.version>5.1.0</guice.version>
+ <guava.version>33.2.1-jre</guava.version>
+<!-- <guice.version>5.1.0</guice.version>-->
<transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
- <commons-net.version>3.10.0</commons-net.version>
+ <commons-net.version>3.11.1</commons-net.version>
<jsch.version>0.1.55</jsch.version>
- <tika-core.version>2.9.1</tika-core.version>
+ <tika-core.version>2.9.2</tika-core.version>
<ip2region.version>2.7.0</ip2region.version>
<bizlog-sdk.version>3.0.6</bizlog-sdk.version>
<reflections.version>0.10.2</reflections.version>
@@ -100,6 +102,7 @@
<xercesImpl.version>2.12.2</xercesImpl.version>
<weixin-java.version>4.6.0</weixin-java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <postgresql.version>42.7.2</postgresql.version>
</properties>
<profiles>
@@ -113,14 +116,31 @@
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
- <nacos.namespace>a7112341-c9e2-4177-bc5b-0d2e8cf0b3bb</nacos.namespace>
<nacos.metadata.version>1.0.0</nacos.metadata.version>
+ <log.path>D:\DLUT\iailab-plat</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
+ <deploy.server>127.0.0.1</deploy.server>
</properties>
<activation>
<!-- 默认环境 -->
<activeByDefault>true</activeByDefault>
</activation>
+ </profile>
+ <profile>
+ <id>test</id>
+ <properties>
+ <!-- 环境标识，需要与配置文件的名称相对应 -->
+ <profiles.active>test</profiles.active>
+ <nacos.server>172.16.8.100:8848</nacos.server>
+ <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
+ <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
+ <nacos.username>nacos</nacos.username>
+ <nacos.password>nacos</nacos.password>
+ <nacos.metadata.version>1.0.0</nacos.metadata.version>
+ <log.path>/home/iailab</log.path>
+ <logstash.address>127.0.0.1:4560</logstash.address>
+ <deploy.server>172.16.59.105</deploy.server>
+ </properties>
</profile>
<profile>
<id>prod</id>
@@ -240,6 +260,11 @@
</dependency>
<!-- DB 相关 -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
<dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-mybatis</artifactId>
@@ -532,6 +557,12 @@
</dependency>
<dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>${joda.time.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.verion}</version>
--
Gitblit v1.9.3