瀏覽代碼

第一次提交

黄渊昊 7 月之前
父節點
當前提交
33c68e21a1

+ 2 - 2
data/init/category.json

@@ -40,10 +40,10 @@
   "createAt" : 1681444312184
 }, {
   "id" : "OpenIitaGateway",
-  "name" : "铱塔智联智能网关",
+  "name" : "博特睿达智联智能网关",
   "createAt" : 1688969826383
 }, {
   "id" : "OpenIitaPump",
-  "name" : "铱塔智联水泵",
+  "name" : "博特睿达智联水泵",
   "createAt" : 1688969826383
 } ]

+ 2 - 2
data/init/product.json

@@ -8,7 +8,7 @@
   "id" : 1,
   "productKey" : "openiitagateway01",
   "productSecret" : "openiitasecret01",
-  "name" : "铱塔智联智能网关01",
+  "name" : "博特睿达智联智能网关01",
   "category" : "OpenIitaGateway",
   "nodeType" : 0,
   "uid" : "1",
@@ -28,7 +28,7 @@
   "id" : 2,
   "productKey" : "openiitapump01",
   "productSecret" : "openiitapump01",
-  "name" : "铱塔智联-单泵01",
+  "name" : "博特睿达智联-单泵01",
   "category" : "OpenIitaPump",
   "nodeType" : 1,
   "uid" : "1",

+ 3 - 3
data/init/sys_dept.json

@@ -8,7 +8,7 @@
   "parentId" : 0,
   "parentName" : null,
   "ancestors" : "0",
-  "deptName" : "铱塔智联",
+  "deptName" : "博特睿达智联",
   "orderNum" : 0,
   "leader" : "openiita",
   "phone" : "15888888888",
@@ -25,7 +25,7 @@
   "parentId" : 100,
   "parentName" : null,
   "ancestors" : "0,100",
-  "deptName" : "深圳总公司",
+  "deptName" : "武汉总公司",
   "orderNum" : 1,
   "leader" : "openiita",
   "phone" : "15888888888",
@@ -42,7 +42,7 @@
   "parentId" : 100,
   "parentName" : null,
   "ancestors" : "0,100",
-  "deptName" : "长沙分公司",
+  "deptName" : "赣州分公司",
   "orderNum" : 2,
   "leader" : "openiita",
   "phone" : "15888888888",

+ 3 - 3
data/init/sys_menu.json

@@ -49,10 +49,10 @@
   "updateBy" : 1,
   "updateTime" : 1708393959961,
   "id" : 4,
-  "menuName" : "铱塔官网",
+  "menuName" : "博特睿达官网",
   "parentId" : 0,
   "orderNum" : 25,
-  "path" : "http://iotkit-open-source.gitee.io/document",
+  "path" : "/bioradar.cn",
   "component" : null,
   "queryParam" : "",
   "isFrame" : "0",
@@ -62,7 +62,7 @@
   "status" : "0",
   "perms" : "",
   "icon" : "guide",
-  "remark" : "铱塔官网",
+  "remark" : "博特睿达官网",
   "children" : [ ]
 }, {
   "createDept" : 103,

+ 5 - 5
iot-dao/iot-data-serviceImpl-rdb/pom.xml

@@ -58,11 +58,11 @@
             <artifactId>h2</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>mysql</groupId>-->
-<!--            <artifactId>mysql-connector-java</artifactId>-->
-<!--            <version>8.0.32</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.32</version>
+        </dependency>
 <!--        -->
 <!--        <dependency>-->
 <!--            <groupId>org.postgresql</groupId>-->

+ 37 - 37
iot-starter/src/main/resources/application-dev.yml

@@ -11,40 +11,7 @@ spring:
 
   #注: 切换数据库时需要将项目根目录中的.init文件删除再重启
   # <<=======内置H2数据库连接设置开始==========
-  jpa:
-    show-sql: false
-    hibernate:
-      ddl-auto: update
-    properties:
-      hibernate:
-        format_sql: true
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driverClassName: org.h2.Driver
-    url: jdbc:h2:./data/iotkit;MODE=MySQL
-    username: sa
-    password: 123456
-    hikari:
-      connection-timeout: 10000
-      idle-timeout: 60000 # 经过idle-timeout时间如果连接还处于空闲状态, 该连接会被回收
-      min-idle: 5 # 池中维护的最小空闲连接数, 默认为 10 个
-      max-pool-size: 16 # 池中最大连接数, 包括闲置和使用中的连接, 默认为 10 个
-      max-lifetime: 120000 # 如果一个连接超过了时长,且没有被使用, 连接会被回收
-      is-auto-commit: true
-    # 内置h2 web console设置
-    platform: h2
-  h2:
-    console:
-      enabled: true
-      path: /h2
-      settings:
-        web-allow-others: true
-  #=======内置H2数据库连接设置结束==========>>
-
-  # <<==========mysql配置开始==============
 #  jpa:
-#    database: MySQL
-#    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
 #    show-sql: false
 #    hibernate:
 #      ddl-auto: update
@@ -53,10 +20,9 @@ spring:
 #        format_sql: true
 #  datasource:
 #    type: com.zaxxer.hikari.HikariDataSource
-#    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
+#    driverClassName: org.h2.Driver
+#    url: jdbc:h2:./data/iotkit;MODE=MySQL
+#    username: sa
 #    password: 123456
 #    hikari:
 #      connection-timeout: 10000
@@ -65,6 +31,40 @@ spring:
 #      max-pool-size: 16 # 池中最大连接数, 包括闲置和使用中的连接, 默认为 10 个
 #      max-lifetime: 120000 # 如果一个连接超过了时长,且没有被使用, 连接会被回收
 #      is-auto-commit: true
+#    # 内置h2 web console设置
+#    platform: h2
+#  h2:
+#    console:
+#      enabled: true
+#      path: /h2
+#      settings:
+#        web-allow-others: true
+  #=======内置H2数据库连接设置结束==========>>
+
+  # <<==========mysql配置开始==============
+  jpa:
+    database: MySQL
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+    show-sql: false
+    hibernate:
+      ddl-auto: update
+    properties:
+      hibernate:
+        format_sql: true
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+    url: jdbc:mysql://192.168.67.228:3306/iotkit?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useSSL=false
+    username: root
+    password: Root123...
+    hikari:
+      connection-timeout: 10000
+      idle-timeout: 60000 # 经过idle-timeout时间如果连接还处于空闲状态, 该连接会被回收
+      min-idle: 5 # 池中维护的最小空闲连接数, 默认为 10 个
+      max-pool-size: 16 # 池中最大连接数, 包括闲置和使用中的连接, 默认为 10 个
+      max-lifetime: 120000 # 如果一个连接超过了时长,且没有被使用, 连接会被回收
+      is-auto-commit: true
   # ============mysql配置结束============>>
 
   #<<================es时序数据配置开始===============