From beb6e85c9b054e8edced241c3367814a0a19d70c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Apr 2021 11:42:38 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

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

diff --git a/zq-erp/src/main/resources/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index cf6a730..44b584e 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -1,4 +1,4 @@
-evn=dev
+evn=lhx
 server.port=8080
 
 
@@ -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