Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

src/main/resources/application-dev.yml

@@ -13,12 +13,12 @@ spring:
         timeout: 10000
     # [不可用] jdbc数据库配置, 暂不支持
     datasource:
-        #        name: eiot
+        #name: eiot
-        #        url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
+        #url: jdbc:mysql://127.0.0.1:3306/eiot?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true
-        #        username:
+        #username:
-        #        password:
+        #password:
-        #        type: com.alibaba.druid.pool.DruidDataSource
+        #type: com.alibaba.druid.pool.DruidDataSource
-        #        driver-class-name: com.mysql.jdbc.Driver
+        #driver-class-name: com.mysql.jdbc.Driver
         name: eiot
         url: jdbc:sqlite::resource:wvp.sqlite
         username:

src/main/resources/application.yml

@@ -1,3 +1,3 @@
 spring:
   profiles:
-    active: local
+    active: dev