system-tenant 多应用多租户支持

pom.xml

@@ -370,6 +370,12 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-system-saas</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.dromara</groupId>
                 <artifactId>ruoyi-job</artifactId>

ruoyi-admin/pom.xml

@@ -47,6 +47,11 @@
             <artifactId>ruoyi-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-system-saas</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-job</artifactId>

ruoyi-modules/pom.xml

@@ -14,7 +14,7 @@
         <module>ruoyi-generator</module>
         <module>ruoyi-job</module>
         <module>ruoyi-system</module>
-        <module>ruoyi-system-tenant</module>
+        <module>ruoyi-system-saas</module>
         <module>ruoyi-workflow</module>
     </modules>
 

ruoyi-modules/ruoyi-system-saas/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>ruoyi-system-tenant</artifactId>
+    <artifactId>ruoyi-system-saas</artifactId>
 
     <description>
         system-tenant 系统模块

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2LogininforController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.monitor;
+package org.dromara.system.saas.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
@@ -12,9 +12,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.bo.SysLogininforBo;
+import org.dromara.system.saas.domain.bo.Sys2LogininforBo;
-import org.dromara.system.tenant.domain.vo.SysLogininforVo;
+import org.dromara.system.saas.domain.vo.Sys2LogininforVo;
-import org.dromara.system.tenant.service.ISysLogininforService;
+import org.dromara.system.saas.service.ISys2LogininforService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -28,17 +28,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/monitor/logininfor")
+@RequestMapping("/monitor2/logininfor")
-public class SysLogininforController extends BaseController {
+public class Sys2LogininforController extends BaseController {
 
-    private final ISysLogininforService logininforService;
+    private final ISys2LogininforService logininforService;
 
     /**
      * 获取系统访问记录列表
      */
     @SaCheckPermission("monitor:logininfor:list")
     @GetMapping("/list")
-    public TableDataInfo<SysLogininforVo> list(SysLogininforBo logininfor, PageQuery pageQuery) {
+    public TableDataInfo<Sys2LogininforVo> list(Sys2LogininforBo logininfor, PageQuery pageQuery) {
         return logininforService.selectPageLogininforList(logininfor, pageQuery);
     }
 
@@ -48,9 +48,9 @@ public class SysLogininforController extends BaseController {
     @Log(title = "登录日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:logininfor:export")
     @PostMapping("/export")
-    public void export(SysLogininforBo logininfor, HttpServletResponse response) {
+    public void export(Sys2LogininforBo logininfor, HttpServletResponse response) {
-        List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
+        List<Sys2LogininforVo> list = logininforService.selectLogininforList(logininfor);
-        ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response);
+        ExcelUtil.exportExcel(list, "登录日志", Sys2LogininforVo.class, response);
     }
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2OperlogController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.monitor;
+package org.dromara.system.saas.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.log.annotation.Log;
@@ -8,9 +8,9 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.system.tenant.domain.bo.SysOperLogBo;
+import org.dromara.system.saas.domain.bo.Sys2OperLogBo;
-import org.dromara.system.tenant.domain.vo.SysOperLogVo;
+import org.dromara.system.saas.domain.vo.Sys2OperLogVo;
-import org.dromara.system.tenant.service.ISysOperLogService;
+import org.dromara.system.saas.service.ISys2OperLogService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -26,17 +26,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/monitor/operlog")
+@RequestMapping("/monitor2/operlog")
-public class SysOperlogController extends BaseController {
+public class Sys2OperlogController extends BaseController {
 
-    private final ISysOperLogService operLogService;
+    private final ISys2OperLogService operLogService;
 
     /**
      * 获取操作日志记录列表
      */
     @SaCheckPermission("monitor:operlog:list")
     @GetMapping("/list")
-    public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
+    public TableDataInfo<Sys2OperLogVo> list(Sys2OperLogBo operLog, PageQuery pageQuery) {
         return operLogService.selectPageOperLogList(operLog, pageQuery);
     }
 
@@ -46,9 +46,9 @@ public class SysOperlogController extends BaseController {
     @Log(title = "操作日志", businessType = BusinessType.EXPORT)
     @SaCheckPermission("monitor:operlog:export")
     @PostMapping("/export")
-    public void export(SysOperLogBo operLog, HttpServletResponse response) {
+    public void export(Sys2OperLogBo operLog, HttpServletResponse response) {
-        List<SysOperLogVo> list = operLogService.selectOperLogList(operLog);
+        List<Sys2OperLogVo> list = operLogService.selectOperLogList(operLog);
-        ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response);
+        ExcelUtil.exportExcel(list, "操作日志", Sys2OperLogVo.class, response);
     }
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/monitor/Sys2UserOnlineController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.monitor;
+package org.dromara.system.saas.controller.monitor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.exception.NotLoginException;
@@ -15,7 +15,7 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.SysUserOnline;
+import org.dromara.system.saas.domain.Sys2UserOnline;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
@@ -30,8 +30,8 @@ import java.util.stream.Collectors;
  */
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/monitor/online")
+@RequestMapping("/monitor2/online")
-public class SysUserOnlineController extends BaseController {
+public class Sys2UserOnlineController extends BaseController {
 
     /**
      * 获取在线用户监控列表
@@ -41,7 +41,7 @@ public class SysUserOnlineController extends BaseController {
      */
     @SaCheckPermission("monitor:online:list")
     @GetMapping("/list")
-    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
+    public TableDataInfo<Sys2UserOnline> list(String ipaddr, String userName) {
         // 获取所有未过期的 token
         List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
         List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
@@ -69,7 +69,7 @@ public class SysUserOnlineController extends BaseController {
         }
         Collections.reverse(userOnlineDTOList);
         userOnlineDTOList.removeAll(Collections.singleton(null));
-        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        List<Sys2UserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class);
         return TableDataInfo.build(userOnlineList);
     }
 
@@ -93,17 +93,17 @@ public class SysUserOnlineController extends BaseController {
      * 获取当前用户登录在线设备
      */
     @GetMapping()
-    public TableDataInfo<SysUserOnline> getInfo() {
+    public TableDataInfo<Sys2UserOnline> getInfo() {
         // 获取指定账号 id 的 token 集合
         List<String> tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString());
         List<UserOnlineDTO> userOnlineDTOList = tokenIds.stream()
             .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1)
             .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token))
             .collect(Collectors.toList());
-        //复制和处理 SysUserOnline 对象列表
+        //复制和处理 Sys2UserOnline 对象列表
         Collections.reverse(userOnlineDTOList);
         userOnlineDTOList.removeAll(Collections.singleton(null));
-        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        List<Sys2UserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, Sys2UserOnline.class);
         return TableDataInfo.build(userOnlineList);
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ApplicationController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import java.util.List;
 
@@ -17,9 +17,9 @@ 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;
-import org.dromara.system.tenant.domain.vo.SysApplicationVo;
+import org.dromara.system.saas.domain.vo.Sys2ApplicationVo;
-import org.dromara.system.tenant.domain.bo.SysApplicationBo;
+import org.dromara.system.saas.domain.bo.Sys2ApplicationBo;
-import org.dromara.system.tenant.service.ISysApplicationService;
+import org.dromara.system.saas.service.ISys2ApplicationService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
@@ -31,17 +31,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/application")
+@RequestMapping("/system2/application")
-public class SysApplicationController extends BaseController {
+public class Sys2ApplicationController extends BaseController {
 
-    private final ISysApplicationService sysApplicationService;
+    private final ISys2ApplicationService sysApplicationService;
 
     /**
      * 查询应用列表
      */
     @SaCheckPermission("system:application:list")
     @GetMapping("/list")
-    public TableDataInfo<SysApplicationVo> list(SysApplicationBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2ApplicationVo> list(Sys2ApplicationBo bo, PageQuery pageQuery) {
         return sysApplicationService.queryPageList(bo, pageQuery);
     }
 
@@ -51,9 +51,9 @@ public class SysApplicationController extends BaseController {
     @SaCheckPermission("system:application:export")
     @Log(title = "应用", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SysApplicationBo bo, HttpServletResponse response) {
+    public void export(Sys2ApplicationBo bo, HttpServletResponse response) {
-        List<SysApplicationVo> list = sysApplicationService.queryList(bo);
+        List<Sys2ApplicationVo> list = sysApplicationService.queryList(bo);
-        ExcelUtil.exportExcel(list, "应用", SysApplicationVo.class, response);
+        ExcelUtil.exportExcel(list, "应用", Sys2ApplicationVo.class, response);
     }
 
     /**
@@ -63,7 +63,7 @@ public class SysApplicationController extends BaseController {
      */
     @SaCheckPermission("system:application:query")
     @GetMapping("/{applicationId}")
-    public R<SysApplicationVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<Sys2ApplicationVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long applicationId) {
         return R.ok(sysApplicationService.queryById(applicationId));
     }
@@ -75,7 +75,7 @@ public class SysApplicationController extends BaseController {
     @Log(title = "应用", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysApplicationBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2ApplicationBo bo) {
         return toAjax(sysApplicationService.insertByBo(bo));
     }
 
@@ -86,7 +86,7 @@ public class SysApplicationController extends BaseController {
     @Log(title = "应用", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysApplicationBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2ApplicationBo bo) {
         return toAjax(sysApplicationService.updateByBo(bo));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ClientController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import java.util.List;
 
@@ -6,6 +6,7 @@ import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.dromara.system.saas.domain.bo.Sys2ClientBo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -17,9 +18,8 @@ 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;
-import org.dromara.system.tenant.domain.vo.SysClientVo;
+import org.dromara.system.saas.domain.vo.Sys2ClientVo;
-import org.dromara.system.tenant.domain.bo.SysClientBo;
+import org.dromara.system.saas.service.ISys2ClientService;
-import org.dromara.system.tenant.service.ISysClientService;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
@@ -31,17 +31,17 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/client")
+@RequestMapping("/system2/client")
-public class SysClientController extends BaseController {
+public class Sys2ClientController extends BaseController {
 
-    private final ISysClientService sysClientService;
+    private final ISys2ClientService sysClientService;
 
     /**
      * 查询客户端管理列表
      */
     @SaCheckPermission("system:client:list")
     @GetMapping("/list")
-    public TableDataInfo<SysClientVo> list(SysClientBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2ClientVo> list(Sys2ClientBo bo, PageQuery pageQuery) {
         return sysClientService.queryPageList(bo, pageQuery);
     }
 
@@ -51,9 +51,9 @@ public class SysClientController extends BaseController {
     @SaCheckPermission("system:client:export")
     @Log(title = "客户端管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SysClientBo bo, HttpServletResponse response) {
+    public void export(Sys2ClientBo bo, HttpServletResponse response) {
-        List<SysClientVo> list = sysClientService.queryList(bo);
+        List<Sys2ClientVo> list = sysClientService.queryList(bo);
-        ExcelUtil.exportExcel(list, "客户端管理", SysClientVo.class, response);
+        ExcelUtil.exportExcel(list, "客户端管理", Sys2ClientVo.class, response);
     }
 
     /**
@@ -63,7 +63,7 @@ public class SysClientController extends BaseController {
      */
     @SaCheckPermission("system:client:query")
     @GetMapping("/{id}")
-    public R<SysClientVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<Sys2ClientVo> getInfo(@NotNull(message = "主键不能为空")
                                   @PathVariable Long id) {
         return R.ok(sysClientService.queryById(id));
     }
@@ -75,7 +75,7 @@ public class SysClientController extends BaseController {
     @Log(title = "客户端管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2ClientBo bo) {
         return toAjax(sysClientService.insertByBo(bo));
     }
 
@@ -86,7 +86,7 @@ public class SysClientController extends BaseController {
     @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2ClientBo bo) {
         return toAjax(sysClientService.updateByBo(bo));
     }
 
@@ -96,7 +96,7 @@ public class SysClientController extends BaseController {
     @SaCheckPermission("system:client:edit")
     @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysClientBo bo) {
+    public R<Void> changeStatus(@RequestBody Sys2ClientBo bo) {
         return toAjax(sysClientService.updateUserStatus(bo.getClientId(), bo.getStatus()));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ConfigController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
@@ -8,9 +8,9 @@ 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.tenant.domain.bo.SysConfigBo;
+import org.dromara.system.saas.domain.bo.Sys2ConfigBo;
-import org.dromara.system.tenant.domain.vo.SysConfigVo;
+import org.dromara.system.saas.domain.vo.Sys2ConfigVo;
-import org.dromara.system.tenant.service.ISysConfigService;
+import org.dromara.system.saas.service.ISys2ConfigService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -26,17 +26,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/config")
+@RequestMapping("/system2/config")
-public class SysConfigController extends BaseController {
+public class Sys2ConfigController extends BaseController {
 
-    private final ISysConfigService configService;
+    private final ISys2ConfigService configService;
 
     /**
      * 获取参数配置列表
      */
     @SaCheckPermission("system:config:list")
     @GetMapping("/list")
-    public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
+    public TableDataInfo<Sys2ConfigVo> list(Sys2ConfigBo config, PageQuery pageQuery) {
         return configService.selectPageConfigList(config, pageQuery);
     }
 
@@ -46,9 +46,9 @@ public class SysConfigController extends BaseController {
     @Log(title = "参数管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:config:export")
     @PostMapping("/export")
-    public void export(SysConfigBo config, HttpServletResponse response) {
+    public void export(Sys2ConfigBo config, HttpServletResponse response) {
-        List<SysConfigVo> list = configService.selectConfigList(config);
+        List<Sys2ConfigVo> list = configService.selectConfigList(config);
-        ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
+        ExcelUtil.exportExcel(list, "参数数据", Sys2ConfigVo.class, response);
     }
 
     /**
@@ -58,7 +58,7 @@ public class SysConfigController extends BaseController {
      */
     @SaCheckPermission("system:config:query")
     @GetMapping(value = "/{configId}")
-    public R<SysConfigVo> getInfo(@PathVariable Long configId) {
+    public R<Sys2ConfigVo> getInfo(@PathVariable Long configId) {
         return R.ok(configService.selectConfigById(configId));
     }
 
@@ -78,7 +78,7 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:add")
     @Log(title = "参数管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysConfigBo config) {
+    public R<Void> add(@Validated @RequestBody Sys2ConfigBo config) {
         if (!configService.checkConfigKeyUnique(config)) {
             return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
@@ -92,7 +92,7 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
+    public R<Void> edit(@Validated @RequestBody Sys2ConfigBo config) {
         if (!configService.checkConfigKeyUnique(config)) {
             return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
         }
@@ -106,7 +106,7 @@ public class SysConfigController extends BaseController {
     @SaCheckPermission("system:config:edit")
     @Log(title = "参数管理", businessType = BusinessType.UPDATE)
     @PutMapping("/updateByKey")
-    public R<Void> updateByKey(@RequestBody SysConfigBo config) {
+    public R<Void> updateByKey(@RequestBody Sys2ConfigBo config) {
         configService.updateConfig(config);
         return R.ok();
     }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DeptController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.convert.Convert;
@@ -9,10 +9,10 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.bo.SysDeptBo;
+import org.dromara.system.saas.domain.bo.Sys2DeptBo;
-import org.dromara.system.tenant.domain.vo.SysDeptVo;
+import org.dromara.system.saas.domain.vo.Sys2DeptVo;
-import org.dromara.system.tenant.service.ISysDeptService;
+import org.dromara.system.saas.service.ISys2DeptService;
-import org.dromara.system.tenant.service.ISysPostService;
+import org.dromara.system.saas.service.ISys2PostService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,19 +26,19 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/dept")
+@RequestMapping("/system2/dept")
-public class SysDeptController extends BaseController {
+public class Sys2DeptController extends BaseController {
 
-    private final ISysDeptService deptService;
+    private final ISys2DeptService deptService;
-    private final ISysPostService postService;
+    private final ISys2PostService postService;
 
     /**
      * 获取部门列表
      */
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list")
-    public R<List<SysDeptVo>> list(SysDeptBo dept) {
+    public R<List<Sys2DeptVo>> list(Sys2DeptBo dept) {
-        List<SysDeptVo> depts = deptService.selectDeptList(dept);
+        List<Sys2DeptVo> depts = deptService.selectDeptList(dept);
         return R.ok(depts);
     }
 
@@ -49,8 +49,8 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:list")
     @GetMapping("/list/exclude/{deptId}")
-    public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+    public R<List<Sys2DeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
-        List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
+        List<Sys2DeptVo> depts = deptService.selectDeptList(new Sys2DeptBo());
         depts.removeIf(d -> d.getDeptId().equals(deptId)
             || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));
         return R.ok(depts);
@@ -63,7 +63,7 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:query")
     @GetMapping(value = "/{deptId}")
-    public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
+    public R<Sys2DeptVo> getInfo(@PathVariable Long deptId) {
         deptService.checkDeptDataScope(deptId);
         return R.ok(deptService.selectDeptById(deptId));
     }
@@ -74,7 +74,7 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:add")
     @Log(title = "部门管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDeptBo dept) {
+    public R<Void> add(@Validated @RequestBody Sys2DeptBo dept) {
         if (!deptService.checkDeptNameUnique(dept)) {
             return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
@@ -87,7 +87,7 @@ public class SysDeptController extends BaseController {
     @SaCheckPermission("system:dept:edit")
     @Log(title = "部门管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
+    public R<Void> edit(@Validated @RequestBody Sys2DeptBo dept) {
         Long deptId = dept.getDeptId();
         deptService.checkDeptDataScope(deptId);
         if (!deptService.checkDeptNameUnique(dept)) {
@@ -133,7 +133,7 @@ public class SysDeptController extends BaseController {
      */
     @SaCheckPermission("system:dept:query")
     @GetMapping("/optionselect")
-    public R<List<SysDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
+    public R<List<Sys2DeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
         return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictDataController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
@@ -9,10 +9,10 @@ import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.system.tenant.domain.bo.SysDictDataBo;
+import org.dromara.system.saas.domain.bo.Sys2DictDataBo;
-import org.dromara.system.tenant.domain.vo.SysDictDataVo;
+import org.dromara.system.saas.domain.vo.Sys2DictDataVo;
-import org.dromara.system.tenant.service.ISysDictDataService;
+import org.dromara.system.saas.service.ISys2DictDataService;
-import org.dromara.system.tenant.service.ISysDictTypeService;
+import org.dromara.system.saas.service.ISys2DictTypeService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -29,18 +29,18 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/dict/data")
+@RequestMapping("/system2/dict/data")
-public class SysDictDataController extends BaseController {
+public class Sys2DictDataController extends BaseController {
 
-    private final ISysDictDataService dictDataService;
+    private final ISys2DictDataService dictDataService;
-    private final ISysDictTypeService dictTypeService;
+    private final ISys2DictTypeService dictTypeService;
 
     /**
      * 查询字典数据列表
      */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
-    public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
+    public TableDataInfo<Sys2DictDataVo> list(Sys2DictDataBo dictData, PageQuery pageQuery) {
         return dictDataService.selectPageDictDataList(dictData, pageQuery);
     }
 
@@ -50,9 +50,9 @@ public class SysDictDataController extends BaseController {
     @Log(title = "字典数据", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
-    public void export(SysDictDataBo dictData, HttpServletResponse response) {
+    public void export(Sys2DictDataBo dictData, HttpServletResponse response) {
-        List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
+        List<Sys2DictDataVo> list = dictDataService.selectDictDataList(dictData);
-        ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
+        ExcelUtil.exportExcel(list, "字典数据", Sys2DictDataVo.class, response);
     }
 
     /**
@@ -62,7 +62,7 @@ public class SysDictDataController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictCode}")
-    public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
+    public R<Sys2DictDataVo> getInfo(@PathVariable Long dictCode) {
         return R.ok(dictDataService.selectDictDataById(dictCode));
     }
 
@@ -72,8 +72,8 @@ public class SysDictDataController extends BaseController {
      * @param dictType 字典类型
      */
     @GetMapping(value = "/type/{dictType}")
-    public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
+    public R<List<Sys2DictDataVo>> dictType(@PathVariable String dictType) {
-        List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
+        List<Sys2DictDataVo> data = dictTypeService.selectDictDataByType(dictType);
         if (ObjectUtil.isNull(data)) {
             data = new ArrayList<>();
         }
@@ -86,7 +86,7 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictDataBo dict) {
+    public R<Void> add(@Validated @RequestBody Sys2DictDataBo dict) {
         if (!dictDataService.checkDictDataUnique(dict)) {
             return R.fail("新增字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
         }
@@ -100,7 +100,7 @@ public class SysDictDataController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典数据", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictDataBo dict) {
+    public R<Void> edit(@Validated @RequestBody Sys2DictDataBo dict) {
         if (!dictDataService.checkDictDataUnique(dict)) {
             return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
         }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2DictTypeController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
@@ -8,9 +8,9 @@ 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.tenant.domain.bo.SysDictTypeBo;
+import org.dromara.system.saas.domain.bo.Sys2DictTypeBo;
-import org.dromara.system.tenant.domain.vo.SysDictTypeVo;
+import org.dromara.system.saas.domain.vo.Sys2DictTypeVo;
-import org.dromara.system.tenant.service.ISysDictTypeService;
+import org.dromara.system.saas.service.ISys2DictTypeService;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
@@ -26,17 +26,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/dict/type")
+@RequestMapping("/system2/dict/type")
-public class SysDictTypeController extends BaseController {
+public class Sys2DictTypeController extends BaseController {
 
-    private final ISysDictTypeService dictTypeService;
+    private final ISys2DictTypeService dictTypeService;
 
     /**
      * 查询字典类型列表
      */
     @SaCheckPermission("system:dict:list")
     @GetMapping("/list")
-    public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
+    public TableDataInfo<Sys2DictTypeVo> list(Sys2DictTypeBo dictType, PageQuery pageQuery) {
         return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
     }
 
@@ -46,9 +46,9 @@ public class SysDictTypeController extends BaseController {
     @Log(title = "字典类型", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:dict:export")
     @PostMapping("/export")
-    public void export(SysDictTypeBo dictType, HttpServletResponse response) {
+    public void export(Sys2DictTypeBo dictType, HttpServletResponse response) {
-        List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
+        List<Sys2DictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
-        ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response);
+        ExcelUtil.exportExcel(list, "字典类型", Sys2DictTypeVo.class, response);
     }
 
     /**
@@ -58,7 +58,7 @@ public class SysDictTypeController extends BaseController {
      */
     @SaCheckPermission("system:dict:query")
     @GetMapping(value = "/{dictId}")
-    public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
+    public R<Sys2DictTypeVo> getInfo(@PathVariable Long dictId) {
         return R.ok(dictTypeService.selectDictTypeById(dictId));
     }
 
@@ -68,7 +68,7 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysDictTypeBo dict) {
+    public R<Void> add(@Validated @RequestBody Sys2DictTypeBo dict) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
             return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
@@ -82,7 +82,7 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysDictTypeBo dict) {
+    public R<Void> edit(@Validated @RequestBody Sys2DictTypeBo dict) {
         if (!dictTypeService.checkDictTypeUnique(dict)) {
             return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
         }
@@ -118,8 +118,8 @@ public class SysDictTypeController extends BaseController {
      * 获取字典选择框列表
      */
     @GetMapping("/optionselect")
-    public R<List<SysDictTypeVo>> optionselect() {
+    public R<List<Sys2DictTypeVo>> optionselect() {
-        List<SysDictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
+        List<Sys2DictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
         return R.ok(dictTypes);
     }
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2NoticeController.java

@@ -1,18 +1,18 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
-import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.service.TwoDictService;
 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.sse.utils.SseMessageUtils;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.bo.SysNoticeBo;
+import org.dromara.system.saas.domain.bo.Sys2NoticeBo;
-import org.dromara.system.tenant.domain.vo.SysNoticeVo;
+import org.dromara.system.saas.domain.vo.Sys2NoticeVo;
-import org.dromara.system.tenant.service.ISysNoticeService;
+import org.dromara.system.saas.service.ISys2NoticeService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,18 +24,18 @@ import org.springframework.web.bind.annotation.*;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/notice")
+@RequestMapping("/system2/notice")
-public class SysNoticeController extends BaseController {
+public class Sys2NoticeController extends BaseController {
 
-    private final ISysNoticeService noticeService;
+    private final ISys2NoticeService noticeService;
-    private final DictService dictService;
+    private final TwoDictService dictService;
 
     /**
      * 获取通知公告列表
      */
     @SaCheckPermission("system:notice:list")
     @GetMapping("/list")
-    public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
+    public TableDataInfo<Sys2NoticeVo> list(Sys2NoticeBo notice, PageQuery pageQuery) {
         return noticeService.selectPageNoticeList(notice, pageQuery);
     }
 
@@ -46,7 +46,7 @@ public class SysNoticeController extends BaseController {
      */
     @SaCheckPermission("system:notice:query")
     @GetMapping(value = "/{noticeId}")
-    public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
+    public R<Sys2NoticeVo> getInfo(@PathVariable Long noticeId) {
         return R.ok(noticeService.selectNoticeById(noticeId));
     }
 
@@ -56,12 +56,12 @@ public class SysNoticeController extends BaseController {
     @SaCheckPermission("system:notice:add")
     @Log(title = "通知公告", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
+    public R<Void> add(@Validated @RequestBody Sys2NoticeBo notice) {
         int rows = noticeService.insertNotice(notice);
         if (rows <= 0) {
             return R.fail();
         }
-        String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType());
+        String type = dictService.getDictLabel("sys2_notice_type", notice.getNoticeType());
         SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle());
         return R.ok();
     }
@@ -72,7 +72,7 @@ public class SysNoticeController extends BaseController {
     @SaCheckPermission("system:notice:edit")
     @Log(title = "通知公告", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
+    public R<Void> edit(@Validated @RequestBody Sys2NoticeBo notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssConfigController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.common.core.domain.R;
@@ -11,9 +11,9 @@ 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.tenant.domain.bo.SysOssConfigBo;
+import org.dromara.system.saas.domain.bo.Sys2OssConfigBo;
-import org.dromara.system.tenant.domain.vo.SysOssConfigVo;
+import org.dromara.system.saas.domain.vo.Sys2OssConfigVo;
-import org.dromara.system.tenant.service.ISysOssConfigService;
+import org.dromara.system.saas.service.ISys2OssConfigService;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
@@ -32,17 +32,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/resource/oss/config")
+@RequestMapping("/resource2/oss/config")
-public class SysOssConfigController extends BaseController {
+public class Sys2OssConfigController extends BaseController {
 
-    private final ISysOssConfigService ossConfigService;
+    private final ISys2OssConfigService ossConfigService;
 
     /**
      * 查询对象存储配置列表
      */
     @SaCheckPermission("system:ossConfig:list")
     @GetMapping("/list")
-    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2OssConfigVo> list(@Validated(QueryGroup.class) Sys2OssConfigBo bo, PageQuery pageQuery) {
         return ossConfigService.queryPageList(bo, pageQuery);
     }
 
@@ -53,7 +53,7 @@ public class SysOssConfigController extends BaseController {
      */
     @SaCheckPermission("system:ossConfig:list")
     @GetMapping("/{ossConfigId}")
-    public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<Sys2OssConfigVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long ossConfigId) {
         return R.ok(ossConfigService.queryById(ossConfigId));
     }
@@ -65,7 +65,7 @@ public class SysOssConfigController extends BaseController {
     @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2OssConfigBo bo) {
         return toAjax(ossConfigService.insertByBo(bo));
     }
 
@@ -76,7 +76,7 @@ public class SysOssConfigController extends BaseController {
     @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2OssConfigBo bo) {
         return toAjax(ossConfigService.updateByBo(bo));
     }
 
@@ -99,7 +99,7 @@ public class SysOssConfigController extends BaseController {
     @SaCheckPermission("system:ossConfig:edit")
     @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+    public R<Void> changeStatus(@RequestBody Sys2OssConfigBo bo) {
         return toAjax(ossConfigService.updateOssConfigStatus(bo));
     }
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2OssController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -10,10 +10,10 @@ 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.tenant.domain.bo.SysOssBo;
+import org.dromara.system.saas.domain.bo.Sys2OssBo;
-import org.dromara.system.tenant.domain.vo.SysOssUploadVo;
+import org.dromara.system.saas.domain.vo.Sys2OssUploadVo;
-import org.dromara.system.tenant.domain.vo.SysOssVo;
+import org.dromara.system.saas.domain.vo.Sys2OssVo;
-import org.dromara.system.tenant.service.ISysOssService;
+import org.dromara.system.saas.service.ISys2OssService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
@@ -34,17 +34,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/resource/oss")
+@RequestMapping("/resource2/oss")
-public class SysOssController extends BaseController {
+public class Sys2OssController extends BaseController {
 
-    private final ISysOssService ossService;
+    private final ISys2OssService ossService;
 
     /**
      * 查询OSS对象存储列表
      */
     @SaCheckPermission("system:oss:list")
     @GetMapping("/list")
-    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2OssVo> list(@Validated(QueryGroup.class) Sys2OssBo bo, PageQuery pageQuery) {
         return ossService.queryPageList(bo, pageQuery);
     }
 
@@ -55,9 +55,9 @@ public class SysOssController extends BaseController {
      */
     @SaCheckPermission("system:oss:list")
     @GetMapping("/listByIds/{ossIds}")
-    public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
+    public R<List<Sys2OssVo>> listByIds(@NotEmpty(message = "主键不能为空")
                                        @PathVariable Long[] ossIds) {
-        List<SysOssVo> list = ossService.listByIds(Arrays.asList(ossIds));
+        List<Sys2OssVo> list = ossService.listByIds(Arrays.asList(ossIds));
         return R.ok(list);
     }
 
@@ -69,12 +69,12 @@ public class SysOssController extends BaseController {
     @SaCheckPermission("system:oss:upload")
     @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
+    public R<Sys2OssUploadVo> upload(@RequestPart("file") MultipartFile file) {
         if (ObjectUtil.isNull(file)) {
             return R.fail("上传文件不能为空");
         }
-        SysOssVo oss = ossService.upload(file);
+        Sys2OssVo oss = ossService.upload(file);
-        SysOssUploadVo uploadVo = new SysOssUploadVo();
+        Sys2OssUploadVo uploadVo = new Sys2OssUploadVo();
         uploadVo.setUrl(oss.getUrl());
         uploadVo.setFileName(oss.getOriginalName());
         uploadVo.setOssId(oss.getOssId().toString());

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2PostController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
@@ -12,9 +12,9 @@ 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.tenant.domain.bo.SysPostBo;
+import org.dromara.system.saas.domain.bo.Sys2PostBo;
-import org.dromara.system.tenant.domain.vo.SysPostVo;
+import org.dromara.system.saas.domain.vo.Sys2PostVo;
-import org.dromara.system.tenant.service.ISysPostService;
+import org.dromara.system.saas.service.ISys2PostService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -29,17 +29,17 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/post")
+@RequestMapping("/system2/post")
-public class SysPostController extends BaseController {
+public class Sys2PostController extends BaseController {
 
-    private final ISysPostService postService;
+    private final ISys2PostService postService;
 
     /**
      * 获取岗位列表
      */
     @SaCheckPermission("system:post:list")
     @GetMapping("/list")
-    public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
+    public TableDataInfo<Sys2PostVo> list(Sys2PostBo post, PageQuery pageQuery) {
         return postService.selectPagePostList(post, pageQuery);
     }
 
@@ -49,9 +49,9 @@ public class SysPostController extends BaseController {
     @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:post:export")
     @PostMapping("/export")
-    public void export(SysPostBo post, HttpServletResponse response) {
+    public void export(Sys2PostBo post, HttpServletResponse response) {
-        List<SysPostVo> list = postService.selectPostList(post);
+        List<Sys2PostVo> list = postService.selectPostList(post);
-        ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
+        ExcelUtil.exportExcel(list, "岗位数据", Sys2PostVo.class, response);
     }
 
     /**
@@ -61,7 +61,7 @@ public class SysPostController extends BaseController {
      */
     @SaCheckPermission("system:post:query")
     @GetMapping(value = "/{postId}")
-    public R<SysPostVo> getInfo(@PathVariable Long postId) {
+    public R<Sys2PostVo> getInfo(@PathVariable Long postId) {
         return R.ok(postService.selectPostById(postId));
     }
 
@@ -71,7 +71,7 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:add")
     @Log(title = "岗位管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysPostBo post) {
+    public R<Void> add(@Validated @RequestBody Sys2PostBo post) {
         if (!postService.checkPostNameUnique(post)) {
             return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (!postService.checkPostCodeUnique(post)) {
@@ -86,7 +86,7 @@ public class SysPostController extends BaseController {
     @SaCheckPermission("system:post:edit")
     @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysPostBo post) {
+    public R<Void> edit(@Validated @RequestBody Sys2PostBo post) {
         if (!postService.checkPostNameUnique(post)) {
             return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
         } else if (!postService.checkPostCodeUnique(post)) {
@@ -118,10 +118,10 @@ public class SysPostController extends BaseController {
      */
     @SaCheckPermission("system:post:query")
     @GetMapping("/optionselect")
-    public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
+    public R<List<Sys2PostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
-        List<SysPostVo> list = new ArrayList<>();
+        List<Sys2PostVo> list = new ArrayList<>();
         if (ObjectUtil.isNotNull(deptId)) {
-            SysPostBo post = new SysPostBo();
+            Sys2PostBo post = new Sys2PostBo();
             post.setDeptId(deptId);
             list = postService.selectPostList(post);
         } else if (postIds != null) {

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2ProfileController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
@@ -14,15 +14,15 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.helper.DataPermissionHelper;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.bo.SysUserBo;
+import org.dromara.system.saas.domain.bo.Sys2UserBo;
-import org.dromara.system.tenant.domain.bo.SysUserPasswordBo;
+import org.dromara.system.saas.domain.bo.Sys2UserPasswordBo;
-import org.dromara.system.tenant.domain.bo.SysUserProfileBo;
+import org.dromara.system.saas.domain.bo.Sys2UserProfileBo;
-import org.dromara.system.tenant.domain.vo.AvatarVo;
+import org.dromara.system.saas.domain.vo.TwoAvatarVo;
-import org.dromara.system.tenant.domain.vo.ProfileVo;
+import org.dromara.system.saas.domain.vo.TwoProfileVo;
-import org.dromara.system.tenant.domain.vo.SysOssVo;
+import org.dromara.system.saas.domain.vo.Sys2OssVo;
-import org.dromara.system.tenant.domain.vo.SysUserVo;
+import org.dromara.system.saas.domain.vo.Sys2UserVo;
-import org.dromara.system.tenant.service.ISysOssService;
+import org.dromara.system.saas.service.ISys2OssService;
-import org.dromara.system.tenant.service.ISysUserService;
+import org.dromara.system.saas.service.ISys2UserService;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,23 +38,23 @@ import java.util.Arrays;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/user/profile")
+@RequestMapping("/system2/user/profile")
-public class SysProfileController extends BaseController {
+public class Sys2ProfileController extends BaseController {
 
-    private final ISysUserService userService;
+    private final ISys2UserService userService;
-    private final ISysOssService ossService;
+    private final ISys2OssService ossService;
 
     /**
      * 个人信息
      */
     @GetMapping
-    public R<ProfileVo> profile() {
+    public R<TwoProfileVo> profile() {
-        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId());
-        ProfileVo profileVo = new ProfileVo();
+        TwoProfileVo twoProfileVo = new TwoProfileVo();
-        profileVo.setUser(user);
+        twoProfileVo.setUser(user);
-        profileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
+        twoProfileVo.setRoleGroup(userService.selectUserRoleGroup(user.getUserId()));
-        profileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId()));
+        twoProfileVo.setPostGroup(userService.selectUserPostGroup(user.getUserId()));
-        return R.ok(profileVo);
+        return R.ok(twoProfileVo);
     }
 
     /**
@@ -63,8 +63,8 @@ public class SysProfileController extends BaseController {
     @RepeatSubmit
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> updateProfile(@Validated @RequestBody SysUserProfileBo profile) {
+    public R<Void> updateProfile(@Validated @RequestBody Sys2UserProfileBo profile) {
-        SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
+        Sys2UserBo user = BeanUtil.toBean(profile, Sys2UserBo.class);
         user.setUserId(LoginHelper.getUserId());
         String username = LoginHelper.getUsername();
         if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
@@ -89,8 +89,8 @@ public class SysProfileController extends BaseController {
     @ApiEncrypt
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public R<Void> updatePwd(@Validated @RequestBody SysUserPasswordBo bo) {
+    public R<Void> updatePwd(@Validated @RequestBody Sys2UserPasswordBo bo) {
-        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        Sys2UserVo user = userService.selectUserById(LoginHelper.getUserId());
         String password = user.getPassword();
         if (!BCrypt.checkpw(bo.getOldPassword(), password)) {
             return R.fail("修改密码失败，旧密码错误");
@@ -113,18 +113,18 @@ public class SysProfileController extends BaseController {
     @RepeatSubmit
     @Log(title = "用户头像", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+    public R<TwoAvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
         if (!avatarfile.isEmpty()) {
             String extension = FileUtil.extName(avatarfile.getOriginalFilename());
             if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
                 return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
             }
-            SysOssVo oss = ossService.upload(avatarfile);
+            Sys2OssVo oss = ossService.upload(avatarfile);
             String avatar = oss.getUrl();
             if (userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId())) {
-                AvatarVo avatarVo = new AvatarVo();
+                TwoAvatarVo twoAvatarVo = new TwoAvatarVo();
-                avatarVo.setImgUrl(avatar);
+                twoAvatarVo.setImgUrl(avatar);
-                return R.ok(avatarVo);
+                return R.ok(twoAvatarVo);
             }
         }
         return R.fail("上传图片异常，请联系管理员");

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2RoleController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import jakarta.servlet.http.HttpServletResponse;
@@ -10,16 +10,16 @@ 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.tenant.domain.SysUserRole;
+import org.dromara.system.saas.domain.Sys2UserRole;
-import org.dromara.system.tenant.domain.bo.SysDeptBo;
+import org.dromara.system.saas.domain.bo.Sys2DeptBo;
-import org.dromara.system.tenant.domain.bo.SysRoleBo;
+import org.dromara.system.saas.domain.bo.Sys2RoleBo;
-import org.dromara.system.tenant.domain.bo.SysUserBo;
+import org.dromara.system.saas.domain.bo.Sys2UserBo;
-import org.dromara.system.tenant.domain.vo.DeptTreeSelectVo;
+import org.dromara.system.saas.domain.vo.TwoDeptTreeSelectVo;
-import org.dromara.system.tenant.domain.vo.SysRoleVo;
+import org.dromara.system.saas.domain.vo.Sys2RoleVo;
-import org.dromara.system.tenant.domain.vo.SysUserVo;
+import org.dromara.system.saas.domain.vo.Sys2UserVo;
-import org.dromara.system.tenant.service.ISysDeptService;
+import org.dromara.system.saas.service.ISys2DeptService;
-import org.dromara.system.tenant.service.ISysRoleService;
+import org.dromara.system.saas.service.ISys2RoleService;
-import org.dromara.system.tenant.service.ISysUserService;
+import org.dromara.system.saas.service.ISys2UserService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,19 +33,19 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/role")
+@RequestMapping("/system2/role")
-public class SysRoleController extends BaseController {
+public class Sys2RoleController extends BaseController {
 
-    private final ISysRoleService roleService;
+    private final ISys2RoleService roleService;
-    private final ISysUserService userService;
+    private final ISys2UserService userService;
-    private final ISysDeptService deptService;
+    private final ISys2DeptService deptService;
 
     /**
      * 获取角色信息列表
      */
     @SaCheckPermission("system:role:list")
     @GetMapping("/list")
-    public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
+    public TableDataInfo<Sys2RoleVo> list(Sys2RoleBo role, PageQuery pageQuery) {
         return roleService.selectPageRoleList(role, pageQuery);
     }
 
@@ -55,9 +55,9 @@ public class SysRoleController extends BaseController {
     @Log(title = "角色管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:role:export")
     @PostMapping("/export")
-    public void export(SysRoleBo role, HttpServletResponse response) {
+    public void export(Sys2RoleBo role, HttpServletResponse response) {
-        List<SysRoleVo> list = roleService.selectRoleList(role);
+        List<Sys2RoleVo> list = roleService.selectRoleList(role);
-        ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
+        ExcelUtil.exportExcel(list, "角色数据", Sys2RoleVo.class, response);
     }
 
     /**
@@ -67,7 +67,7 @@ public class SysRoleController extends BaseController {
      */
     @SaCheckPermission("system:role:query")
     @GetMapping(value = "/{roleId}")
-    public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
+    public R<Sys2RoleVo> getInfo(@PathVariable Long roleId) {
         roleService.checkRoleDataScope(roleId);
         return R.ok(roleService.selectRoleById(roleId));
     }
@@ -78,7 +78,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:add")
     @Log(title = "角色管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysRoleBo role) {
+    public R<Void> add(@Validated @RequestBody Sys2RoleBo role) {
         roleService.checkRoleAllowed(role);
         if (!roleService.checkRoleNameUnique(role)) {
             return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
@@ -95,7 +95,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
+    public R<Void> edit(@Validated @RequestBody Sys2RoleBo role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         if (!roleService.checkRoleNameUnique(role)) {
@@ -117,7 +117,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/dataScope")
-    public R<Void> dataScope(@RequestBody SysRoleBo role) {
+    public R<Void> dataScope(@RequestBody Sys2RoleBo role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.authDataScope(role));
@@ -129,7 +129,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysRoleBo role) {
+    public R<Void> changeStatus(@RequestBody Sys2RoleBo role) {
         roleService.checkRoleAllowed(role);
         roleService.checkRoleDataScope(role.getRoleId());
         return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus()));
@@ -154,7 +154,7 @@ public class SysRoleController extends BaseController {
      */
     @SaCheckPermission("system:role:query")
     @GetMapping("/optionselect")
-    public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
+    public R<List<Sys2RoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
         return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds)));
     }
 
@@ -163,7 +163,7 @@ public class SysRoleController extends BaseController {
      */
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/allocatedList")
-    public TableDataInfo<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
+    public TableDataInfo<Sys2UserVo> allocatedList(Sys2UserBo user, PageQuery pageQuery) {
         return userService.selectAllocatedList(user, pageQuery);
     }
 
@@ -172,7 +172,7 @@ public class SysRoleController extends BaseController {
      */
     @SaCheckPermission("system:role:list")
     @GetMapping("/authUser/unallocatedList")
-    public TableDataInfo<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
+    public TableDataInfo<Sys2UserVo> unallocatedList(Sys2UserBo user, PageQuery pageQuery) {
         return userService.selectUnallocatedList(user, pageQuery);
     }
 
@@ -182,7 +182,7 @@ public class SysRoleController extends BaseController {
     @SaCheckPermission("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/cancel")
-    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+    public R<Void> cancelAuthUser(@RequestBody Sys2UserRole userRole) {
         return toAjax(roleService.deleteAuthUser(userRole));
     }
 
@@ -220,10 +220,10 @@ public class SysRoleController extends BaseController {
      */
     @SaCheckPermission("system:role:list")
     @GetMapping(value = "/deptTree/{roleId}")
-    public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+    public R<TwoDeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
-        DeptTreeSelectVo selectVo = new DeptTreeSelectVo();
+        TwoDeptTreeSelectVo selectVo = new TwoDeptTreeSelectVo();
         selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId));
-        selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo()));
+        selectVo.setDepts(deptService.selectDeptTreeList(new Sys2DeptBo()));
         return R.ok(selectVo);
     }
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2SocialController.java

@@ -1,11 +1,11 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.vo.SysSocialVo;
+import org.dromara.system.saas.domain.vo.Sys2SocialVo;
-import org.dromara.system.tenant.service.ISysSocialService;
+import org.dromara.system.saas.service.ISys2SocialService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,16 +22,16 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/social")
+@RequestMapping("/system2/social")
-public class SysSocialController extends BaseController {
+public class Sys2SocialController extends BaseController {
 
-    private final ISysSocialService socialUserService;
+    private final ISys2SocialService socialUserService;
 
     /**
      * 查询社会化关系列表
      */
     @GetMapping("/list")
-    public R<List<SysSocialVo>> list() {
+    public R<List<Sys2SocialVo>> list() {
         return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId()));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
@@ -21,9 +21,9 @@ 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.tenant.domain.bo.SysTenantBo;
+import org.dromara.system.saas.domain.bo.Sys2TenantBo;
-import org.dromara.system.tenant.domain.vo.SysTenantVo;
+import org.dromara.system.saas.domain.vo.Sys2TenantVo;
-import org.dromara.system.tenant.service.ISysTenantService;
+import org.dromara.system.saas.service.ISys2TenantService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -38,11 +38,11 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/tenant")
+@RequestMapping("/system2/tenant")
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
-public class SysTenantController extends BaseController {
+public class Sys2TenantController extends BaseController {
 
-    private final ISysTenantService tenantService;
+    private final ISys2TenantService tenantService;
 
     /**
      * 查询租户列表
@@ -50,7 +50,7 @@ public class SysTenantController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:list")
     @GetMapping("/list")
-    public TableDataInfo<SysTenantVo> list(SysTenantBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2TenantVo> list(Sys2TenantBo bo, PageQuery pageQuery) {
         return tenantService.queryPageList(bo, pageQuery);
     }
 
@@ -61,9 +61,9 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:export")
     @Log(title = "租户", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SysTenantBo bo, HttpServletResponse response) {
+    public void export(Sys2TenantBo bo, HttpServletResponse response) {
-        List<SysTenantVo> list = tenantService.queryList(bo);
+        List<Sys2TenantVo> list = tenantService.queryList(bo);
-        ExcelUtil.exportExcel(list, "租户", SysTenantVo.class, response);
+        ExcelUtil.exportExcel(list, "租户", Sys2TenantVo.class, response);
     }
 
     /**
@@ -74,7 +74,7 @@ public class SysTenantController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:query")
     @GetMapping("/{id}")
-    public R<SysTenantVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<Sys2TenantVo> getInfo(@NotNull(message = "主键不能为空")
                                   @PathVariable Long id) {
         return R.ok(tenantService.queryById(id));
     }
@@ -89,7 +89,7 @@ public class SysTenantController extends BaseController {
     @Lock4j
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2TenantBo bo) {
         if (!tenantService.checkCompanyNameUnique(bo)) {
             return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在");
         }
@@ -104,7 +104,7 @@ public class SysTenantController extends BaseController {
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2TenantBo bo) {
         tenantService.checkTenantAllowed(bo.getTenantId());
         if (!tenantService.checkCompanyNameUnique(bo)) {
             return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在");
@@ -119,7 +119,7 @@ public class SysTenantController extends BaseController {
     @SaCheckPermission("system:tenant:edit")
     @Log(title = "租户", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
+    public R<Void> changeStatus(@RequestBody Sys2TenantBo bo) {
         tenantService.checkTenantAllowed(bo.getTenantId());
         return toAjax(tenantService.updateTenantStatus(bo));
     }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2TenantPackageController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
@@ -13,9 +13,9 @@ 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.tenant.domain.bo.SysTenantPackageBo;
+import org.dromara.system.saas.domain.bo.Sys2TenantPackageBo;
-import org.dromara.system.tenant.domain.vo.SysTenantPackageVo;
+import org.dromara.system.saas.domain.vo.Sys2TenantPackageVo;
-import org.dromara.system.tenant.service.ISysTenantPackageService;
+import org.dromara.system.saas.service.ISys2TenantPackageService;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -34,11 +34,11 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/tenant/package")
+@RequestMapping("/system2/tenant/package")
 @ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
-public class SysTenantPackageController extends BaseController {
+public class Sys2TenantPackageController extends BaseController {
 
-    private final ISysTenantPackageService tenantPackageService;
+    private final ISys2TenantPackageService tenantPackageService;
 
     /**
      * 查询租户套餐列表
@@ -46,7 +46,7 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/list")
-    public TableDataInfo<SysTenantPackageVo> list(SysTenantPackageBo bo, PageQuery pageQuery) {
+    public TableDataInfo<Sys2TenantPackageVo> list(Sys2TenantPackageBo bo, PageQuery pageQuery) {
         return tenantPackageService.queryPageList(bo, pageQuery);
     }
 
@@ -56,7 +56,7 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:list")
     @GetMapping("/selectList")
-    public R<List<SysTenantPackageVo>> selectList() {
+    public R<List<Sys2TenantPackageVo>> selectList() {
         return R.ok(tenantPackageService.selectList());
     }
 
@@ -67,9 +67,9 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckPermission("system:tenantPackage:export")
     @Log(title = "租户套餐", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(SysTenantPackageBo bo, HttpServletResponse response) {
+    public void export(Sys2TenantPackageBo bo, HttpServletResponse response) {
-        List<SysTenantPackageVo> list = tenantPackageService.queryList(bo);
+        List<Sys2TenantPackageVo> list = tenantPackageService.queryList(bo);
-        ExcelUtil.exportExcel(list, "租户套餐", SysTenantPackageVo.class, response);
+        ExcelUtil.exportExcel(list, "租户套餐", Sys2TenantPackageVo.class, response);
     }
 
     /**
@@ -80,7 +80,7 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenantPackage:query")
     @GetMapping("/{packageId}")
-    public R<SysTenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
+    public R<Sys2TenantPackageVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long packageId) {
         return R.ok(tenantPackageService.queryById(packageId));
     }
@@ -93,7 +93,7 @@ public class SysTenantPackageController extends BaseController {
     @Log(title = "租户套餐", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysTenantPackageBo bo) {
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody Sys2TenantPackageBo bo) {
         if (!tenantPackageService.checkPackageNameUnique(bo)) {
             return R.fail("新增套餐'" + bo.getPackageName() + "'失败，套餐名称已存在");
         }
@@ -108,7 +108,7 @@ public class SysTenantPackageController extends BaseController {
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantPackageBo bo) {
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody Sys2TenantPackageBo bo) {
         if (!tenantPackageService.checkPackageNameUnique(bo)) {
             return R.fail("修改套餐'" + bo.getPackageName() + "'失败，套餐名称已存在");
         }
@@ -122,7 +122,7 @@ public class SysTenantPackageController extends BaseController {
     @SaCheckPermission("system:tenantPackage:edit")
     @Log(title = "租户套餐", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysTenantPackageBo bo) {
+    public R<Void> changeStatus(@RequestBody Sys2TenantPackageBo bo) {
         return toAjax(tenantPackageService.updatePackageStatus(bo));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/Sys2UserController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.secure.BCrypt;
@@ -23,15 +23,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.tenant.helper.TenantHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.bo.SysDeptBo;
+import org.dromara.system.saas.domain.bo.Sys2DeptBo;
-import org.dromara.system.tenant.domain.bo.SysPostBo;
+import org.dromara.system.saas.domain.bo.Sys2PostBo;
-import org.dromara.system.tenant.domain.bo.SysRoleBo;
+import org.dromara.system.saas.domain.bo.Sys2RoleBo;
-import org.dromara.system.tenant.domain.bo.SysUserBo;
+import org.dromara.system.saas.domain.bo.Sys2UserBo;
-import org.dromara.system.domain.vo.*;
+import org.dromara.system.saas.domain.vo.*;
-import org.dromara.system.tenant.domain.vo.*;
+import org.dromara.system.saas.listener.SysUserImportListener;
-import org.dromara.system.tenant.listener.SysUserImportListener;
+import org.dromara.system.saas.service.*;
-import org.dromara.system.service.*;
-import org.dromara.system.tenant.service.*;
 import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -48,21 +46,21 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/user")
+@RequestMapping("/system2/user")
-public class SysUserController extends BaseController {
+public class Sys2UserController extends BaseController {
 
-    private final ISysUserService userService;
+    private final ISys2UserService userService;
-    private final ISysRoleService roleService;
+    private final ISys2RoleService roleService;
-    private final ISysPostService postService;
+    private final ISys2PostService postService;
-    private final ISysDeptService deptService;
+    private final ISys2DeptService deptService;
-    private final ISysTenantService tenantService;
+    private final ISys2TenantService tenantService;
 
     /**
      * 获取用户列表
      */
     @SaCheckPermission("system:user:list")
     @GetMapping("/list")
-    public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
+    public TableDataInfo<Sys2UserVo> list(Sys2UserBo user, PageQuery pageQuery) {
         return userService.selectPageUserList(user, pageQuery);
     }
 
@@ -72,9 +70,9 @@ public class SysUserController extends BaseController {
     @Log(title = "用户管理", businessType = BusinessType.EXPORT)
     @SaCheckPermission("system:user:export")
     @PostMapping("/export")
-    public void export(SysUserBo user, HttpServletResponse response) {
+    public void export(Sys2UserBo user, HttpServletResponse response) {
-        List<SysUserExportVo> list = userService.selectUserExportList(user);
+        List<Sys2UserExportVo> list = userService.selectUserExportList(user);
-        ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response);
+        ExcelUtil.exportExcel(list, "用户数据", Sys2UserExportVo.class, response);
     }
 
     /**
@@ -87,7 +85,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:import")
     @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
+        ExcelResult<Sys2UserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), Sys2UserImportVo.class, new SysUserImportListener(updateSupport));
         return R.ok(result.getAnalysis());
     }
 
@@ -96,7 +94,7 @@ public class SysUserController extends BaseController {
      */
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
-        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", Sys2UserImportVo.class, response);
     }
 
     /**
@@ -105,21 +103,21 @@ public class SysUserController extends BaseController {
      * @return 用户信息
      */
     @GetMapping("/getInfo")
-    public R<UserInfoVo> getInfo() {
+    public R<TwoUserInfoVo> getInfo() {
-        UserInfoVo userInfoVo = new UserInfoVo();
+        TwoUserInfoVo twoUserInfoVo = new TwoUserInfoVo();
         LoginUser loginUser = LoginHelper.getLoginUser();
         if (TenantHelper.isEnable() && LoginHelper.isSuperAdmin()) {
             // 超级管理员 如果重新加载用户信息需清除动态租户
             TenantHelper.clearDynamic();
         }
-        SysUserVo user = userService.selectUserById(loginUser.getUserId());
+        Sys2UserVo user = userService.selectUserById(loginUser.getUserId());
         if (ObjectUtil.isNull(user)) {
             return R.fail("没有权限访问用户数据!");
         }
-        userInfoVo.setUser(user);
+        twoUserInfoVo.setUser(user);
-        userInfoVo.setPermissions(loginUser.getMenuPermission());
+        twoUserInfoVo.setPermissions(loginUser.getMenuPermission());
-        userInfoVo.setRoles(loginUser.getRolePermission());
+        twoUserInfoVo.setRoles(loginUser.getRolePermission());
-        return R.ok(userInfoVo);
+        return R.ok(twoUserInfoVo);
     }
 
     /**
@@ -129,20 +127,20 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:query")
     @GetMapping(value = {"/", "/{userId}"})
-    public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+    public R<Sys2UserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
         userService.checkUserDataScope(userId);
-        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo();
-        SysRoleBo roleBo = new SysRoleBo();
+        Sys2RoleBo roleBo = new Sys2RoleBo();
         roleBo.setStatus(UserConstants.ROLE_NORMAL);
-        List<SysRoleVo> roles = roleService.selectRoleList(roleBo);
+        List<Sys2RoleVo> roles = roleService.selectRoleList(roleBo);
         userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
         if (ObjectUtil.isNotNull(userId)) {
-            SysUserVo sysUser = userService.selectUserById(userId);
+            Sys2UserVo sysUser = userService.selectUserById(userId);
             userInfoVo.setUser(sysUser);
             userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
             Long deptId = sysUser.getDeptId();
             if (ObjectUtil.isNotNull(deptId)) {
-                SysPostBo postBo = new SysPostBo();
+                Sys2PostBo postBo = new Sys2PostBo();
                 postBo.setDeptId(deptId);
                 userInfoVo.setPosts(postService.selectPostList(postBo));
                 userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
@@ -157,7 +155,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:add")
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysUserBo user) {
+    public R<Void> add(@Validated @RequestBody Sys2UserBo user) {
         deptService.checkDeptDataScope(user.getDeptId());
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
@@ -181,7 +179,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysUserBo user) {
+    public R<Void> edit(@Validated @RequestBody Sys2UserBo user) {
         userService.checkUserAllowed(user.getUserId());
         userService.checkUserDataScope(user.getUserId());
         deptService.checkDeptDataScope(user.getDeptId());
@@ -218,7 +216,7 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:query")
     @GetMapping("/optionselect")
-    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
+    public R<List<Sys2UserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
                                             @RequestParam(required = false) Long deptId) {
         return R.ok(userService.selectUserByIds(userIds == null ? null : List.of(userIds), deptId));
     }
@@ -230,7 +228,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")
-    public R<Void> resetPwd(@RequestBody SysUserBo user) {
+    public R<Void> resetPwd(@RequestBody Sys2UserBo user) {
         userService.checkUserAllowed(user.getUserId());
         userService.checkUserDataScope(user.getUserId());
         user.setPassword(BCrypt.hashpw(user.getPassword()));
@@ -243,7 +241,7 @@ public class SysUserController extends BaseController {
     @SaCheckPermission("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/changeStatus")
-    public R<Void> changeStatus(@RequestBody SysUserBo user) {
+    public R<Void> changeStatus(@RequestBody Sys2UserBo user) {
         userService.checkUserAllowed(user.getUserId());
         userService.checkUserDataScope(user.getUserId());
         return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus()));
@@ -256,11 +254,11 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:query")
     @GetMapping("/authRole/{userId}")
-    public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
+    public R<Sys2UserInfoVo> authRole(@PathVariable Long userId) {
         userService.checkUserDataScope(userId);
-        SysUserVo user = userService.selectUserById(userId);
+        Sys2UserVo user = userService.selectUserById(userId);
-        List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
+        List<Sys2RoleVo> roles = roleService.selectRolesAuthByUserId(userId);
-        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        Sys2UserInfoVo userInfoVo = new Sys2UserInfoVo();
         userInfoVo.setUser(user);
         userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
         return R.ok(userInfoVo);
@@ -286,7 +284,7 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:list")
     @GetMapping("/deptTree")
-    public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
+    public R<List<Tree<Long>>> deptTree(Sys2DeptBo dept) {
         return R.ok(deptService.selectDeptTreeList(dept));
     }
 
@@ -295,7 +293,7 @@ public class SysUserController extends BaseController {
      */
     @SaCheckPermission("system:user:list")
     @GetMapping("/list/dept/{deptId}")
-    public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
+    public R<List<Sys2UserVo>> listByDept(@PathVariable @NotNull Long deptId) {
         return R.ok(userService.selectUserListByDept(deptId));
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/controller/system/SysSaasMenuController.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.controller.system;
+package org.dromara.system.saas.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
@@ -12,12 +12,12 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.system.tenant.domain.SysMenu;
+import org.dromara.system.saas.domain.SysSaasMenu;
-import org.dromara.system.tenant.domain.bo.SysMenuBo;
+import org.dromara.system.saas.domain.bo.SysSaasMenuBo;
-import org.dromara.system.tenant.domain.vo.MenuTreeSelectVo;
+import org.dromara.system.saas.domain.vo.TwoMenuTreeSelectVo;
-import org.dromara.system.tenant.domain.vo.RouterVo;
+import org.dromara.system.saas.domain.vo.TwoRouterVo;
-import org.dromara.system.tenant.domain.vo.SysMenuVo;
+import org.dromara.system.saas.domain.vo.SysSaasMenuVo;
-import org.dromara.system.tenant.service.ISysMenuService;
+import org.dromara.system.saas.service.ISysSaasMenuService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -32,10 +32,10 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/menu")
+@RequestMapping("/systemSaas/menu")
-public class SysMenuController extends BaseController {
+public class SysSaasMenuController extends BaseController {
 
-    private final ISysMenuService menuService;
+    private final ISysSaasMenuService menuService;
 
     /**
      * 获取路由信息
@@ -43,8 +43,8 @@ public class SysMenuController extends BaseController {
      * @return 路由信息
      */
     @GetMapping("/getRouters")
-    public R<List<RouterVo>> getRouters() {
+    public R<List<TwoRouterVo>> getRouters() {
-        List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
+        List<SysSaasMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
         return R.ok(menuService.buildMenus(menus));
     }
 
@@ -55,10 +55,10 @@ public class SysMenuController extends BaseController {
             TenantConstants.SUPER_ADMIN_ROLE_KEY,
             TenantConstants.TENANT_ADMIN_ROLE_KEY
     }, mode = SaMode.OR)
-    @SaCheckPermission("system:menu:list")
+    @SaCheckPermission("systemSaas:menu:list")
     @GetMapping("/list")
-    public R<List<SysMenuVo>> list(SysMenuBo menu) {
+    public R<List<SysSaasMenuVo>> list(SysSaasMenuBo menu) {
-        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        List<SysSaasMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
         return R.ok(menus);
     }
 
@@ -71,19 +71,19 @@ public class SysMenuController extends BaseController {
             TenantConstants.SUPER_ADMIN_ROLE_KEY,
             TenantConstants.TENANT_ADMIN_ROLE_KEY
     }, mode = SaMode.OR)
-    @SaCheckPermission("system:menu:query")
+    @SaCheckPermission("systemSaas:menu:query")
     @GetMapping(value = "/{menuId}")
-    public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
+    public R<SysSaasMenuVo> getInfo(@PathVariable Long menuId) {
         return R.ok(menuService.selectMenuById(menuId));
     }
 
     /**
      * 获取菜单下拉树列表
      */
-    @SaCheckPermission("system:menu:query")
+    @SaCheckPermission("systemSaas:menu:query")
     @GetMapping("/treeselect")
-    public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+    public R<List<Tree<Long>>> treeselect(SysSaasMenuBo menu) {
-        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        List<SysSaasMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
         return R.ok(menuService.buildMenuTreeSelect(menus));
     }
 
@@ -92,11 +92,11 @@ public class SysMenuController extends BaseController {
      *
      * @param roleId 角色ID
      */
-    @SaCheckPermission("system:menu:query")
+    @SaCheckPermission("systemSaas:menu:query")
     @GetMapping(value = "/roleMenuTreeselect/{roleId}")
-    public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+    public R<TwoMenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
-        List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+        List<SysSaasMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
-        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+        TwoMenuTreeSelectVo selectVo = new TwoMenuTreeSelectVo();
         selectVo.setCheckedKeys(menuService.selectMenuListByRoleId(roleId));
         selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
         return R.ok(selectVo);
@@ -108,11 +108,11 @@ public class SysMenuController extends BaseController {
      * @param packageId 租户套餐ID
      */
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:query")
+    @SaCheckPermission("systemSaas:menu:query")
     @GetMapping(value = "/tenantPackageMenuTreeselect/{packageId}")
-    public R<MenuTreeSelectVo> tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {
+    public R<TwoMenuTreeSelectVo> tenantPackageMenuTreeselect(@PathVariable("packageId") Long packageId) {
-        List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+        List<SysSaasMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
-        MenuTreeSelectVo selectVo = new MenuTreeSelectVo();
+        TwoMenuTreeSelectVo selectVo = new TwoMenuTreeSelectVo();
         selectVo.setCheckedKeys(menuService.selectMenuListByPackageId(packageId));
         selectVo.setMenus(menuService.buildMenuTreeSelect(menus));
         return R.ok(selectVo);
@@ -122,10 +122,10 @@ public class SysMenuController extends BaseController {
      * 新增菜单
      */
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:add")
+    @SaCheckPermission("systemSaas:menu:add")
     @Log(title = "菜单管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public R<Void> add(@Validated @RequestBody SysMenuBo menu) {
+    public R<Void> add(@Validated @RequestBody SysSaasMenuBo menu) {
         if (!menuService.checkMenuNameUnique(menu)) {
             return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
@@ -138,10 +138,10 @@ public class SysMenuController extends BaseController {
      * 修改菜单
      */
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:edit")
+    @SaCheckPermission("systemSaas:menu:edit")
     @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public R<Void> edit(@Validated @RequestBody SysMenuBo menu) {
+    public R<Void> edit(@Validated @RequestBody SysSaasMenuBo menu) {
         if (!menuService.checkMenuNameUnique(menu)) {
             return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
         } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
@@ -158,7 +158,7 @@ public class SysMenuController extends BaseController {
      * @param menuId 菜单ID
      */
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
-    @SaCheckPermission("system:menu:remove")
+    @SaCheckPermission("systemSaas:menu:remove")
     @Log(title = "菜单管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{menuId}")
     public R<Void> remove(@PathVariable("menuId") Long menuId) {

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Application.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
@@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
 import java.io.Serial;
 
 /**
- * 应用对象 sys_application
+ * 应用对象 sys_saas_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_application")
+@TableName("sys_saas_application")
-public class SysApplication extends BaseEntity {
+public class Sys2Application extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Cache.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import org.dromara.common.core.utils.StringUtils;
 import lombok.Data;
@@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @NoArgsConstructor
-public class SysCache {
+public class Sys2Cache {
 
     /**
      * 缓存名称
@@ -33,12 +33,12 @@ public class SysCache {
      */
     private String remark = "";
 
-    public SysCache(String cacheName, String remark) {
+    public Sys2Cache(String cacheName, String remark) {
         this.cacheName = cacheName;
         this.remark = remark;
     }
 
-    public SysCache(String cacheName, String cacheKey, String cacheValue) {
+    public Sys2Cache(String cacheName, String cacheKey, String cacheValue) {
         this.cacheName = StringUtils.replace(cacheName, ":", "");
         this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
         this.cacheValue = cacheValue;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Client.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import com.baomidou.mybatisplus.annotation.*;
@@ -8,15 +8,15 @@ import lombok.EqualsAndHashCode;
 import java.io.Serial;
 
 /**
- * 授权管理对象 sys_client
+ * 授权管理对象 sys2_client
  *
  * @author Michelle.Chung
  * @date 2023-05-15
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_client")
+@TableName("sys2_client")
-public class SysClient extends BaseEntity {
+public class Sys2Client extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Config.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,15 +7,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 参数配置表 sys_config
+ * 参数配置表 sys2_config
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_config")
+@TableName("sys2_config")
-public class SysConfig extends TenantEntity {
+public class Sys2Config extends TenantEntity {
 
     /**
      * 参数主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Dept.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -10,15 +10,15 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.io.Serial;
 
 /**
- * 部门表 sys_dept
+ * 部门表 sys2_dept
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_dept")
+@TableName("sys2_dept")
-public class SysDept extends TenantEntity {
+public class Sys2Dept extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictData.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,15 +8,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 字典数据表 sys_dict_data
+ * 字典数据表 sys2_dict_data
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_dict_data")
+@TableName("sys2_dict_data")
-public class SysDictData extends TenantEntity {
+public class Sys2DictData extends TenantEntity {
 
     /**
      * 字典编码

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2DictType.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,15 +7,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 字典类型表 sys_dict_type
+ * 字典类型表 sys2_dict_type
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_dict_type")
+@TableName("sys2_dict_type")
-public class SysDictType extends TenantEntity {
+public class Sys2DictType extends TenantEntity {
 
     /**
      * 字典主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Logininfor.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,14 +9,14 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 系统访问记录表 sys_logininfor
+ * 系统访问记录表 sys2_logininfor
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys_logininfor")
+@TableName("sys2_logininfor")
-public class SysLogininfor implements Serializable {
+public class Sys2Logininfor implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Notice.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -8,14 +8,14 @@ import lombok.EqualsAndHashCode;
 
 
 /**
- * 通知公告表 sys_notice
+ * 通知公告表 sys2_notice
  *
  * @author Lion Li
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_notice")
+@TableName("sys2_notice")
-public class SysNotice extends TenantEntity {
+public class Sys2Notice extends TenantEntity {
 
     /**
      * 公告ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OperLog.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -15,8 +15,8 @@ import java.util.Date;
  */
 
 @Data
-@TableName("sys_oper_log")
+@TableName("sys2_oper_log")
-public class SysOperLog implements Serializable {
+public class Sys2OperLog implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Oss.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_oss")
+@TableName("sys2_oss")
-public class SysOss extends TenantEntity {
+public class Sys2Oss extends TenantEntity {
 
     /**
      * 对象存储主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2OssConfig.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,14 +7,14 @@ import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 对象存储配置对象 sys_oss_config
+ * 对象存储配置对象 sys2_oss_config
  *
  * @author Lion Li
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_oss_config")
+@TableName("sys2_oss_config")
-public class SysOssConfig extends BaseEntity {
+public class Sys2OssConfig extends BaseEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Post.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,15 +7,15 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 岗位表 sys_post
+ * 岗位表 sys2_post
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_post")
+@TableName("sys2_post")
-public class SysPost extends TenantEntity {
+public class Sys2Post extends TenantEntity {
 
     /**
      * 岗位序号

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Role.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 /**
- * 角色表 sys_role
+ * 角色表 sys2_role
  *
  * @author Lion Li
  */
@@ -17,8 +17,8 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_role")
+@TableName("sys2_role")
-public class SysRole extends TenantEntity {
+public class Sys2Role extends TenantEntity {
 
     /**
      * 角色ID
@@ -72,7 +72,7 @@ public class SysRole extends TenantEntity {
      */
     private String remark;
 
-    public SysRole(Long roleId) {
+    public Sys2Role(Long roleId) {
         this.roleId = roleId;
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleDept.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 角色和部门关联 sys_role_dept
+ * 角色和部门关联 sys2_role_dept
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys_role_dept")
+@TableName("sys2_role_dept")
-public class SysRoleDept {
+public class Sys2RoleDept {
 
     /**
      * 角色ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2RoleMenu.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 角色和菜单关联 sys_role_menu
+ * 角色和菜单关联 sys2_role_menu
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys_role_menu")
+@TableName("sys2_role_menu")
-public class SysRoleMenu {
+public class Sys2RoleMenu {
 
     /**
      * 角色ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Social.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,14 +9,14 @@ import org.dromara.common.tenant.core.TenantEntity;
 import java.io.Serial;
 
 /**
- * 社会化关系对象 sys_social
+ * 社会化关系对象 sys2_social
  *
  * @author thiszhc
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_social")
+@TableName("sys2_social")
-public class SysSocial extends TenantEntity {
+public class Sys2Social extends TenantEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2Tenant.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -11,14 +11,14 @@ import java.io.Serial;
 import java.util.Date;
 
 /**
- * 租户对象 sys_tenant
+ * 租户对象 sys2_tenant
  *
  * @author Michelle.Chung
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_tenant")
+@TableName("sys2_tenant")
-public class SysTenant extends BaseEntity {
+public class Sys2Tenant extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantApplication.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -7,14 +7,14 @@ import java.io.Serial;
 import java.io.Serializable;
 
 /**
- * 租户和应用关联对象 sys_tenant_application
+ * 租户和应用关联对象 sys2_tenant_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
-@TableName("sys_tenant_application")
+@TableName("sys2_tenant_application")
-public class SysTenantApplication implements Serializable {
+public class Sys2TenantApplication implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2TenantPackage.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -8,14 +8,14 @@ import java.io.Serial;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户套餐对象 sys_tenant_package
+ * 租户套餐对象 sys2_tenant_package
  *
  * @author Michelle.Chung
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_tenant_package")
+@TableName("sys2_tenant_package")
-public class SysTenantPackage extends BaseEntity {
+public class Sys2TenantPackage extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2User.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import org.dromara.common.core.constant.UserConstants;
@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 import java.util.Date;
 
 /**
- * 用户对象 sys_user
+ * 用户对象 sys2_user
  *
  * @author Lion Li
  */
@@ -18,8 +18,8 @@ import java.util.Date;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_user")
+@TableName("sys2_user")
-public class SysUser extends TenantEntity {
+public class Sys2User extends TenantEntity {
 
     /**
      * 用户ID
@@ -43,7 +43,7 @@ public class SysUser extends TenantEntity {
     private String nickName;
 
     /**
-     * 用户类型（sys_user系统用户）
+     * 用户类型（sys2_user系统用户）
      */
     private String userType;
 
@@ -104,7 +104,7 @@ public class SysUser extends TenantEntity {
     private String remark;
 
 
-    public SysUser(Long userId) {
+    public Sys2User(Long userId) {
         this.userId = userId;
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserOnline.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import lombok.Data;
  * @author Lion Li
  */
 @Data
-public class SysUserOnline {
+public class Sys2UserOnline {
 
     /**
      * 会话编号

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserPost.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 用户和岗位关联 sys_user_post
+ * 用户和岗位关联 sys2_user_post
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys_user_post")
+@TableName("sys2_user_post")
-public class SysUserPost {
+public class Sys2UserPost {
 
     /**
      * 用户ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/Sys2UserRole.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -6,14 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
- * 用户和角色关联 sys_user_role
+ * 用户和角色关联 sys2_user_role
  *
  * @author Lion Li
  */
 
 @Data
-@TableName("sys_user_role")
+@TableName("sys2_user_role")
-public class SysUserRole {
+public class Sys2UserRole {
 
     /**
      * 用户ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/SysSaasMenu.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain;
+package org.dromara.system.saas.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,20 +14,25 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * 菜单权限表 sys_menu
+ * 菜单权限表 sys_saas_menu
  *
  * @author Lion Li
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("sys_menu")
+@TableName("sys_saas_menu")
-public class SysMenu extends BaseEntity {
+public class SysSaasMenu extends BaseEntity {
+
+    /**
+     * 应用id
+     */
+    @TableId(value = "application_id")
+    private Long applicationId;
 
     /**
      * 菜单ID
      */
-    @TableId(value = "menu_id")
     private Long menuId;
 
     /**
@@ -110,7 +115,7 @@ public class SysMenu extends BaseEntity {
      * 子菜单
      */
     @TableField(exist = false)
-    private List<SysMenu> children = new ArrayList<>();
+    private List<SysSaasMenu> children = new ArrayList<>();
 
     /**
      * 获取路由名称

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ApplicationBo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
-import org.dromara.system.tenant.domain.SysApplication;
+import org.dromara.system.saas.domain.Sys2Application;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -10,15 +10,15 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 /**
- * 应用业务对象 sys_application
+ * 应用业务对象 sys_saas_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysApplication.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Application.class, reverseConvertGenerate = false)
-public class SysApplicationBo extends BaseEntity {
+public class Sys2ApplicationBo extends BaseEntity {
 
     /**
      * id

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ClientBo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
-import org.dromara.system.tenant.domain.SysClient;
+import org.dromara.system.saas.domain.Sys2Client;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
@@ -12,15 +12,15 @@ import jakarta.validation.constraints.*;
 import java.util.List;
 
 /**
- * 授权管理业务对象 sys_client
+ * 授权管理业务对象 sys2_client
  *
  * @author Michelle.Chung
  * @date 2023-05-15
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysClient.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Client.class, reverseConvertGenerate = false)
-public class SysClientBo extends BaseEntity {
+public class Sys2ClientBo extends BaseEntity {
 
     /**
      * id

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2ConfigBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -6,18 +6,18 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysConfig;
+import org.dromara.system.saas.domain.Sys2Config;
 
 /**
- * 参数配置业务对象 sys_config
+ * 参数配置业务对象 sys2_config
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Config.class, reverseConvertGenerate = false)
-public class SysConfigBo extends BaseEntity {
+public class Sys2ConfigBo extends BaseEntity {
 
     /**
      * 参数主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DeptBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.Email;
@@ -8,18 +8,18 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysDept;
+import org.dromara.system.saas.domain.Sys2Dept;
 
 /**
- * 部门业务对象 sys_dept
+ * 部门业务对象 sys2_dept
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysDept.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Dept.class, reverseConvertGenerate = false)
-public class SysDeptBo extends BaseEntity {
+public class Sys2DeptBo extends BaseEntity {
 
     /**
      * 部门id

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictDataBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -6,18 +6,18 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysDictData;
+import org.dromara.system.saas.domain.Sys2DictData;
 
 /**
- * 字典数据业务对象 sys_dict_data
+ * 字典数据业务对象 sys2_dict_data
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2DictData.class, reverseConvertGenerate = false)
-public class SysDictDataBo extends BaseEntity {
+public class Sys2DictDataBo extends BaseEntity {
 
     /**
      * 字典编码

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2DictTypeBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -8,18 +8,18 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.core.constant.RegexConstants;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysDictType;
+import org.dromara.system.saas.domain.Sys2DictType;
 
 /**
- * 字典类型业务对象 sys_dict_type
+ * 字典类型业务对象 sys2_dict_type
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2DictType.class, reverseConvertGenerate = false)
-public class SysDictTypeBo extends BaseEntity {
+public class Sys2DictTypeBo extends BaseEntity {
 
     /**
      * 字典主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2LogininforBo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
-import org.dromara.system.tenant.domain.SysLogininfor;
+import org.dromara.system.saas.domain.Sys2Logininfor;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -9,14 +9,14 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 系统访问记录业务对象 sys_logininfor
+ * 系统访问记录业务对象 sys2_logininfor
  *
  * @author Michelle.Chung
  */
 
 @Data
-@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Logininfor.class, reverseConvertGenerate = false)
-public class SysLogininforBo {
+public class Sys2LogininforBo {
 
     /**
      * 访问ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2NoticeBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -7,18 +7,18 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.core.xss.Xss;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysNotice;
+import org.dromara.system.saas.domain.Sys2Notice;
 
 /**
- * 通知公告业务对象 sys_notice
+ * 通知公告业务对象 sys2_notice
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Notice.class, reverseConvertGenerate = false)
-public class SysNoticeBo extends BaseEntity {
+public class Sys2NoticeBo extends BaseEntity {
 
     /**
      * 公告ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OperLogBo.java

@@ -1,7 +1,7 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import org.dromara.common.log.event.OperLogEvent;
-import org.dromara.system.tenant.domain.SysOperLog;
+import org.dromara.system.saas.domain.Sys2OperLog;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMappers;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * 操作日志记录业务对象 sys_oper_log
+ * 操作日志记录业务对象 sys2_oper_log
  *
  * @author Michelle.Chung
  * @date 2023-02-07
@@ -19,10 +19,10 @@ import java.util.Map;
 
 @Data
 @AutoMappers({
-    @AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false),
+    @AutoMapper(target = Sys2OperLog.class, reverseConvertGenerate = false),
     @AutoMapper(target = OperLogEvent.class)
 })
-public class SysOperLogBo {
+public class Sys2OperLogBo {
 
     /**
      * 日志主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssBo.java

@@ -1,20 +1,20 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysOss;
+import org.dromara.system.saas.domain.Sys2Oss;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * OSS对象存储分页查询对象 sys_oss
+ * OSS对象存储分页查询对象 sys2_oss
  *
  * @author Lion Li
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysOss.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Oss.class, reverseConvertGenerate = false)
-public class SysOssBo extends BaseEntity {
+public class Sys2OssBo extends BaseEntity {
 
     /**
      * ossId

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2OssConfigBo.java

@@ -1,9 +1,9 @@
-package org.dromara.system.tenant.domain.bo;
+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.tenant.domain.SysOssConfig;
+import org.dromara.system.saas.domain.Sys2OssConfig;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
@@ -12,7 +12,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 对象存储配置业务对象 sys_oss_config
+ * 对象存储配置业务对象 sys2_oss_config
  *
  * @author Lion Li
  * @author 孤舟烟雨
@@ -21,8 +21,8 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2OssConfig.class, reverseConvertGenerate = false)
-public class SysOssConfigBo extends BaseEntity {
+public class Sys2OssConfigBo extends BaseEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2PostBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -7,18 +7,18 @@ import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysPost;
+import org.dromara.system.saas.domain.Sys2Post;
 
 /**
- * 岗位信息业务对象 sys_post
+ * 岗位信息业务对象 sys2_post
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysPost.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Post.class, reverseConvertGenerate = false)
-public class SysPostBo extends BaseEntity {
+public class Sys2PostBo extends BaseEntity {
 
     /**
      * 岗位ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2RoleBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -9,10 +9,10 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysRole;
+import org.dromara.system.saas.domain.Sys2Role;
 
 /**
- * 角色信息业务对象 sys_role
+ * 角色信息业务对象 sys2_role
  *
  * @author Michelle.Chung
  */
@@ -20,8 +20,8 @@ import org.dromara.system.tenant.domain.SysRole;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysRole.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Role.class, reverseConvertGenerate = false)
-public class SysRoleBo extends BaseEntity {
+public class Sys2RoleBo extends BaseEntity {
 
     /**
      * 角色ID
@@ -83,7 +83,7 @@ public class SysRoleBo extends BaseEntity {
      */
     private Long[] deptIds;
 
-    public SysRoleBo(Long roleId) {
+    public Sys2RoleBo(Long roleId) {
         this.roleId = roleId;
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2SocialBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -9,18 +9,18 @@ import lombok.NoArgsConstructor;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.tenant.core.TenantEntity;
-import org.dromara.system.tenant.domain.SysSocial;
+import org.dromara.system.saas.domain.Sys2Social;
 
 /**
- * 社会化关系业务对象 sys_social
+ * 社会化关系业务对象 sys2_social
  *
  * @author Lion Li
  */
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysSocial.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Social.class, reverseConvertGenerate = false)
-public class SysSocialBo extends TenantEntity {
+public class Sys2SocialBo extends TenantEntity {
 
     /**
      * 主键

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantApplicationBo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
-import org.dromara.system.tenant.domain.SysTenantApplication;
+import org.dromara.system.saas.domain.Sys2TenantApplication;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -9,15 +9,15 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 /**
- * 租户和应用关联业务对象 sys_tenant_application
+ * 租户和应用关联业务对象 sys2_tenant_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysTenantApplication.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2TenantApplication.class, reverseConvertGenerate = false)
-public class SysTenantApplicationBo extends BaseEntity {
+public class Sys2TenantApplicationBo extends BaseEntity {
 
     @NotNull(message = "租户ID不能为空", groups = {EditGroup.class})
     private Long tenantId;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantBo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.bo;
+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.tenant.domain.SysTenant;
+import org.dromara.system.saas.domain.Sys2Tenant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,15 +13,15 @@ import java.util.Date;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户业务对象 sys_tenant
+ * 租户业务对象 sys2_tenant
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysTenant.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2Tenant.class, reverseConvertGenerate = false)
-public class SysTenantBo extends BaseEntity {
+public class Sys2TenantBo extends BaseEntity {
 
     /**
      * id

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2TenantPackageBo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.bo;
+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.tenant.domain.SysTenantPackage;
+import org.dromara.system.saas.domain.Sys2TenantPackage;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
@@ -12,15 +12,15 @@ import jakarta.validation.constraints.*;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
 
 /**
- * 租户套餐业务对象 sys_tenant_package
+ * 租户套餐业务对象 sys2_tenant_package
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysTenantPackage.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2TenantPackage.class, reverseConvertGenerate = false)
-public class SysTenantPackageBo extends BaseEntity {
+public class Sys2TenantPackageBo extends BaseEntity {
 
     /**
      * 租户套餐id

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.Email;
@@ -10,10 +10,10 @@ import lombok.NoArgsConstructor;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.xss.Xss;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysUser;
+import org.dromara.system.saas.domain.Sys2User;
 
 /**
- * 用户信息业务对象 sys_user
+ * 用户信息业务对象 sys2_user
  *
  * @author Michelle.Chung
  */
@@ -21,8 +21,8 @@ import org.dromara.system.tenant.domain.SysUser;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysUser.class, reverseConvertGenerate = false)
+@AutoMapper(target = Sys2User.class, reverseConvertGenerate = false)
-public class SysUserBo extends BaseEntity {
+public class Sys2UserBo extends BaseEntity {
 
     /**
      * 应用id
@@ -57,7 +57,7 @@ public class SysUserBo extends BaseEntity {
     private String nickName;
 
     /**
-     * 用户类型（sys_user系统用户）
+     * 用户类型（sys2_user系统用户）
      */
     private String userType;
 
@@ -114,7 +114,7 @@ public class SysUserBo extends BaseEntity {
      */
     private String excludeUserIds;
 
-    public SysUserBo(Long userId) {
+    public Sys2UserBo(Long userId) {
         this.userId = userId;
     }
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserPasswordBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * 用户密码修改bo
  */
 @Data
-public class SysUserPasswordBo implements Serializable {
+public class Sys2UserPasswordBo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/Sys2UserProfileBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.Pattern;
@@ -21,7 +21,7 @@ import org.dromara.common.sensitive.core.SensitiveStrategy;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-public class SysUserProfileBo extends BaseEntity {
+public class Sys2UserProfileBo extends BaseEntity {
 
     /**
      * 用户昵称

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/bo/SysSaasMenuBo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.bo;
+package org.dromara.system.saas.domain.bo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -10,18 +10,18 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.core.constant.RegexConstants;
 import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.system.tenant.domain.SysMenu;
+import org.dromara.system.saas.domain.SysSaasMenu;
 
 /**
- * 菜单权限业务对象 sys_menu
+ * 菜单权限业务对象 sys_saas_menu
  *
  * @author Michelle.Chung
  */
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false)
+@AutoMapper(target = SysSaasMenu.class, reverseConvertGenerate = false)
-public class SysMenuBo extends BaseEntity {
+public class SysSaasMenuBo extends BaseEntity {
 
     /**
      * 菜单ID

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ApplicationVo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
-import org.dromara.system.tenant.domain.SysApplication;
+import org.dromara.system.saas.domain.Sys2Application;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -11,15 +11,15 @@ import java.io.Serializable;
 
 
 /**
- * 应用视图对象 sys_application
+ * 应用视图对象 sys_saas_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysApplication.class)
+@AutoMapper(target = Sys2Application.class)
-public class SysApplicationVo implements Serializable {
+public class Sys2ApplicationVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ClientVo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
-import org.dromara.system.tenant.domain.SysClient;
+import org.dromara.system.saas.domain.Sys2Client;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -14,15 +14,15 @@ import java.util.List;
 
 
 /**
- * 授权管理视图对象 sys_client
+ * 授权管理视图对象 sys2_client
  *
  * @author Michelle.Chung
  * @date 2023-05-15
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysClient.class)
+@AutoMapper(target = Sys2Client.class)
-public class SysClientVo implements Serializable {
+public class Sys2ClientVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2ConfigVo.java

@@ -1,10 +1,10 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysConfig;
+import org.dromara.system.saas.domain.Sys2Config;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -14,14 +14,14 @@ import java.util.Date;
 
 
 /**
- * 参数配置视图对象 sys_config
+ * 参数配置视图对象 sys2_config
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysConfig.class)
+@AutoMapper(target = Sys2Config.class)
-public class SysConfigVo implements Serializable {
+public class Sys2ConfigVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ public class SysConfigVo implements Serializable {
      * 系统内置（Y是 N否）
      */
     @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_yes_no")
+    @ExcelDictFormat(dictType = "sys2_yes_no")
     private String configType;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DeptVo.java

@@ -1,10 +1,10 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysDept;
+import org.dromara.system.saas.domain.Sys2Dept;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -13,14 +13,14 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 部门视图对象 sys_dept
+ * 部门视图对象 sys2_dept
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysDept.class)
+@AutoMapper(target = Sys2Dept.class)
-public class SysDeptVo implements Serializable {
+public class Sys2DeptVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -90,7 +90,7 @@ public class SysDeptVo implements Serializable {
      * 部门状态（0正常 1停用）
      */
     @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelDictFormat(dictType = "sys2_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictDataVo.java

@@ -1,10 +1,10 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysDictData;
+import org.dromara.system.saas.domain.Sys2DictData;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -14,14 +14,14 @@ import java.util.Date;
 
 
 /**
- * 字典数据视图对象 sys_dict_data
+ * 字典数据视图对象 sys2_dict_data
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysDictData.class)
+@AutoMapper(target = Sys2DictData.class)
-public class SysDictDataVo implements Serializable {
+public class Sys2DictDataVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -70,7 +70,7 @@ public class SysDictDataVo implements Serializable {
      * 是否默认（Y是 N否）
      */
     @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_yes_no")
+    @ExcelDictFormat(dictType = "sys2_yes_no")
     private String isDefault;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2DictTypeVo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.system.tenant.domain.SysDictType;
+import org.dromara.system.saas.domain.Sys2DictType;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -12,14 +12,14 @@ import java.util.Date;
 
 
 /**
- * 字典类型视图对象 sys_dict_type
+ * 字典类型视图对象 sys2_dict_type
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysDictType.class)
+@AutoMapper(target = Sys2DictType.class)
-public class SysDictTypeVo implements Serializable {
+public class Sys2DictTypeVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2LogininforVo.java

@@ -1,11 +1,11 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysLogininfor;
+import org.dromara.system.saas.domain.Sys2Logininfor;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -15,15 +15,15 @@ import java.io.Serializable;
 
 
 /**
- * 系统访问记录视图对象 sys_logininfor
+ * 系统访问记录视图对象 sys2_logininfor
  *
  * @author Michelle.Chung
  * @date 2023-02-07
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysLogininfor.class)
+@AutoMapper(target = Sys2Logininfor.class)
-public class SysLogininforVo implements Serializable {
+public class Sys2LogininforVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -55,14 +55,14 @@ public class SysLogininforVo implements Serializable {
      * 设备类型
      */
     @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_device_type")
+    @ExcelDictFormat(dictType = "sys2_device_type")
     private String deviceType;
 
     /**
      * 登录状态（0成功 1失败）
      */
     @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
+    @ExcelDictFormat(dictType = "sys2_common_status")
     private String status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2NoticeVo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.system.tenant.domain.SysNotice;
+import org.dromara.system.saas.domain.Sys2Notice;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -13,13 +13,13 @@ import java.util.Date;
 
 
 /**
- * 通知公告视图对象 sys_notice
+ * 通知公告视图对象 sys2_notice
  *
  * @author Michelle.Chung
  */
 @Data
-@AutoMapper(target = SysNotice.class)
+@AutoMapper(target = Sys2Notice.class)
-public class SysNoticeVo implements Serializable {
+public class Sys2NoticeVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OperLogVo.java

@@ -1,10 +1,10 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysOperLog;
+import org.dromara.system.saas.domain.Sys2OperLog;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -14,15 +14,15 @@ import java.util.Date;
 
 
 /**
- * 操作日志记录视图对象 sys_oper_log
+ * 操作日志记录视图对象 sys2_oper_log
  *
  * @author Michelle.Chung
  * @date 2023-02-07
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysOperLog.class)
+@AutoMapper(target = Sys2OperLog.class)
-public class SysOperLogVo implements Serializable {
+public class Sys2OperLogVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -48,7 +48,7 @@ public class SysOperLogVo implements Serializable {
      * 业务类型（0其它 1新增 2修改 3删除）
      */
     @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_oper_type")
+    @ExcelDictFormat(dictType = "sys2_oper_type")
     private Integer businessType;
 
     /**
@@ -121,7 +121,7 @@ public class SysOperLogVo implements Serializable {
      * 操作状态（0正常 1异常）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_common_status")
+    @ExcelDictFormat(dictType = "sys2_common_status")
     private Integer status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssConfigVo.java

@@ -1,7 +1,7 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import org.dromara.system.tenant.domain.SysOssConfig;
+import org.dromara.system.saas.domain.Sys2OssConfig;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -10,7 +10,7 @@ import java.io.Serializable;
 
 
 /**
- * 对象存储配置视图对象 sys_oss_config
+ * 对象存储配置视图对象 sys2_oss_config
  *
  * @author Lion Li
  * @author 孤舟烟雨
@@ -18,8 +18,8 @@ import java.io.Serializable;
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysOssConfig.class)
+@AutoMapper(target = Sys2OssConfig.class)
-public class SysOssConfigVo implements Serializable {
+public class Sys2OssConfigVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssUploadVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import lombok.Data;
  * @author Michelle.Chung
  */
 @Data
-public class SysOssUploadVo {
+public class Sys2OssUploadVo {
 
     /**
      * URL地址

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2OssVo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.system.tenant.domain.SysOss;
+import org.dromara.system.saas.domain.Sys2Oss;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -11,13 +11,13 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * OSS对象存储视图对象 sys_oss
+ * OSS对象存储视图对象 sys2_oss
  *
  * @author Lion Li
  */
 @Data
-@AutoMapper(target = SysOss.class)
+@AutoMapper(target = Sys2Oss.class)
-public class SysOssVo implements Serializable {
+public class Sys2OssVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2PostVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -8,21 +8,21 @@ import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.system.tenant.domain.SysPost;
+import org.dromara.system.saas.domain.Sys2Post;
 
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 岗位信息视图对象 sys_post
+ * 岗位信息视图对象 sys2_post
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysPost.class)
+@AutoMapper(target = Sys2Post.class)
-public class SysPostVo implements Serializable {
+public class Sys2PostVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -67,7 +67,7 @@ public class SysPostVo implements Serializable {
      * 状态（0正常 1停用）
      */
     @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelDictFormat(dictType = "sys2_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2RoleVo.java

@@ -1,11 +1,11 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import org.dromara.system.tenant.domain.SysRole;
+import org.dromara.system.saas.domain.Sys2Role;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -14,14 +14,14 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 角色信息视图对象 sys_role
+ * 角色信息视图对象 sys2_role
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysRole.class)
+@AutoMapper(target = Sys2Role.class)
-public class SysRoleVo implements Serializable {
+public class Sys2RoleVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -73,7 +73,7 @@ public class SysRoleVo implements Serializable {
      * 角色状态（0正常 1停用）
      */
     @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelDictFormat(dictType = "sys2_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2SocialVo.java

@@ -1,8 +1,8 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.dromara.system.tenant.domain.SysSocial;
+import org.dromara.system.saas.domain.Sys2Social;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -10,13 +10,13 @@ import java.util.Date;
 
 
 /**
- * 社会化关系视图对象 sys_social
+ * 社会化关系视图对象 sys2_social
  *
  * @author thiszhc
  */
 @Data
-@AutoMapper(target = SysSocial.class)
+@AutoMapper(target = Sys2Social.class)
-public class SysSocialVo implements Serializable {
+public class Sys2SocialVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantApplicationVo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
-import org.dromara.system.tenant.domain.SysTenantApplication;
+import org.dromara.system.saas.domain.Sys2TenantApplication;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -11,15 +11,15 @@ import java.io.Serializable;
 
 
 /**
- * 租户和应用关联视图对象 sys_tenant_application
+ * 租户和应用关联视图对象 sys2_tenant_application
  *
  * @author Lion Li
  * @date 2024-09-22
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysTenantApplication.class)
+@AutoMapper(target = Sys2TenantApplication.class)
-public class SysTenantApplicationVo implements Serializable {
+public class Sys2TenantApplicationVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantPackageVo.java

@@ -1,10 +1,10 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysTenantPackage;
+import org.dromara.system.saas.domain.Sys2TenantPackage;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -13,14 +13,14 @@ import java.io.Serializable;
 
 
 /**
- * 租户套餐视图对象 sys_tenant_package
+ * 租户套餐视图对象 sys2_tenant_package
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysTenantPackage.class)
+@AutoMapper(target = Sys2TenantPackage.class)
-public class SysTenantPackageVo implements Serializable {
+public class Sys2TenantPackageVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2TenantVo.java

@@ -1,11 +1,11 @@
-package org.dromara.system.tenant.domain.vo;
+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.tenant.domain.SysTenant;
+import org.dromara.system.saas.domain.Sys2Tenant;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -14,14 +14,14 @@ import java.io.Serializable;
 
 
 /**
- * 租户视图对象 sys_tenant
+ * 租户视图对象 sys2_tenant
  *
  * @author Michelle.Chung
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysTenant.class)
+@AutoMapper(target = Sys2Tenant.class)
-public class SysTenantVo implements Serializable {
+public class Sys2TenantVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserExportVo.java

@@ -1,10 +1,8 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
 import org.dromara.common.excel.convert.ExcelDictConvert;
-import io.github.linpeilie.annotations.AutoMapper;
-import io.github.linpeilie.annotations.ReverseAutoMapping;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,7 +18,7 @@ import java.util.Date;
 
 @Data
 @NoArgsConstructor
-public class SysUserExportVo implements Serializable {
+public class Sys2UserExportVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -59,14 +57,14 @@ public class SysUserExportVo implements Serializable {
      * 用户性别
      */
     @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_user_sex")
+    @ExcelDictFormat(dictType = "sys2_user_sex")
     private String sex;
 
     /**
      * 帐号状态（0正常 1停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelDictFormat(dictType = "sys2_normal_disable")
     private String status;
 
     /**

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserImportVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -18,7 +18,7 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 // @Accessors(chain = true) // 导入不允许使用 会找不到set方法
-public class SysUserImportVo implements Serializable {
+public class Sys2UserImportVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -63,14 +63,14 @@ public class SysUserImportVo implements Serializable {
      * 用户性别
      */
     @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_user_sex")
+    @ExcelDictFormat(dictType = "sys2_user_sex")
     private String sex;
 
     /**
      * 帐号状态（0正常 1停用）
      */
     @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelDictFormat(dictType = "sys2_normal_disable")
     private String status;
 
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserInfoVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import lombok.Data;
 
@@ -10,12 +10,12 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class SysUserInfoVo {
+public class Sys2UserInfoVo {
 
     /**
      * 用户信息
      */
-    private SysUserVo user;
+    private Sys2UserVo user;
 
     /**
      * 角色ID列表
@@ -25,7 +25,7 @@ public class SysUserInfoVo {
     /**
      * 角色列表
      */
-    private List<SysRoleVo> roles;
+    private List<Sys2RoleVo> roles;
 
     /**
      * 岗位ID列表
@@ -35,6 +35,6 @@ public class SysUserInfoVo {
     /**
      * 岗位列表
      */
-    private List<SysPostVo> posts;
+    private List<Sys2PostVo> posts;
 
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/Sys2UserVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -6,7 +6,7 @@ import org.dromara.common.sensitive.annotation.Sensitive;
 import org.dromara.common.sensitive.core.SensitiveStrategy;
 import org.dromara.common.translation.annotation.Translation;
 import org.dromara.common.translation.constant.TransConstant;
-import org.dromara.system.tenant.domain.SysUser;
+import org.dromara.system.saas.domain.Sys2User;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -17,13 +17,13 @@ import java.util.List;
 
 
 /**
- * 用户信息视图对象 sys_user
+ * 用户信息视图对象 sys2_user
  *
  * @author Michelle.Chung
  */
 @Data
-@AutoMapper(target = SysUser.class)
+@AutoMapper(target = Sys2User.class)
-public class SysUserVo implements Serializable {
+public class Sys2UserVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -54,7 +54,7 @@ public class SysUserVo implements Serializable {
     private String nickName;
 
     /**
-     * 用户类型（sys_user系统用户）
+     * 用户类型（sys2_user系统用户）
      */
     private String userType;
 
@@ -122,7 +122,7 @@ public class SysUserVo implements Serializable {
     /**
      * 角色对象
      */
-    private List<SysRoleVo> roles;
+    private List<Sys2RoleVo> roles;
 
     /**
      * 角色组

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/SysSaasMenuVo.java

@@ -1,6 +1,6 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
-import org.dromara.system.tenant.domain.SysMenu;
+import org.dromara.system.saas.domain.SysSaasMenu;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -12,17 +12,20 @@ import java.util.List;
 
 
 /**
- * 菜单权限视图对象 sys_menu
+ * 菜单权限视图对象 sys_saas_menu
  *
  * @author Michelle.Chung
  */
 @Data
-@AutoMapper(target = SysMenu.class)
+@AutoMapper(target = SysSaasMenu.class)
-public class SysMenuVo implements Serializable {
+public class SysSaasMenuVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
-
+    /**
+     * 应用id
+     */
+    private Long applicationId;
     /**
      * 菜单ID
      */
@@ -69,7 +72,7 @@ public class SysMenuVo implements Serializable {
     private String isCache;
 
     /**
-     * 菜单类型（M目录 C菜单 F按钮）
+     * 菜单类型（A应用 M目录 C菜单 F按钮 A应用）
      */
     private String menuType;
 
@@ -111,6 +114,6 @@ public class SysMenuVo implements Serializable {
     /**
      * 子菜单
      */
-    private List<SysMenuVo> children = new ArrayList<>();
+    private List<SysSaasMenuVo> children = new ArrayList<>();
 
 }

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoAvatarVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import lombok.Data;
 
@@ -8,7 +8,7 @@ import lombok.Data;
  * @author Michelle.Chung
  */
 @Data
-public class AvatarVo {
+public class TwoAvatarVo {
 
     /**
      * 头像地址

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoCacheListInfoVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import lombok.Data;
 
@@ -12,7 +12,7 @@ import java.util.Properties;
  * @author Michelle.Chung
  */
 @Data
-public class CacheListInfoVo {
+public class TwoCacheListInfoVo {
 
     private Properties info;
 

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoDeptTreeSelectVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import cn.hutool.core.lang.tree.Tree;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class DeptTreeSelectVo {
+public class TwoDeptTreeSelectVo {
 
     /**
      * 选中部门列表

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMenuTreeSelectVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import cn.hutool.core.lang.tree.Tree;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.util.List;
  * @author Michelle.Chung
  */
 @Data
-public class MenuTreeSelectVo {
+public class TwoMenuTreeSelectVo {
 
     /**
      * 选中菜单列表

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoMetaVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import org.dromara.common.core.utils.StringUtils;
 import lombok.Data;
@@ -10,7 +10,7 @@ import lombok.Data;
  */
 
 @Data
-public class MetaVo {
+public class TwoMetaVo {
 
     /**
      * 设置该路由在侧边栏和面包屑中展示的名字
@@ -32,24 +32,24 @@ public class MetaVo {
      */
     private String link;
 
-    public MetaVo(String title, String icon) {
+    public TwoMetaVo(String title, String icon) {
         this.title = title;
         this.icon = icon;
     }
 
-    public MetaVo(String title, String icon, boolean noCache) {
+    public TwoMetaVo(String title, String icon, boolean noCache) {
         this.title = title;
         this.icon = icon;
         this.noCache = noCache;
     }
 
-    public MetaVo(String title, String icon, String link) {
+    public TwoMetaVo(String title, String icon, String link) {
         this.title = title;
         this.icon = icon;
         this.link = link;
     }
 
-    public MetaVo(String title, String icon, boolean noCache, String link) {
+    public TwoMetaVo(String title, String icon, boolean noCache, String link) {
         this.title = title;
         this.icon = icon;
         this.noCache = noCache;

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoProfileVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import lombok.Data;
 
@@ -8,12 +8,12 @@ import lombok.Data;
  * @author Michelle.Chung
  */
 @Data
-public class ProfileVo {
+public class TwoProfileVo {
 
     /**
      * 用户信息
      */
-    private SysUserVo user;
+    private Sys2UserVo user;
 
     /**
      * 用户所属角色组

ruoyi-modules/ruoyi-system-saas/src/main/java/org/dromara/system/saas/domain/vo/TwoRouterVo.java

@@ -1,4 +1,4 @@
-package org.dromara.system.tenant.domain.vo;
+package org.dromara.system.saas.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.List;
  */
 @Data
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouterVo {
+public class TwoRouterVo {
 
     /**
      * 路由名字
@@ -52,11 +52,11 @@ public class RouterVo {
     /**
      * 其他元素
      */
-    private MetaVo meta;
+    private TwoMetaVo meta;
 
     /**
      * 子路由
      */
-    private List<RouterVo> children;
+    private List<TwoRouterVo> children;
 
 }