From d159c2b8a7c3bebac57528b9626b7c1a03094057 Mon Sep 17 00:00:00 2001
From: xiwa <xw2sy@163.com>
Date: Fri, 20 Oct 2023 23:12:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:mysql=E9=85=8D=E7=BD=AE=E7=BC=A9=E8=BF=9B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/iot-starter/src/main/resources/application.yml b/iot-starter/src/main/resources/application.yml
index d323071f..199020b4 100644
--- a/iot-starter/src/main/resources/application.yml
+++ b/iot-starter/src/main/resources/application.yml
@@ -68,36 +68,36 @@ spring:
   #=======内置H2数据库连接设置结束==========>>
 
   # <<==========mysql配置开始==============
-  #  jpa:
-  #    database: MySQL
-  #    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-  #    show-sql: true
-  #    hibernate:
-  #      ddl-auto: update
-  #    properties:
-  #      hibernate:
-  #        format_sql: true
-  #  datasource:
-  #    type: com.zaxxer.hikari.HikariDataSource
-  #    dynamic:
-  #      hikari:
-  #        connection-timeout: 5000
-  #        idle-timeout: 30000 # 经过idle-timeout时间如果连接还处于空闲状态, 该连接会被回收
-  #        min-idle: 5 # 池中维护的最小空闲连接数, 默认为 10 个
-  #        max-pool-size: 16 # 池中最大连接数, 包括闲置和使用中的连接, 默认为 10 个
-  #        max-lifetime: 60000 # 如果一个连接超过了时长，且没有被使用, 连接会被回收
-  #        is-auto-commit: true
-  #      primary: master #设置默认的数据源或者数据源组,默认值即为master
-  #      strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
-  #      datasource:
-  #        # 主库数据源
-  #        master:
-  #          type: ${spring.datasource.type}
-  #          driverClassName: com.mysql.cj.jdbc.Driver
-  #          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
-  #          url: jdbc:mysql://192.168.31.136:3306/iotkit?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
-  #          username: root
-  #          password: 123456
+#  jpa:
+#    database: MySQL
+#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+#    show-sql: true
+#    hibernate:
+#      ddl-auto: update
+#    properties:
+#      hibernate:
+#        format_sql: true
+#  datasource:
+#    type: com.zaxxer.hikari.HikariDataSource
+#    dynamic:
+#      hikari:
+#        connection-timeout: 5000
+#        idle-timeout: 30000 # 经过idle-timeout时间如果连接还处于空闲状态, 该连接会被回收
+#        min-idle: 5 # 池中维护的最小空闲连接数, 默认为 10 个
+#        max-pool-size: 16 # 池中最大连接数, 包括闲置和使用中的连接, 默认为 10 个
+#        max-lifetime: 60000 # 如果一个连接超过了时长，且没有被使用, 连接会被回收
+#        is-auto-commit: true
+#      primary: master #设置默认的数据源或者数据源组,默认值即为master
+#      strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+#      datasource:
+#        # 主库数据源
+#        master:
+#          type: ${spring.datasource.type}
+#          driverClassName: com.mysql.cj.jdbc.Driver
+#          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+#          url: jdbc:mysql://127.0.0.1:3306/iotkit?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+#          username: root
+#          password: 123456
   # ============mysql配置结束============>>
 
   #<<================es时序数据配置开始===============