From d2e857f70be9b91709a854f477eb9764d4708cf1 Mon Sep 17 00:00:00 2001 From: Github_lizhw <171332584@qq.com> Date: Sat, 4 Apr 2026 23:29:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-md-system-saas-service/pom.xml | 5 +- .../system/SysSaasApplicationController.java | 105 -- .../system/SysSaasConfigController.java | 137 -- .../system/SysSaasOssConfigController.java | 105 -- .../system/SysSaasTenantController.java | 179 -- .../SysSaasTenantPackageController.java | 142 -- .../system/SysSaasUserController.java | 9 +- .../saas/domain/SysSaasApplication.java | 42 - .../system/saas/domain/SysSaasCache.java | 47 - .../system/saas/domain/SysSaasConfig.java | 51 - .../system/saas/domain/SysSaasOssConfig.java | 89 - .../system/saas/domain/SysSaasTenant.java | 103 -- .../saas/domain/SysSaasTenantApplication.java | 34 - .../saas/domain/SysSaasTenantPackage.java | 54 - .../saas/domain/bo/SysSaasApplicationBo.java | 43 - .../saas/domain/bo/SysSaasConfigBo.java | 59 - .../saas/domain/bo/SysSaasOssConfigBo.java | 109 -- .../domain/bo/SysSaasTenantApplicationBo.java | 32 - .../saas/domain/bo/SysSaasTenantBo.java | 114 -- .../domain/bo/SysSaasTenantPackageBo.java | 59 - .../convert/SysSaasTenantVoConvert.java | 18 - .../saas/domain/vo/SysSaasApplicationVo.java | 46 - .../saas/domain/vo/SysSaasConfigVo.java | 72 - .../saas/domain/vo/SysSaasOssConfigVo.java | 97 -- .../domain/vo/SysSaasTenantApplicationVo.java | 38 - .../domain/vo/SysSaasTenantPackageVo.java | 66 - .../saas/domain/vo/SysSaasTenantVo.java | 115 -- .../saas/dubbo/RemoteConfigServiceImpl.java | 6 +- .../saas/dubbo/RemoteTenantServiceImpl.java | 12 +- .../saas/dubbo/RemoteUserServiceImpl.java | 3 +- .../saas/listener/SysUserImportListener.java | 4 +- .../saas/mapper/SysSaasApplicationMapper.java | 17 - .../saas/mapper/SysSaasConfigMapper.java | 16 - .../saas/mapper/SysSaasOssConfigMapper.java | 18 - .../SysSaasTenantApplicationMapper.java | 17 - .../saas/mapper/SysSaasTenantMapper.java | 16 - .../mapper/SysSaasTenantPackageMapper.java | 16 - .../saas/runner/System2ApplicationRunner.java | 28 - .../service/ISysSaasApplicationService.java | 68 - .../saas/service/ISysSaasConfigService.java | 87 - .../service/ISysSaasOssConfigService.java | 64 - .../ISysSaasTenantApplicationService.java | 68 - .../service/ISysSaasTenantPackageService.java | 62 - .../saas/service/ISysSaasTenantService.java | 82 - .../impl/SysSaasApplicationServiceImpl.java | 130 -- .../impl/SysSaasConfigServiceImpl.java | 219 --- .../service/impl/SysSaasMenuServiceImpl.java | 52 +- .../impl/SysSaasOssConfigServiceImpl.java | 176 -- .../SysSaasTenantApplicationServiceImpl.java | 127 -- .../impl/SysSaasTenantPackageServiceImpl.java | 157 -- .../impl/SysSaasTenantServiceImpl.java | 372 ---- .../systemTenant/SysSaasApplicationMapper.xml | 7 - .../systemTenant/SysSaasConfigMapper.xml | 7 - .../systemTenant/SysSaasOssConfigMapper.xml | 7 - .../SysSaasTenantApplicationMapper.xml | 7 - .../systemTenant/SysSaasTenantMapper.xml | 7 - .../SysSaasTenantPackageMapper.xml | 7 - .../src/main/resources/application-dev.yml | 3 - .../src/main/resources/application-local.yml | 3 - script/sql/tenant/ry_vue_5.X.sql | 1501 ++++++----------- 60 files changed, 597 insertions(+), 4739 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasApplicationController.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasApplication.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasApplicationBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasApplicationVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasApplicationMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasApplicationService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasApplicationServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml delete mode 100644 ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml index 2bb3e1ad5..753b8f7cf 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/pom.xml @@ -105,11 +105,14 @@ org.apache.dubbo dubbo-nacos-spring-boot-starter - org.dromara ruoyi-md-system-saas-api + + org.dromara + ruoyi-md-system-service + diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasApplicationController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasApplicationController.java deleted file mode 100644 index fd02236d7..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasApplicationController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.system.saas.controller.system; - -import java.util.List; - -import lombok.RequiredArgsConstructor; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.*; -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasApplicationBo; -import org.dromara.system.saas.domain.vo.SysSaasApplicationVo; -import org.dromara.system.saas.service.ISysSaasApplicationService; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.excel.utils.ExcelUtil; - -/** - * 应用 - * - * @author Lion Li - * @date 2024-10-14 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/saasApplication") -public class SysSaasApplicationController extends BaseController { - - private final ISysSaasApplicationService sysSaasApplicationService; - - /** - * 查询应用列表 - */ - @SaCheckPermission("system:saasApplication:list") - @GetMapping("/list") - public TableDataInfo list(SysSaasApplicationBo bo, PageQuery pageQuery) { - return sysSaasApplicationService.queryPageList(bo, pageQuery); - } - - /** - * 导出应用列表 - */ - @SaCheckPermission("system:saasApplication:export") - @Log(title = "应用", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysSaasApplicationBo bo, HttpServletResponse response) { - List list = sysSaasApplicationService.queryList(bo); - ExcelUtil.exportExcel(list, "应用", SysSaasApplicationVo.class, response); - } - - /** - * 获取应用详细信息 - * - * @param applicationId 主键 - */ - @SaCheckPermission("system:saasApplication:query") - @GetMapping("/{applicationId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long applicationId) { - return R.ok(sysSaasApplicationService.queryById(applicationId)); - } - - /** - * 新增应用 - */ - @SaCheckPermission("system:saasApplication:add") - @Log(title = "应用", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysSaasApplicationBo bo) { - return toAjax(sysSaasApplicationService.insertByBo(bo)); - } - - /** - * 修改应用 - */ - @SaCheckPermission("system:saasApplication:edit") - @Log(title = "应用", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysSaasApplicationBo bo) { - return toAjax(sysSaasApplicationService.updateByBo(bo)); - } - - /** - * 删除应用 - * - * @param applicationIds 主键串 - */ - @SaCheckPermission("system:saasApplication:remove") - @Log(title = "应用", businessType = BusinessType.DELETE) - @DeleteMapping("/{applicationIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] applicationIds) { - return toAjax(sysSaasApplicationService.deleteWithValidByIds(List.of(applicationIds), true)); - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java deleted file mode 100644 index 6ecc1d66f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasConfigController.java +++ /dev/null @@ -1,137 +0,0 @@ -//package org.dromara.system.saas.controller.system; -// -//import cn.dev33.satoken.annotation.SaCheckPermission; -//import org.dromara.common.core.domain.R; -//import org.dromara.common.excel.utils.ExcelUtil; -//import org.dromara.common.log.annotation.Log; -//import org.dromara.common.log.enums.BusinessType; -//import org.dromara.common.mybatis.core.page.PageQuery; -//import org.dromara.common.mybatis.core.page.TableDataInfo; -//import org.dromara.common.web.core.BaseController; -//import org.dromara.system.saas.domain.bo.SysSaasConfigBo; -//import org.dromara.system.saas.domain.vo.SysSaasConfigVo; -//import org.dromara.system.saas.service.ISysSaasConfigService; -//import jakarta.servlet.http.HttpServletResponse; -//import lombok.RequiredArgsConstructor; -//import org.springframework.validation.annotation.Validated; -//import org.springframework.web.bind.annotation.*; -// -//import java.util.List; -// -///** -// * 参数配置 信息操作处理 -// * -// * @author Lion Li -// */ -//@Validated -//@RequiredArgsConstructor -//@RestController -//@RequestMapping("/system/saasConfig") -//public class SysSaasConfigController extends BaseController { -// -// private final ISysSaasConfigService configService; -// -// /** -// * 获取参数配置列表 -// */ -// @SaCheckPermission("system:config:list") -// @GetMapping("/list") -// public TableDataInfo list(SysSaasConfigBo config, PageQuery pageQuery) { -// return configService.selectPageConfigList(config, pageQuery); -// } -// -// /** -// * 导出参数配置列表 -// */ -// @Log(title = "参数管理", businessType = BusinessType.EXPORT) -// @SaCheckPermission("system:config:export") -// @PostMapping("/export") -// public void export(SysSaasConfigBo config, HttpServletResponse response) { -// List list = configService.selectConfigList(config); -// ExcelUtil.exportExcel(list, "参数数据", SysSaasConfigVo.class, response); -// } -// -// /** -// * 根据参数编号获取详细信息 -// * -// * @param configId 参数ID -// */ -// @SaCheckPermission("system:config:query") -// @GetMapping(value = "/{configId}") -// public R getInfo(@PathVariable Long configId) { -// return R.ok(configService.selectConfigById(configId)); -// } -// -// /** -// * 根据参数键名查询参数值 -// * -// * @param configKey 参数Key -// */ -// @GetMapping(value = "/configKey/{configKey}") -// public R getConfigKey(@PathVariable String configKey) { -// return R.ok("操作成功", configService.selectConfigByKey(configKey)); -// } -// -// /** -// * 新增参数配置 -// */ -// @SaCheckPermission("system:config:add") -// @Log(title = "参数管理", businessType = BusinessType.INSERT) -// @PostMapping -// public R add(@Validated @RequestBody SysSaasConfigBo config) { -// if (!configService.checkConfigKeyUnique(config)) { -// return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); -// } -// configService.insertConfig(config); -// return R.ok(); -// } -// -// /** -// * 修改参数配置 -// */ -// @SaCheckPermission("system:config:edit") -// @Log(title = "参数管理", businessType = BusinessType.UPDATE) -// @PutMapping -// public R edit(@Validated @RequestBody SysSaasConfigBo config) { -// if (!configService.checkConfigKeyUnique(config)) { -// return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); -// } -// configService.updateConfig(config); -// return R.ok(); -// } -// -// /** -// * 根据参数键名修改参数配置 -// */ -// @SaCheckPermission("system:config:edit") -// @Log(title = "参数管理", businessType = BusinessType.UPDATE) -// @PutMapping("/updateByKey") -// public R updateByKey(@RequestBody SysSaasConfigBo config) { -// configService.updateConfig(config); -// return R.ok(); -// } -// -// /** -// * 删除参数配置 -// * -// * @param configIds 参数ID串 -// */ -// @SaCheckPermission("system:config:remove") -// @Log(title = "参数管理", businessType = BusinessType.DELETE) -// @DeleteMapping("/{configIds}") -// public R remove(@PathVariable Long[] configIds) { -// configService.deleteConfigByIds(configIds); -// return R.ok(); -// } -// -// /** -// * 刷新参数缓存 -// */ -// @SaCheckPermission("system:config:remove") -// @Log(title = "参数管理", businessType = BusinessType.CLEAN) -// @DeleteMapping("/refreshCache") -// public R refreshCache() { -// configService.resetConfigCache(); -// return R.ok(); -// } -//} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java deleted file mode 100644 index 28e3bdca0..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasOssConfigController.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.dromara.system.saas.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo; -import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; -import org.dromara.system.saas.service.ISysSaasOssConfigService; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 对象存储配置 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/resource2/oss/config") -public class SysSaasOssConfigController extends BaseController { - - private final ISysSaasOssConfigService ossConfigService; - - /** - * 查询对象存储配置列表 - */ - @SaCheckPermission("system:ossConfig:list") - @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysSaasOssConfigBo bo, PageQuery pageQuery) { - return ossConfigService.queryPageList(bo, pageQuery); - } - - /** - * 获取对象存储配置详细信息 - * - * @param ossConfigId OSS配置ID - */ - @SaCheckPermission("system:ossConfig:list") - @GetMapping("/{ossConfigId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long ossConfigId) { - return R.ok(ossConfigService.queryById(ossConfigId)); - } - - /** - * 新增对象存储配置 - */ - @SaCheckPermission("system:ossConfig:add") - @Log(title = "对象存储配置", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysSaasOssConfigBo bo) { - return toAjax(ossConfigService.insertByBo(bo)); - } - - /** - * 修改对象存储配置 - */ - @SaCheckPermission("system:ossConfig:edit") - @Log(title = "对象存储配置", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysSaasOssConfigBo bo) { - return toAjax(ossConfigService.updateByBo(bo)); - } - - /** - * 删除对象存储配置 - * - * @param ossConfigIds OSS配置ID串 - */ - @SaCheckPermission("system:ossConfig:remove") - @Log(title = "对象存储配置", businessType = BusinessType.DELETE) - @DeleteMapping("/{ossConfigIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ossConfigIds) { - return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true)); - } - - /** - * 状态修改 - */ - @SaCheckPermission("system:ossConfig:edit") - @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysSaasOssConfigBo bo) { - return toAjax(ossConfigService.updateOssConfigStatus(bo)); - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java deleted file mode 100644 index 772d32779..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantController.java +++ /dev/null @@ -1,179 +0,0 @@ -package org.dromara.system.saas.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import com.baomidou.lock.annotation.Lock4j; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.SysSaasTenantBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.dromara.system.saas.service.ISysSaasTenantService; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 租户管理 - * - * @author Michelle.Chung - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/saasTenant") -@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysSaasTenantController extends BaseController { - - private final ISysSaasTenantService tenantService; - - /** - * 查询租户列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:list") - @GetMapping("/list") - public TableDataInfo list(SysSaasTenantBo bo, PageQuery pageQuery) { - return tenantService.queryPageList(bo, pageQuery); - } - - /** - * 导出租户列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:export") - @Log(title = "租户", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysSaasTenantBo bo, HttpServletResponse response) { - List list = tenantService.queryList(bo); - ExcelUtil.exportExcel(list, "租户", SysSaasTenantVo.class, response); - } - - /** - * 获取租户详细信息 - * - * @param id 主键 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:query") - @GetMapping("/{id}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long id) { - return R.ok(tenantService.queryById(id)); - } - - /** - * 新增租户 - */ - @ApiEncrypt - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:add") - @Log(title = "租户", businessType = BusinessType.INSERT) - @Lock4j - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysSaasTenantBo bo) { - if (!tenantService.checkCompanyNameUnique(bo)) { - return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); - } - return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo))); - } - - /** - * 修改租户 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantBo bo) { - tenantService.checkTenantAllowed(bo.getTenantId()); - if (!tenantService.checkCompanyNameUnique(bo)) { - return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); - } - return toAjax(tenantService.updateByBo(bo)); - } - - /** - * 状态修改 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysSaasTenantBo bo) { - tenantService.checkTenantAllowed(bo.getTenantId()); - return toAjax(tenantService.updateTenantStatus(bo)); - } - - /** - * 删除租户 - * - * @param ids 主键串 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:remove") - @Log(title = "租户", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] ids) { - return toAjax(tenantService.deleteWithValidByIds(List.of(ids), true)); - } - - /** - * 动态切换租户 - * - * @param tenantId 租户ID - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @GetMapping("/dynamic/{tenantId}") - public R dynamicTenant(@NotBlank(message = "租户ID不能为空") @PathVariable String tenantId) { -// TenantHelper.setDynamic(tenantId, true); - return R.ok(); - } - -// /** -// * 清除动态租户 -// */ -// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) -// @GetMapping("/dynamic/clear") -// public R dynamicClear() { -// TenantHelper.clearDynamic(); -// return R.ok(); -// } - - - /** - * 同步租户套餐 - * - * @param tenantId 租户id - * @param packageId 套餐id - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenant:edit") - @Log(title = "租户", businessType = BusinessType.UPDATE) - @GetMapping("/syncTenantPackage") - public R syncTenantPackage(@NotBlank(message = "租户ID不能为空") String tenantId, - @NotNull(message = "套餐ID不能为空") Long packageId) { - return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId))); - } - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java deleted file mode 100644 index a1378e81d..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasTenantPackageController.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.dromara.system.saas.controller.system; - -import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaCheckRole; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.domain.R; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; -import org.dromara.common.log.annotation.Log; -import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.web.core.BaseController; -import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo; -import org.dromara.system.saas.service.ISysSaasTenantPackageService; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 租户套餐管理 - * - * @author Michelle.Chung - */ -@Validated -@RequiredArgsConstructor -@RestController -@RequestMapping("/system/saasTenant/package") -@ConditionalOnProperty(value = "tenant.enable", havingValue = "true") -public class SysSaasTenantPackageController extends BaseController { - - private final ISysSaasTenantPackageService tenantPackageService; - - /** - * 查询租户套餐列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:list") - @GetMapping("/list") - public TableDataInfo list(SysSaasTenantPackageBo bo, PageQuery pageQuery) { - return tenantPackageService.queryPageList(bo, pageQuery); - } - - /** - * 查询租户套餐下拉选列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:list") - @GetMapping("/selectList") - public R> selectList() { - return R.ok(tenantPackageService.selectList()); - } - - /** - * 导出租户套餐列表 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:export") - @Log(title = "租户套餐", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysSaasTenantPackageBo bo, HttpServletResponse response) { - List list = tenantPackageService.queryList(bo); - ExcelUtil.exportExcel(list, "租户套餐", SysSaasTenantPackageVo.class, response); - } - - /** - * 获取租户套餐详细信息 - * - * @param packageId 主键 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:query") - @GetMapping("/{packageId}") - public R getInfo(@NotNull(message = "主键不能为空") - @PathVariable Long packageId) { - return R.ok(tenantPackageService.queryById(packageId)); - } - - /** - * 新增租户套餐 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:add") - @Log(title = "租户套餐", businessType = BusinessType.INSERT) - @RepeatSubmit() - @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody SysSaasTenantPackageBo bo) { - if (!tenantPackageService.checkPackageNameUnique(bo)) { - return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); - } - return toAjax(tenantPackageService.insertByBo(bo)); - } - - /** - * 修改租户套餐 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:edit") - @Log(title = "租户套餐", businessType = BusinessType.UPDATE) - @RepeatSubmit() - @PutMapping() - public R edit(@Validated(EditGroup.class) @RequestBody SysSaasTenantPackageBo bo) { - if (!tenantPackageService.checkPackageNameUnique(bo)) { - return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在"); - } - return toAjax(tenantPackageService.updateByBo(bo)); - } - - /** - * 状态修改 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:edit") - @Log(title = "租户套餐", businessType = BusinessType.UPDATE) - @PutMapping("/changeStatus") - public R changeStatus(@RequestBody SysSaasTenantPackageBo bo) { - return toAjax(tenantPackageService.updatePackageStatus(bo)); - } - - /** - * 删除租户套餐 - * - * @param packageIds 主键串 - */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:tenantPackage:remove") - @Log(title = "租户套餐", businessType = BusinessType.DELETE) - @DeleteMapping("/{packageIds}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable Long[] packageIds) { - return toAjax(tenantPackageService.deleteWithValidByIds(List.of(packageIds), true)); - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java index 94f9b31e1..40cded015 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/controller/system/SysSaasUserController.java @@ -53,7 +53,7 @@ public class SysSaasUserController extends BaseController { private final ISysSaasRoleService roleService; private final ISysSaasPostService postService; private final ISysSaasDeptService deptService; - private final ISysSaasTenantService tenantService; +// private final ISysSaasTenantService tenantService; /** * 获取用户列表 @@ -170,9 +170,10 @@ public class SysSaasUserController extends BaseController { return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } if (TenantHelper.isEnable()) { - if (!tenantService.checkAccountBalance(LoginHelper.getTenantId())) { - return R.fail("当前租户下用户名额不足，请联系管理员"); - } + //TODO 应该查询系统的 +// if (!tenantService.checkAccountBalance(LoginHelper.getTenantId())) { +// return R.fail("当前租户下用户名额不足，请联系管理员"); +// } } user.setPassword(BCrypt.hashpw(user.getPassword())); return toAjax(userService.insertUser(user)); diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasApplication.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasApplication.java deleted file mode 100644 index 6a78134a2..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasApplication.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -import java.io.Serial; - -/** - * 应用对象 sys_saas_application - * - * @author Lion Li - * @date 2024-10-14 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_saas_application") -public class SysSaasApplication extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "application_id") - private Long applicationId; - - /** - * 应用名称 - */ - private String applicationName; - - /** - * 应用code - */ - private String applicationCode; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java deleted file mode 100644 index afdb3276d..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasCache.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.system.saas.domain; - -import org.dromara.common.core.utils.StringUtils; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 缓存信息 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class SysSaasCache { - - /** - * 缓存名称 - */ - private String cacheName = ""; - - /** - * 缓存键名 - */ - private String cacheKey = ""; - - /** - * 缓存内容 - */ - private String cacheValue = ""; - - /** - * 备注 - */ - private String remark = ""; - - public SysSaasCache(String cacheName, String remark) { - this.cacheName = cacheName; - this.remark = remark; - } - - public SysSaasCache(String cacheName, String cacheKey, String cacheValue) { - this.cacheName = StringUtils.replace(cacheName, ":", ""); - this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); - this.cacheValue = cacheValue; - } - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java deleted file mode 100644 index 3b69574c5..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.tenant.core.TenantEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 参数配置表 sys_saas_config - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_saas_config") -public class SysSaasConfig extends TenantEntity { - - /** - * 参数主键 - */ - @TableId(value = "config_id") - private Long configId; - - /** - * 参数名称 - */ - private String configName; - - /** - * 参数键名 - */ - private String configKey; - - /** - * 参数键值 - */ - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - private String configType; - - /** - * 备注 - */ - private String remark; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java deleted file mode 100644 index bde270eff..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasOssConfig.java +++ /dev/null @@ -1,89 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 对象存储配置对象 sys_saas_oss_config - * - * @author Lion Li - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_saas_oss_config") -public class SysSaasOssConfig extends BaseEntity { - - /** - * 主键 - */ - @TableId(value = "oss_config_id") - private Long ossConfigId; - - /** - * 配置key - */ - private String configKey; - - /** - * accessKey - */ - private String accessKey; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 桶名称 - */ - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（0否 1是） - */ - private String isHttps; - - /** - * 域 - */ - private String region; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - private String accessPolicy; -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java deleted file mode 100644 index e11c7280f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenant.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; -import java.util.Date; - -/** - * 租户对象 sys_saas_tenant - * - * @author Michelle.Chung - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_saas_tenant") -public class SysSaasTenant extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @TableId(value = "id") - private Long id; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 联系人 - */ - private String contactUserName; - - /** - * 联系电话 - */ - private String contactPhone; - - /** - * 企业名称 - */ - private String companyName; - - /** - * 统一社会信用代码 - */ - private String licenseNumber; - - /** - * 地址 - */ - private String address; - - /** - * 域名 - */ - private String domain; - - /** - * 企业简介 - */ - private String intro; - - /** - * 备注 - */ - private String remark; - - /** - * 租户套餐编号 - */ - private Long packageId; - - /** - * 过期时间 - */ - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - private String status; - - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java deleted file mode 100644 index 8179a8e31..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - -/** - * 租户和应用关联对象 sys_saas_tenant_application - * - * @author Lion Li - * @date 2024-09-22 - */ -@Data -@TableName("sys_saas_tenant_application") -public class SysSaasTenantApplication implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户id - */ - @TableId(value = "td") - private Long td; - - /** - * 应用ID - */ - private Long applicationId; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java deleted file mode 100644 index 7e8c97aff..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/SysSaasTenantPackage.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.dromara.system.saas.domain; - -import com.baomidou.mybatisplus.annotation.*; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户套餐对象 sys_saas_tenant_package - * - * @author Michelle.Chung - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_saas_tenant_package") -public class SysSaasTenantPackage extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户套餐id - */ - @TableId(value = "package_id") - private Long packageId; - /** - * 套餐名称 - */ - private String packageName; - /** - * 关联菜单id - */ - private String menuIds; - /** - * 备注 - */ - private String remark; - /** - * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示） - */ - private Boolean menuCheckStrictly; - /** - * 状态（0正常 1停用） - */ - private String status; - /** - * 删除标志（0代表存在 2代表删除） - */ - @TableLogic - private String delFlag; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasApplicationBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasApplicationBo.java deleted file mode 100644 index 6c806b8a3..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasApplicationBo.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.SysSaasApplication; - -/** - * 应用业务对象 sys_saas_application - * - * @author Lion Li - * @date 2024-10-14 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasApplication.class, reverseConvertGenerate = false) -public class SysSaasApplicationBo extends BaseEntity { - - /** - * id - */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) - private Long applicationId; - - /** - * 应用名称 - */ - @NotBlank(message = "应用名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String applicationName; - - /** - * 应用code - */ - @NotBlank(message = "应用code不能为空", groups = { AddGroup.class, EditGroup.class }) - private String applicationCode; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java deleted file mode 100644 index d67c2fd9f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasConfigBo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.SysSaasConfig; - -/** - * 参数配置业务对象 sys_saas_config - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasConfig.class, reverseConvertGenerate = false) -public class SysSaasConfigBo extends BaseEntity { - - /** - * 参数主键 - */ - private Long configId; - - /** - * 参数名称 - */ - @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符") - private String configName; - - /** - * 参数键名 - */ - @NotBlank(message = "参数键名不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符") - private String configKey; - - /** - * 参数键值 - */ - @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符") - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - private String configType; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java deleted file mode 100644 index 571f187ee..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasOssConfigBo.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.system.saas.domain.SysSaasOssConfig; -import io.github.linpeilie.annotations.AutoMapper; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 对象存储配置业务对象 sys_saas_oss_config - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasOssConfig.class, reverseConvertGenerate = false) -public class SysSaasOssConfigBo extends BaseEntity { - - /** - * 主键 - */ - @NotNull(message = "主键不能为空", groups = {EditGroup.class}) - private Long ossConfigId; - - /** - * 配置key - */ - @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间") - private String configKey; - - /** - * accessKey - */ - @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间") - private String accessKey; - - /** - * 秘钥 - */ - @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间") - private String secretKey; - - /** - * 桶名称 - */ - @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间") - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间") - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（Y=是,N=否） - */ - private String isHttps; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 域 - */ - private String region; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class}) - private String accessPolicy; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java deleted file mode 100644 index 6e83c0107..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantApplicationBo.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import org.dromara.system.saas.domain.SysSaasTenantApplication; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.common.core.validate.EditGroup; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -/** - * 租户和应用关联业务对象 sys_saas_tenant_application - * - * @author Lion Li - * @date 2024-09-22 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasTenantApplication.class, reverseConvertGenerate = false) -public class SysSaasTenantApplicationBo extends BaseEntity { - - @NotNull(message = "租户ID不能为空", groups = {EditGroup.class}) - private Long tenantId; - - /** - * 应用ID - */ - @NotNull(message = "应用ID不能为空", groups = {EditGroup.class}) - private Long applicationId; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java deleted file mode 100644 index ac3efd7a1..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantBo.java +++ /dev/null @@ -1,114 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.saas.domain.SysSaasTenant; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import java.util.Date; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户业务对象 sys_saas_tenant - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasTenant.class, reverseConvertGenerate = false) -public class SysSaasTenantBo extends BaseEntity { - - /** - * id - */ - @NotNull(message = "id不能为空", groups = { EditGroup.class }) - private Long id; - - /** - * 租户编号 - */ - private String tenantId; - - /** - * 联系人 - */ - @NotBlank(message = "联系人不能为空", groups = { AddGroup.class, EditGroup.class }) - private String contactUserName; - - /** - * 联系电话 - */ - @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class }) - private String contactPhone; - - /** - * 企业名称 - */ - @NotBlank(message = "企业名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String companyName; - - /** - * 用户名（创建系统用户） - */ - @NotBlank(message = "用户名不能为空", groups = { AddGroup.class }) - private String username; - - /** - * 密码（创建系统用户） - */ - @NotBlank(message = "密码不能为空", groups = { AddGroup.class }) - private String password; - - /** - * 统一社会信用代码 - */ - private String licenseNumber; - - /** - * 地址 - */ - private String address; - - /** - * 域名 - */ - private String domain; - - /** - * 企业简介 - */ - private String intro; - - /** - * 备注 - */ - private String remark; - - /** - * 租户套餐编号 - */ - @NotNull(message = "租户套餐不能为空", groups = { AddGroup.class }) - private Long packageId; - - /** - * 过期时间 - */ - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - private String status; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java deleted file mode 100644 index bb82fa4fd..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/bo/SysSaasTenantPackageBo.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.dromara.system.saas.domain.bo; - -import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.core.validate.EditGroup; -import org.dromara.system.saas.domain.SysSaasTenantPackage; -import io.github.linpeilie.annotations.AutoMapper; -import io.github.linpeilie.annotations.AutoMapping; -import lombok.Data; -import lombok.EqualsAndHashCode; -import jakarta.validation.constraints.*; - -import org.dromara.common.mybatis.core.domain.BaseEntity; - -/** - * 租户套餐业务对象 sys_saas_tenant_package - * - * @author Michelle.Chung - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@AutoMapper(target = SysSaasTenantPackage.class, reverseConvertGenerate = false) -public class SysSaasTenantPackageBo extends BaseEntity { - - /** - * 租户套餐id - */ - @NotNull(message = "租户套餐id不能为空", groups = { EditGroup.class }) - private Long packageId; - - /** - * 套餐名称 - */ - @NotBlank(message = "套餐名称不能为空", groups = { AddGroup.class, EditGroup.class }) - private String packageName; - - /** - * 关联菜单id - */ - @AutoMapping(target = "menuIds", expression = "java(org.dromara.common.core.utils.StringUtils.join(source.getMenuIds(), \",\"))") - private Long[] menuIds; - - /** - * 备注 - */ - private String remark; - - /** - * 菜单树选择项是否关联显示 - */ - private Boolean menuCheckStrictly; - - /** - * 状态（0正常 1停用） - */ - private String status; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java deleted file mode 100644 index dfde7d1de..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/convert/SysSaasTenantVoConvert.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.system.saas.domain.convert; - -import io.github.linpeilie.BaseMapper; -import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.mapstruct.Mapper; -import org.mapstruct.MappingConstants; -import org.mapstruct.ReportingPolicy; - -/** - * 租户转换器 - * - * @author zhujie - */ -@Mapper(componentModel = MappingConstants.ComponentModel.SPRING, unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface SysSaasTenantVoConvert extends BaseMapper { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasApplicationVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasApplicationVo.java deleted file mode 100644 index 3bec2dfb0..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasApplicationVo.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; -import org.dromara.system.saas.domain.SysSaasApplication; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 应用视图对象 sys_saas_application - * - * @author Lion Li - * @date 2024-10-14 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasApplication.class) -public class SysSaasApplicationVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ExcelProperty(value = "id") - private Long applicationId; - - /** - * 应用名称 - */ - @ExcelProperty(value = "应用名称") - private String applicationName; - - /** - * 应用code - */ - @ExcelProperty(value = "应用code") - private String applicationCode; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java deleted file mode 100644 index 280538610..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasConfigVo.java +++ /dev/null @@ -1,72 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.saas.domain.SysSaasConfig; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; -import java.util.Date; - - -/** - * 参数配置视图对象 sys_saas_config - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasConfig.class) -public class SysSaasConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 参数主键 - */ - @ExcelProperty(value = "参数主键") - private Long configId; - - /** - * 参数名称 - */ - @ExcelProperty(value = "参数名称") - private String configName; - - /** - * 参数键名 - */ - @ExcelProperty(value = "参数键名") - private String configKey; - - /** - * 参数键值 - */ - @ExcelProperty(value = "参数键值") - private String configValue; - - /** - * 系统内置（Y是 N否） - */ - @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class) - @ExcelDictFormat(dictType = "sys_saas_yes_no") - private String configType; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 创建时间 - */ - @ExcelProperty(value = "创建时间") - private Date createTime; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java deleted file mode 100644 index 1f5fa4c7f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasOssConfigVo.java +++ /dev/null @@ -1,97 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import org.dromara.system.saas.domain.SysSaasOssConfig; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 对象存储配置视图对象 sys_saas_oss_config - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasOssConfig.class) -public class SysSaasOssConfigVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private Long ossConfigId; - - /** - * 配置key - */ - private String configKey; - - /** - * accessKey - */ - private String accessKey; - - /** - * 秘钥 - */ - private String secretKey; - - /** - * 桶名称 - */ - private String bucketName; - - /** - * 前缀 - */ - private String prefix; - - /** - * 访问站点 - */ - private String endpoint; - - /** - * 自定义域名 - */ - private String domain; - - /** - * 是否https（Y=是,N=否） - */ - private String isHttps; - - /** - * 域 - */ - private String region; - - /** - * 是否默认（0=是,1=否） - */ - private String status; - - /** - * 扩展字段 - */ - private String ext1; - - /** - * 备注 - */ - private String remark; - - /** - * 桶权限类型(0private 1public 2custom) - */ - private String accessPolicy; - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java deleted file mode 100644 index be4bc5a75..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantApplicationVo.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import org.dromara.system.saas.domain.SysSaasTenantApplication; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 租户和应用关联视图对象 sys_saas_tenant_application - * - * @author Lion Li - * @date 2024-09-22 - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasTenantApplication.class) -public class SysSaasTenantApplicationVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - - @ExcelProperty(value = "租户id") - private Long td; - - /** - * 应用ID - */ - @ExcelProperty(value = "应用ID") - private Long applicationId; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java deleted file mode 100644 index d007a0c62..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantPackageVo.java +++ /dev/null @@ -1,66 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.saas.domain.SysSaasTenantPackage; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 租户套餐视图对象 sys_saas_tenant_package - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasTenantPackage.class) -public class SysSaasTenantPackageVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 租户套餐id - */ - @ExcelProperty(value = "租户套餐id") - private Long packageId; - - /** - * 套餐名称 - */ - @ExcelProperty(value = "套餐名称") - private String packageName; - - /** - * 关联菜单id - */ - @ExcelProperty(value = "关联菜单id") - private String menuIds; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 菜单树选择项是否关联显示 - */ - @ExcelProperty(value = "菜单树选择项是否关联显示") - private Boolean menuCheckStrictly; - - /** - * 状态（0正常 1停用） - */ - @ExcelProperty(value = "状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java deleted file mode 100644 index 69233dd5e..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/domain/vo/SysSaasTenantVo.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.dromara.system.saas.domain.vo; - -import java.util.Date; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; -import org.dromara.system.saas.domain.SysSaasTenant; -import io.github.linpeilie.annotations.AutoMapper; -import lombok.Data; - -import java.io.Serial; -import java.io.Serializable; - - -/** - * 租户视图对象 sys_saas_tenant - * - * @author Michelle.Chung - */ -@Data -@ExcelIgnoreUnannotated -@AutoMapper(target = SysSaasTenant.class) -public class SysSaasTenantVo implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * id - */ - @ExcelProperty(value = "id") - private Long id; - - /** - * 租户编号 - */ - @ExcelProperty(value = "租户编号") - private String tenantId; - - /** - * 联系人 - */ - @ExcelProperty(value = "联系人") - private String contactUserName; - - /** - * 联系电话 - */ - @ExcelProperty(value = "联系电话") - private String contactPhone; - - /** - * 企业名称 - */ - @ExcelProperty(value = "企业名称") - private String companyName; - - /** - * 统一社会信用代码 - */ - @ExcelProperty(value = "统一社会信用代码") - private String licenseNumber; - - /** - * 地址 - */ - @ExcelProperty(value = "地址") - private String address; - - /** - * 域名 - */ - @ExcelProperty(value = "域名") - private String domain; - - /** - * 企业简介 - */ - @ExcelProperty(value = "企业简介") - private String intro; - - /** - * 备注 - */ - @ExcelProperty(value = "备注") - private String remark; - - /** - * 租户套餐编号 - */ - @ExcelProperty(value = "租户套餐编号") - private Long packageId; - - /** - * 过期时间 - */ - @ExcelProperty(value = "过期时间") - private Date expireTime; - - /** - * 用户数量（-1不限制） - */ - @ExcelProperty(value = "用户数量") - private Long accountCount; - - /** - * 租户状态（0正常 1停用） - */ - @ExcelProperty(value = "租户状态", converter = ExcelDictConvert.class) - @ExcelDictFormat(readConverterExp = "0=正常,1=停用") - private String status; - - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java index 7cab62eaf..e0bb07f1f 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteConfigServiceImpl.java @@ -3,7 +3,7 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.system.saas.api.RemoteConfigService; -import org.dromara.system.saas.service.ISysSaasConfigService; +import org.dromara.system.service.ISysConfigService; import org.springframework.stereotype.Service; /** @@ -16,14 +16,14 @@ import org.springframework.stereotype.Service; @DubboService public class RemoteConfigServiceImpl implements RemoteConfigService { - private final ISysSaasConfigService sysSaasConfigService; + private final ISysConfigService sysConfigService; /** * 获取注册开关 */ @Override public boolean selectRegisterEnabled(String tenantId) { - return sysSaasConfigService.selectRegisterEnabled(tenantId); + return sysConfigService.selectRegisterEnabled(tenantId); } } diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java index d238799b7..fcf95a969 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteTenantServiceImpl.java @@ -3,11 +3,11 @@ package org.dromara.system.saas.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.saas.api.RemoteTenantService; import org.dromara.system.saas.api.domain.vo.RemoteTenantVo; -import org.dromara.system.saas.domain.bo.SysSaasTenantBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.dromara.system.saas.service.ISysSaasTenantService; +import org.dromara.system.service.ISysTenantService; import org.springframework.stereotype.Service; import java.util.List; @@ -20,14 +20,14 @@ import java.util.List; @DubboService public class RemoteTenantServiceImpl implements RemoteTenantService { - private final ISysSaasTenantService tenantSaasService; + private final ISysTenantService sysTenantService; /** * 根据租户id获取租户详情 */ @Override public RemoteTenantVo queryByTenantId(String tenantId) { - SysSaasTenantVo vo = tenantSaasService.queryByTenantId(tenantId); + SysTenantVo vo = sysTenantService.queryByTenantId(tenantId); return MapstructUtils.convert(vo, RemoteTenantVo.class); } @@ -36,7 +36,7 @@ public class RemoteTenantServiceImpl implements RemoteTenantService { */ @Override public List queryList() { - List list = tenantSaasService.queryList(new SysSaasTenantBo()); + List list = sysTenantService.queryList(new SysTenantBo()); return MapstructUtils.convert(list, RemoteTenantVo.class); } diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java index 4473ef5f6..b5751e714 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/dubbo/RemoteUserServiceImpl.java @@ -28,6 +28,7 @@ import org.dromara.system.saas.domain.vo.SysSaasRoleVo; import org.dromara.system.saas.domain.vo.SysSaasUserVo; import org.dromara.system.saas.mapper.SysSaasUserMapper; import org.dromara.system.saas.service.*; +import org.dromara.system.service.ISysConfigService; import org.springframework.stereotype.Service; import java.util.List; @@ -45,10 +46,10 @@ public class RemoteUserServiceImpl implements RemoteUserService { private final ISysSaasUserService userService; private final SaasUserService saasUserService; private final ISysSaasPermissionService permissionService; - private final ISysSaasConfigService configService; private final ISysSaasRoleService roleService; private final ISysSaasDeptService deptService; private final SysSaasUserMapper userMapper; + private final ISysConfigService configService; /** * 通过用户名查询用户信息 diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java index 0ca6bf771..bdf343848 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/listener/SysUserImportListener.java @@ -14,9 +14,9 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.saas.domain.bo.SysSaasUserBo; import org.dromara.system.saas.domain.vo.SysSaasUserImportVo; import org.dromara.system.saas.domain.vo.SysSaasUserVo; -import org.dromara.system.saas.service.ISysSaasConfigService; import org.dromara.system.saas.service.ISysSaasUserService; import lombok.extern.slf4j.Slf4j; +import org.dromara.system.service.ISysConfigService; import java.util.List; @@ -42,7 +42,7 @@ public class SysUserImportListener extends AnalysisEventListener { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java deleted file mode 100644 index b7def68b8..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasConfigMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.SysSaasConfig; -import org.dromara.system.saas.domain.vo.SysSaasConfigVo; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -@Mapper -public interface SysSaasConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java deleted file mode 100644 index 3944e117c..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasOssConfigMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.SysSaasOssConfig; -import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; - -/** - * 对象存储配置Mapper接口 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Mapper -public interface SysSaasOssConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java deleted file mode 100644 index 10d8b9c6e..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantApplicationMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.SysSaasTenantApplication; -import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户和应用关联Mapper接口 - * - * @author Lion Li - * @date 2024-09-22 - */ -@Mapper -public interface SysSaasTenantApplicationMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java deleted file mode 100644 index dc734bfb6..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.system.saas.domain.SysSaasTenant; -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; - -/** - * 租户Mapper接口 - * - * @author Michelle.Chung - */ -@Mapper -public interface SysSaasTenantMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java deleted file mode 100644 index a18d24e51..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/mapper/SysSaasTenantPackageMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.dromara.system.saas.mapper; - -import org.apache.ibatis.annotations.Mapper; -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.system.saas.domain.SysSaasTenantPackage; -import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo; - -/** - * 租户套餐Mapper接口 - * - * @author Michelle.Chung - */ -@Mapper -public interface SysSaasTenantPackageMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java deleted file mode 100644 index d7ad24ae9..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/runner/System2ApplicationRunner.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.dromara.system.saas.runner; - -import org.dromara.system.saas.service.ISysSaasOssConfigService; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -/** - * 初始化 system 模块对应业务数据 - * - * @author Lion Li - */ -@Slf4j -@RequiredArgsConstructor -@Component -public class System2ApplicationRunner implements ApplicationRunner { - - private final ISysSaasOssConfigService ossConfigService; - - @Override - public void run(ApplicationArguments args) throws Exception { - ossConfigService.init(); - log.info("初始化OSS配置成功"); - } - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasApplicationService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasApplicationService.java deleted file mode 100644 index f0c2c9a0f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasApplicationService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.system.saas.domain.bo.SysSaasApplicationBo; -import org.dromara.system.saas.domain.vo.SysSaasApplicationVo; - -import java.util.Collection; -import java.util.List; - -/** - * 应用Service接口 - * - * @author Lion Li - * @date 2024-10-14 - */ -public interface ISysSaasApplicationService { - - /** - * 查询应用 - * - * @param applicationId 主键 - * @return 应用 - */ - SysSaasApplicationVo queryById(Long applicationId); - - /** - * 分页查询应用列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 应用分页列表 - */ - TableDataInfo queryPageList(SysSaasApplicationBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的应用列表 - * - * @param bo 查询条件 - * @return 应用列表 - */ - List queryList(SysSaasApplicationBo bo); - - /** - * 新增应用 - * - * @param bo 应用 - * @return 是否新增成功 - */ - Boolean insertByBo(SysSaasApplicationBo bo); - - /** - * 修改应用 - * - * @param bo 应用 - * @return 是否修改成功 - */ - Boolean updateByBo(SysSaasApplicationBo bo); - - /** - * 校验并批量删除应用信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java deleted file mode 100644 index 700e9161a..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasConfigService.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasConfigBo; -import org.dromara.system.saas.domain.vo.SysSaasConfigVo; - -import java.util.List; - -/** - * 参数配置 服务层 - * - * @author Lion Li - */ -public interface ISysSaasConfigService { - - - TableDataInfo selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery); - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - SysSaasConfigVo selectConfigById(Long configId); - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数键名 - * @return 参数键值 - */ - String selectConfigByKey(String configKey); - - /** - * 获取注册开关 - * @param tenantId 租户id - * @return true开启，false关闭 - */ - boolean selectRegisterEnabled(String tenantId); - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - List selectConfigList(SysSaasConfigBo config); - - /** - * 新增参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - String insertConfig(SysSaasConfigBo bo); - - /** - * 修改参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - String updateConfig(SysSaasConfigBo bo); - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - void deleteConfigByIds(Long[] configIds); - - /** - * 重置参数缓存数据 - */ - void resetConfigCache(); - - /** - * 校验参数键名是否唯一 - * - * @param config 参数信息 - * @return 结果 - */ - boolean checkConfigKeyUnique(SysSaasConfigBo config); - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java deleted file mode 100644 index 591c8412f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasOssConfigService.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo; -import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; - -import java.util.Collection; - -/** - * 对象存储配置Service接口 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -public interface ISysSaasOssConfigService { - - /** - * 初始化OSS配置 - */ - void init(); - - /** - * 查询单个 - */ - SysSaasOssConfigVo queryById(Long ossConfigId); - - /** - * 查询列表 - */ - TableDataInfo queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery); - - /** - * 根据新增业务对象插入对象存储配置 - * - * @param bo 对象存储配置新增业务对象 - * @return 结果 - */ - Boolean insertByBo(SysSaasOssConfigBo bo); - - /** - * 根据编辑业务对象修改对象存储配置 - * - * @param bo 对象存储配置编辑业务对象 - * @return 结果 - */ - Boolean updateByBo(SysSaasOssConfigBo bo); - - /** - * 校验并删除数据 - * - * @param ids 主键集合 - * @param isValid 是否校验,true-删除前校验,false-不校验 - * @return 结果 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 启用停用状态 - */ - int updateOssConfigStatus(SysSaasOssConfigBo bo); - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java deleted file mode 100644 index 9145efe5e..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantApplicationService.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo; -import org.dromara.system.saas.domain.bo.SysSaasTenantApplicationBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 租户和应用关联Service接口 - * - * @author Lion Li - * @date 2024-09-22 - */ -public interface ISysSaasTenantApplicationService { - - /** - * 查询租户和应用关联 - * - * @param tenantId 主键 - * @return 租户和应用关联 - */ - SysSaasTenantApplicationVo queryById(Long tenantId); - - /** - * 分页查询租户和应用关联列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 租户和应用关联分页列表 - */ - TableDataInfo queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery); - - /** - * 查询符合条件的租户和应用关联列表 - * - * @param bo 查询条件 - * @return 租户和应用关联列表 - */ - List queryList(SysSaasTenantApplicationBo bo); - - /** - * 新增租户和应用关联 - * - * @param bo 租户和应用关联 - * @return 是否新增成功 - */ - Boolean insertByBo(SysSaasTenantApplicationBo bo); - - /** - * 修改租户和应用关联 - * - * @param bo 租户和应用关联 - * @return 是否修改成功 - */ - Boolean updateByBo(SysSaasTenantApplicationBo bo); - - /** - * 校验并批量删除租户和应用关联信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java deleted file mode 100644 index 54537e4fa..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantPackageService.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo; - -import java.util.Collection; -import java.util.List; - -/** - * 租户套餐Service接口 - * - * @author Michelle.Chung - */ -public interface ISysSaasTenantPackageService { - - /** - * 查询租户套餐 - */ - SysSaasTenantPackageVo queryById(Long packageId); - - /** - * 查询租户套餐列表 - */ - TableDataInfo queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery); - - /** - * 查询租户套餐已启用列表 - */ - List selectList(); - - /** - * 查询租户套餐列表 - */ - List queryList(SysSaasTenantPackageBo bo); - - /** - * 新增租户套餐 - */ - Boolean insertByBo(SysSaasTenantPackageBo bo); - - /** - * 修改租户套餐 - */ - Boolean updateByBo(SysSaasTenantPackageBo bo); - - /** - * 校验套餐名称是否唯一 - */ - boolean checkPackageNameUnique(SysSaasTenantPackageBo bo); - - /** - * 修改套餐状态 - */ - int updatePackageStatus(SysSaasTenantPackageBo bo); - - /** - * 校验并批量删除租户套餐信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java deleted file mode 100644 index de7fedf16..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/ISysSaasTenantService.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.dromara.system.saas.service; - -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.dromara.system.saas.domain.bo.SysSaasTenantBo; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; - -import java.util.Collection; -import java.util.List; - -/** - * 租户Service接口 - * - * @author Michelle.Chung - */ -public interface ISysSaasTenantService { - - /** - * 查询租户 - */ - SysSaasTenantVo queryById(Long id); - - /** - * 基于租户ID查询租户 - */ - SysSaasTenantVo queryByTenantId(String tenantId); - - /** - * 查询租户列表 - */ - TableDataInfo queryPageList(SysSaasTenantBo bo, PageQuery pageQuery); - - /** - * 查询租户列表 - */ - List queryList(SysSaasTenantBo bo); - - /** - * 新增租户 - */ - Boolean insertByBo(SysSaasTenantBo bo); - - /** - * 修改租户 - */ - Boolean updateByBo(SysSaasTenantBo bo); - - /** - * 修改租户状态 - */ - int updateTenantStatus(SysSaasTenantBo bo); - - /** - * 校验租户是否允许操作 - */ - void checkTenantAllowed(String tenantId); - - /** - * 校验并批量删除租户信息 - */ - Boolean deleteWithValidByIds(Collection ids, Boolean isValid); - - /** - * 校验企业名称是否唯一 - */ - boolean checkCompanyNameUnique(SysSaasTenantBo bo); - - /** - * 校验账号余额 - */ - boolean checkAccountBalance(String tenantId); - - /** - * 校验有效期 - */ - boolean checkExpireTime(String tenantId); - - /** - * 同步租户套餐 - */ - Boolean syncTenantPackage(String tenantId, Long packageId); -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasApplicationServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasApplicationServiceImpl.java deleted file mode 100644 index 5c2714dcb..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasApplicationServiceImpl.java +++ /dev/null @@ -1,130 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.SysSaasApplication; -import org.dromara.system.saas.domain.bo.SysSaasApplicationBo; -import org.dromara.system.saas.domain.vo.SysSaasApplicationVo; -import org.dromara.system.saas.mapper.SysSaasApplicationMapper; -import org.dromara.system.saas.service.ISysSaasApplicationService; -import org.springframework.stereotype.Service; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * 应用Service业务层处理 - * - * @author Lion Li - * @date 2024-10-14 - */ -@RequiredArgsConstructor -@Service -public class SysSaasApplicationServiceImpl implements ISysSaasApplicationService { - - private final SysSaasApplicationMapper baseMapper; - - /** - * 查询应用 - * - * @param applicationId 主键 - * @return 应用 - */ - @Override - public SysSaasApplicationVo queryById(Long applicationId) { - return baseMapper.selectVoById(applicationId); - } - - /** - * 分页查询应用列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 应用分页列表 - */ - @Override - public TableDataInfo queryPageList(SysSaasApplicationBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的应用列表 - * - * @param bo 查询条件 - * @return 应用列表 - */ - @Override - public List queryList(SysSaasApplicationBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysSaasApplicationBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getApplicationName()), SysSaasApplication::getApplicationName, bo.getApplicationName()); - lqw.eq(StringUtils.isNotBlank(bo.getApplicationCode()), SysSaasApplication::getApplicationCode, bo.getApplicationCode()); - return lqw; - } - - /** - * 新增应用 - * - * @param bo 应用 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(SysSaasApplicationBo bo) { - SysSaasApplication add = MapstructUtils.convert(bo, SysSaasApplication.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setApplicationId(add.getApplicationId()); - } - return flag; - } - - /** - * 修改应用 - * - * @param bo 应用 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(SysSaasApplicationBo bo) { - SysSaasApplication update = MapstructUtils.convert(bo, SysSaasApplication.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysSaasApplication entity) { - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除应用信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java deleted file mode 100644 index cf100db80..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasConfigServiceImpl.java +++ /dev/null @@ -1,219 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.UserConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.ConfigService; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.system.saas.domain.SysSaasConfig; -import org.dromara.system.saas.domain.bo.SysSaasConfigBo; -import org.dromara.system.saas.domain.vo.SysSaasConfigVo; -import org.dromara.system.saas.mapper.SysSaasConfigMapper; -import org.dromara.system.saas.service.ISysSaasConfigService; -import lombok.RequiredArgsConstructor; -import org.springframework.cache.annotation.CachePut; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 参数配置 服务层实现 - * - * @author Lion Li - */ -@RequiredArgsConstructor -@Service -public class SysSaasConfigServiceImpl implements ISysSaasConfigService, ConfigService { - - private final SysSaasConfigMapper baseMapper; - - @Override - public TableDataInfo selectPageConfigList(SysSaasConfigBo config, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(page); - } - - /** - * 查询参数配置信息 - * - * @param configId 参数配置ID - * @return 参数配置信息 - */ - @Override - @DS("master") - public SysSaasConfigVo selectConfigById(Long configId) { - return baseMapper.selectVoById(configId); - } - - /** - * 根据键名查询参数配置信息 - * - * @param configKey 参数key - * @return 参数键值 - */ - @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey") - @Override - public String selectConfigByKey(String configKey) { - SysSaasConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysSaasConfig::getConfigKey, configKey)); - if (ObjectUtil.isNotNull(retConfig)) { - return retConfig.getConfigValue(); - } - return StringUtils.EMPTY; - } - - /** - * 获取注册开关 - * @param tenantId 租户id - * @return true开启，false关闭 - */ - @Override - public boolean selectRegisterEnabled(String tenantId) { - SysSaasConfig retConfig = TenantHelper.dynamic(tenantId, () -> { - return baseMapper.selectOne(new LambdaQueryWrapper() - .eq(SysSaasConfig::getConfigKey, "sys.account.registerUser")); - }); - if (ObjectUtil.isNull(retConfig)) { - return false; - } - return Convert.toBool(retConfig.getConfigValue()); - } - - /** - * 查询参数配置列表 - * - * @param config 参数配置信息 - * @return 参数配置集合 - */ - @Override - public List selectConfigList(SysSaasConfigBo config) { - LambdaQueryWrapper lqw = buildQueryWrapper(config); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysSaasConfigBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysSaasConfig::getConfigName, bo.getConfigName()); - lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysSaasConfig::getConfigType, bo.getConfigType()); - lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysSaasConfig::getConfigKey, bo.getConfigKey()); - lqw.between(params.get("beginTime") != null && params.get("endTime") != null, - SysSaasConfig::getCreateTime, params.get("beginTime"), params.get("endTime")); - lqw.orderByAsc(SysSaasConfig::getConfigId); - return lqw; - } - - /** - * 新增参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") - @Override - public String insertConfig(SysSaasConfigBo bo) { - SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class); - int row = baseMapper.insert(config); - if (row > 0) { - return config.getConfigValue(); - } - throw new ServiceException("操作失败"); - } - - /** - * 修改参数配置 - * - * @param bo 参数配置信息 - * @return 结果 - */ - @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey") - @Override - public String updateConfig(SysSaasConfigBo bo) { - int row = 0; - SysSaasConfig config = MapstructUtils.convert(bo, SysSaasConfig.class); - if (config.getConfigId() != null) { - SysSaasConfig temp = baseMapper.selectById(config.getConfigId()); - if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) { - CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey()); - } - row = baseMapper.updateById(config); - } else { - CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - row = baseMapper.update(config, new LambdaQueryWrapper() - .eq(SysSaasConfig::getConfigKey, config.getConfigKey())); - } - if (row > 0) { - return config.getConfigValue(); - } - throw new ServiceException("操作失败"); - } - - /** - * 批量删除参数信息 - * - * @param configIds 需要删除的参数ID - */ - @Override - public void deleteConfigByIds(Long[] configIds) { - for (Long configId : configIds) { - SysSaasConfig config = baseMapper.selectById(configId); - if (StringUtils.equals(UserConstants.YES, config.getConfigType())) { - throw new ServiceException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey())); - } - CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey()); - } - baseMapper.deleteByIds(Arrays.asList(configIds)); - } - - /** - * 重置参数缓存数据 - */ - @Override - public void resetConfigCache() { - CacheUtils.clear(CacheNames.SYS_CONFIG); - } - - /** - * 校验参数键名是否唯一 - * - * @param config 参数配置信息 - * @return 结果 - */ - @Override - public boolean checkConfigKeyUnique(SysSaasConfigBo config) { - long configId = ObjectUtil.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysSaasConfig info = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysSaasConfig::getConfigKey, config.getConfigKey())); - if (ObjectUtil.isNotNull(info) && info.getConfigId() != configId) { - return false; - } - return true; - } - - /** - * 根据参数 key 获取参数值 - * - * @param configKey 参数 key - * @return 参数值 - */ - @Override - public String getConfigValue(String configKey) { - return SpringUtils.getAopProxy(this).selectConfigByKey(configKey); - } - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java index e0ce977eb..64baeadc9 100644 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasMenuServiceImpl.java @@ -14,13 +14,19 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.TreeBuildUtils; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.system.saas.domain.*; +import org.dromara.system.domain.vo.SysTenantPackageVo; +import org.dromara.system.saas.domain.SysSaasMenu; +import org.dromara.system.saas.domain.SysSaasRole; +import org.dromara.system.saas.domain.SysSaasRoleMenu; import org.dromara.system.saas.domain.bo.SysSaasMenuBo; +import org.dromara.system.saas.domain.vo.SysSaasMenuVo; import org.dromara.system.saas.domain.vo.TwoMetaVo; import org.dromara.system.saas.domain.vo.TwoRouterVo; -import org.dromara.system.saas.domain.vo.SysSaasMenuVo; -import org.dromara.system.saas.mapper.*; +import org.dromara.system.saas.mapper.SysSaasMenuMapper; +import org.dromara.system.saas.mapper.SysSaasRoleMapper; +import org.dromara.system.saas.mapper.SysSaasRoleMenuMapper; import org.dromara.system.saas.service.ISysSaasMenuService; +import org.dromara.system.service.ISysTenantPackageService; import org.springframework.stereotype.Service; import java.util.*; @@ -37,7 +43,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { private final SysSaasMenuMapper baseMapper; private final SysSaasRoleMapper roleMapper; private final SysSaasRoleMenuMapper roleMenuMapper; - private final SysSaasTenantPackageMapper tenantPackageMapper; + private final ISysTenantPackageService sysTenantPackageService; /** * 根据用户查询系统菜单列表 @@ -71,11 +77,11 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { } else { QueryWrapper wrapper = Wrappers.query(); wrapper.inSql("r.role_id", "select role_id from sys_saas_user_role where user_id = " + userId) - .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) - .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) - .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) - .orderByAsc("m.parent_id") - .orderByAsc("m.order_num"); + .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName()) + .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible()) + .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus()) + .orderByAsc("m.parent_id") + .orderByAsc("m.order_num"); List list = baseMapper.selectMenuListByUserId(wrapper); menuList = MapstructUtils.convert(list, SysSaasMenuVo.class); } @@ -155,7 +161,7 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { */ @Override public List selectMenuListByPackageId(Long packageId) { - SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); + SysTenantPackageVo tenantPackage = sysTenantPackageService.queryById(packageId); List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); if (CollUtil.isEmpty(menuIds)) { return List.of(); @@ -163,12 +169,16 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { List parentIds = null; if (tenantPackage.getMenuCheckStrictly()) { parentIds = baseMapper.selectObjs(new LambdaQueryWrapper() - .select(SysSaasMenu::getParentId) - .in(SysSaasMenu::getMenuId, menuIds), x -> {return Convert.toLong(x);}); + .select(SysSaasMenu::getParentId) + .in(SysSaasMenu::getMenuId, menuIds), x -> { + return Convert.toLong(x); + }); } return baseMapper.selectObjs(new LambdaQueryWrapper() - .in(SysSaasMenu::getMenuId, menuIds) - .notIn(CollUtil.isNotEmpty(parentIds), SysSaasMenu::getMenuId, parentIds), x -> {return Convert.toLong(x);}); + .in(SysSaasMenu::getMenuId, menuIds) + .notIn(CollUtil.isNotEmpty(parentIds), SysSaasMenu::getMenuId, parentIds), x -> { + return Convert.toLong(x); + }); } /** @@ -238,10 +248,10 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { return CollUtil.newArrayList(); } return TreeBuildUtils.build(menus, (menu, tree) -> - tree.setId(menu.getMenuId()) - .setParentId(menu.getParentId()) - .setName(menu.getMenuName()) - .setWeight(menu.getOrderNum())); + tree.setId(menu.getMenuId()) + .setParentId(menu.getParentId()) + .setName(menu.getMenuName()) + .setWeight(menu.getOrderNum())); } /** @@ -321,9 +331,9 @@ public class SysSaasMenuServiceImpl implements ISysSaasMenuService { @Override public boolean checkMenuNameUnique(SysSaasMenuBo menu) { boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysSaasMenu::getMenuName, menu.getMenuName()) - .eq(SysSaasMenu::getParentId, menu.getParentId()) - .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysSaasMenu::getMenuId, menu.getMenuId())); + .eq(SysSaasMenu::getMenuName, menu.getMenuName()) + .eq(SysSaasMenu::getParentId, menu.getParentId()) + .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysSaasMenu::getMenuId, menu.getMenuId())); return !exist; } diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java deleted file mode 100644 index 0e77e6120..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasOssConfigServiceImpl.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.json.utils.JsonUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.oss.constant.OssConstant; -import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.common.redis.utils.RedisUtils; -import org.dromara.system.saas.domain.SysSaasOssConfig; -import org.dromara.system.saas.domain.bo.SysSaasOssConfigBo; -import org.dromara.system.saas.domain.vo.SysSaasOssConfigVo; -import org.dromara.system.saas.mapper.SysSaasOssConfigMapper; -import org.dromara.system.saas.service.ISysSaasOssConfigService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Collection; -import java.util.List; - -/** - * 对象存储配置Service业务层处理 - * - * @author Lion Li - * @author 孤舟烟雨 - * @date 2021-08-13 - */ -@Slf4j -@RequiredArgsConstructor -@Service -public class SysSaasOssConfigServiceImpl implements ISysSaasOssConfigService { - - private final SysSaasOssConfigMapper baseMapper; - - /** - * 项目启动时，初始化参数到缓存，加载配置类 - */ - @Override - public void init() { - List list = baseMapper.selectList(); - // 加载OSS初始化配置 - for (SysSaasOssConfig config : list) { - String configKey = config.getConfigKey(); - if ("0".equals(config.getStatus())) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey); - } - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - } - - @Override - public SysSaasOssConfigVo queryById(Long ossConfigId) { - return baseMapper.selectVoById(ossConfigId); - } - - @Override - public TableDataInfo queryPageList(SysSaasOssConfigBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - - private LambdaQueryWrapper buildQueryWrapper(SysSaasOssConfigBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysSaasOssConfig::getConfigKey, bo.getConfigKey()); - lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysSaasOssConfig::getBucketName, bo.getBucketName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasOssConfig::getStatus, bo.getStatus()); - lqw.orderByAsc(SysSaasOssConfig::getOssConfigId); - return lqw; - } - - @Override - public Boolean insertByBo(SysSaasOssConfigBo bo) { - SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class); - validEntityBeforeSave(config); - boolean flag = baseMapper.insert(config) > 0; - if (flag) { - // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - return flag; - } - - @Override - public Boolean updateByBo(SysSaasOssConfigBo bo) { - SysSaasOssConfig config = MapstructUtils.convert(bo, SysSaasOssConfig.class); - validEntityBeforeSave(config); - LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); - luw.set(ObjectUtil.isNull(config.getPrefix()), SysSaasOssConfig::getPrefix, ""); - luw.set(ObjectUtil.isNull(config.getRegion()), SysSaasOssConfig::getRegion, ""); - luw.set(ObjectUtil.isNull(config.getExt1()), SysSaasOssConfig::getExt1, ""); - luw.set(ObjectUtil.isNull(config.getRemark()), SysSaasOssConfig::getRemark, ""); - luw.eq(SysSaasOssConfig::getOssConfigId, config.getOssConfigId()); - boolean flag = baseMapper.update(config, luw) > 0; - if (flag) { - // 从数据库查询完整的数据做缓存 - config = baseMapper.selectById(config.getOssConfigId()); - CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config)); - } - return flag; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysSaasOssConfig entity) { - if (StringUtils.isNotEmpty(entity.getConfigKey()) - && !checkConfigKeyUnique(entity)) { - throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!"); - } - } - - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) { - throw new ServiceException("系统内置, 不可删除!"); - } - } - List list = CollUtil.newArrayList(); - for (Long configId : ids) { - SysSaasOssConfig config = baseMapper.selectById(configId); - list.add(config); - } - boolean flag = baseMapper.deleteByIds(ids) > 0; - if (flag) { - list.forEach(sysSaasOssConfig -> - CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysSaasOssConfig.getConfigKey())); - } - return flag; - } - - /** - * 判断configKey是否唯一 - */ - private boolean checkConfigKeyUnique(SysSaasOssConfig sysSaasOssConfig) { - long ossConfigId = ObjectUtil.isNull(sysSaasOssConfig.getOssConfigId()) ? -1L : sysSaasOssConfig.getOssConfigId(); - SysSaasOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper() - .select(SysSaasOssConfig::getOssConfigId, SysSaasOssConfig::getConfigKey) - .eq(SysSaasOssConfig::getConfigKey, sysSaasOssConfig.getConfigKey())); - if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) { - return false; - } - return true; - } - - /** - * 启用禁用状态 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public int updateOssConfigStatus(SysSaasOssConfigBo bo) { - SysSaasOssConfig sysSaasOssConfig = MapstructUtils.convert(bo, SysSaasOssConfig.class); - int row = baseMapper.update(null, new LambdaUpdateWrapper() - .set(SysSaasOssConfig::getStatus, "1")); - row += baseMapper.updateById(sysSaasOssConfig); - if (row > 0) { - RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysSaasOssConfig.getConfigKey()); - } - return row; - } - -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java deleted file mode 100644 index 88aa37587..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantApplicationServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.mybatis.core.page.PageQuery; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import lombok.RequiredArgsConstructor; -import org.dromara.system.saas.domain.SysSaasTenantApplication; -import org.dromara.system.saas.domain.bo.SysSaasTenantApplicationBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantApplicationVo; -import org.dromara.system.saas.mapper.SysSaasTenantApplicationMapper; -import org.dromara.system.saas.service.ISysSaasTenantApplicationService; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Map; -import java.util.Collection; - -/** - * 租户和应用关联Service业务层处理 - * - * @author Lion Li - * @date 2024-09-22 - */ -@RequiredArgsConstructor -@Service -public class SysSaasTenantApplicationServiceImpl implements ISysSaasTenantApplicationService { - - private final SysSaasTenantApplicationMapper baseMapper; - - /** - * 查询租户和应用关联 - * - * @param tenantId 主键 - * @return 租户和应用关联 - */ - @Override - public SysSaasTenantApplicationVo queryById(Long tenantId){ - return baseMapper.selectVoById(tenantId); - } - - /** - * 分页查询租户和应用关联列表 - * - * @param bo 查询条件 - * @param pageQuery 分页参数 - * @return 租户和应用关联分页列表 - */ - @Override - public TableDataInfo queryPageList(SysSaasTenantApplicationBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询符合条件的租户和应用关联列表 - * - * @param bo 查询条件 - * @return 租户和应用关联列表 - */ - @Override - public List queryList(SysSaasTenantApplicationBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantApplicationBo bo) { - Map params = bo.getParams(); - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - return lqw; - } - - /** - * 新增租户和应用关联 - * - * @param bo 租户和应用关联 - * @return 是否新增成功 - */ - @Override - public Boolean insertByBo(SysSaasTenantApplicationBo bo) { - SysSaasTenantApplication add = MapstructUtils.convert(bo, SysSaasTenantApplication.class); - validEntityBeforeSave(add); - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setTenantId(add.getTd()); - } - return flag; - } - - /** - * 修改租户和应用关联 - * - * @param bo 租户和应用关联 - * @return 是否修改成功 - */ - @Override - public Boolean updateByBo(SysSaasTenantApplicationBo bo) { - SysSaasTenantApplication update = MapstructUtils.convert(bo, SysSaasTenantApplication.class); - validEntityBeforeSave(update); - return baseMapper.updateById(update) > 0; - } - - /** - * 保存前的数据校验 - */ - private void validEntityBeforeSave(SysSaasTenantApplication entity){ - //TODO 做一些数据校验,如唯一约束 - } - - /** - * 校验并批量删除租户和应用关联信息 - * - * @param ids 待删除的主键集合 - * @param isValid 是否进行有效性校验 - * @return 是否删除成功 - */ - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - //TODO 做一些业务上的校验,判断是否需要校验 - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java deleted file mode 100644 index 41cab0236..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantPackageServiceImpl.java +++ /dev/null @@ -1,157 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.SysSaasTenant; -import org.dromara.system.saas.domain.SysSaasTenantPackage; -import org.dromara.system.saas.domain.bo.SysSaasTenantPackageBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantPackageVo; -import org.dromara.system.saas.mapper.SysSaasTenantMapper; -import org.dromara.system.saas.mapper.SysSaasTenantPackageMapper; -import org.dromara.system.saas.service.ISysSaasTenantPackageService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -/** - * 租户套餐Service业务层处理 - * - * @author Michelle.Chung - */ -@RequiredArgsConstructor -@Service -public class SysSaasTenantPackageServiceImpl implements ISysSaasTenantPackageService { - - private final SysSaasTenantPackageMapper baseMapper; - private final SysSaasTenantMapper tenantMapper; - - /** - * 查询租户套餐 - */ - @Override - public SysSaasTenantPackageVo queryById(Long packageId){ - return baseMapper.selectVoById(packageId); - } - - /** - * 查询租户套餐列表 - */ - @Override - public TableDataInfo queryPageList(SysSaasTenantPackageBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - @Override - public List selectList() { - return baseMapper.selectVoList(new LambdaQueryWrapper() - .eq(SysSaasTenantPackage::getStatus, TenantConstants.NORMAL)); - } - - /** - * 查询租户套餐列表 - */ - @Override - public List queryList(SysSaasTenantPackageBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantPackageBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.like(StringUtils.isNotBlank(bo.getPackageName()), SysSaasTenantPackage::getPackageName, bo.getPackageName()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasTenantPackage::getStatus, bo.getStatus()); - lqw.orderByAsc(SysSaasTenantPackage::getPackageId); - return lqw; - } - - /** - * 新增租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysSaasTenantPackageBo bo) { - SysSaasTenantPackage add = MapstructUtils.convert(bo, SysSaasTenantPackage.class); - // 保存菜单id - List menuIds = Arrays.asList(bo.getMenuIds()); - if (CollUtil.isNotEmpty(menuIds)) { - add.setMenuIds(StringUtils.join(menuIds, ", ")); - } else { - add.setMenuIds(""); - } - boolean flag = baseMapper.insert(add) > 0; - if (flag) { - bo.setPackageId(add.getPackageId()); - } - return flag; - } - - /** - * 修改租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean updateByBo(SysSaasTenantPackageBo bo) { - SysSaasTenantPackage update = MapstructUtils.convert(bo, SysSaasTenantPackage.class); - // 保存菜单id - List menuIds = Arrays.asList(bo.getMenuIds()); - if (CollUtil.isNotEmpty(menuIds)) { - update.setMenuIds(StringUtils.join(menuIds, ", ")); - } else { - update.setMenuIds(""); - } - return baseMapper.updateById(update) > 0; - } - - /** - * 校验套餐名称是否唯一 - */ - @Override - public boolean checkPackageNameUnique(SysSaasTenantPackageBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysSaasTenantPackage::getPackageName, bo.getPackageName()) - .ne(ObjectUtil.isNotNull(bo.getPackageId()), SysSaasTenantPackage::getPackageId, bo.getPackageId())); - return !exist; - } - - /** - * 修改套餐状态 - * - * @param bo 套餐信息 - * @return 结果 - */ - @Override - public int updatePackageStatus(SysSaasTenantPackageBo bo) { - SysSaasTenantPackage tenantPackage = MapstructUtils.convert(bo, SysSaasTenantPackage.class); - return baseMapper.updateById(tenantPackage); - } - - /** - * 批量删除租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if(isValid){ - boolean exists = tenantMapper.exists(new LambdaQueryWrapper().in(SysSaasTenant::getPackageId, ids)); - if (exists) { - throw new ServiceException("租户套餐已被使用"); - } - } - return baseMapper.deleteByIds(ids) > 0; - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java deleted file mode 100644 index 43ab3b81a..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/java/org/dromara/system/saas/service/impl/SysSaasTenantServiceImpl.java +++ /dev/null @@ -1,372 +0,0 @@ -package org.dromara.system.saas.service.impl; - -import cn.dev33.satoken.secure.BCrypt; -import cn.hutool.core.convert.Convert; -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.RequiredArgsConstructor; -import org.dromara.common.core.constant.CacheNames; -import org.dromara.common.core.constant.Constants; -import org.dromara.common.core.constant.TenantConstants; -import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.utils.MapstructUtils; -import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.system.saas.domain.bo.SysSaasTenantBo; -import org.dromara.system.saas.domain.vo.SysSaasTenantVo; -import org.dromara.system.saas.service.ISysSaasTenantService; -import org.dromara.system.saas.domain.*; -import org.dromara.system.saas.mapper.*; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.cache.annotation.Cacheable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; - -/** - * 租户Service业务层处理 - * - * @author Michelle.Chung - */ -@RequiredArgsConstructor -@Service -public class SysSaasTenantServiceImpl implements ISysSaasTenantService { - - private final SysSaasTenantMapper baseMapper; - private final SysSaasTenantPackageMapper tenantPackageMapper; - private final SysSaasUserMapper userMapper; - private final SysSaasDeptMapper deptMapper; - private final SysSaasRoleMapper roleMapper; - private final SysSaasRoleMenuMapper roleMenuMapper; - private final SysSaasRoleDeptMapper roleDeptMapper; - private final SysSaasUserRoleMapper userRoleMapper; - private final SysSaasDictTypeMapper dictTypeMapper; - private final SysSaasDictDataMapper dictDataMapper; - private final SysSaasConfigMapper configMapper; - - /** - * 查询租户 - */ - @Override - public SysSaasTenantVo queryById(Long id) { - return baseMapper.selectVoById(id); - } - - /** - * 基于租户ID查询租户 - */ - @Cacheable(cacheNames = CacheNames.SYS_TENANT, key = "#tenantId") - @Override - public SysSaasTenantVo queryByTenantId(String tenantId) { - return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysSaasTenant::getTenantId, tenantId)); - } - - /** - * 查询租户列表 - */ - @Override - public TableDataInfo queryPageList(SysSaasTenantBo bo, PageQuery pageQuery) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return TableDataInfo.build(result); - } - - /** - * 查询租户列表 - */ - @Override - public List queryList(SysSaasTenantBo bo) { - LambdaQueryWrapper lqw = buildQueryWrapper(bo); - return baseMapper.selectVoList(lqw); - } - - private LambdaQueryWrapper buildQueryWrapper(SysSaasTenantBo bo) { - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getTenantId()), SysSaasTenant::getTenantId, bo.getTenantId()); - lqw.like(StringUtils.isNotBlank(bo.getContactUserName()), SysSaasTenant::getContactUserName, bo.getContactUserName()); - lqw.eq(StringUtils.isNotBlank(bo.getContactPhone()), SysSaasTenant::getContactPhone, bo.getContactPhone()); - lqw.like(StringUtils.isNotBlank(bo.getCompanyName()), SysSaasTenant::getCompanyName, bo.getCompanyName()); - lqw.eq(StringUtils.isNotBlank(bo.getLicenseNumber()), SysSaasTenant::getLicenseNumber, bo.getLicenseNumber()); - lqw.eq(StringUtils.isNotBlank(bo.getAddress()), SysSaasTenant::getAddress, bo.getAddress()); - lqw.eq(StringUtils.isNotBlank(bo.getIntro()), SysSaasTenant::getIntro, bo.getIntro()); - lqw.like(StringUtils.isNotBlank(bo.getDomain()), SysSaasTenant::getDomain, bo.getDomain()); - lqw.eq(bo.getPackageId() != null, SysSaasTenant::getPackageId, bo.getPackageId()); - lqw.eq(bo.getExpireTime() != null, SysSaasTenant::getExpireTime, bo.getExpireTime()); - lqw.eq(bo.getAccountCount() != null, SysSaasTenant::getAccountCount, bo.getAccountCount()); - lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysSaasTenant::getStatus, bo.getStatus()); - lqw.orderByAsc(SysSaasTenant::getId); - return lqw; - } - - /** - * 新增租户 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(SysSaasTenantBo bo) { - SysSaasTenant add = MapstructUtils.convert(bo, SysSaasTenant.class); - - // 获取所有租户编号 - List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(SysSaasTenant::getTenantId), x -> {return Convert.toStr(x);}); - String tenantId = generateTenantId(tenantIds); - add.setTenantId(tenantId); - boolean flag = baseMapper.insert(add) > 0; - if (!flag) { - throw new ServiceException("创建租户失败"); - } - bo.setId(add.getId()); - - // 根据套餐创建角色 - Long roleId = createTenantRole(tenantId, bo.getPackageId()); - - // 创建部门: 公司名是部门名称 - SysSaasDept dept = new SysSaasDept(); - dept.setTenantId(tenantId); - dept.setDeptName(bo.getCompanyName()); - dept.setParentId(Constants.TOP_PARENT_ID); - dept.setAncestors(Constants.TOP_PARENT_ID.toString()); - deptMapper.insert(dept); - Long deptId = dept.getDeptId(); - - // 角色和部门关联表 - SysSaasRoleDept roleDept = new SysSaasRoleDept(); - roleDept.setRoleId(roleId); - roleDept.setDeptId(deptId); - roleDeptMapper.insert(roleDept); - - // 创建系统用户 - SysSaasUser user = new SysSaasUser(); - user.setTenantId(tenantId); - user.setUserName(bo.getUsername()); - user.setNickName(bo.getUsername()); - user.setPassword(BCrypt.hashpw(bo.getPassword())); - user.setDeptId(deptId); - userMapper.insert(user); - //新增系统用户后，默认当前用户为部门的负责人 - SysSaasDept sd = new SysSaasDept(); - sd.setLeader(user.getUserId()); - sd.setDeptId(deptId); - deptMapper.updateById(sd); - - // 用户和角色关联表 - SysSaasUserRole userRole = new SysSaasUserRole(); - userRole.setUserId(user.getUserId()); - userRole.setRoleId(roleId); - userRoleMapper.insert(userRole); - - String defaultTenantId = TenantConstants.DEFAULT_TENANT_ID; - List dictTypeList = dictTypeMapper.selectList( - new LambdaQueryWrapper().eq(SysSaasDictType::getTenantId, defaultTenantId)); - List dictDataList = dictDataMapper.selectList( - new LambdaQueryWrapper().eq(SysSaasDictData::getTenantId, defaultTenantId)); - for (SysSaasDictType dictType : dictTypeList) { - dictType.setDictId(null); - dictType.setTenantId(tenantId); - } - for (SysSaasDictData dictData : dictDataList) { - dictData.setDictCode(null); - dictData.setTenantId(tenantId); - } - dictTypeMapper.insertBatch(dictTypeList); - dictDataMapper.insertBatch(dictDataList); - - List sysSaasConfigList = configMapper.selectList( - new LambdaQueryWrapper().eq(SysSaasConfig::getTenantId, defaultTenantId)); - for (SysSaasConfig config : sysSaasConfigList) { - config.setConfigId(null); - config.setTenantId(tenantId); - } - configMapper.insertBatch(sysSaasConfigList); - return true; - } - - /** - * 生成租户id - * - * @param tenantIds 已有租户id列表 - * @return 租户id - */ - private String generateTenantId(List tenantIds) { - // 随机生成6位 - String numbers = RandomUtil.randomNumbers(6); - // 判断是否存在，如果存在则重新生成 - if (tenantIds.contains(numbers)) { - generateTenantId(tenantIds); - } - return numbers; - } - - /** - * 根据租户菜单创建租户角色 - * - * @param tenantId 租户编号 - * @param packageId 租户套餐id - * @return 角色id - */ - private Long createTenantRole(String tenantId, Long packageId) { - // 获取租户套餐 - SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - if (ObjectUtil.isNull(tenantPackage)) { - throw new ServiceException("套餐不存在"); - } - // 获取套餐菜单id - List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); - - // 创建角色 - SysSaasRole role = new SysSaasRole(); - role.setTenantId(tenantId); - role.setRoleName(TenantConstants.TENANT_ADMIN_ROLE_NAME); - role.setRoleKey(TenantConstants.TENANT_ADMIN_ROLE_KEY); - role.setRoleSort(1); - role.setStatus(TenantConstants.NORMAL); - roleMapper.insert(role); - Long roleId = role.getRoleId(); - - // 创建角色菜单 - List roleMenus = new ArrayList<>(menuIds.size()); - menuIds.forEach(menuId -> { - SysSaasRoleMenu roleMenu = new SysSaasRoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(menuId); - roleMenus.add(roleMenu); - }); - roleMenuMapper.insertBatch(roleMenus); - - return roleId; - } - - /** - * 修改租户 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") - @Override - public Boolean updateByBo(SysSaasTenantBo bo) { - SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class); - tenant.setTenantId(null); - tenant.setPackageId(null); - return baseMapper.updateById(tenant) > 0; - } - - /** - * 修改租户状态 - * - * @param bo 租户信息 - * @return 结果 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, key = "#bo.tenantId") - @Override - public int updateTenantStatus(SysSaasTenantBo bo) { - SysSaasTenant tenant = MapstructUtils.convert(bo, SysSaasTenant.class); - return baseMapper.updateById(tenant); - } - - /** - * 校验租户是否允许操作 - * - * @param tenantId 租户ID - */ - @Override - public void checkTenantAllowed(String tenantId) { - if (ObjectUtil.isNotNull(tenantId) && TenantConstants.DEFAULT_TENANT_ID.equals(tenantId)) { - throw new ServiceException("不允许操作管理租户"); - } - } - - /** - * 批量删除租户 - */ - @CacheEvict(cacheNames = CacheNames.SYS_TENANT, allEntries = true) - @Override - public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { - if (isValid) { - // 做一些业务上的校验,判断是否需要校验 - if (ids.contains(TenantConstants.SUPER_ADMIN_ID)) { - throw new ServiceException("超管租户不能删除"); - } - } - return baseMapper.deleteByIds(ids) > 0; - } - - /** - * 校验企业名称是否唯一 - */ - @Override - public boolean checkCompanyNameUnique(SysSaasTenantBo bo) { - boolean exist = baseMapper.exists(new LambdaQueryWrapper() - .eq(SysSaasTenant::getCompanyName, bo.getCompanyName()) - .ne(ObjectUtil.isNotNull(bo.getTenantId()), SysSaasTenant::getTenantId, bo.getTenantId())); - return !exist; - } - - /** - * 校验账号余额 - */ - @Override - public boolean checkAccountBalance(String tenantId) { - SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); - // 如果余额为-1代表不限制 - if (tenant.getAccountCount() == -1) { - return true; - } - Long userNumber = userMapper.selectCount(new LambdaQueryWrapper<>()); - // 如果余额大于0代表还有可用名额 - return tenant.getAccountCount() - userNumber > 0; - } - - /** - * 校验有效期 - */ - @Override - public boolean checkExpireTime(String tenantId) { - SysSaasTenantVo tenant = SpringUtils.getAopProxy(this).queryByTenantId(tenantId); - // 如果未设置过期时间代表不限制 - if (ObjectUtil.isNull(tenant.getExpireTime())) { - return true; - } - // 如果当前时间在过期时间之前则通过 - return new Date().before(tenant.getExpireTime()); - } - - /** - * 同步租户套餐 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public Boolean syncTenantPackage(String tenantId, Long packageId) { - SysSaasTenantPackage tenantPackage = tenantPackageMapper.selectById(packageId); - List roles = roleMapper.selectList( - new LambdaQueryWrapper().eq(SysSaasRole::getTenantId, tenantId)); - List roleIds = new ArrayList<>(roles.size() - 1); - List menuIds = StringUtils.splitTo(tenantPackage.getMenuIds(), Convert::toLong); - roles.forEach(item -> { - if (TenantConstants.TENANT_ADMIN_ROLE_KEY.equals(item.getRoleKey())) { - List roleMenus = new ArrayList<>(menuIds.size()); - menuIds.forEach(menuId -> { - SysSaasRoleMenu roleMenu = new SysSaasRoleMenu(); - roleMenu.setRoleId(item.getRoleId()); - roleMenu.setMenuId(menuId); - roleMenus.add(roleMenu); - }); - roleMenuMapper.delete(new LambdaQueryWrapper().eq(SysSaasRoleMenu::getRoleId, item.getRoleId())); - roleMenuMapper.insertBatch(roleMenus); - } else { - roleIds.add(item.getRoleId()); - } - }); - if (!roleIds.isEmpty()) { - roleMenuMapper.delete( - new LambdaQueryWrapper().in(SysSaasRoleMenu::getRoleId, roleIds).notIn(!menuIds.isEmpty(), SysSaasRoleMenu::getMenuId, menuIds)); - } - return true; - } -} diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml deleted file mode 100644 index 81401e4d8..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasApplicationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml deleted file mode 100644 index 4241f006f..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml deleted file mode 100644 index c932b44fa..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasOssConfigMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml deleted file mode 100644 index cb5b8d8e4..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantApplicationMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml deleted file mode 100644 index 0f79bf363..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml b/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml deleted file mode 100644 index 64e9d2b1c..000000000 --- a/ruoyi-modules/ruoyi-md-system-saas/ruoyi-md-system-saas-service/src/main/resources/mapper/systemTenant/SysSaasTenantPackageMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml index cca8bf1eb..273c3b7af 100644 --- a/ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-site/ruoyi-admin/src/main/resources/application-dev.yml @@ -119,9 +119,6 @@ tenant: - sys_client - sys_oss_config - sys_saas_menu - - sys_saas_tenant - - sys_saas_tenant_package - - sys_saas_application - sys_saas_role_dept - sys_saas_role_menu - sys_saas_user_post diff --git a/ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml index 9c167cb76..3a692259d 100644 --- a/ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml +++ b/ruoyi-site/ruoyi-admin/src/main/resources/application-local.yml @@ -119,9 +119,6 @@ tenant: - sys_client - sys_oss_config - sys_saas_menu - - sys_saas_tenant - - sys_saas_tenant_package - - sys_saas_application - sys_saas_role_dept - sys_saas_role_menu - sys_saas_user_post diff --git a/script/sql/tenant/ry_vue_5.X.sql b/script/sql/tenant/ry_vue_5.X.sql index a4b5409b2..5761102a8 100644 --- a/script/sql/tenant/ry_vue_5.X.sql +++ b/script/sql/tenant/ry_vue_5.X.sql @@ -1,57 +1,41 @@ -create table sys_saas_application -( - application_id bigint not null comment 'id' - primary key, - application_name varchar(255) not null comment '应用名称', - application_code varchar(10) not null comment '应用code', - create_dept bigint null comment '创建部门', - create_time datetime null comment '创建时间', - create_by bigint null comment '上传人', - update_time datetime null comment '更新时间', - update_by bigint null comment '更新人', - constraint application_code - unique (application_code), - constraint application_name - unique (application_name) -) - comment '应用'; - -- ---------------------------- -- 第三方平台授权表 -- ---------------------------- create table sys_saas_social ( - id bigint not null comment '主键', - user_id bigint not null comment '用户ID', - td bigint not null comment '租户id', - auth_id varchar(255) not null comment '平台+平台唯一id', - source varchar(255) not null comment '用户来源', - open_id varchar(255) default null comment '平台编号唯一id', - user_name varchar(30) not null comment '登录账号', - nick_name varchar(30) default '' comment '用户昵称', - email varchar(255) default '' comment '用户邮箱', - avatar varchar(500) default '' comment '头像地址', - access_token varchar(255) not null comment '用户的授权令牌', - expire_in int default null comment '用户的授权令牌的有效期，部分平台可能没有', - refresh_token varchar(255) default null comment '刷新令牌，部分平台可能没有', - access_code varchar(255) default null comment '平台的授权信息，部分平台可能没有', - union_id varchar(255) default null comment '用户的 unionid', - scope varchar(255) default null comment '授予的权限，部分平台可能没有', - token_type varchar(255) default null comment '个别平台的授权信息，部分平台可能没有', - id_token varchar(2000) default null comment 'id token，部分平台可能没有', - mac_algorithm varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - mac_key varchar(255) default null comment '小米平台用户的附带属性，部分平台可能没有', - code varchar(255) default null comment '用户的授权code，部分平台可能没有', - oauth_token varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - oauth_token_secret varchar(255) default null comment 'Twitter平台用户的附带属性，部分平台可能没有', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - PRIMARY KEY (id) -) engine = innodb comment = '社会化关系表'; + id bigint not null comment '主键' + primary key, + user_id bigint not null comment '用户ID', + tenant_id varchar(20) null comment '租户id', + auth_id varchar(255) not null comment '平台+平台唯一id', + source varchar(255) not null comment '用户来源', + open_id varchar(255) null comment '平台编号唯一id', + user_name varchar(30) not null comment '登录账号', + nick_name varchar(30) default '' null comment '用户昵称', + email varchar(255) default '' null comment '用户邮箱', + avatar varchar(500) default '' null comment '头像地址', + access_token varchar(255) not null comment '用户的授权令牌', + expire_in int null comment '用户的授权令牌的有效期，部分平台可能没有', + refresh_token varchar(255) null comment '刷新令牌，部分平台可能没有', + access_code varchar(255) null comment '平台的授权信息，部分平台可能没有', + union_id varchar(255) null comment '用户的 unionid', + scope varchar(255) null comment '授予的权限，部分平台可能没有', + token_type varchar(255) null comment '个别平台的授权信息，部分平台可能没有', + id_token varchar(2000) null comment 'id token，部分平台可能没有', + mac_algorithm varchar(255) null comment '小米平台用户的附带属性，部分平台可能没有', + mac_key varchar(255) null comment '小米平台用户的附带属性，部分平台可能没有', + code varchar(255) null comment '用户的授权code，部分平台可能没有', + oauth_token varchar(255) null comment 'Twitter平台用户的附带属性，部分平台可能没有', + oauth_token_secret varchar(255) null comment 'Twitter平台用户的附带属性，部分平台可能没有', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + del_flag char default '0' null comment '删除标志（0代表存在 2代表删除）' +) + comment '社会化关系表'; + -- ---------------------------- @@ -82,161 +66,105 @@ create table sys_saas_tenant primary key (id) ) engine = innodb comment = '租户表'; - --- ---------------------------- --- 初始化-租户表数据 --- ---------------------------- - -insert into sys_saas_tenant -values (1, '000000', '管理组', '15888888888', 'XXX有限公司', null, null, '多租户通用后台管理管理系统', null, null, null, null, -1, '0', '0', 103, 1, sysdate(), null, null); - - --- ---------------------------- --- 租户套餐表 --- ---------------------------- -create table sys_saas_tenant_package -( - package_id bigint(20) not null comment '租户套餐id', - package_name varchar(20) comment '套餐名称', - menu_ids varchar(3000) comment '关联菜单id', - remark varchar(200) comment '备注', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) comment '创建部门', - create_by bigint(20) comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) comment '更新者', - update_time datetime comment '更新时间', - primary key (package_id) -) engine = innodb comment = '租户套餐表'; - - -- ---------------------------- -- 1、部门表 -- ---------------------------- create table sys_saas_dept ( - dept_id bigint(20) not null comment '部门id', - td bigint not null comment '租户编号', - parent_id bigint(20) default 0 comment '父部门id', - ancestors varchar(500) default '' comment '祖级列表', - dept_name varchar(30) default '' comment '部门名称', - dept_category varchar(100) default null comment '部门类别编码', - order_num int(4) default 0 comment '显示顺序', - leader bigint(20) default null comment '负责人', - phone varchar(11) default null comment '联系电话', - email varchar(50) default null comment '邮箱', - status char(1) default '0' comment '部门状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - primary key (dept_id) -) engine = innodb comment = '部门表'; - --- ---------------------------- --- 初始化-部门表数据 --- ---------------------------- - - -insert into sys_saas_dept -values (100, '000000', 0, '0', 'XXX科技', null, 0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (101, '000000', 100, '0,100', '深圳总公司', null, 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (102, '000000', 100, '0,100', '长沙分公司', null, 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (103, '000000', 101, '0,100,101', '研发部门', null, 1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (104, '000000', 101, '0,100,101', '市场部门', null, 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (105, '000000', 101, '0,100,101', '测试部门', null, 3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (106, '000000', 101, '0,100,101', '财务部门', null, 4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (107, '000000', 101, '0,100,101', '运维部门', null, 5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (108, '000000', 102, '0,100,102', '市场部门', null, 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); -insert into sys_saas_dept -values (109, '000000', 102, '0,100,102', '财务部门', null, 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null); + dept_id bigint not null comment '部门id' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + parent_id bigint default 0 null comment '父部门id', + ancestors varchar(500) default '' null comment '祖级列表', + dept_name varchar(30) default '' null comment '部门名称', + dept_category varchar(100) null comment '部门类别编码', + order_num int(4) default 0 null comment '显示顺序', + leader bigint null comment '负责人', + phone varchar(11) null comment '联系电话', + email varchar(50) null comment '邮箱', + status char default '0' null comment '部门状态（0正常 1停用）', + del_flag char default '0' null comment '删除标志（0代表存在 2代表删除）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间' +) + comment '部门表'; +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (100, '000000', 0, '0', 'XXX科技', null, 0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (101, '000000', 100, '0,100', '深圳总公司', null, 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (102, '000000', 100, '0,100', '长沙分公司', null, 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (103, '000000', 101, '0,100,101', '研发部门', null, 1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (104, '000000', 101, '0,100,101', '市场部门', null, 2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (105, '000000', 101, '0,100,101', '测试部门', null, 3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (106, '000000', 101, '0,100,101', '财务部门', null, 4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (107, '000000', 101, '0,100,101', '运维部门', null, 5, null, '15888888888', 'xxx@qq.com', '0', '2', 103, 1, '2024-10-11 15:36:57', 1, '2024-10-16 22:01:55'); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (108, '000000', 102, '0,100,102', '市场部门', null, 1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, '2024-10-11 15:36:57', null, null); +INSERT INTO `ry-vue`.sys_saas_dept (dept_id, tenant_id, parent_id, ancestors, dept_name, dept_category, order_num, leader, phone, email, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (109, '000000', 102, '0,100,102', '财务部门', null, 2, null, '15888888888', 'xxx@qq.com', '0', '2', 103, 1, '2024-10-11 15:36:57', 1, '2024-10-16 22:02:00'); -- ---------------------------- -- 2、用户信息表 -- ---------------------------- create table sys_saas_user ( - user_id bigint(20) not null comment '用户ID', - td bigint not null comment '租户编号', - dept_id bigint(20) default null comment '部门ID', - user_name varchar(30) not null comment '用户账号', - nick_name varchar(30) not null comment '用户昵称', - user_type varchar(10) default 'sys_saas_user' comment '用户类型（sys_saas_user系统用户）', - email varchar(50) default '' comment '用户邮箱', - phonenumber varchar(11) default '' comment '手机号码', - sex char(1) default '0' comment '用户性别（0男 1女 2未知）', - avatar bigint(20) comment '头像地址', - password varchar(100) default '' comment '密码', - status char(1) default '0' comment '帐号状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - login_ip varchar(128) default '' comment '最后登录IP', - login_date datetime comment '最后登录时间', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (user_id) -) engine = innodb comment = '用户信息表'; + user_id bigint not null comment '用户ID' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + dept_id bigint null comment '部门ID', + user_name varchar(30) not null comment '用户账号', + nick_name varchar(30) not null comment '用户昵称', + user_type varchar(16) default 'sys_saas_user' null comment '用户类型（sys_saas_user系统用户）', + email varchar(50) default '' null comment '用户邮箱', + phonenumber varchar(11) default '' null comment '手机号码', + sex char default '0' null comment '用户性别（0男 1女 2未知）', + avatar bigint null comment '头像地址', + password varchar(100) default '' null comment '密码', + status char default '0' null comment '帐号状态（0正常 1停用）', + del_flag char default '0' null comment '删除标志（0代表存在 2代表删除）', + login_ip varchar(128) default '' null comment '最后登录IP', + login_date datetime null comment '最后登录时间', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) null comment '备注' +) + comment '用户信息表'; --- ---------------------------- --- 初始化-用户信息表数据 --- ---------------------------- -insert into sys_saas_user -values (1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_saas_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), null, - null, '管理员'); -insert into sys_saas_user -values (3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null); -insert into sys_saas_user -values (4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null); +INSERT INTO `ry-vue`.sys_saas_user (user_id, tenant_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', 103, 'admin', '疯狂的狮子Li', 'sys_saas_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-10-11 15:36:57', 103, 1, '2024-10-11 15:36:57', null, null, '管理员'); +INSERT INTO `ry-vue`.sys_saas_user (user_id, tenant_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (3, '000000', 108, 'test', '本部门及以下 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '2', '127.0.0.1', '2024-10-11 15:36:57', 103, 1, '2024-10-11 15:36:57', 1, '2024-10-16 22:21:09', null); +INSERT INTO `ry-vue`.sys_saas_user (user_id, tenant_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (4, '000000', 102, 'test1', '仅本人 密码666666', 'sys_saas_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '2', '127.0.0.1', '2024-10-11 15:36:57', 103, 1, '2024-10-11 15:36:57', 1, '2024-10-16 22:20:56', null); +INSERT INTO `ry-vue`.sys_saas_user (user_id, tenant_id, dept_id, user_name, nick_name, user_type, email, phonenumber, sex, avatar, password, status, del_flag, login_ip, login_date, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1865786535347699713, '000000', null, 'test1', 'test1', 'sys_saas_user', '', '', '0', null, '$2a$10$hIbrfIRePgG0ag3K6ERqheX5rc2hFymIDDJThsS3HRcJNf6vgcG6K', '0', '0', '172.22.0.1', '2025-01-14 22:38:06', null, null, '2024-12-08 23:52:29', 1865786535347699713, '2025-01-14 22:38:06', ''); -- ---------------------------- -- 3、岗位信息表 -- ---------------------------- create table sys_saas_post ( - post_id bigint(20) not null comment '岗位ID', - td bigint not null comment '租户编号', - dept_id bigint(20) not null comment '部门id', - post_code varchar(64) not null comment '岗位编码', - post_category varchar(100) default null comment '岗位类别编码', - post_name varchar(50) not null comment '岗位名称', - post_sort int(4) not null comment '显示顺序', - status char(1) not null comment '状态（0正常 1停用）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (post_id) -) engine = innodb comment = '岗位信息表'; + post_id bigint not null comment '岗位ID' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + dept_id bigint not null comment '部门id', + post_code varchar(64) not null comment '岗位编码', + post_category varchar(100) null comment '岗位类别编码', + post_name varchar(50) not null comment '岗位名称', + post_sort int(4) not null comment '显示顺序', + status char not null comment '状态（0正常 1停用）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) null comment '备注' +) + comment '岗位信息表'; --- ---------------------------- --- 初始化-岗位信息表数据 --- ---------------------------- -insert into sys_saas_post -values (1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_post -values (2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_post -values (3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_post -values (4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate(), null, null, ''); +INSERT INTO `ry-vue`.sys_saas_post (post_id, tenant_id, dept_id, post_code, post_category, post_name, post_sort, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', 103, 'ceo', null, '董事长', 1, '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_post (post_id, tenant_id, dept_id, post_code, post_category, post_name, post_sort, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (2, '000000', 100, 'se', null, '项目经理', 2, '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_post (post_id, tenant_id, dept_id, post_code, post_category, post_name, post_sort, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (3, '000000', 100, 'hr', null, '人力资源', 3, '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_post (post_id, tenant_id, dept_id, post_code, post_category, post_name, post_sort, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); -- ---------------------------- @@ -244,34 +172,29 @@ values (4, '000000', 100, 'user', null, '普通员工', 4, '0', 103, 1, sysdate( -- ---------------------------- create table sys_saas_role ( - role_id bigint(20) not null comment '角色ID', - td bigint not null comment '租户编号', - role_name varchar(30) not null comment '角色名称', - role_key varchar(100) not null comment '角色权限字符串', - role_sort int(4) not null comment '显示顺序', - data_scope char(1) default '1' comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - menu_check_strictly tinyint(1) default 1 comment '菜单树选择项是否关联显示', - dept_check_strictly tinyint(1) default 1 comment '部门树选择项是否关联显示', - status char(1) not null comment '角色状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (role_id) -) engine = innodb comment = '角色信息表'; + role_id bigint not null comment '角色ID' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + role_name varchar(30) not null comment '角色名称', + role_key varchar(100) not null comment '角色权限字符串', + role_sort int(4) not null comment '显示顺序', + data_scope char default '1' null comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', + menu_check_strictly tinyint(1) default 1 null comment '菜单树选择项是否关联显示', + dept_check_strictly tinyint(1) default 1 null comment '部门树选择项是否关联显示', + status char not null comment '角色状态（0正常 1停用）', + del_flag char default '0' null comment '删除标志（0代表存在 2代表删除）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) null comment '备注' +) + comment '角色信息表'; --- ---------------------------- --- 初始化-角色信息表数据 --- ---------------------------- -insert into sys_saas_role -values (1, '000000', '超级管理员', 'superadmin', 1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员'); -insert into sys_saas_role -values (3, '000000', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_role -values (4, '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, ''); +INSERT INTO `ry-vue`.sys_saas_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', '超级管理员', 'superadmin', 1, '1', 1, 1, '0', '0', 103, 1, '2024-10-11 15:36:57', null, null, '超级管理员'); +INSERT INTO `ry-vue`.sys_saas_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (3, '000000', '本部门及以下', 'test1', 3, '4', 1, 1, '0', '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_role (role_id, tenant_id, role_name, role_key, role_sort, data_scope, menu_check_strictly, dept_check_strictly, status, del_flag, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (4, '000000', '仅本人', 'test2', 4, '5', 1, 1, '0', '0', 103, 1, '2024-10-11 15:36:57', null, null, ''); -- ---------------------------- -- 5、菜单权限表 @@ -281,292 +204,147 @@ values (4, '000000', '仅本人', 'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate -- ---------------------------- create table sys_saas_menu ( - application_id bigint not null comment '应用id', - menu_id bigint(20) not null comment '菜单ID', - menu_name varchar(50) not null comment '菜单名称', - parent_id bigint(20) default 0 comment '父菜单ID', - order_num int(4) default 0 comment '显示顺序', - path varchar(200) default '' comment '路由地址', - component varchar(255) default null comment '组件路径', - query_param varchar(255) default null comment '路由参数', - is_frame int(1) default 1 comment '是否为外链（0是 1否）', - is_cache int(1) default 0 comment '是否缓存（0缓存 1不缓存）', - menu_type char(1) default '' comment '菜单类型（M目录 C菜单 F按钮）', - visible char(1) default 0 comment '显示状态（0显示 1隐藏）', - status char(1) default 0 comment '菜单状态（0正常 1停用）', - perms varchar(100) default null comment '权限标识', - icon varchar(100) default '#' comment '菜单图标', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default '' comment '备注', + application_id bigint not null comment '应用id', + menu_id bigint not null comment '菜单ID', + menu_name varchar(50) not null comment '菜单名称', + parent_id bigint default 0 null comment '父菜单ID', + order_num int(4) default 0 null comment '显示顺序', + path varchar(200) default '' null comment '路由地址', + component varchar(255) null comment '组件路径', + query_param varchar(255) null comment '路由参数', + is_frame int(1) default 1 null comment '是否为外链（0是 1否）', + is_cache int(1) default 0 null comment '是否缓存（0缓存 1不缓存）', + menu_type char default '' null comment '菜单类型（M目录 C菜单 F按钮）', + visible char default '0' null comment '显示状态（0显示 1隐藏）', + status char default '0' null comment '菜单状态（0正常 1停用）', + perms varchar(100) null comment '权限标识', + icon varchar(100) default '#' null comment '菜单图标', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) default '' null comment '备注', primary key (application_id, menu_id) -) engine = innodb comment = '菜单权限表'; +) + comment '菜单权限表'; --- ---------------------------- --- 初始化-菜单信息表数据 --- ---------------------------- --- 一级菜单 -insert into sys_saas_menu -values (1837790678245658626, '1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, sysdate(), null, null, '系统管理目录'); -insert into sys_saas_menu -values (1837790678245658626, '6', '租户管理', '0', '2', 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, sysdate(), null, null, '租户管理目录'); -insert into sys_saas_menu -values (1837790678245658626, '2', '系统监控', '0', '3', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), null, null, '系统监控目录'); -insert into sys_saas_menu -values (1837790678245658626, '3', '系统工具', '0', '4', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, sysdate(), null, null, '系统工具目录'); -insert into sys_saas_menu -values (1837790678245658626, '4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址'); -insert into sys_saas_menu -values (1837790678245658626, '5', '测试菜单', '0', '5', 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, sysdate(), null, null, '测试菜单'); --- 二级菜单 -insert into sys_saas_menu -values (1837790678245658626, '100', '用户管理', '1', '1', 'user', 'system2/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, sysdate(), null, null, '用户管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '101', '角色管理', '1', '2', 'role', 'system2/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, sysdate(), null, null, '角色管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '102', '菜单管理', '1', '3', 'menu', 'system2/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, sysdate(), null, null, '菜单管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '103', '部门管理', '1', '4', 'dept', 'system2/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, sysdate(), null, null, '部门管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '104', '岗位管理', '1', '5', 'post', 'system2/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, sysdate(), null, null, '岗位管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '105', '字典管理', '1', '6', 'dict', 'system2/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, sysdate(), null, null, '字典管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '106', '参数设置', '1', '7', 'config', 'system2/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, sysdate(), null, null, '参数设置菜单'); -insert into sys_saas_menu -values (1837790678245658626, '107', '通知公告', '1', '8', 'notice', 'system2/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, sysdate(), null, null, '通知公告菜单'); -insert into sys_saas_menu -values (1837790678245658626, '108', '日志管理', '1', '9', 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, sysdate(), null, null, '日志管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '109', '在线用户', '2', '1', 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, sysdate(), null, null, '在线用户菜单'); -insert into sys_saas_menu -values (1837790678245658626, '113', '缓存监控', '2', '5', 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, sysdate(), null, null, '缓存监控菜单'); -insert into sys_saas_menu -values (1837790678245658626, '115', '代码生成', '3', '2', 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, sysdate(), null, null, '代码生成菜单'); -insert into sys_saas_menu -values (1837790678245658626, '121', '租户管理', '6', '1', 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, sysdate(), null, null, '租户管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '122', '租户套餐管理', '6', '2', 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, sysdate(), null, null, - '租户套餐管理菜单'); -insert into sys_saas_menu -values (1837790678245658626, '123', '客户端管理', '1', '11', 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, sysdate(), null, null, '客户端管理菜单'); - --- springboot-admin监控 -insert into sys_saas_menu -values (1837790678245658626, '117', 'Admin监控', '2', '5', 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, sysdate(), null, null, 'Admin监控菜单'); --- oss菜单 -insert into sys_saas_menu -values (1837790678245658626, '118', '文件管理', '1', '10', 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, sysdate(), null, null, '文件管理菜单'); --- snail-job server控制台 -insert into sys_saas_menu -values (1837790678245658626, '120', '任务调度中心', '2', '6', 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, sysdate(), null, null, 'SnailJob控制台菜单'); - --- 三级菜单 -insert into sys_saas_menu -values (1837790678245658626, '500', '操作日志', '108', '1', 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, sysdate(), null, null, '操作日志菜单'); -insert into sys_saas_menu -values (1837790678245658626, '501', '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, sysdate(), null, null, '登录日志菜单'); --- 用户管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1001', '用户查询', '100', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1002', '用户新增', '100', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1003', '用户修改', '100', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1004', '用户删除', '100', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1005', '用户导出', '100', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1006', '用户导入', '100', '6', '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1007', '重置密码', '100', '7', '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, sysdate(), null, null, ''); --- 角色管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1008', '角色查询', '101', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1009', '角色新增', '101', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1010', '角色修改', '101', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1011', '角色删除', '101', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1012', '角色导出', '101', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, sysdate(), null, null, ''); --- 菜单管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1013', '菜单查询', '102', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1014', '菜单新增', '102', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1015', '菜单修改', '102', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1016', '菜单删除', '102', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, sysdate(), null, null, ''); --- 部门管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1017', '部门查询', '103', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1018', '部门新增', '103', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1019', '部门修改', '103', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1020', '部门删除', '103', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, sysdate(), null, null, ''); --- 岗位管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1021', '岗位查询', '104', '1', '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1022', '岗位新增', '104', '2', '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1023', '岗位修改', '104', '3', '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1024', '岗位删除', '104', '4', '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1025', '岗位导出', '104', '5', '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, sysdate(), null, null, ''); --- 字典管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, sysdate(), null, null, ''); --- 参数设置按钮 -insert into sys_saas_menu -values (1837790678245658626, '1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, sysdate(), null, null, ''); --- 通知公告按钮 -insert into sys_saas_menu -values (1837790678245658626, '1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, sysdate(), null, null, ''); --- 操作日志按钮 -insert into sys_saas_menu -values (1837790678245658626, '1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, sysdate(), null, null, ''); --- 登录日志按钮 -insert into sys_saas_menu -values (1837790678245658626, '1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, sysdate(), null, null, ''); --- 在线用户按钮 -insert into sys_saas_menu -values (1837790678245658626, '1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate(), null, null, ''); --- 代码生成按钮 -insert into sys_saas_menu -values (1837790678245658626, '1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, sysdate(), null, null, ''); --- oss相关按钮 -insert into sys_saas_menu -values (1837790678245658626, '1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate(), null, null, ''); - --- 租户管理相关按钮 -insert into sys_saas_menu -values (1837790678245658626, '1606', '租户查询', '121', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1607', '租户新增', '121', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1608', '租户修改', '121', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1609', '租户删除', '121', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1610', '租户导出', '121', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, sysdate(), null, null, ''); --- 租户套餐管理相关按钮 -insert into sys_saas_menu -values (1837790678245658626, '1611', '租户套餐查询', '122', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1612', '租户套餐新增', '122', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1613', '租户套餐修改', '122', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1614', '租户套餐删除', '122', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1615', '租户套餐导出', '122', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, sysdate(), null, null, ''); --- 客户端管理按钮 -insert into sys_saas_menu -values (1837790678245658626, '1061', '客户端管理查询', '123', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1062', '客户端管理新增', '123', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1063', '客户端管理修改', '123', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1064', '客户端管理删除', '123', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1065', '客户端管理导出', '123', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, sysdate(), null, null, ''); --- 测试菜单 -insert into sys_saas_menu -values (1837790678245658626, '1500', '测试单表', '5', '1', 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate(), null, null, '测试单表菜单'); -insert into sys_saas_menu -values (1837790678245658626, '1501', '测试单表查询', '1500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1502', '测试单表新增', '1500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1503', '测试单表修改', '1500', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1504', '测试单表删除', '1500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1505', '测试单表导出', '1500', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1506', '测试树表', '5', '1', 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate(), null, null, '测试树表菜单'); -insert into sys_saas_menu -values (1837790678245658626, '1507', '测试树表查询', '1506', '1', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1508', '测试树表新增', '1506', '2', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1509', '测试树表修改', '1506', '3', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1510', '测试树表删除', '1506', '4', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate(), null, null, ''); -insert into sys_saas_menu -values (1837790678245658626, '1511', '测试树表导出', '1506', '5', '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate(), null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1, '系统管理', 1837790678245658626, 1, 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 103, 1, '2024-10-13 14:18:30', null, null, '系统管理目录'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 2, '系统监控', 1837790678245658626, 3, 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 103, 1, '2024-10-13 14:18:30', null, null, '系统监控目录'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 3, '系统工具', 1837790678245658626, 4, 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 103, 1, '2024-10-13 14:18:30', null, null, '系统工具目录'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 4, 'PLUS官网', 1837790678245658626, 5, 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 103, 1, '2024-10-13 14:18:30', null, null, 'RuoYi-Vue-Plus官网地址'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 5, '测试菜单', 1837790678245658626, 5, 'demo', null, '', 1, 0, 'M', '0', '0', '', 'star', 103, 1, '2024-10-13 14:18:30', null, null, '测试菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 6, '租户管理', 1837790678245658626, 2, 'tenant', null, '', 1, 0, 'M', '0', '0', '', 'chart', 103, 1, '2024-10-13 14:18:30', null, null, '租户管理目录'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 100, '用户管理', 1, 1, 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 103, 1, '2024-10-13 14:18:30', null, null, '用户管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 101, '角色管理', 1, 2, 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 103, 1, '2024-10-13 14:18:30', null, null, '角色管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 102, '菜单管理', 1, 3, 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 103, 1, '2024-10-13 14:18:30', null, null, '菜单管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 103, '部门管理', 1, 4, 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 103, 1, '2024-10-13 14:18:30', null, null, '部门管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 104, '岗位管理', 1, 5, 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 103, 1, '2024-10-13 14:18:31', null, null, '岗位管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 105, '字典管理', 1, 6, 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 103, 1, '2024-10-13 14:18:31', null, null, '字典管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 106, '参数设置', 1, 7, 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 103, 1, '2024-10-13 14:18:31', null, null, '参数设置菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 107, '通知公告', 1, 8, 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 103, 1, '2024-10-13 14:18:31', null, null, '通知公告菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 108, '日志管理', 1, 9, 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 103, 1, '2024-10-13 14:18:31', null, null, '日志管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 109, '在线用户', 2, 1, 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 103, 1, '2024-10-13 14:18:31', null, null, '在线用户菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 113, '缓存监控', 2, 5, 'cache', 'monitor/cache/index', '', 1, 0, 'C', '0', '0', 'monitor:cache:list', 'redis', 103, 1, '2024-10-13 14:18:31', null, null, '缓存监控菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 115, '代码生成', 3, 2, 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 103, 1, '2024-10-13 14:18:31', null, null, '代码生成菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 117, 'Admin监控', 2, 5, 'Admin', 'monitor/admin/index', '', 1, 0, 'C', '0', '0', 'monitor:admin:list', 'dashboard', 103, 1, '2024-10-13 14:18:31', null, null, 'Admin监控菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 118, '文件管理', 1, 10, 'oss', 'system/oss/index', '', 1, 0, 'C', '0', '0', 'system:oss:list', 'upload', 103, 1, '2024-10-13 14:18:31', null, null, '文件管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 120, '任务调度中心', 2, 6, 'snailjob', 'monitor/snailjob/index', '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job', 103, 1, '2024-10-13 14:18:31', null, null, 'SnailJob控制台菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 121, '租户管理', 6, 1, 'tenant', 'system/tenant/index', '', 1, 0, 'C', '0', '0', 'system:tenant:list', 'list', 103, 1, '2024-10-13 14:18:31', null, null, '租户管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 122, '租户套餐管理', 6, 2, 'tenantPackage', 'system/tenantPackage/index', '', 1, 0, 'C', '0', '0', 'system:tenantPackage:list', 'form', 103, 1, '2024-10-13 14:18:31', null, null, '租户套餐管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 123, '客户端管理', 1, 11, 'client', 'system/client/index', '', 1, 0, 'C', '0', '0', 'system:client:list', 'international', 103, 1, '2024-10-13 14:18:31', null, null, '客户端管理菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 500, '操作日志', 108, 1, 'operlog', 'monitor/operlog/index', '', 1, 0, 'C', '0', '0', 'monitor:operlog:list', 'form', 103, 1, '2024-10-13 14:18:31', null, null, '操作日志菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 501, '登录日志', 108, 2, 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor', 103, 1, '2024-10-13 14:18:31', null, null, '登录日志菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1001, '用户查询', 100, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1002, '用户新增', 100, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1003, '用户修改', 100, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1004, '用户删除', 100, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1005, '用户导出', 100, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1006, '用户导入', 100, 6, '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1007, '重置密码', 100, 7, '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1008, '角色查询', 101, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1009, '角色新增', 101, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1010, '角色修改', 101, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1011, '角色删除', 101, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1012, '角色导出', 101, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1013, '菜单查询', 102, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1014, '菜单新增', 102, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1015, '菜单修改', 102, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1016, '菜单删除', 102, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1017, '部门查询', 103, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1018, '部门新增', 103, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1019, '部门修改', 103, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1020, '部门删除', 103, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1021, '岗位查询', 104, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1022, '岗位新增', 104, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1023, '岗位修改', 104, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1024, '岗位删除', 104, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1025, '岗位导出', 104, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1026, '字典查询', 105, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1027, '字典新增', 105, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1028, '字典修改', 105, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1029, '字典删除', 105, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1030, '字典导出', 105, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1031, '参数查询', 106, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1032, '参数新增', 106, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1033, '参数修改', 106, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1034, '参数删除', 106, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1035, '参数导出', 106, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1036, '公告查询', 107, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1037, '公告新增', 107, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1038, '公告修改', 107, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1039, '公告删除', 107, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1040, '操作查询', 500, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1041, '操作删除', 500, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1042, '日志导出', 500, 4, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1043, '登录查询', 501, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1044, '登录删除', 501, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1045, '日志导出', 501, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1046, '在线查询', 109, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1047, '批量强退', 109, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1048, '单条强退', 109, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1050, '账户解锁', 501, 4, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1055, '生成查询', 115, 1, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1056, '生成修改', 115, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1057, '生成删除', 115, 3, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1058, '导入代码', 115, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1059, '预览代码', 115, 4, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1060, '生成代码', 115, 5, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1061, '客户端管理查询', 123, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1062, '客户端管理新增', 123, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1063, '客户端管理修改', 123, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1064, '客户端管理删除', 123, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1065, '客户端管理导出', 123, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1500, '测试单表', 5, 1, 'demo', 'demo/demo/index', '', 1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, '2024-10-13 14:18:31', null, null, '测试单表菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1501, '测试单表查询', 1500, 1, '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1502, '测试单表新增', 1500, 2, '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1503, '测试单表修改', 1500, 3, '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1504, '测试单表删除', 1500, 4, '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1505, '测试单表导出', 1500, 5, '#', '', '', 1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1506, '测试树表', 5, 1, 'tree', 'demo/tree/index', '', 1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, '2024-10-13 14:18:31', null, null, '测试树表菜单'); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1507, '测试树表查询', 1506, 1, '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1508, '测试树表新增', 1506, 2, '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1509, '测试树表修改', 1506, 3, '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, '2024-10-13 14:18:32', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1510, '测试树表删除', 1506, 4, '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, '2024-10-13 14:18:32', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1511, '测试树表导出', 1506, 5, '#', '', '', 1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, '2024-10-13 14:18:32', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1600, '文件查询', 118, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1601, '文件上传', 118, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1602, '文件下载', 118, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1603, '文件删除', 118, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1606, '租户查询', 121, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1607, '租户新增', 121, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1608, '租户修改', 121, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1609, '租户删除', 121, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1610, '租户导出', 121, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenant:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1611, '租户套餐查询', 122, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:query', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1612, '租户套餐新增', 122, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1613, '租户套餐修改', 122, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1614, '租户套餐删除', 122, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1615, '租户套餐导出', 122, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:tenantPackage:export', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1620, '配置列表', 118, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1621, '配置添加', 118, 6, '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1622, '配置编辑', 118, 6, '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); +INSERT INTO `ry-vue`.sys_saas_menu (application_id, menu_id, menu_name, parent_id, order_num, path, component, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1837790678245658626, 1623, '配置删除', 118, 6, '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, '2024-10-13 14:18:31', null, null, ''); -- lizhw后加的 @@ -588,255 +366,171 @@ values (1837445872877223943, '多应用菜单删除', '6', '4', '', '', '', 1, 0 -- ---------------------------- create table sys_saas_user_role ( - user_id bigint(20) not null comment '用户ID', - role_id bigint(20) not null comment '角色ID', + user_id bigint not null comment '用户ID', + role_id bigint not null comment '角色ID', primary key (user_id, role_id) -) engine = innodb comment = '用户和角色关联表'; +) + comment '用户和角色关联表'; --- ---------------------------- --- 初始化-用户和角色关联表数据 --- ---------------------------- -insert into sys_saas_user_role -values ('1', '1'); -insert into sys_saas_user_role -values ('3', '3'); -insert into sys_saas_user_role -values ('4', '4'); +INSERT INTO `ry-vue`.sys_saas_user_role (user_id, role_id) VALUES (1, 1); +INSERT INTO `ry-vue`.sys_saas_user_role (user_id, role_id) VALUES (1865786535347699713, 3); -- ---------------------------- -- 7、角色和菜单关联表 角色1-N菜单 -- ---------------------------- create table sys_saas_role_menu ( - role_id bigint(20) not null comment '角色ID', - menu_id bigint(20) not null comment '菜单ID', + role_id bigint not null comment '角色ID', + menu_id bigint not null comment '菜单ID', primary key (role_id, menu_id) -) engine = innodb comment = '角色和菜单关联表'; +) + comment '角色和菜单关联表'; + +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 5); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 100); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 101); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 102); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 103); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 104); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 105); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 106); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 107); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 108); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 500); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 501); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1001); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1002); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1003); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1004); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1005); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1006); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1007); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1008); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1009); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1010); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1011); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1012); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1013); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1014); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1015); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1016); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1017); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1018); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1019); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1020); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1021); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1022); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1023); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1024); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1025); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1026); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1027); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1028); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1029); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1030); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1031); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1032); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1033); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1034); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1035); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1036); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1037); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1038); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1039); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1040); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1041); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1042); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1043); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1044); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1045); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1500); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1501); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1502); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1503); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1504); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1505); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1506); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1507); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1508); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1509); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1510); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (3, 1511); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 5); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1500); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1501); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1502); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1503); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1504); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1505); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1506); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1507); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1508); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1509); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1510); +INSERT INTO `ry-vue`.sys_saas_role_menu (role_id, menu_id) VALUES (4, 1511); --- ---------------------------- --- 初始化-角色和菜单关联表数据 --- ---------------------------- -insert into sys_saas_role_menu -values ('3', '1'); -insert into sys_saas_role_menu -values ('3', '5'); -insert into sys_saas_role_menu -values ('3', '100'); -insert into sys_saas_role_menu -values ('3', '101'); -insert into sys_saas_role_menu -values ('3', '102'); -insert into sys_saas_role_menu -values ('3', '103'); -insert into sys_saas_role_menu -values ('3', '104'); -insert into sys_saas_role_menu -values ('3', '105'); -insert into sys_saas_role_menu -values ('3', '106'); -insert into sys_saas_role_menu -values ('3', '107'); -insert into sys_saas_role_menu -values ('3', '108'); -insert into sys_saas_role_menu -values ('3', '500'); -insert into sys_saas_role_menu -values ('3', '501'); -insert into sys_saas_role_menu -values ('3', '1001'); -insert into sys_saas_role_menu -values ('3', '1002'); -insert into sys_saas_role_menu -values ('3', '1003'); -insert into sys_saas_role_menu -values ('3', '1004'); -insert into sys_saas_role_menu -values ('3', '1005'); -insert into sys_saas_role_menu -values ('3', '1006'); -insert into sys_saas_role_menu -values ('3', '1007'); -insert into sys_saas_role_menu -values ('3', '1008'); -insert into sys_saas_role_menu -values ('3', '1009'); -insert into sys_saas_role_menu -values ('3', '1010'); -insert into sys_saas_role_menu -values ('3', '1011'); -insert into sys_saas_role_menu -values ('3', '1012'); -insert into sys_saas_role_menu -values ('3', '1013'); -insert into sys_saas_role_menu -values ('3', '1014'); -insert into sys_saas_role_menu -values ('3', '1015'); -insert into sys_saas_role_menu -values ('3', '1016'); -insert into sys_saas_role_menu -values ('3', '1017'); -insert into sys_saas_role_menu -values ('3', '1018'); -insert into sys_saas_role_menu -values ('3', '1019'); -insert into sys_saas_role_menu -values ('3', '1020'); -insert into sys_saas_role_menu -values ('3', '1021'); -insert into sys_saas_role_menu -values ('3', '1022'); -insert into sys_saas_role_menu -values ('3', '1023'); -insert into sys_saas_role_menu -values ('3', '1024'); -insert into sys_saas_role_menu -values ('3', '1025'); -insert into sys_saas_role_menu -values ('3', '1026'); -insert into sys_saas_role_menu -values ('3', '1027'); -insert into sys_saas_role_menu -values ('3', '1028'); -insert into sys_saas_role_menu -values ('3', '1029'); -insert into sys_saas_role_menu -values ('3', '1030'); -insert into sys_saas_role_menu -values ('3', '1031'); -insert into sys_saas_role_menu -values ('3', '1032'); -insert into sys_saas_role_menu -values ('3', '1033'); -insert into sys_saas_role_menu -values ('3', '1034'); -insert into sys_saas_role_menu -values ('3', '1035'); -insert into sys_saas_role_menu -values ('3', '1036'); -insert into sys_saas_role_menu -values ('3', '1037'); -insert into sys_saas_role_menu -values ('3', '1038'); -insert into sys_saas_role_menu -values ('3', '1039'); -insert into sys_saas_role_menu -values ('3', '1040'); -insert into sys_saas_role_menu -values ('3', '1041'); -insert into sys_saas_role_menu -values ('3', '1042'); -insert into sys_saas_role_menu -values ('3', '1043'); -insert into sys_saas_role_menu -values ('3', '1044'); -insert into sys_saas_role_menu -values ('3', '1045'); -insert into sys_saas_role_menu -values ('3', '1500'); -insert into sys_saas_role_menu -values ('3', '1501'); -insert into sys_saas_role_menu -values ('3', '1502'); -insert into sys_saas_role_menu -values ('3', '1503'); -insert into sys_saas_role_menu -values ('3', '1504'); -insert into sys_saas_role_menu -values ('3', '1505'); -insert into sys_saas_role_menu -values ('3', '1506'); -insert into sys_saas_role_menu -values ('3', '1507'); -insert into sys_saas_role_menu -values ('3', '1508'); -insert into sys_saas_role_menu -values ('3', '1509'); -insert into sys_saas_role_menu -values ('3', '1510'); -insert into sys_saas_role_menu -values ('3', '1511'); -insert into sys_saas_role_menu -values ('4', '5'); -insert into sys_saas_role_menu -values ('4', '1500'); -insert into sys_saas_role_menu -values ('4', '1501'); -insert into sys_saas_role_menu -values ('4', '1502'); -insert into sys_saas_role_menu -values ('4', '1503'); -insert into sys_saas_role_menu -values ('4', '1504'); -insert into sys_saas_role_menu -values ('4', '1505'); -insert into sys_saas_role_menu -values ('4', '1506'); -insert into sys_saas_role_menu -values ('4', '1507'); -insert into sys_saas_role_menu -values ('4', '1508'); -insert into sys_saas_role_menu -values ('4', '1509'); -insert into sys_saas_role_menu -values ('4', '1510'); -insert into sys_saas_role_menu -values ('4', '1511'); -- ---------------------------- -- 8、角色和部门关联表 角色1-N部门 -- ---------------------------- create table sys_saas_role_dept ( - role_id bigint(20) not null comment '角色ID', - dept_id bigint(20) not null comment '部门ID', + role_id bigint not null comment '角色ID', + dept_id bigint not null comment '部门ID', primary key (role_id, dept_id) -) engine = innodb comment = '角色和部门关联表'; +) + comment '角色和部门关联表'; -- ---------------------------- -- 9、用户与岗位关联表 用户1-N岗位 -- ---------------------------- create table sys_saas_user_post ( - user_id bigint(20) not null comment '用户ID', - post_id bigint(20) not null comment '岗位ID', + user_id bigint not null comment '用户ID', + post_id bigint not null comment '岗位ID', primary key (user_id, post_id) -) engine = innodb comment = '用户与岗位关联表'; +) + comment '用户与岗位关联表'; --- ---------------------------- --- 初始化-用户与岗位关联表数据 --- ---------------------------- -insert into sys_saas_user_post -values ('1', '1'); +INSERT INTO `ry-vue`.sys_saas_user_post (user_id, post_id) VALUES (1, 1); -- ---------------------------- -- 10、操作日志记录 -- ---------------------------- create table sys_saas_oper_log ( - oper_id bigint(20) not null comment '日志主键', - td bigint not null comment '租户编号', - title varchar(50) default '' comment '模块标题', - business_type int(2) default 0 comment '业务类型（0其它 1新增 2修改 3删除）', - method varchar(100) default '' comment '方法名称', - request_method varchar(10) default '' comment '请求方式', - operator_type int(1) default 0 comment '操作类别（0其它 1后台用户 2手机端用户）', - oper_name varchar(50) default '' comment '操作人员', - dept_name varchar(50) default '' comment '部门名称', - oper_url varchar(255) default '' comment '请求URL', - oper_ip varchar(128) default '' comment '主机地址', - oper_location varchar(255) default '' comment '操作地点', - oper_param varchar(2000) default '' comment '请求参数', - json_result varchar(2000) default '' comment '返回参数', - status int(1) default 0 comment '操作状态（0正常 1异常）', - error_msg varchar(2000) default '' comment '错误消息', - oper_time datetime comment '操作时间', - cost_time bigint(20) default 0 comment '消耗时间', - primary key (oper_id), - key idx_sys_saas_oper_log_bt (business_type), - key idx_sys_saas_oper_log_s (status), - key idx_sys_saas_oper_log_ot (oper_time) -) engine = innodb comment = '操作日志记录'; + oper_id bigint not null comment '日志主键' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + title varchar(50) default '' null comment '模块标题', + business_type int(2) default 0 null comment '业务类型（0其它 1新增 2修改 3删除）', + method varchar(100) default '' null comment '方法名称', + request_method varchar(10) default '' null comment '请求方式', + operator_type int(1) default 0 null comment '操作类别（0其它 1后台用户 2手机端用户）', + oper_name varchar(50) default '' null comment '操作人员', + dept_name varchar(50) default '' null comment '部门名称', + oper_url varchar(255) default '' null comment '请求URL', + oper_ip varchar(128) default '' null comment '主机地址', + oper_location varchar(255) default '' null comment '操作地点', + oper_param varchar(2000) default '' null comment '请求参数', + json_result varchar(2000) default '' null comment '返回参数', + status int(1) default 0 null comment '操作状态（0正常 1异常）', + error_msg varchar(2000) default '' null comment '错误消息', + oper_time datetime null comment '操作时间', + cost_time bigint default 0 null comment '消耗时间' +) + comment '操作日志记录'; + +create index idx_sys2_oper_log_bt + on sys_saas_oper_log (business_type); + +create index idx_sys2_oper_log_ot + on sys_saas_oper_log (oper_time); + +create index idx_sys2_oper_log_s + on sys_saas_oper_log (status); + -- ---------------------------- @@ -844,40 +538,32 @@ create table sys_saas_oper_log -- ---------------------------- create table sys_saas_dict_type ( - dict_id bigint(20) not null comment '字典主键', - td bigint not null comment '租户编号', - dict_name varchar(100) default '' comment '字典名称', - dict_type varchar(100) default '' comment '字典类型', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_id), - unique (td, dict_type) -) engine = innodb comment = '字典类型表'; + dict_id bigint not null comment '字典主键' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + dict_name varchar(100) default '' null comment '字典名称', + dict_type varchar(100) default '' null comment '字典类型', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) null comment '备注', + constraint tenant_id + unique (tenant_id, dict_type) +) + comment '字典类型表'; -insert into sys_saas_dict_type -values (1, '000000', '用户性别', 'sys_saas_user_sex', 103, 1, sysdate(), null, null, '用户性别列表'); -insert into sys_saas_dict_type -values (2, '000000', '菜单状态', 'sys_saas_show_hide', 103, 1, sysdate(), null, null, '菜单状态列表'); -insert into sys_saas_dict_type -values (3, '000000', '系统开关', 'sys_saas_normal_disable', 103, 1, sysdate(), null, null, '系统开关列表'); -insert into sys_saas_dict_type -values (6, '000000', '系统是否', 'sys_saas_yes_no', 103, 1, sysdate(), null, null, '系统是否列表'); -insert into sys_saas_dict_type -values (7, '000000', '通知类型', 'sys_saas_notice_type', 103, 1, sysdate(), null, null, '通知类型列表'); -insert into sys_saas_dict_type -values (8, '000000', '通知状态', 'sys_saas_notice_status', 103, 1, sysdate(), null, null, '通知状态列表'); -insert into sys_saas_dict_type -values (9, '000000', '操作类型', 'sys_saas_oper_type', 103, 1, sysdate(), null, null, '操作类型列表'); -insert into sys_saas_dict_type -values (10, '000000', '系统状态', 'sys_saas_common_status', 103, 1, sysdate(), null, null, '登录状态列表'); -insert into sys_saas_dict_type -values (11, '000000', '授权类型', 'sys_saas_grant_type', 103, 1, sysdate(), null, null, '认证授权类型'); -insert into sys_saas_dict_type -values (12, '000000', '设备类型', 'sys_saas_device_type', 103, 1, sysdate(), null, null, '客户端设备类型'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', '用户性别', 'sys2_user_sex', 103, 1, '2024-10-11 15:37:00', null, null, '用户性别列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (2, '000000', '菜单状态', 'sys2_show_hide', 103, 1, '2024-10-11 15:37:00', null, null, '菜单状态列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (3, '000000', '系统开关', 'sys2_normal_disable', 103, 1, '2024-10-11 15:37:00', null, null, '系统开关列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (6, '000000', '系统是否', 'sys2_yes_no', 103, 1, '2024-10-11 15:37:00', null, null, '系统是否列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (7, '000000', '通知类型', 'sys2_notice_type', 103, 1, '2024-10-11 15:37:00', null, null, '通知类型列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (8, '000000', '通知状态', 'sys2_notice_status', 103, 1, '2024-10-11 15:37:00', null, null, '通知状态列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (9, '000000', '操作类型', 'sys2_oper_type', 103, 1, '2024-10-11 15:37:00', null, null, '操作类型列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (10, '000000', '系统状态', 'sys2_common_status', 103, 1, '2024-10-11 15:37:00', null, null, '登录状态列表'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (11, '000000', '授权类型', 'sys2_grant_type', 103, 1, '2024-10-11 15:37:00', null, null, '认证授权类型'); +INSERT INTO `ry-vue`.sys_saas_dict_type (dict_id, tenant_id, dict_name, dict_type, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (12, '000000', '设备类型', 'sys2_device_type', 103, 1, '2024-10-11 15:37:00', null, null, '客户端设备类型'); -- ---------------------------- @@ -885,147 +571,87 @@ values (12, '000000', '设备类型', 'sys_saas_device_type', 103, 1, sysdate(), -- ---------------------------- create table sys_saas_dict_data ( - dict_code bigint(20) not null comment '字典编码', - td bigint not null comment '租户编号', - dict_sort int(4) default 0 comment '字典排序', - dict_label varchar(100) default '' comment '字典标签', - dict_value varchar(100) default '' comment '字典键值', - dict_type varchar(100) default '' comment '字典类型', - css_class varchar(100) default null comment '样式属性（其他样式扩展）', - list_class varchar(100) default null comment '表格回显样式', - is_default char(1) default 'N' comment '是否默认（Y是 N否）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (dict_code) -) engine = innodb comment = '字典数据表'; - -insert into sys_saas_dict_data -values (1, '000000', 1, '男', '0', 'sys_saas_user_sex', '', '', 'Y', 103, 1, sysdate(), null, null, '性别男'); -insert into sys_saas_dict_data -values (2, '000000', 2, '女', '1', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别女'); -insert into sys_saas_dict_data -values (3, '000000', 3, '未知', '2', 'sys_saas_user_sex', '', '', 'N', 103, 1, sysdate(), null, null, '性别未知'); -insert into sys_saas_dict_data -values (4, '000000', 1, '显示', '0', 'sys_saas_show_hide', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单'); -insert into sys_saas_dict_data -values (5, '000000', 2, '隐藏', '1', 'sys_saas_show_hide', '', 'danger', 'N', 103, 1, sysdate(), null, null, '隐藏菜单'); -insert into sys_saas_dict_data -values (6, '000000', 1, '正常', '0', 'sys_saas_normal_disable', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_saas_dict_data -values (7, '000000', 2, '停用', '1', 'sys_saas_normal_disable', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_saas_dict_data -values (12, '000000', 1, '是', 'Y', 'sys_saas_yes_no', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是'); -insert into sys_saas_dict_data -values (13, '000000', 2, '否', 'N', 'sys_saas_yes_no', '', 'danger', 'N', 103, 1, sysdate(), null, null, '系统默认否'); -insert into sys_saas_dict_data -values (14, '000000', 1, '通知', '1', 'sys_saas_notice_type', '', 'warning', 'Y', 103, 1, sysdate(), null, null, '通知'); -insert into sys_saas_dict_data -values (15, '000000', 2, '公告', '2', 'sys_saas_notice_type', '', 'success', 'N', 103, 1, sysdate(), null, null, '公告'); -insert into sys_saas_dict_data -values (16, '000000', 1, '正常', '0', 'sys_saas_notice_status', '', 'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_saas_dict_data -values (17, '000000', 2, '关闭', '1', 'sys_saas_notice_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '关闭状态'); -insert into sys_saas_dict_data -values (29, '000000', 99, '其他', '0', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '其他操作'); -insert into sys_saas_dict_data -values (18, '000000', 1, '新增', '1', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '新增操作'); -insert into sys_saas_dict_data -values (19, '000000', 2, '修改', '2', 'sys_saas_oper_type', '', 'info', 'N', 103, 1, sysdate(), null, null, '修改操作'); -insert into sys_saas_dict_data -values (20, '000000', 3, '删除', '3', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '删除操作'); -insert into sys_saas_dict_data -values (21, '000000', 4, '授权', '4', 'sys_saas_oper_type', '', 'primary', 'N', 103, 1, sysdate(), null, null, '授权操作'); -insert into sys_saas_dict_data -values (22, '000000', 5, '导出', '5', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导出操作'); -insert into sys_saas_dict_data -values (23, '000000', 6, '导入', '6', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '导入操作'); -insert into sys_saas_dict_data -values (24, '000000', 7, '强退', '7', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '强退操作'); -insert into sys_saas_dict_data -values (25, '000000', 8, '生成代码', '8', 'sys_saas_oper_type', '', 'warning', 'N', 103, 1, sysdate(), null, null, '生成操作'); -insert into sys_saas_dict_data -values (26, '000000', 9, '清空数据', '9', 'sys_saas_oper_type', '', 'danger', 'N', 103, 1, sysdate(), null, null, '清空操作'); -insert into sys_saas_dict_data -values (27, '000000', 1, '成功', '0', 'sys_saas_common_status', '', 'primary', 'N', 103, 1, sysdate(), null, null, '正常状态'); -insert into sys_saas_dict_data -values (28, '000000', 2, '失败', '1', 'sys_saas_common_status', '', 'danger', 'N', 103, 1, sysdate(), null, null, '停用状态'); -insert into sys_saas_dict_data -values (30, '000000', 0, '密码认证', 'password', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证'); -insert into sys_saas_dict_data -values (31, '000000', 0, '短信认证', 'sms', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证'); -insert into sys_saas_dict_data -values (32, '000000', 0, '邮件认证', 'email', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证'); -insert into sys_saas_dict_data -values (33, '000000', 0, '小程序认证', 'xcx', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证'); -insert into sys_saas_dict_data -values (34, '000000', 0, '三方登录认证', 'social', 'sys_saas_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证'); -insert into sys_saas_dict_data -values (35, '000000', 0, 'PC', 'pc', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'PC'); -insert into sys_saas_dict_data -values (36, '000000', 0, '安卓', 'android', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '安卓'); -insert into sys_saas_dict_data -values (37, '000000', 0, 'iOS', 'ios', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, 'iOS'); -insert into sys_saas_dict_data -values (38, '000000', 0, '小程序', 'xcx', 'sys_saas_device_type', '', 'default', 'N', 103, 1, sysdate(), null, null, '小程序'); - - --- ---------------------------- --- 13、参数配置表 --- ---------------------------- -create table sys_saas_config -( - config_id bigint(20) not null comment '参数主键', - td bigint not null comment '租户编号', - config_name varchar(100) default '' comment '参数名称', - config_key varchar(100) default '' comment '参数键名', - config_value varchar(500) default '' comment '参数键值', - config_type char(1) default 'N' comment '系统内置（Y是 N否）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (config_id) -) engine = innodb comment = '参数配置表'; - -insert into sys_saas_config -values (1, '000000', '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow'); -insert into sys_saas_config -values (2, '000000', '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 103, 1, sysdate(), null, null, '初始化密码 123456'); -insert into sys_saas_config -values (3, '000000', '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light'); -insert into sys_saas_config -values (5, '000000', '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）'); -insert into sys_saas_config -values (11, '000000', 'OSS预览列表资源开关', 'sys.oss.previewListResource', 'true', 'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭'); + dict_code bigint not null comment '字典编码' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + dict_sort int(4) default 0 null comment '字典排序', + dict_label varchar(100) default '' null comment '字典标签', + dict_value varchar(100) default '' null comment '字典键值', + dict_type varchar(100) default '' null comment '字典类型', + css_class varchar(100) null comment '样式属性（其他样式扩展）', + list_class varchar(100) null comment '表格回显样式', + is_default char default 'N' null comment '是否默认（Y是 N否）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(500) null comment '备注' +) + comment '字典数据表'; +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', 1, '男', '0', 'sys2_user_sex', '', '', 'Y', 103, 1, '2024-10-11 15:37:00', null, null, '性别男'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (2, '000000', 2, '女', '1', 'sys2_user_sex', '', '', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '性别女'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (3, '000000', 3, '未知', '2', 'sys2_user_sex', '', '', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '性别未知'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (4, '000000', 1, '显示', '0', 'sys2_show_hide', '', 'primary', 'Y', 103, 1, '2024-10-11 15:37:00', null, null, '显示菜单'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (5, '000000', 2, '隐藏', '1', 'sys2_show_hide', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '隐藏菜单'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (6, '000000', 1, '正常', '0', 'sys2_normal_disable', '', 'primary', 'Y', 103, 1, '2024-10-11 15:37:00', null, null, '正常状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (7, '000000', 2, '停用', '1', 'sys2_normal_disable', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '停用状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (12, '000000', 1, '是', 'Y', 'sys2_yes_no', '', 'primary', 'Y', 103, 1, '2024-10-11 15:37:00', null, null, '系统默认是'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (13, '000000', 2, '否', 'N', 'sys2_yes_no', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '系统默认否'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (14, '000000', 1, '通知', '1', 'sys2_notice_type', '', 'warning', 'Y', 103, 1, '2024-10-11 15:37:00', null, null, '通知'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (15, '000000', 2, '公告', '2', 'sys2_notice_type', '', 'success', 'N', 103, 1, '2024-10-11 15:37:00', null, null, '公告'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (16, '000000', 1, '正常', '0', 'sys2_notice_status', '', 'primary', 'Y', 103, 1, '2024-10-11 15:37:01', null, null, '正常状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (17, '000000', 2, '关闭', '1', 'sys2_notice_status', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '关闭状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (18, '000000', 1, '新增', '1', 'sys2_oper_type', '', 'info', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '新增操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (19, '000000', 2, '修改', '2', 'sys2_oper_type', '', 'info', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '修改操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (20, '000000', 3, '删除', '3', 'sys2_oper_type', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '删除操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (21, '000000', 4, '授权', '4', 'sys2_oper_type', '', 'primary', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '授权操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (22, '000000', 5, '导出', '5', 'sys2_oper_type', '', 'warning', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '导出操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (23, '000000', 6, '导入', '6', 'sys2_oper_type', '', 'warning', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '导入操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (24, '000000', 7, '强退', '7', 'sys2_oper_type', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '强退操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (25, '000000', 8, '生成代码', '8', 'sys2_oper_type', '', 'warning', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '生成操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (26, '000000', 9, '清空数据', '9', 'sys2_oper_type', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '清空操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (27, '000000', 1, '成功', '0', 'sys2_common_status', '', 'primary', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '正常状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (28, '000000', 2, '失败', '1', 'sys2_common_status', '', 'danger', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '停用状态'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (29, '000000', 99, '其他', '0', 'sys2_oper_type', '', 'info', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '其他操作'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (30, '000000', 0, '密码认证', 'password', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '密码认证'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (31, '000000', 0, '短信认证', 'sms', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '短信认证'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (32, '000000', 0, '邮件认证', 'email', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '邮件认证'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (33, '000000', 0, '小程序认证', 'xcx', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '小程序认证'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (34, '000000', 0, '三方登录认证', 'social', 'sys2_grant_type', 'el-check-tag', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '三方登录认证'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (35, '000000', 0, 'PC', 'pc', 'sys2_device_type', '', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, 'PC'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (36, '000000', 0, '安卓', 'android', 'sys2_device_type', '', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '安卓'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (37, '000000', 0, 'iOS', 'ios', 'sys2_device_type', '', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, 'iOS'); +INSERT INTO `ry-vue`.sys_saas_dict_data (dict_code, tenant_id, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (38, '000000', 0, '小程序', 'xcx', 'sys2_device_type', '', 'default', 'N', 103, 1, '2024-10-11 15:37:01', null, null, '小程序'); -- ---------------------------- -- 14、系统访问记录 -- ---------------------------- create table sys_saas_logininfor ( - info_id bigint(20) not null comment '访问ID', - td bigint not null comment '租户编号', - user_name varchar(50) default '' comment '用户账号', - client_key varchar(32) default '' comment '客户端', - device_type varchar(32) default '' comment '设备类型', - ipaddr varchar(128) default '' comment '登录IP地址', - login_location varchar(255) default '' comment '登录地点', - browser varchar(50) default '' comment '浏览器类型', - os varchar(50) default '' comment '操作系统', - status char(1) default '0' comment '登录状态（0成功 1失败）', - msg varchar(255) default '' comment '提示消息', - login_time datetime comment '访问时间', - primary key (info_id), - key idx_sys_saas_logininfor_s (status), - key idx_sys_saas_logininfor_lt (login_time) -) engine = innodb comment = '系统访问记录'; + info_id bigint not null comment '访问ID' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + user_name varchar(50) default '' null comment '用户账号', + client_key varchar(32) default '' null comment '客户端', + device_type varchar(32) default '' null comment '设备类型', + ipaddr varchar(128) default '' null comment '登录IP地址', + login_location varchar(255) default '' null comment '登录地点', + browser varchar(50) default '' null comment '浏览器类型', + os varchar(50) default '' null comment '操作系统', + status char default '0' null comment '登录状态（0成功 1失败）', + msg varchar(255) default '' null comment '提示消息', + login_time datetime null comment '访问时间' +) + comment '系统访问记录'; + +create index idx_sys2_logininfor_lt + on sys_saas_logininfor (login_time); + +create index idx_sys2_logininfor_s + on sys_saas_logininfor (status); + -- ---------------------------- @@ -1033,28 +659,24 @@ create table sys_saas_logininfor -- ---------------------------- create table sys_saas_notice ( - notice_id bigint(20) not null comment '公告ID', - td bigint not null comment '租户编号', - notice_title varchar(50) not null comment '公告标题', - notice_type char(1) not null comment '公告类型（1通知 2公告）', - notice_content longblob default null comment '公告内容', - status char(1) default '0' comment '公告状态（0正常 1关闭）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime comment '更新时间', - remark varchar(255) default null comment '备注', - primary key (notice_id) -) engine = innodb comment = '通知公告表'; + notice_id bigint not null comment '公告ID' + primary key, + tenant_id varchar(20) default '000000' null comment '租户编号', + notice_title varchar(50) not null comment '公告标题', + notice_type char not null comment '公告类型（1通知 2公告）', + notice_content longblob null comment '公告内容', + status char default '0' null comment '公告状态（0正常 1关闭）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间', + remark varchar(255) null comment '备注' +) + comment '通知公告表'; --- ---------------------------- --- 初始化-公告信息表数据 --- ---------------------------- -insert into sys_saas_notice -values ('1', '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员'); -insert into sys_saas_notice -values ('2', '000000', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容', '0', 103, 1, sysdate(), null, null, '管理员'); +INSERT INTO `ry-vue`.sys_saas_notice (notice_id, tenant_id, notice_title, notice_type, notice_content, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (1, '000000', '温馨提醒：2018-07-01 新版本发布啦', '2', 0xE696B0E78988E69CACE58685E5AEB9, '0', 103, 1, '2024-10-11 15:37:01', null, null, '管理员'); +INSERT INTO `ry-vue`.sys_saas_notice (notice_id, tenant_id, notice_title, notice_type, notice_content, status, create_dept, create_by, create_time, update_by, update_time, remark) VALUES (2, '000000', '维护通知：2018-07-01 系统凌晨维护', '1', 0xE7BBB4E68AA4E58685E5AEB9, '0', 103, 1, '2024-10-11 15:37:01', null, null, '管理员'); -- ---------------------------- -- OSS对象存储表 @@ -1076,64 +698,29 @@ create table sys_saas_oss primary key (oss_id) ) engine = innodb comment ='OSS对象存储表'; --- ---------------------------- --- OSS对象存储动态配置表 --- ---------------------------- -create table sys_saas_oss_config -( - oss_config_id bigint(20) not null comment '主键', - td bigint not null comment '租户编号', - config_key varchar(20) not null default '' comment '配置key', - access_key varchar(255) default '' comment 'accessKey', - secret_key varchar(255) default '' comment '秘钥', - bucket_name varchar(255) default '' comment '桶名称', - prefix varchar(255) default '' comment '前缀', - endpoint varchar(255) default '' comment '访问站点', - domain varchar(255) default '' comment '自定义域名', - is_https char(1) default 'N' comment '是否https（Y=是,N=否）', - region varchar(255) default '' comment '域', - access_policy char(1) not null default '1' comment '桶权限类型(0=private 1=public 2=custom)', - status char(1) default '1' comment '是否默认（0=是,1=否）', - ext1 varchar(255) default '' comment '扩展字段', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - remark varchar(500) default null comment '备注', - primary key (oss_config_id) -) engine = innodb comment ='对象存储配置表'; - -insert into sys_saas_oss_config -values (1, '000000', 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', '127.0.0.1:9000', '', 'N', '', '1', '0', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_saas_oss_config -values (2, '000000', 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 's3-cn-north-1.qiniucs.com', '', 'N', '', '1', '1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_saas_oss_config -values (3, '000000', 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'oss-cn-beijing.aliyuncs.com', '', 'N', '', '1', '1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_saas_oss_config -values (4, '000000', 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'cos.ap-beijing.myqcloud.com', '', 'N', 'ap-beijing', '1', '1', '', 103, 1, sysdate(), 1, sysdate(), null); -insert into sys_saas_oss_config -values (5, '000000', 'image', 'ruoyi', 'ruoyi123', 'ruoyi', 'image', '127.0.0.1:9000', '', 'N', '', '1', '1', '', 103, 1, sysdate(), 1, sysdate(), null); - -- ---------------------------- -- 系统授权表 -- ---------------------------- create table sys_saas_client ( - id bigint(20) not null comment 'id', - client_id varchar(64) default null comment '客户端id', - client_key varchar(32) default null comment '客户端key', - client_secret varchar(255) default null comment '客户端秘钥', - grant_type varchar(255) default null comment '授权类型', - device_type varchar(32) default null comment '设备类型', - active_timeout int(11) default 1800 comment 'token活跃超时时间', - timeout int(11) default 604800 comment 'token固定超时', - status char(1) default '0' comment '状态（0正常 1停用）', - del_flag char(1) default '0' comment '删除标志（0代表存在 2代表删除）', - create_dept bigint(20) default null comment '创建部门', - create_by bigint(20) default null comment '创建者', - create_time datetime default null comment '创建时间', - update_by bigint(20) default null comment '更新者', - update_time datetime default null comment '更新时间', - primary key (id) -) engine = innodb comment ='系统授权表'; + id bigint not null comment 'id' + primary key, + client_id varchar(64) null comment '客户端id', + client_key varchar(32) null comment '客户端key', + client_secret varchar(255) null comment '客户端秘钥', + grant_type varchar(255) null comment '授权类型', + device_type varchar(32) null comment '设备类型', + active_timeout int default 1800 null comment 'token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结', + timeout int default 1800 null comment 'token 有效期（单位：秒），默认30天，-1代表永不过期 ', + status char default '0' null comment '状态（0正常 1停用）', + del_flag char default '0' null comment '删除标志（0代表存在 2代表删除）', + create_dept bigint null comment '创建部门', + create_by bigint null comment '创建者', + create_time datetime null comment '创建时间', + update_by bigint null comment '更新者', + update_time datetime null comment '更新时间' +) + comment '系统授权表'; + +INSERT INTO `ry-vue`.sys_saas_client (id, client_id, client_key, client_secret, grant_type, device_type, active_timeout, timeout, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', -1, 1800, '0', '0', 103, 1, '2024-10-11 15:37:28', 1, '2024-10-11 15:37:28'); +INSERT INTO `ry-vue`.sys_saas_client (id, client_id, client_key, client_secret, grant_type, device_type, active_timeout, timeout, status, del_flag, create_dept, create_by, create_time, update_by, update_time) VALUES (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', -1, 1800, '0', '0', 103, 1, '2024-10-11 15:37:28', 1, '2024-10-11 15:37:28');