From 67e2e142e752b724e021f3562c7f28e128e6f118 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 18:35:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

---
 zq-erp/src/main/resources/config/lhx/application.properties |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index 95b0bd7..44b584e 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -37,11 +37,10 @@
 
 
 #rabbitMQ配置
-rabbitmq.host=47.111.134.136
+rabbitmq.host=120.27.238.55
 rabbitmq.port=5672
-rabbitmq.username=hivequeue
-rabbitmq.password=hivequeueadmin
-useRabbit=false
+rabbitmq.username=ct_rabbit
+rabbitmq.password=123456
 
 server.session.timeout=120
 
@@ -57,4 +56,4 @@
 #定时任务
 scheduling.enabled=true
 
-swagger.enable=false
\ No newline at end of file
+swagger.enable=true
\ No newline at end of file

--
Gitblit v1.9.1