wuzudaniu
/
cloud-plus-server
6
0
Fork 0
Code Issues Pull Requests 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev.parse' into dev.parse 

# Conflicts:
#	cloud-common/cloud-common-kafka/pom.xml
#	cloud-common/pom.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/pom.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/dev.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/prod.xml
#	cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/logback/test.xml
pull/17/head
ruyaxie 2024-09-30 09:12:02 +08:00
parent 6eff930c84 63ebaee731
commit 61dc7f9277
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloud-common/pom.xml
View File

@ -20,8 +20,8 @@
<module>cloud-common-system</module>
<module>cloud-common-xxl</module>
<module>cloud-common-rabbit</module>
<module>cloud-common-kafka</module>
<module>cloud-common-cache</module>
<module>cloud-common-kafka</module>
<module>cloud-common-iotdb</module>
<module>cloud-common-caffeine</module>

4
cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml
View File

@ -4,10 +4,10 @@ server:
# nacos线上地址
nacos:
addr: 127.0.0.1:8848
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
namespace: wx
namespace: five
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring: