From dc1a4670261bc852f643d19a83ffc53eeac1b902 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Mon, 25 Jan 2021 16:16:45 +0800
Subject: [PATCH] Merge branch 'hive2.0' into api

---
 zq-erp/src/main/resources/config/prd/application.properties |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/config/prd/application.properties b/zq-erp/src/main/resources/config/prd/application.properties
index 3d5e977..dc05d4e 100644
--- a/zq-erp/src/main/resources/config/prd/application.properties
+++ b/zq-erp/src/main/resources/config/prd/application.properties
@@ -1,9 +1,14 @@
 evn=prd
 server.port=8080
 
-spring.datasource.username=hive_data
-spring.datasource.password=hive_4321#&@
-spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_prd?useUnicode=true&characterEncoding=utf8mb4&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+
+#spring.datasource.username=hive_data
+#spring.datasource.password=hive_4321#&@
+#spring.datasource.url=jdbc:mysql://119.3.52.84:3306/hive_prd?useUnicode=true&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
+
 
 
 

--
Gitblit v1.9.1