From 6ada97d503bd93722c081b66a9adcce7599e5536 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 14 Apr 2021 17:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop

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

diff --git a/zq-erp/src/main/resources/config/system.properties b/zq-erp/src/main/resources/config/system.properties
index 8a17d20..36cb7f1 100644
--- a/zq-erp/src/main/resources/config/system.properties
+++ b/zq-erp/src/main/resources/config/system.properties
@@ -17,19 +17,20 @@
 
 #文件保存地址
 #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
 #\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.database=2
 redis_time_out=1800000
 cookie_time_out=36000
 
@@ -99,9 +100,9 @@
 
 #是否启用异常上报
 is_open_exception_report=false
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+showExcptionUrl=http://test.hive.jyymatrix.cc/showException
 
 
 #异常信息查询接口
-showExcptionUrl=http://erp.hive.jyymatrix.cc/showException
+showExcptionUrl=http://test.hive.jyymatrix.cc/showException
 

--
Gitblit v1.9.1