From 1e1282e8ed0385a1bc88d82dbd9bbcf5d1d22ece Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 05 Feb 2021 14:06:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0

---
 zq-erp/src/main/resources/config/test/system.properties |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/zq-erp/src/main/resources/config/test/system.properties b/zq-erp/src/main/resources/config/test/system.properties
index 8f40377..568731d 100644
--- a/zq-erp/src/main/resources/config/test/system.properties
+++ b/zq-erp/src/main/resources/config/test/system.properties
@@ -1,7 +1,7 @@
 #是否启用debug模式
-debug=true
+debug=false
 # 日志文件保存地址
-log_path=/Users/jiangyouyao/logs/zqerp
+log_path=/mnt/hive/log-test
 
 # 系统语言环境 zh中文，us英文
 system_language=zh
@@ -12,12 +12,9 @@
 default_password=123
 
 #nginx静态资源访问地址
-#static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
-static_resource_url=http://localhost:1088/
-
+static_resource_url=http://testfile.hive.jyymatrix.cc/
 #文件保存地址
-#file_storage_path=/mnt/hive/static/uploadeFile/
-file_storage_path=/Users/jiangyouyao/java/webresources/
+file_storage_path=/mnt/upload/
 #文件上传大小字节为单位  10MB
 maxUploadSize=10485760
 
@@ -49,8 +46,10 @@
 
 
 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_appid =wx5cc58f796224af61
+xcx_secret =facea088aae414e5c2ee86b459887721
+gzh_appid=wx57e6335559bdbda6
+gzh_secret=ecb408af170e3890e6544290cad33760
 
 #微信支付调试开关
 wx_pay_debug_onoff = false

--
Gitblit v1.9.1