From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/resources/config/application.yml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/config/application.yml b/zq-erp/src/main/resources/config/application.yml
index 46087ae..3bc53ce 100644
--- a/zq-erp/src/main/resources/config/application.yml
+++ b/zq-erp/src/main/resources/config/application.yml
@@ -21,10 +21,14 @@
strict: false
datasource:
master:
- url: jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://120.27.238.55:3306/hive_test_meidu?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: ct_test
password: 123456
driver-class-name: com.mysql.jdbc.Driver
+# url: jdbc:mysql://124.70.222.34/hive_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
+# username: hive
+# password: hive123!@#
+# driver-class-name: com.mysql.jdbc.Driver
slave:
url: jdbc:mysql://47.111.134.136:3306/db_meidu8300?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: meidu_data
@@ -35,6 +39,9 @@
initial-size: 5
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ thymeleaf:
+ prefix: classpath:/templates/views/
+ cache: false
useRabbit: false
rabbitmq:
--
Gitblit v1.9.1