by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Details

Browse Source 
# Conflicts:
#	pom.xml
#	ruoyi-modules/Property/pom.xml
This commit is contained in:
15683799673
2025-07-21 03:37:26 +08:00
parent 365ca2d7bc 7511227e51
commit 800a2de30f
38 changed files with 1021 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@@ -73,9 +73,9 @@
<id>local</id>
<properties>
<!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>local</profiles.active>
<nacos.server>172.18.128.1:8848</nacos.server>
<logstash.address>172.18.128.1:4560</logstash.address>
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<logstash.address>127.0.0.1:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
@@ -91,8 +91,8 @@
<properties>
<!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active>
<nacos.server>192.168.0.108:8848</nacos.server>
<logstash.address>192.168.0.108:4560</logstash.address>
<nacos.server>by.missmoc.top:8848</nacos.server>
<logstash.address>by.missmoc.top:4560</logstash.address>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>