调整结构

@@ -332,6 +332,38 @@
                 <artifactId>scm-core</artifactId>
                 <version>${fp-scm.version}</version>
             </dependency>
+
+            <!--Mybatis-->
+            <dependency>
+                <groupId>com.scm</groupId>
+                <artifactId>scm-mybatis</artifactId>
+                <version>${fp-scm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.scm</groupId>
+                <artifactId>scm-security</artifactId>
+                <version>${fp-scm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.scm</groupId>
+                <artifactId>scm-web</artifactId>
+                <version>${fp-scm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.scm</groupId>
+                <artifactId>scm-redis</artifactId>
+                <version>${fp-scm.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.scm</groupId>
+                <artifactId>scm-ratelimiter</artifactId>
+                <version>${fp-scm.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -340,6 +372,9 @@
         <module>scm-framework</module>
         <module>scm-system</module>
         <module>scm-extend</module>
+        <module>scm-framework/scm-redis</module>
+        <module>scm-framework/scm-ratelimiter</module>
+        <module>scm-framework/scm-encrypt</module>
     </modules>
     <packaging>pom</packaging>
 

@@ -45,11 +45,6 @@
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
 
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.scm</groupId>
-            <artifactId>scm-core</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.scm</groupId>
@@ -63,15 +58,15 @@
         </dependency>
 -->
 
+        <!-- 代码生成-->
         <dependency>
             <groupId>com.scm</groupId>
-            <artifactId>scm-oss</artifactId>
+            <artifactId>scm-generator</artifactId>
         </dependency>
 
-        <!-- 代码生成-->
         <dependency>
             <groupId>com.scm</groupId>
-            <artifactId>scm-generator</artifactId>
+            <artifactId>scm-ratelimiter</artifactId>
         </dependency>
 
         <dependency>

@@ -8,15 +8,15 @@ import cn.hutool.core.util.RandomUtil;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.enums.CaptchaType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.email.MailUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.reflect.ReflectUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.properties.CaptchaProperties;
 import com.ruoyi.framework.config.properties.MailProperties;
+import com.ruoyi.redis.utils.RedisUtils;
 import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.web.config.properties.CaptchaProperties;
+import com.ruoyi.web.enmus.CaptchaType;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.sms4j.api.SmsBlend;

@@ -7,8 +7,8 @@ import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.CacheUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysCache;
 import lombok.RequiredArgsConstructor;
 import org.redisson.spring.data.connection.RedissonConnectionFactory;

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysLogininfor;
 import com.ruoyi.system.service.ISysLogininforService;
 import lombok.RequiredArgsConstructor;

@@ -13,7 +13,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import com.ruoyi.system.domain.SysUserOnline;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;

@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.domain.SysDept;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysDeptService;

@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.system.domain.SysDictData;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

@@ -2,11 +2,10 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.system.domain.SysDictType;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysMenu;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.core.domain.model.EmailLoginBody;
 import com.ruoyi.common.core.domain.model.LoginBody;
 import com.ruoyi.common.core.domain.model.LoginUser;

@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysMenuService;

@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
@@ -11,6 +10,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.ratelimiter.annotation.RepeatSubmit;
 import com.ruoyi.system.domain.bo.SysOssConfigBo;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
 import com.ruoyi.system.service.ISysOssConfigService;

@@ -3,15 +3,13 @@ package com.ruoyi.web.controller.system;
 import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.io.FileUtil;
 import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.system.domain.SysOss;
 import com.ruoyi.system.domain.vo.SysOssVo;
 import com.ruoyi.system.service.ISysOssService;
 import com.ruoyi.system.service.ISysUserService;

@@ -5,9 +5,9 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysDept;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;

@@ -11,9 +11,9 @@ import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysDept;
+import com.ruoyi.system.domain.SysRole;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.excel.ExcelResult;

@@ -49,7 +49,7 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.1.19:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: root
         # 从库数据源
@@ -57,7 +57,7 @@ spring:
           lazy: true
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://192.168.1.19:3306/ruoyi-vue2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
           password: root
       hikari:
@@ -81,13 +81,13 @@ spring:
       ds0:
         type: com.zaxxer.hikari.HikariDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://192.168.1.19:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
         username: root
         password: root
       ds1:
         type: com.zaxxer.hikari.HikariDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.1.21:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://192.168.1.19:3306/ruoyi-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
         username: root
         password: root
     rules: # 配置表规则
@@ -114,7 +114,7 @@ spring:
               # 分片策略
               strategy: standard
               # 分片算法类
-              algorithmClassName: com.ruoyi.framework.config.sharding.TimeShardingAlgorithm
+              algorithmClassName: com.ruoyi.mybatis.config.sharding.TimeShardingAlgorithm
     props:
       sql-show: true # 是否打印 ShardingSphere 生成的 SQL
       show-process-log: true # 是否显示处理日志
@@ -125,7 +125,7 @@ spring:
 spring:
   redis:
     # 地址
-    host: 192.168.1.21
+    host: 192.168.1.19
     # 端口，默认为6379
     port: 6379
     # 数据库索引

@@ -185,7 +185,7 @@ mybatis-plus:
 # 数据加密
 mybatis-encryptor:
   # 是否开启加密
-  enable: false
+  enable: true
   # 默认加密算法
   algorithm: BASE64
   # 编码方式 BASE64/HEX。默认BASE64

@@ -19,6 +19,8 @@
         <module>scm-oss</module>
         <module>scm-sms</module>
         <module>scm-core</module>
+        <module>scm-security</module>
+        <module>scm-web</module>
     </modules>
 
 

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>scm-framework</artifactId>
+        <groupId>com.scm</groupId>
+        <version>4.8.2</version>
+    </parent>
+
+    <artifactId>scm-encrypt</artifactId>
+
+
+    <dependencies>
+        <!--<dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>-->
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

-package com.ruoyi.common.annotation;
+package com.ruoyi.encrypt.annotation;
 
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
 
 import java.lang.annotation.*;
 

-package com.ruoyi.framework.config;
+package com.ruoyi.encrypt.config;
 
-import com.ruoyi.framework.config.properties.EncryptorProperties;
-import com.ruoyi.framework.manager.EncryptorManager;
-import com.ruoyi.framework.encrypt.MybatisDecryptInterceptor;
-import com.ruoyi.framework.encrypt.MybatisEncryptInterceptor;
+import com.ruoyi.encrypt.config.properties.EncryptorProperties;
+import com.ruoyi.encrypt.core.EncryptorManager;
+import com.ruoyi.encrypt.interceptor.MybatisDecryptInterceptor;
+import com.ruoyi.encrypt.interceptor.MybatisEncryptInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;

-package com.ruoyi.framework.config.properties;
+package com.ruoyi.encrypt.config.properties;
 
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

-package com.ruoyi.common.encrypt;
+package com.ruoyi.encrypt.core;
 
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
 import lombok.Data;
 
 /**

-package com.ruoyi.framework.manager;
+package com.ruoyi.encrypt.core;
 
 import cn.hutool.core.util.ReflectUtil;
-import com.ruoyi.common.annotation.EncryptField;
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.encrypt.IEncryptor;
+import com.ruoyi.encrypt.annotation.EncryptField;
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Field;

-package com.ruoyi.common.encrypt;
+package com.ruoyi.encrypt.core;
 
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
 
 /**
  * 加解者

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.encrypt.IEncryptor;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.core.IEncryptor;
 
 /**
  * 所有加密执行者的基类

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.EncryptUtils;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.utils.EncryptUtils;
 
 /**
  * AES算法实现

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.EncryptUtils;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.utils.EncryptUtils;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
 
 /**
  * Base64算法实现

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.EncryptUtils;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.utils.EncryptUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.EncryptUtils;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.utils.EncryptUtils;
 import com.ruoyi.common.utils.StringUtils;
 
 /**

-package com.ruoyi.common.encrypt.encryptor;
+package com.ruoyi.encrypt.core.encryptor;
 
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.EncryptUtils;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.utils.EncryptUtils;
 
 /**
  * sm4算法实现

-package com.ruoyi.common.enums;
+package com.ruoyi.encrypt.enumd;
 
-import com.ruoyi.common.encrypt.encryptor.*;
+import com.ruoyi.encrypt.core.encryptor.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 

-package com.ruoyi.common.enums;
+package com.ruoyi.encrypt.enumd;
 
 /**
  * 编码类型

-package com.ruoyi.framework.encrypt;
+package com.ruoyi.encrypt.interceptor;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.EncryptField;
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.properties.EncryptorProperties;
-import com.ruoyi.framework.manager.EncryptorManager;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ruoyi.encrypt.annotation.EncryptField;
+import com.ruoyi.encrypt.config.properties.EncryptorProperties;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.core.EncryptorManager;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.executor.resultset.ResultSetHandler;

-package com.ruoyi.framework.encrypt;
+package com.ruoyi.encrypt.interceptor;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.annotation.EncryptField;
-import com.ruoyi.common.encrypt.EncryptContext;
-import com.ruoyi.common.enums.AlgorithmType;
-import com.ruoyi.common.enums.EncodeType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.properties.EncryptorProperties;
-import com.ruoyi.framework.manager.EncryptorManager;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.ruoyi.encrypt.annotation.EncryptField;
+import com.ruoyi.encrypt.config.properties.EncryptorProperties;
+import com.ruoyi.encrypt.core.EncryptContext;
+import com.ruoyi.encrypt.enumd.AlgorithmType;
+import com.ruoyi.encrypt.enumd.EncodeType;
+import com.ruoyi.encrypt.core.EncryptorManager;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.executor.parameter.ParameterHandler;

-package com.ruoyi.common.utils;
+package com.ruoyi.encrypt.utils;
 
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.ArrayUtil;

+com.ruoyi.encrypt.config.EncryptorConfig

@@ -2,7 +2,6 @@ package ${packageName}.controller;
 
 import java.util.List;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
@@ -17,7 +16,6 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
-import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import ${packageName}.domain.vo.${ClassName}Vo;

@@ -12,6 +12,9 @@
     <artifactId>scm-mybatis</artifactId>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>
     </dependencies>
 </project>

-package com.ruoyi.framework.config;
+package com.ruoyi.mybatis.config;
 
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;

-package com.ruoyi.framework.config;
+package com.ruoyi.mybatis.config;
 
 import cn.hutool.core.net.NetUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
-import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler;
-import com.ruoyi.framework.interceptor.PlusDataPermissionInterceptor;
+import com.ruoyi.mybatis.handler.CreateAndUpdateMetaObjectHandler;
+import com.ruoyi.mybatis.interceptor.PlusDataPermissionInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-package com.ruoyi.framework.config.sharding;
+package com.ruoyi.mybatis.config.sharding;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.sharding.enums.ShardingTableCacheEnum;
+import com.ruoyi.mybatis.config.sharding.enums.ShardingTableCacheEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
 import org.apache.shardingsphere.infra.config.RuleConfiguration;

-package com.ruoyi.framework.config.sharding;
+package com.ruoyi.mybatis.config.sharding;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;

-package com.ruoyi.framework.config.sharding;
+package com.ruoyi.mybatis.config.sharding;
 
 import com.google.common.collect.Range;
-import com.ruoyi.framework.config.sharding.enums.ShardingTableCacheEnum;
+import com.ruoyi.mybatis.config.sharding.enums.ShardingTableCacheEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
 import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;

-package com.ruoyi.framework.config.sharding.enums;
+package com.ruoyi.mybatis.config.sharding.enums;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 
 import java.util.*;
 
-import static com.ruoyi.framework.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
+import static com.ruoyi.mybatis.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
 
 
 /**

-package com.ruoyi.framework.handler;
+package com.ruoyi.mybatis.handler;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.HttpStatus;

-package com.ruoyi.framework.handler;
+package com.ruoyi.mybatis.handler;
 
 import cn.hutool.core.annotation.AnnotationUtil;
 import cn.hutool.core.collection.CollUtil;

-package com.ruoyi.framework.interceptor;
+package com.ruoyi.mybatis.interceptor;
 
 import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.util.ArrayUtil;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.ruoyi.common.annotation.DataColumn;
-import com.ruoyi.framework.handler.PlusDataPermissionHandler;
+import com.ruoyi.mybatis.handler.PlusDataPermissionHandler;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.select.PlainSelect;

@@ -28,6 +28,11 @@
             <artifactId>aws-java-sdk-s3</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-redis</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

@@ -3,8 +3,8 @@ package com.ruoyi.oss.factory;
 import com.ruoyi.common.constant.CacheNames;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.CacheUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.CacheUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import com.ruoyi.oss.constant.OssConstant;
 import com.ruoyi.oss.core.OssClient;
 import com.ruoyi.oss.exception.OssException;

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.scm</groupId>
+        <artifactId>scm-framework</artifactId>
+        <version>4.8.2</version>
+    </parent>
+
+    <artifactId>scm-ratelimiter</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-redis</artifactId>
+        </dependency>
+    </dependencies>
+</project>

-package com.ruoyi.common.annotation;
+package com.ruoyi.ratelimiter.annotation;
 
-import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.ratelimiter.enums.LimitType;
 
 import java.lang.annotation.*;
 

-package com.ruoyi.common.annotation;
+package com.ruoyi.ratelimiter.annotation;
 
 import java.lang.annotation.*;
 import java.util.concurrent.TimeUnit;

-package com.ruoyi.framework.aspectj;
+package com.ruoyi.ratelimiter.aspectj;
 
 import cn.hutool.core.util.ArrayUtil;
-import com.ruoyi.common.annotation.RateLimiter;
 import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.enums.LimitType;
+import com.ruoyi.ratelimiter.enums.LimitType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.ratelimiter.annotation.RateLimiter;
+import com.ruoyi.redis.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;

-package com.ruoyi.framework.aspectj;
+package com.ruoyi.ratelimiter.aspectj;
 
 import cn.dev33.satoken.SaManager;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.crypto.SecureUtil;
-import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.ratelimiter.annotation.RepeatSubmit;
 import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.ServiceException;
@@ -12,7 +12,7 @@ import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;

-package com.ruoyi.common.enums;
+package com.ruoyi.ratelimiter.enums;
 
 /**
  * 限流类型

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.scm</groupId>
+        <artifactId>scm-framework</artifactId>
+        <version>4.8.2</version>
+    </parent>
+
+
+    <artifactId>scm-redis</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>
+    </dependencies>
+</project>

-package com.ruoyi.framework.config;
+package com.ruoyi.redis.config;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.framework.config.properties.RedissonProperties;
-import com.ruoyi.framework.handler.KeyPrefixHandler;
-import com.ruoyi.framework.manager.PlusSpringCacheManager;
+import com.ruoyi.redis.config.properties.RedissonProperties;
+import com.ruoyi.redis.handler.KeyPrefixHandler;
+import com.ruoyi.redis.manager.PlusSpringCacheManager;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;

-package com.ruoyi.framework.config.properties;
+package com.ruoyi.redis.config.properties;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

-package com.ruoyi.framework.handler;
+package com.ruoyi.redis.handler;
 
 import com.ruoyi.common.utils.StringUtils;
 import org.redisson.api.NameMapper;

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.ruoyi.framework.manager;
+package com.ruoyi.redis.manager;
 
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.spring.cache.CacheConfig;

-package com.ruoyi.common.utils.redis;
+package com.ruoyi.redis.utils;
 
 import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.AccessLevel;

-package com.ruoyi.common.utils.redis;
+package com.ruoyi.redis.utils;
 
 import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.AccessLevel;

-package com.ruoyi.common.utils.redis;
+package com.ruoyi.redis.utils;
 
 import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.AccessLevel;

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>scm-framework</artifactId>
+        <groupId>com.scm</groupId>
+        <version>4.8.2</version>
+    </parent>
+
+    <artifactId>scm-security</artifactId>
+
+
+    <dependencies>
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-redis</artifactId>
+        </dependency>
+    </dependencies>
+</project>

-package com.ruoyi.framework.config;
+package com.ruoyi.security.config;
 
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.interceptor.SaInterceptor;
@@ -8,10 +8,11 @@ import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.framework.config.properties.SecurityProperties;
-import com.ruoyi.framework.handler.AllUrlHandler;
-import com.ruoyi.framework.satoken.dao.PlusSaTokenDao;
-import com.ruoyi.framework.satoken.service.SaPermissionImpl;
+import com.ruoyi.security.config.properties.SecurityProperties;
+import com.ruoyi.security.handler.AllUrlHandler;
+import com.ruoyi.security.satoken.dao.PlusSaTokenDao;
+import com.ruoyi.security.satoken.service.SaPermissionImpl;
+import com.ruoyi.security.handler.AllUrlHandler;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;

-package com.ruoyi.framework.config.properties;
+package com.ruoyi.security.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

-package com.ruoyi.framework.handler;
+package com.ruoyi.security.handler;
 
 import cn.hutool.core.util.ReUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;

-package com.ruoyi.framework.listener;
+package com.ruoyi.security.listener;
 
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.listener.SaTokenListener;
@@ -12,7 +12,7 @@ import com.ruoyi.common.enums.UserType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

-package com.ruoyi.framework.satoken.dao;
+package com.ruoyi.security.satoken.dao;
 
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.util.SaFoxUtil;
-import com.ruoyi.common.utils.redis.RedisUtils;
+import com.ruoyi.redis.utils.RedisUtils;
 
 import java.time.Duration;
 import java.util.ArrayList;

-package com.ruoyi.framework.satoken.service;
+package com.ruoyi.security.satoken.service;
 
 import cn.dev33.satoken.stp.StpInterface;
 import com.ruoyi.common.core.domain.model.LoginUser;

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>scm-framework</artifactId>
+        <groupId>com.scm</groupId>
+        <version>4.8.2</version>
+    </parent>
+
+    <artifactId>scm-web</artifactId>
+
+    <dependencies>
+     <!--   <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>-->
+
+        <!-- SpringBoot Web容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- web 容器使用 undertow 性能更强 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>transmittable-thread-local</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-common</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>

-package com.ruoyi.framework.config;
+package com.ruoyi.web.config;
 
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.CircleCaptcha;

-package com.ruoyi.framework.config;
+package com.ruoyi.web.config;
 
 import com.ruoyi.common.filter.RepeatableFilter;
 import com.ruoyi.common.filter.XssFilter;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.config.properties.XssProperties;
+import com.ruoyi.web.config.properties.XssProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

-package com.ruoyi.framework.config;
+package com.ruoyi.web.config;
 
 import cn.hutool.core.util.StrUtil;
 import org.springframework.context.annotation.Bean;

-package com.ruoyi.framework.config;
+package com.ruoyi.web.config;
 
-import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor;
+import com.ruoyi.web.interceptor.PlusWebInvokeTimeInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;

-package com.ruoyi.framework.config;
+package com.ruoyi.web.config;
 
 import io.undertow.server.DefaultByteBufferPool;
 import io.undertow.websockets.jsr.WebSocketDeploymentInfo;

-package com.ruoyi.framework.config.properties;
+package com.ruoyi.web.config.properties;
 
-import com.ruoyi.common.enums.CaptchaCategory;
-import com.ruoyi.common.enums.CaptchaType;
+import com.ruoyi.web.enmus.CaptchaCategory;
+import com.ruoyi.web.enmus.CaptchaType;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;

-package com.ruoyi.framework.config.properties;
+package com.ruoyi.web.config.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

-package com.ruoyi.common.enums;
+package com.ruoyi.web.enmus;
 
 import cn.hutool.captcha.AbstractCaptcha;
 import cn.hutool.captcha.CircleCaptcha;

-package com.ruoyi.common.enums;
+package com.ruoyi.web.enmus;
 
 import cn.hutool.captcha.generator.CodeGenerator;
 import cn.hutool.captcha.generator.RandomGenerator;

-package com.ruoyi.framework.web.exception;
+package com.ruoyi.web.exception;
 
 import cn.dev33.satoken.exception.NotLoginException;
 import cn.dev33.satoken.exception.NotPermissionException;

-package com.ruoyi.framework.interceptor;
+package com.ruoyi.web.interceptor;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.map.MapUtil;

@@ -17,12 +17,6 @@
 
     <dependencies>
 
-        <!-- 通用工具-->
-        <dependency>
-            <groupId>com.scm</groupId>
-            <artifactId>scm-common</artifactId>
-        </dependency>
-
         <!-- OSS功能模块 -->
         <dependency>
             <groupId>com.scm</groupId>
@@ -35,6 +29,27 @@
             <artifactId>scm-sms</artifactId>
         </dependency>
 
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.scm</groupId>
+            <artifactId>scm-web</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;

-package com.ruoyi.common.core.domain.entity;
+package com.ruoyi.system.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;

@@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysUser;
 import com.ruoyi.common.excel.ExcelListener;
 import com.ruoyi.common.excel.ExcelResult;
 import com.ruoyi.common.exception.ServiceException;

@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.system.domain.SysConfig;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 参数配置 数据层
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysConfigMapper extends BaseMapperPlus<SysConfigMapper, SysConfig, SysConfig> {
 
 }

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.common.annotation.DataColumn;
 import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.system.domain.SysDept;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, SysDept> {
 
     /**

@@ -2,8 +2,9 @@ package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.entity.SysDictData;
+import com.ruoyi.system.domain.SysDictData;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -12,6 +13,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, SysDictData, SysDictData> {
 
     default List<SysDictData> selectDictDataByType(String dictType) {

 package com.ruoyi.system.mapper;
 
-import com.ruoyi.common.core.domain.entity.SysDictType;
+import com.ruoyi.system.domain.SysDictType;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 字典表 数据层
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysDictTypeMapper extends BaseMapperPlus<SysDictTypeMapper, SysDictType, SysDictType> {
 
 }

@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.system.domain.SysLogininfor;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 系统访问日志情况信息 数据层
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysLogininforMapper extends BaseMapperPlus<SysLogininforMapper, SysLogininfor, SysLogininfor> {
 
 }

@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.entity.SysMenu;
+import com.ruoyi.system.domain.SysMenu;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.List;
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> {
 
     /**

@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.system.domain.SysNotice;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 通知公告表 数据层
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysNoticeMapper extends BaseMapperPlus<SysNoticeMapper, SysNotice, SysNotice> {
 
 }

@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
 
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.system.domain.SysOperLog;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 操作日志 数据层
  *
  * @author Lion Li
  */
+@Mapper
 public interface SysOperLogMapper extends BaseMapperPlus<SysOperLogMapper, SysOperLog, SysOperLog> {
 
 }

@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
 import com.ruoyi.common.core.mapper.BaseMapperPlus;
 import com.ruoyi.system.domain.SysOssConfig;
 import com.ruoyi.system.domain.vo.SysOssConfigVo;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 对象存储配置Mapper接口
@@ -11,6 +12,7 @@ import com.ruoyi.system.domain.vo.SysOssConfigVo;
  * @author 孤舟烟雨
  * @date 2021-08-13
  */
+@Mapper
 public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> {
 
 }