From 560228ac3c15cccce0b2a5994d44e4e81b5b3b73 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 24 May 2022 11:12:22 +0800
Subject: [PATCH] 合并服务单订单改造分支

---
 zq-erp/src/main/resources/config/application-test.properties |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/config/application-test.properties b/zq-erp/src/main/resources/config/application-test.properties
index 664d934..15dd8cf 100644
--- a/zq-erp/src/main/resources/config/application-test.properties
+++ b/zq-erp/src/main/resources/config/application-test.properties
@@ -1,8 +1,7 @@
 #数据库链接
 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.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&useSSL=false
 
 #是否启用debug模式
 debug=false
@@ -50,6 +49,10 @@
 showExcptionUrl=http://test.hive.jyymatrix.cc/showException
 
 
+xcx_manager_appid=wx2948b3b914a9722e
+xcx_manager_secret=1685dfd99a43e213ed8be07870b898ba
+
+
 #百度编辑器,覆盖默认配置
 ueditor.imageUrlPrefix=http://testfile.hive.jyymatrix.cc/uploadeFile
 ueditor.imagePathFormat=/image/{yyyy}{mm}{dd}/{time}{rand:6}

--
Gitblit v1.9.1