From b51ab926c93ac946fb9c78cdbad74cdb90e5e7e1 Mon Sep 17 00:00:00 2001
From: JiangYouYao <ak473600000>
Date: Tue, 15 Mar 2022 10:48:40 +0800
Subject: [PATCH] Merge branch 'develop'

---
 zq-erp/src/main/resources/config/application-alpha.properties |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/zq-erp/src/main/resources/config/application-alpha.properties b/zq-erp/src/main/resources/config/application-alpha.properties
index 9ebe364..61475ac 100644
--- a/zq-erp/src/main/resources/config/application-alpha.properties
+++ b/zq-erp/src/main/resources/config/application-alpha.properties
@@ -3,9 +3,9 @@
 
 
 #线上测试环境
-spring.datasource.username=ct_test
-spring.datasource.password=123456
-spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+spring.datasource.username=hive
+spring.datasource.password=hive123!@#
+spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
 
 
 
@@ -37,10 +37,11 @@
 
 
 #rabbitMQ配置
-rabbitmq.host=120.27.238.55
+rabbitmq.host=47.111.134.136
 rabbitmq.port=5672
-rabbitmq.username=ct_rabbit
-rabbitmq.password=123456
+rabbitmq.username=hivequeue
+rabbitmq.password=hivequeueadmin
+useRabbit=true
 
 server.session.timeout=120
 
@@ -61,7 +62,7 @@
 #是否启用debug模式
 debug=false
 # 日志文件保存地址
-log_path=/home/javaweb/hive/log
+log_path=/mnt/hive/log
 
 # 系统语言环境 zh中文，us英文
 system_language=zh
@@ -72,9 +73,9 @@
 default_password=123
 
 #nginx静态资源访问地址
-static_resource_url=http://120.27.238.55:8000/hive/static/uploadeFile/
+static_resource_url=https://hive.file.csxuncong.com/uploadeFile/
 #文件保存地址
-file_storage_path=/home/javaweb/webresource/hive/static/uploadeFile/
+file_storage_path=/mnt/hive/static/uploadeFile/
 #文件上传大小字节为单位  10MB
 maxUploadSize=10485760
 
@@ -119,6 +120,8 @@
 wechar_login_url =https://api.weixin.qq.com/sns/jscode2session?appid=%s&secret=%s&js_code=%s&grant_type=authorization_code
 xcx_appid =wx3836ab3c1490ff29
 xcx_secret =39a3687ec5b2666ed68e7c8b83b26b47
+xcx_manager_appid=wx0d5655a6443807d3
+xcx_manager_secret=b04e675224437c4f17c3068b6c2377b6
 
 #微信支付调试开关
 wx_pay_debug_onoff = false

--
Gitblit v1.9.1