From 700398ba1359e75c766e5116b4b1d0f962b5fdf9 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 12 一月 2021 10:37:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/resources/application-dev.yml | 12 ++++++------
src/main/resources/application.yml | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cbc5725..c235c81 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -13,12 +13,12 @@
timeout: 10000
# [涓嶅彲鐢╙ jdbc鏁版嵁搴撻厤缃�, 鏆備笉鏀寔
datasource:
- # name: eiot
- # url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
- # username:
- # password:
- # type: com.alibaba.druid.pool.DruidDataSource
- # driver-class-name: com.mysql.jdbc.Driver
+ #name: eiot
+ #url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+ #username:
+ #password:
+ #type: com.alibaba.druid.pool.DruidDataSource
+ #driver-class-name: com.mysql.jdbc.Driver
name: eiot
url: jdbc:sqlite::resource:wvp.sqlite
username:
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ef46c2a..caf4dfc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: local
\ No newline at end of file
+ active: dev
\ No newline at end of file
--
Gitblit v1.8.0