From 83297b67cb09717d93f0c194fca5763cb3e4374f Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Thu, 28 Jan 2021 17:58:56 +0800 Subject: [PATCH] 1、修复充值问题 --- zq-erp/pom.xml | 4 ++-- zq-erp/src/main/resources/config/test/application.properties | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml index 10d3f71..ca46822 100644 --- a/zq-erp/pom.xml +++ b/zq-erp/pom.xml @@ -390,11 +390,11 @@ <exclude>config/test/*</exclude> <exclude>config/xcx/*</exclude> - <!-- + <!----> <exclude>config/config.json</exclude> <exclude>config/application.properties</exclude> <exclude>config/system.properties</exclude> - --> + diff --git a/zq-erp/src/main/resources/config/test/application.properties b/zq-erp/src/main/resources/config/test/application.properties index ddd637e..a4f5857 100644 --- a/zq-erp/src/main/resources/config/test/application.properties +++ b/zq-erp/src/main/resources/config/test/application.properties @@ -4,13 +4,9 @@ #线上测试环境 -#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.username=chuhuan -spring.datasource.password=chuhuan -spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 +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 -- Gitblit v1.9.1