Merge remote-tracking branch 'origin/hive2.0' into hive2.0

jyy

2020-12-09 95cdd1c5f86bf7ec5af17a07d819976a0365b5d7

 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://119.3.52.84:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8