From fd4948ce4d936ca72baad4a076a9661f2a4b4fb9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:07:11 +0800
Subject: [PATCH] Merge branch 'master' into test

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

diff --git a/zq-erp/src/main/resources/config/test/system.properties b/zq-erp/src/main/resources/config/test/system.properties
index e008d06..0bf1388 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
 # 日志文件保存地址
-log_path=/Users/jiangyouyao/logs/zqerp
+log_path=/mnt/hive/log-test
 
 # 系统语言环境 zh中文，us英文
 system_language=zh
@@ -12,15 +12,13 @@
 default_password=123
 
 #nginx静态资源访问地址
-#static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
-static_resource_url=http://localhost:1088/
-
+static_resource_url=https://filehive2.jyymatrix.cc/uploadeFile/
 #文件保存地址
-#file_storage_path=/mnt/hive/static/uploadeFile/
-file_storage_path=/Users/jiangyouyao/java/webresources/
+file_storage_path=/mnt/hive/static/uploadeFile/
 #文件上传大小字节为单位  10MB
 maxUploadSize=10485760
 
+
 #Matser\u7684ip\u5730\u5740
 redis.hostname=118.31.227.147
 #\u7AEF\u53E3\u53F7

--
Gitblit v1.9.1