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 | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0a380e..32a18a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
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>
@@ -21,7 +21,7 @@
<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>
@@ -48,7 +48,7 @@
<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.32.0</redisson.version> <!-- Spring Boot 2.X 最多使用 3.18.0 版本，否则会报 Tuple NoClassDefFoundError -->
+ <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.3.0</rocketmq-spring.version>
@@ -102,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>
@@ -115,9 +116,10 @@
<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>
<!-- 默认环境 -->
@@ -134,9 +136,10 @@
<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>/home/iailab</log.path>
<logstash.address>127.0.0.1:4560</logstash.address>
+ <deploy.server>172.16.59.105</deploy.server>
</properties>
</profile>
<profile>
@@ -258,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