From 1c9b9ce046f3d4d721ac93514e9e62486874ff83 Mon Sep 17 00:00:00 2001 From: xiwa Date: Thu, 21 Mar 2024 00:01:29 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=AE=80=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- iot-dao/iot-data-serviceImpl-rdb/pom.xml | 5 -- .../controller/SysTenantController.java | 2 - .../src/main/resources/application.yml | 64 +++++++------------ pom.xml | 12 ---- 4 files changed, 23 insertions(+), 60 deletions(-) diff --git a/iot-dao/iot-data-serviceImpl-rdb/pom.xml b/iot-dao/iot-data-serviceImpl-rdb/pom.xml index 75ccb112..346b1e3b 100644 --- a/iot-dao/iot-data-serviceImpl-rdb/pom.xml +++ b/iot-dao/iot-data-serviceImpl-rdb/pom.xml @@ -70,11 +70,6 @@ - - com.baomidou - dynamic-datasource-spring-boot-starter - - cn.hutool hutool-core diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java index e2193ca1..71075a1a 100644 --- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java +++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysTenantController.java @@ -16,7 +16,6 @@ import cc.iotkit.system.dto.vo.SysTenantVo; import cc.iotkit.system.service.ISysTenantService; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; -import com.baomidou.lock.annotation.Lock4j; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import jakarta.validation.constraints.NotBlank; @@ -86,7 +85,6 @@ public class SysTenantController extends BaseController { @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) @SaCheckPermission("system:tenant:add") @Log(title = "租户", businessType = BusinessType.INSERT) - @Lock4j @PostMapping("/add") public void add(@Validated(AddGroup.class) @RequestBody Request bo) { SysTenantBo data = bo.getData(); diff --git a/iot-starter/src/main/resources/application.yml b/iot-starter/src/main/resources/application.yml index 86a1563d..cf964720 100644 --- a/iot-starter/src/main/resources/application.yml +++ b/iot-starter/src/main/resources/application.yml @@ -20,28 +20,17 @@ spring: format_sql: true datasource: type: com.zaxxer.hikari.HikariDataSource - # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content - 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: org.h2.Driver - # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 - # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:h2:./data/iotkit;MODE=MySQL - username: sa - password: 123456 - + driverClassName: org.h2.Driver + url: jdbc:h2:./data/iotkit;MODE=MySQL + username: sa + password: 123456 + 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 # 内置h2 web console设置 platform: h2 h2: @@ -64,25 +53,18 @@ spring: # 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 +# 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 +# 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 # ============mysql配置结束============>> #<<================es时序数据配置开始=============== diff --git a/pom.xml b/pom.xml index d500901d..d2f33d54 100755 --- a/pom.xml +++ b/pom.xml @@ -85,12 +85,6 @@ ${lombok.version} - - org.apache.directory.studio - org.apache.commons.codec - 1.8 - - jakarta.servlet jakarta.servlet-api @@ -193,12 +187,6 @@ 1.0.0 - - com.baomidou - dynamic-datasource-spring-boot-starter - 3.5.1 - - com.github.xiaoymin knife4j-spring-boot-starter