diff --git a/kernel-d-log/log-business/pom.xml b/kernel-d-log/log-business/pom.xml index a84dfd72a..8c5177b0c 100644 --- a/kernel-d-log/log-business/pom.xml +++ b/kernel-d-log/log-business/pom.xml @@ -17,6 +17,14 @@ + + + + cn.stylefeng.roses + ds-container-api + ${roses.version} + + cn.stylefeng.roses diff --git a/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessContentServiceImpl.java b/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessContentServiceImpl.java index d2ea8bb01..cfc9a630a 100644 --- a/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessContentServiceImpl.java +++ b/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessContentServiceImpl.java @@ -4,10 +4,12 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.dsctn.api.context.DataSourceContext; import cn.stylefeng.roses.kernel.log.business.entity.SysLogBusinessContent; import cn.stylefeng.roses.kernel.log.business.mapper.SysLogBusinessContentMapper; import cn.stylefeng.roses.kernel.log.business.pojo.request.SysLogBusinessContentRequest; import cn.stylefeng.roses.kernel.log.business.service.SysLogBusinessContentService; +import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,7 +40,11 @@ public class SysLogBusinessContentServiceImpl extends ServiceImpl sysLogBusinessContentList) { - this.getBaseMapper().insertBatchSomeColumn(sysLogBusinessContentList); + if (DbTypeEnum.MYSQL.equals(DataSourceContext.me().getCurrentDbType())) { + this.getBaseMapper().insertBatchSomeColumn(sysLogBusinessContentList); + } else { + this.saveBatch(sysLogBusinessContentList); + } } /** diff --git a/kernel-s-system/system-business-permission/pom.xml b/kernel-s-system/system-business-permission/pom.xml index b14218e44..a170ca0a8 100644 --- a/kernel-s-system/system-business-permission/pom.xml +++ b/kernel-s-system/system-business-permission/pom.xml @@ -17,6 +17,14 @@ + + + + cn.stylefeng.roses + ds-container-api + ${roses.version} + + cn.stylefeng.roses diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java index cc78ea16c..6fb344e6a 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleMenuOptionsServiceImpl.java @@ -2,6 +2,8 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.cache.api.CacheOperatorApi; +import cn.stylefeng.roses.kernel.dsctn.api.context.DataSourceContext; +import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveMenuCallbackApi; import cn.stylefeng.roses.kernel.sys.api.callback.RemoveRoleCallbackApi; import cn.stylefeng.roses.kernel.sys.api.constants.SysConstants; @@ -16,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -44,6 +47,7 @@ public class SysRoleMenuOptionsServiceImpl extends ServiceImpl sysMenuOptionsList) { if (ObjectUtil.isEmpty(roleId) || ObjectUtil.isEmpty(sysMenuOptionsList)) { @@ -65,7 +69,12 @@ public class SysRoleMenuOptionsServiceImpl extends ServiceImpl + + + + cn.stylefeng.roses + ds-container-api + ${roses.version} + + cn.stylefeng.roses diff --git a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/service/impl/PortalUserAppServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/service/impl/PortalUserAppServiceImpl.java index c76f46fa6..757d5fc96 100644 --- a/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/service/impl/PortalUserAppServiceImpl.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/sys/modular/userapp/service/impl/PortalUserAppServiceImpl.java @@ -2,6 +2,8 @@ package cn.stylefeng.roses.kernel.sys.modular.userapp.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.auth.api.context.LoginContext; +import cn.stylefeng.roses.kernel.dsctn.api.context.DataSourceContext; +import cn.stylefeng.roses.kernel.rule.enums.DbTypeEnum; import cn.stylefeng.roses.kernel.sys.api.SysMenuServiceApi; import cn.stylefeng.roses.kernel.sys.api.pojo.menu.UserAppMenuInfo; import cn.stylefeng.roses.kernel.sys.modular.userapp.entity.PortalUserApp; @@ -55,7 +57,12 @@ public class PortalUserAppServiceImpl extends ServiceImpl