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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b6b1bfb..32a18a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,14 +11,12 @@
<module>iailab-framework</module>
<module>iailab-cloud</module>
<!-- 各种 module 拓展 -->
-<!-- <module>iailab-module-ai</module>-->
<module>iailab-module-system</module>
<module>iailab-module-infra</module>
<module>iailab-module-bpm</module>
<module>iailab-module-report</module>
<module>iailab-module-data</module>
<module>iailab-module-model</module>
- <!--<module>iailab-fast</module>-->
</modules>
<name>${project.artifactId}</name>
@@ -104,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>
@@ -118,8 +117,9 @@
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<nacos.metadata.version>1.0.0</nacos.metadata.version>
- <log.path>E:\DLUT\iailab-plat</log.path>
+ <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>
<!-- 默认环境 -->
@@ -139,6 +139,7 @@
<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>
@@ -260,6 +261,11 @@
<!-- DB 相关 -->
<dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>${postgresql.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.iailab</groupId>
<artifactId>iailab-common-mybatis</artifactId>
<version>${revision}</version>
--
Gitblit v1.9.3