From e522e4d40451b4e46ec79b3d8a3891899196f14f Mon Sep 17 00:00:00 2001 From: jyy <jyy> Date: Sat, 19 Jun 2021 14:45:17 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/config/application.properties | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 334452c..5e7f6d5 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -2,9 +2,7 @@ server.port=8080 -<<<<<<< HEAD #线上测试环境 - #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 @@ -16,19 +14,8 @@ spring.datasource.username=hive spring.datasource.password=hive123!@# -spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 -======= -#spring.datasource.username=hive -#spring.datasource.password=hive123!@# -#spring.datasource.url=jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 - -spring.datasource.username=hive -spring.datasource.password=hive123!@# spring.datasource.url=jdbc:mysql://124.70.222.34:3306/hive_prd?useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 - - ->>>>>>> d85af61932a03bd03663daf9da33177af5824a5c spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.initialSize=3 -- Gitblit v1.9.1