From c34b0342177c90564ee5c9d3ef25c7442aaf71ba Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 14 Feb 2022 14:59:05 +0800 Subject: [PATCH] Merge branch 'api_score_meger' into alpha --- zq-erp/src/main/resources/config/prd/application.properties | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/config/prd/application.properties b/zq-erp/src/main/resources/config/prd/application.properties index 4102d75..ee826cb 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,6 +26,7 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000 spring.thymeleaf.prefix: classpath:/templates/views/ spring.thymeleaf.cache=false +mybatis-plus.global-config.db-config.id-type=auto mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml #设置全局时间返回格式 第三行设置为true表示返回时间戳 @@ -68,3 +69,4 @@ #默认头像 default.vip.photo.woman=https://filehive2.jyymatrix.cc/uploadeFile/20210125/db53552e688040afb286686f081e1e68f3fe946f75624598828f01898635152e.png default.vip.photo.man=https://filehive2.jyymatrix.cc/uploadeFile/20210125/3642f1d827c44c76832fea106c85e0f89e089c16cbcc4dd0a82bb52b9ac700f4.png + -- Gitblit v1.9.1