From e3940d7c6d251167fd1eac3e3877c5c32153b7b0 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Mon, 25 Oct 2021 23:25:14 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/config/application.properties | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 18196de..7b6d3b6 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -17,6 +17,15 @@ #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=meidu_data +#spring.datasource.password=meidu_4321#&@ +#spring.datasource.url=jdbc:mysql://47.111.134.136/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + + +#spring.datasource.username=root +#spring.datasource.password=root +#spring.datasource.url=jdbc:mysql://127.0.0.1:3306/md_test_local?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + spring.datasource.type=com.alibaba.druid.pool.DruidDataSource spring.datasource.initialSize=3 @@ -44,10 +53,10 @@ #rabbitMQ配置 -rabbitmq.host=47.111.134.136 -rabbitmq.port=5672 -rabbitmq.username=hivequeue -rabbitmq.password=hivequeueadmin +#rabbitmq.host=47.111.134.136 +#rabbitmq.port=5672 +#rabbitmq.username=hivequeue +#rabbitmq.password=hivequeueadmin useRabbit=false server.session.timeout=120 -- Gitblit v1.9.1