From 9ee7b4433d56b4d64e80d7a0df05269e461364e7 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 08 Nov 2021 19:20:15 +0800 Subject: [PATCH] Merge branch 'ty_fix' into alpha --- zq-erp/src/main/resources/config/prd/application.properties | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/zq-erp/src/main/resources/config/prd/application.properties b/zq-erp/src/main/resources/config/prd/application.properties index c04fee1..ecdb7bb 100644 --- a/zq-erp/src/main/resources/config/prd/application.properties +++ b/zq-erp/src/main/resources/config/prd/application.properties @@ -3,9 +3,9 @@ -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=db_alpha +spring.datasource.password=Alpha!qaz@wsx +spring.datasource.url=jdbc:mysql://124.70.222.34/db_alpha?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 @@ -26,8 +26,8 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false -mybatis.config-location=classpath:mybatis/mybatis-config.xml -mybatis.mapper-locations=classpath*:mybatis/mapper/*/*.xml +mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml +mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml #设置全局时间返回格式 第三行设置为true表示返回时间戳 #spring.jackson.date-format=yyyy-MM-dd #spring.jackson.time-zone=GMT+8 -- Gitblit v1.9.1