From ff1ebb8f686b25c2383acb1efb79e7c01d78fc01 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Sat, 30 Oct 2021 21:53:56 +0800 Subject: [PATCH] Merge branch 'score_shop' into api_score_meger --- zq-erp/src/main/resources/config/application.properties | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/zq-erp/src/main/resources/config/application.properties b/zq-erp/src/main/resources/config/application.properties index 863a592..c5f1bc5 100644 --- a/zq-erp/src/main/resources/config/application.properties +++ b/zq-erp/src/main/resources/config/application.properties @@ -22,6 +22,11 @@ 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 spring.datasource.minIdle=3 @@ -48,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