From c253b555c7905c5136d47cd615ef545fa50cc6ad Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sun, 20 Feb 2022 21:24:16 +0800
Subject: [PATCH] Merge branch 'api_score_meger'

---
 zq-erp/src/main/resources/config/system.properties |   34 +++++++++++++++++++++-------------
 1 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/zq-erp/src/main/resources/config/system.properties b/zq-erp/src/main/resources/config/system.properties
index e008d06..e2c8614 100644
--- a/zq-erp/src/main/resources/config/system.properties
+++ b/zq-erp/src/main/resources/config/system.properties
@@ -17,20 +17,21 @@
 
 #文件保存地址
 #file_storage_path=/mnt/hive/static/uploadeFile/
-file_storage_path=/Users/jiangyouyao/java/webresources/
+file_storage_path=D:\\test\\
+
 #文件上传大小字节为单位  10MB
 maxUploadSize=10485760
 
 #Matser\u7684ip\u5730\u5740
-redis.hostname=118.31.227.147
+#redis.hostname=120.27.238.55
 #\u7AEF\u53E3\u53F7
-redis.port=6379
+#redis.port=6379
 #\u5982\u679C\u6709\u5BC6\u7801
-redis.password=123456
+#redis.password=xcong123
 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000
-redis.timeout=10000  
-redis.database=1
-redis_time_out=1800000
+#redis.timeout=10000
+#redis.database=2
+#redis_time_out=1800000
 cookie_time_out=36000
 
 #APP登录公钥
@@ -48,8 +49,16 @@
 
 
 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
+xcx_manager_appid=wx2948b3b914a9722e
+xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
+
+#公众号
+gzh_appid=wx57e6335559bdbda6
+gzh_secret=ecb408af170e3890e6544290cad33760
+
+
 
 #微信支付调试开关
 wx_pay_debug_onoff = false
@@ -92,10 +101,9 @@
 
 
 #是否启用异常上报
-is_open_exception_report=true
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+is_open_exception_report=false
+showExcptionUrl=http://test.hive.jyymatrix.cc/showException
 
 
-#异常信息查询接口
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+
 

--
Gitblit v1.9.1