fp / fp_scm · Commits

Go to a project

Authored by meijiajie
Commit ceef5770fcf5505af56affd59a6f3c8f8e4c6eda 1 parent 22535a4b

调整结构

Inline Side-by-side
Showing 100 changed files with 436 additions and 194 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 100+ files are displayed.

@@ -332,6 +332,38 @@ @@ -332,6 +332,38 @@
332 <artifactId>scm-core</artifactId> 332 <artifactId>scm-core</artifactId>
333 <version>${fp-scm.version}</version> 333 <version>${fp-scm.version}</version>
334 </dependency> 334 </dependency>
  335 +
  336 + <!--Mybatis-->
  337 + <dependency>
  338 + <groupId>com.scm</groupId>
  339 + <artifactId>scm-mybatis</artifactId>
  340 + <version>${fp-scm.version}</version>
  341 + </dependency>
  342 +
  343 + <dependency>
  344 + <groupId>com.scm</groupId>
  345 + <artifactId>scm-security</artifactId>
  346 + <version>${fp-scm.version}</version>
  347 + </dependency>
  348 +
  349 + <dependency>
  350 + <groupId>com.scm</groupId>
  351 + <artifactId>scm-web</artifactId>
  352 + <version>${fp-scm.version}</version>
  353 + </dependency>
  354 +
  355 + <dependency>
  356 + <groupId>com.scm</groupId>
  357 + <artifactId>scm-redis</artifactId>
  358 + <version>${fp-scm.version}</version>
  359 + </dependency>
  360 +
  361 + <dependency>
  362 + <groupId>com.scm</groupId>
  363 + <artifactId>scm-ratelimiter</artifactId>
  364 + <version>${fp-scm.version}</version>
  365 + </dependency>
  366 +
335 </dependencies> 367 </dependencies>
336 </dependencyManagement> 368 </dependencyManagement>
337 369
@@ -340,6 +372,9 @@ @@ -340,6 +372,9 @@
340 <module>scm-framework</module> 372 <module>scm-framework</module>
341 <module>scm-system</module> 373 <module>scm-system</module>
342 <module>scm-extend</module> 374 <module>scm-extend</module>
  375 + <module>scm-framework/scm-redis</module>
  376 + <module>scm-framework/scm-ratelimiter</module>
  377 + <module>scm-framework/scm-encrypt</module>
343 </modules> 378 </modules>
344 <packaging>pom</packaging> 379 <packaging>pom</packaging>
345 380
@@ -45,11 +45,6 @@ @@ -45,11 +45,6 @@
45 <artifactId>mssql-jdbc</artifactId> 45 <artifactId>mssql-jdbc</artifactId>
46 </dependency> 46 </dependency>
47 47
48 - <!-- 核心模块-->  
49 - <dependency>  
50 - <groupId>com.scm</groupId>  
51 - <artifactId>scm-core</artifactId>  
52 - </dependency>  
53 48
54 <dependency> 49 <dependency>
55 <groupId>com.scm</groupId> 50 <groupId>com.scm</groupId>
@@ -63,15 +58,15 @@ @@ -63,15 +58,15 @@
63 </dependency> 58 </dependency>
64 --> 59 -->
65 60
  61 + <!-- 代码生成-->
66 <dependency> 62 <dependency>
67 <groupId>com.scm</groupId> 63 <groupId>com.scm</groupId>
68 - <artifactId>scm-oss</artifactId> 64 + <artifactId>scm-generator</artifactId>
69 </dependency> 65 </dependency>
70 66
71 - <!-- 代码生成-->  
72 <dependency> 67 <dependency>
73 <groupId>com.scm</groupId> 68 <groupId>com.scm</groupId>
74 - <artifactId>scm-generator</artifactId> 69 + <artifactId>scm-ratelimiter</artifactId>
75 </dependency> 70 </dependency>
76 71
77 <dependency> 72 <dependency>
@@ -8,15 +8,15 @@ import cn.hutool.core.util.RandomUtil; @@ -8,15 +8,15 @@ import cn.hutool.core.util.RandomUtil;
8 import com.ruoyi.common.constant.CacheConstants; 8 import com.ruoyi.common.constant.CacheConstants;
9 import com.ruoyi.common.constant.Constants; 9 import com.ruoyi.common.constant.Constants;
10 import com.ruoyi.common.core.domain.R; 10 import com.ruoyi.common.core.domain.R;
11 -import com.ruoyi.common.enums.CaptchaType;  
12 import com.ruoyi.common.utils.StringUtils; 11 import com.ruoyi.common.utils.StringUtils;
13 import com.ruoyi.common.utils.email.MailUtils; 12 import com.ruoyi.common.utils.email.MailUtils;
14 -import com.ruoyi.common.utils.redis.RedisUtils;  
15 import com.ruoyi.common.utils.reflect.ReflectUtils; 13 import com.ruoyi.common.utils.reflect.ReflectUtils;
16 import com.ruoyi.common.utils.spring.SpringUtils; 14 import com.ruoyi.common.utils.spring.SpringUtils;
17 -import com.ruoyi.framework.config.properties.CaptchaProperties;  
18 import com.ruoyi.framework.config.properties.MailProperties; 15 import com.ruoyi.framework.config.properties.MailProperties;
  16 +import com.ruoyi.redis.utils.RedisUtils;
19 import com.ruoyi.system.service.ISysConfigService; 17 import com.ruoyi.system.service.ISysConfigService;
  18 +import com.ruoyi.web.config.properties.CaptchaProperties;
  19 +import com.ruoyi.web.enmus.CaptchaType;
20 import lombok.RequiredArgsConstructor; 20 import lombok.RequiredArgsConstructor;
21 import lombok.extern.slf4j.Slf4j; 21 import lombok.extern.slf4j.Slf4j;
22 import org.dromara.sms4j.api.SmsBlend; 22 import org.dromara.sms4j.api.SmsBlend;
@@ -7,8 +7,8 @@ import com.ruoyi.common.constant.CacheNames; @@ -7,8 +7,8 @@ import com.ruoyi.common.constant.CacheNames;
7 import com.ruoyi.common.core.domain.R; 7 import com.ruoyi.common.core.domain.R;
8 import com.ruoyi.common.utils.JsonUtils; 8 import com.ruoyi.common.utils.JsonUtils;
9 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
10 -import com.ruoyi.common.utils.redis.CacheUtils;  
11 -import com.ruoyi.common.utils.redis.RedisUtils; 10 +import com.ruoyi.redis.utils.CacheUtils;
  11 +import com.ruoyi.redis.utils.RedisUtils;
12 import com.ruoyi.system.domain.SysCache; 12 import com.ruoyi.system.domain.SysCache;
13 import lombok.RequiredArgsConstructor; 13 import lombok.RequiredArgsConstructor;
14 import org.redisson.spring.data.connection.RedissonConnectionFactory; 14 import org.redisson.spring.data.connection.RedissonConnectionFactory;
@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.R; @@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.R;
9 import com.ruoyi.common.core.page.TableDataInfo; 9 import com.ruoyi.common.core.page.TableDataInfo;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.poi.ExcelUtil; 11 import com.ruoyi.common.utils.poi.ExcelUtil;
12 -import com.ruoyi.common.utils.redis.RedisUtils; 12 +import com.ruoyi.redis.utils.RedisUtils;
13 import com.ruoyi.system.domain.SysLogininfor; 13 import com.ruoyi.system.domain.SysLogininfor;
14 import com.ruoyi.system.service.ISysLogininforService; 14 import com.ruoyi.system.service.ISysLogininforService;
15 import lombok.RequiredArgsConstructor; 15 import lombok.RequiredArgsConstructor;
@@ -13,7 +13,7 @@ import com.ruoyi.common.core.page.TableDataInfo; @@ -13,7 +13,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
13 import com.ruoyi.common.enums.BusinessType; 13 import com.ruoyi.common.enums.BusinessType;
14 import com.ruoyi.common.utils.StreamUtils; 14 import com.ruoyi.common.utils.StreamUtils;
15 import com.ruoyi.common.utils.StringUtils; 15 import com.ruoyi.common.utils.StringUtils;
16 -import com.ruoyi.common.utils.redis.RedisUtils; 16 +import com.ruoyi.redis.utils.RedisUtils;
17 import com.ruoyi.system.domain.SysUserOnline; 17 import com.ruoyi.system.domain.SysUserOnline;
18 import lombok.RequiredArgsConstructor; 18 import lombok.RequiredArgsConstructor;
19 import org.springframework.web.bind.annotation.*; 19 import org.springframework.web.bind.annotation.*;
@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log; @@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
6 import com.ruoyi.common.constant.UserConstants; 6 import com.ruoyi.common.constant.UserConstants;
7 import com.ruoyi.common.core.controller.BaseController; 7 import com.ruoyi.common.core.controller.BaseController;
8 import com.ruoyi.common.core.domain.R; 8 import com.ruoyi.common.core.domain.R;
9 -import com.ruoyi.common.core.domain.entity.SysDept; 9 +import com.ruoyi.system.domain.SysDept;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.StringUtils; 11 import com.ruoyi.common.utils.StringUtils;
12 import com.ruoyi.system.service.ISysDeptService; 12 import com.ruoyi.system.service.ISysDeptService;
@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log; @@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
6 import com.ruoyi.common.core.controller.BaseController; 6 import com.ruoyi.common.core.controller.BaseController;
7 import com.ruoyi.common.core.domain.PageQuery; 7 import com.ruoyi.common.core.domain.PageQuery;
8 import com.ruoyi.common.core.domain.R; 8 import com.ruoyi.common.core.domain.R;
9 -import com.ruoyi.common.core.domain.entity.SysDictData; 9 +import com.ruoyi.system.domain.SysDictData;
10 import com.ruoyi.common.core.page.TableDataInfo; 10 import com.ruoyi.common.core.page.TableDataInfo;
11 import com.ruoyi.common.enums.BusinessType; 11 import com.ruoyi.common.enums.BusinessType;
12 import com.ruoyi.common.utils.poi.ExcelUtil; 12 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -2,11 +2,10 @@ package com.ruoyi.web.controller.system; @@ -2,11 +2,10 @@ package com.ruoyi.web.controller.system;
2 2
3 import cn.dev33.satoken.annotation.SaCheckPermission; 3 import cn.dev33.satoken.annotation.SaCheckPermission;
4 import com.ruoyi.common.annotation.Log; 4 import com.ruoyi.common.annotation.Log;
5 -import com.ruoyi.common.constant.UserConstants;  
6 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
7 import com.ruoyi.common.core.domain.PageQuery; 6 import com.ruoyi.common.core.domain.PageQuery;
8 import com.ruoyi.common.core.domain.R; 7 import com.ruoyi.common.core.domain.R;
9 -import com.ruoyi.common.core.domain.entity.SysDictType; 8 +import com.ruoyi.system.domain.SysDictType;
10 import com.ruoyi.common.core.page.TableDataInfo; 9 import com.ruoyi.common.core.page.TableDataInfo;
11 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
12 import com.ruoyi.common.utils.poi.ExcelUtil; 11 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -3,8 +3,8 @@ package com.ruoyi.web.controller.system; @@ -3,8 +3,8 @@ package com.ruoyi.web.controller.system;
3 import cn.dev33.satoken.annotation.SaIgnore; 3 import cn.dev33.satoken.annotation.SaIgnore;
4 import com.ruoyi.common.constant.Constants; 4 import com.ruoyi.common.constant.Constants;
5 import com.ruoyi.common.core.domain.R; 5 import com.ruoyi.common.core.domain.R;
6 -import com.ruoyi.common.core.domain.entity.SysMenu;  
7 -import com.ruoyi.common.core.domain.entity.SysUser; 6 +import com.ruoyi.system.domain.SysMenu;
  7 +import com.ruoyi.system.domain.SysUser;
8 import com.ruoyi.common.core.domain.model.EmailLoginBody; 8 import com.ruoyi.common.core.domain.model.EmailLoginBody;
9 import com.ruoyi.common.core.domain.model.LoginBody; 9 import com.ruoyi.common.core.domain.model.LoginBody;
10 import com.ruoyi.common.core.domain.model.LoginUser; 10 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log; @@ -6,7 +6,7 @@ import com.ruoyi.common.annotation.Log;
6 import com.ruoyi.common.constant.UserConstants; 6 import com.ruoyi.common.constant.UserConstants;
7 import com.ruoyi.common.core.controller.BaseController; 7 import com.ruoyi.common.core.controller.BaseController;
8 import com.ruoyi.common.core.domain.R; 8 import com.ruoyi.common.core.domain.R;
9 -import com.ruoyi.common.core.domain.entity.SysMenu; 9 +import com.ruoyi.system.domain.SysMenu;
10 import com.ruoyi.common.enums.BusinessType; 10 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.utils.StringUtils; 11 import com.ruoyi.common.utils.StringUtils;
12 import com.ruoyi.system.service.ISysMenuService; 12 import com.ruoyi.system.service.ISysMenuService;
@@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system; @@ -2,7 +2,6 @@ package com.ruoyi.web.controller.system;
2 2
3 import cn.dev33.satoken.annotation.SaCheckPermission; 3 import cn.dev33.satoken.annotation.SaCheckPermission;
4 import com.ruoyi.common.annotation.Log; 4 import com.ruoyi.common.annotation.Log;
5 -import com.ruoyi.common.annotation.RepeatSubmit;  
6 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
7 import com.ruoyi.common.core.domain.PageQuery; 6 import com.ruoyi.common.core.domain.PageQuery;
8 import com.ruoyi.common.core.domain.R; 7 import com.ruoyi.common.core.domain.R;
@@ -11,6 +10,7 @@ import com.ruoyi.common.core.validate.AddGroup; @@ -11,6 +10,7 @@ import com.ruoyi.common.core.validate.AddGroup;
11 import com.ruoyi.common.core.validate.EditGroup; 10 import com.ruoyi.common.core.validate.EditGroup;
12 import com.ruoyi.common.core.validate.QueryGroup; 11 import com.ruoyi.common.core.validate.QueryGroup;
13 import com.ruoyi.common.enums.BusinessType; 12 import com.ruoyi.common.enums.BusinessType;
  13 +import com.ruoyi.ratelimiter.annotation.RepeatSubmit;
14 import com.ruoyi.system.domain.bo.SysOssConfigBo; 14 import com.ruoyi.system.domain.bo.SysOssConfigBo;
15 import com.ruoyi.system.domain.vo.SysOssConfigVo; 15 import com.ruoyi.system.domain.vo.SysOssConfigVo;
16 import com.ruoyi.system.service.ISysOssConfigService; 16 import com.ruoyi.system.service.ISysOssConfigService;
@@ -3,15 +3,13 @@ package com.ruoyi.web.controller.system; @@ -3,15 +3,13 @@ package com.ruoyi.web.controller.system;
3 import cn.dev33.satoken.secure.BCrypt; 3 import cn.dev33.satoken.secure.BCrypt;
4 import cn.hutool.core.io.FileUtil; 4 import cn.hutool.core.io.FileUtil;
5 import com.ruoyi.common.annotation.Log; 5 import com.ruoyi.common.annotation.Log;
6 -import com.ruoyi.common.constant.UserConstants;  
7 import com.ruoyi.common.core.controller.BaseController; 6 import com.ruoyi.common.core.controller.BaseController;
8 import com.ruoyi.common.core.domain.R; 7 import com.ruoyi.common.core.domain.R;
9 -import com.ruoyi.common.core.domain.entity.SysUser; 8 +import com.ruoyi.system.domain.SysUser;
10 import com.ruoyi.common.enums.BusinessType; 9 import com.ruoyi.common.enums.BusinessType;
11 import com.ruoyi.common.helper.LoginHelper; 10 import com.ruoyi.common.helper.LoginHelper;
12 import com.ruoyi.common.utils.StringUtils; 11 import com.ruoyi.common.utils.StringUtils;
13 import com.ruoyi.common.utils.file.MimeTypeUtils; 12 import com.ruoyi.common.utils.file.MimeTypeUtils;
14 -import com.ruoyi.system.domain.SysOss;  
15 import com.ruoyi.system.domain.vo.SysOssVo; 13 import com.ruoyi.system.domain.vo.SysOssVo;
16 import com.ruoyi.system.service.ISysOssService; 14 import com.ruoyi.system.service.ISysOssService;
17 import com.ruoyi.system.service.ISysUserService; 15 import com.ruoyi.system.service.ISysUserService;
@@ -5,9 +5,9 @@ import com.ruoyi.common.annotation.Log; @@ -5,9 +5,9 @@ import com.ruoyi.common.annotation.Log;
5 import com.ruoyi.common.core.controller.BaseController; 5 import com.ruoyi.common.core.controller.BaseController;
6 import com.ruoyi.common.core.domain.PageQuery; 6 import com.ruoyi.common.core.domain.PageQuery;
7 import com.ruoyi.common.core.domain.R; 7 import com.ruoyi.common.core.domain.R;
8 -import com.ruoyi.common.core.domain.entity.SysDept;  
9 -import com.ruoyi.common.core.domain.entity.SysRole;  
10 -import com.ruoyi.common.core.domain.entity.SysUser; 8 +import com.ruoyi.system.domain.SysDept;
  9 +import com.ruoyi.system.domain.SysRole;
  10 +import com.ruoyi.system.domain.SysUser;
11 import com.ruoyi.common.core.page.TableDataInfo; 11 import com.ruoyi.common.core.page.TableDataInfo;
12 import com.ruoyi.common.enums.BusinessType; 12 import com.ruoyi.common.enums.BusinessType;
13 import com.ruoyi.common.utils.poi.ExcelUtil; 13 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -11,9 +11,9 @@ import com.ruoyi.common.constant.UserConstants; @@ -11,9 +11,9 @@ import com.ruoyi.common.constant.UserConstants;
11 import com.ruoyi.common.core.controller.BaseController; 11 import com.ruoyi.common.core.controller.BaseController;
12 import com.ruoyi.common.core.domain.PageQuery; 12 import com.ruoyi.common.core.domain.PageQuery;
13 import com.ruoyi.common.core.domain.R; 13 import com.ruoyi.common.core.domain.R;
14 -import com.ruoyi.common.core.domain.entity.SysDept;  
15 -import com.ruoyi.common.core.domain.entity.SysRole;  
16 -import com.ruoyi.common.core.domain.entity.SysUser; 14 +import com.ruoyi.system.domain.SysDept;
  15 +import com.ruoyi.system.domain.SysRole;
  16 +import com.ruoyi.system.domain.SysUser;
17 import com.ruoyi.common.core.page.TableDataInfo; 17 import com.ruoyi.common.core.page.TableDataInfo;
18 import com.ruoyi.common.enums.BusinessType; 18 import com.ruoyi.common.enums.BusinessType;
19 import com.ruoyi.common.excel.ExcelResult; 19 import com.ruoyi.common.excel.ExcelResult;
@@ -49,7 +49,7 @@ spring: @@ -49,7 +49,7 @@ spring:
49 driverClassName: com.mysql.cj.jdbc.Driver 49 driverClassName: com.mysql.cj.jdbc.Driver
50 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 50 # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
51 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) 51 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
52 - 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 52 + 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
53 username: root 53 username: root
54 password: root 54 password: root
55 # 从库数据源 55 # 从库数据源
@@ -57,7 +57,7 @@ spring: @@ -57,7 +57,7 @@ spring:
57 lazy: true 57 lazy: true
58 type: ${spring.datasource.type} 58 type: ${spring.datasource.type}
59 driverClassName: com.mysql.cj.jdbc.Driver 59 driverClassName: com.mysql.cj.jdbc.Driver
60 - 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 60 + 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
61 username: root 61 username: root
62 password: root 62 password: root
63 hikari: 63 hikari:
@@ -81,13 +81,13 @@ spring: @@ -81,13 +81,13 @@ spring:
81 ds0: 81 ds0:
82 type: com.zaxxer.hikari.HikariDataSource 82 type: com.zaxxer.hikari.HikariDataSource
83 driver-class-name: com.mysql.cj.jdbc.Driver 83 driver-class-name: com.mysql.cj.jdbc.Driver
84 - 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 84 + 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
85 username: root 85 username: root
86 password: root 86 password: root
87 ds1: 87 ds1:
88 type: com.zaxxer.hikari.HikariDataSource 88 type: com.zaxxer.hikari.HikariDataSource
89 driver-class-name: com.mysql.cj.jdbc.Driver 89 driver-class-name: com.mysql.cj.jdbc.Driver
90 - 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 90 + 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
91 username: root 91 username: root
92 password: root 92 password: root
93 rules: # 配置表规则 93 rules: # 配置表规则
@@ -114,7 +114,7 @@ spring: @@ -114,7 +114,7 @@ spring:
114 # 分片策略 114 # 分片策略
115 strategy: standard 115 strategy: standard
116 # 分片算法类 116 # 分片算法类
117 - algorithmClassName: com.ruoyi.framework.config.sharding.TimeShardingAlgorithm 117 + algorithmClassName: com.ruoyi.mybatis.config.sharding.TimeShardingAlgorithm
118 props: 118 props:
119 sql-show: true # 是否打印 ShardingSphere 生成的 SQL 119 sql-show: true # 是否打印 ShardingSphere 生成的 SQL
120 show-process-log: true # 是否显示处理日志 120 show-process-log: true # 是否显示处理日志
@@ -125,7 +125,7 @@ spring: @@ -125,7 +125,7 @@ spring:
125 spring: 125 spring:
126 redis: 126 redis:
127 # 地址 127 # 地址
128 - host: 192.168.1.21 128 + host: 192.168.1.19
129 # 端口，默认为6379 129 # 端口，默认为6379
130 port: 6379 130 port: 6379
131 # 数据库索引 131 # 数据库索引
@@ -185,7 +185,7 @@ mybatis-plus: @@ -185,7 +185,7 @@ mybatis-plus:
185 # 数据加密 185 # 数据加密
186 mybatis-encryptor: 186 mybatis-encryptor:
187 # 是否开启加密 187 # 是否开启加密
188 - enable: false 188 + enable: true
189 # 默认加密算法 189 # 默认加密算法
190 algorithm: BASE64 190 algorithm: BASE64
191 # 编码方式 BASE64/HEX。默认BASE64 191 # 编码方式 BASE64/HEX。默认BASE64
@@ -19,6 +19,8 @@ @@ -19,6 +19,8 @@
19 <module>scm-oss</module> 19 <module>scm-oss</module>
20 <module>scm-sms</module> 20 <module>scm-sms</module>
21 <module>scm-core</module> 21 <module>scm-core</module>
  22 + <module>scm-security</module>
  23 + <module>scm-web</module>
22 </modules> 24 </modules>
23 25
24 26
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 + <parent>
  7 + <artifactId>scm-framework</artifactId>
  8 + <groupId>com.scm</groupId>
  9 + <version>4.8.2</version>
  10 + </parent>
  11 +
  12 + <artifactId>scm-encrypt</artifactId>
  13 +
  14 +
  15 + <dependencies>
  16 + <!--<dependency>
  17 + <groupId>com.scm</groupId>
  18 + <artifactId>scm-common</artifactId>
  19 + </dependency>-->
  20 +
  21 + <dependency>
  22 + <groupId>cn.hutool</groupId>
  23 + <artifactId>hutool-core</artifactId>
  24 + </dependency>
  25 +
  26 + <dependency>
  27 + <groupId>cn.hutool</groupId>
  28 + <artifactId>hutool-crypto</artifactId>
  29 + </dependency>
  30 +
  31 + <dependency>
  32 + <groupId>org.projectlombok</groupId>
  33 + <artifactId>lombok</artifactId>
  34 + </dependency>
  35 +
  36 + <dependency>
  37 + <groupId>com.baomidou</groupId>
  38 + <artifactId>mybatis-plus-boot-starter</artifactId>
  39 + </dependency>
  40 +
  41 + </dependencies>
  42 +
  43 +</project>
1 -package com.ruoyi.common.annotation; 1 +package com.ruoyi.encrypt.annotation;
2 2
3 -import com.ruoyi.common.enums.AlgorithmType;  
4 -import com.ruoyi.common.enums.EncodeType; 3 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  4 +import com.ruoyi.encrypt.enumd.EncodeType;
5 5
6 import java.lang.annotation.*; 6 import java.lang.annotation.*;
7 7
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.encrypt.config;
2 2
3 -import com.ruoyi.framework.config.properties.EncryptorProperties;  
4 -import com.ruoyi.framework.manager.EncryptorManager;  
5 -import com.ruoyi.framework.encrypt.MybatisDecryptInterceptor;  
6 -import com.ruoyi.framework.encrypt.MybatisEncryptInterceptor; 3 +import com.ruoyi.encrypt.config.properties.EncryptorProperties;
  4 +import com.ruoyi.encrypt.core.EncryptorManager;
  5 +import com.ruoyi.encrypt.interceptor.MybatisDecryptInterceptor;
  6 +import com.ruoyi.encrypt.interceptor.MybatisEncryptInterceptor;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
9 import org.springframework.context.annotation.Bean; 9 import org.springframework.context.annotation.Bean;
1 -package com.ruoyi.framework.config.properties; 1 +package com.ruoyi.encrypt.config.properties;
2 2
3 -import com.ruoyi.common.enums.AlgorithmType;  
4 -import com.ruoyi.common.enums.EncodeType; 3 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  4 +import com.ruoyi.encrypt.enumd.EncodeType;
5 import lombok.Data; 5 import lombok.Data;
6 import org.springframework.boot.context.properties.ConfigurationProperties; 6 import org.springframework.boot.context.properties.ConfigurationProperties;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
1 -package com.ruoyi.common.encrypt; 1 +package com.ruoyi.encrypt.core;
2 2
3 -import com.ruoyi.common.enums.AlgorithmType;  
4 -import com.ruoyi.common.enums.EncodeType; 3 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  4 +import com.ruoyi.encrypt.enumd.EncodeType;
5 import lombok.Data; 5 import lombok.Data;
6 6
7 /** 7 /**
1 -package com.ruoyi.framework.manager; 1 +package com.ruoyi.encrypt.core;
2 2
3 import cn.hutool.core.util.ReflectUtil; 3 import cn.hutool.core.util.ReflectUtil;
4 -import com.ruoyi.common.annotation.EncryptField;  
5 -import com.ruoyi.common.encrypt.EncryptContext;  
6 -import com.ruoyi.common.encrypt.IEncryptor; 4 +import com.ruoyi.encrypt.annotation.EncryptField;
7 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
8 6
9 import java.lang.reflect.Field; 7 import java.lang.reflect.Field;
1 -package com.ruoyi.common.encrypt; 1 +package com.ruoyi.encrypt.core;
2 2
3 -import com.ruoyi.common.enums.AlgorithmType;  
4 -import com.ruoyi.common.enums.EncodeType; 3 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  4 +import com.ruoyi.encrypt.enumd.EncodeType;
5 5
6 /** 6 /**
7 * 加解者 7 * 加解者
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 -import com.ruoyi.common.encrypt.EncryptContext;  
4 -import com.ruoyi.common.encrypt.IEncryptor; 3 +import com.ruoyi.encrypt.core.EncryptContext;
  4 +import com.ruoyi.encrypt.core.IEncryptor;
5 5
6 /** 6 /**
7 * 所有加密执行者的基类 7 * 所有加密执行者的基类
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 -import com.ruoyi.common.encrypt.EncryptContext;  
4 -import com.ruoyi.common.enums.AlgorithmType;  
5 -import com.ruoyi.common.enums.EncodeType;  
6 -import com.ruoyi.common.utils.EncryptUtils; 3 +import com.ruoyi.encrypt.core.EncryptContext;
  4 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  5 +import com.ruoyi.encrypt.enumd.EncodeType;
  6 +import com.ruoyi.encrypt.utils.EncryptUtils;
7 7
8 /** 8 /**
9 * AES算法实现 9 * AES算法实现
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 -import com.ruoyi.common.encrypt.EncryptContext;  
4 -import com.ruoyi.common.enums.AlgorithmType;  
5 -import com.ruoyi.common.enums.EncodeType;  
6 -import com.ruoyi.common.utils.EncryptUtils; 3 +import com.ruoyi.encrypt.core.EncryptContext;
  4 +import com.ruoyi.encrypt.enumd.EncodeType;
  5 +import com.ruoyi.encrypt.utils.EncryptUtils;
  6 +import com.ruoyi.encrypt.enumd.AlgorithmType;
7 7
8 /** 8 /**
9 * Base64算法实现 9 * Base64算法实现
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 -import com.ruoyi.common.encrypt.EncryptContext;  
4 -import com.ruoyi.common.enums.AlgorithmType;  
5 -import com.ruoyi.common.enums.EncodeType;  
6 -import com.ruoyi.common.utils.EncryptUtils; 3 +import com.ruoyi.encrypt.core.EncryptContext;
  4 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  5 +import com.ruoyi.encrypt.enumd.EncodeType;
  6 +import com.ruoyi.encrypt.utils.EncryptUtils;
7 import com.ruoyi.common.utils.StringUtils; 7 import com.ruoyi.common.utils.StringUtils;
8 8
9 9
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 3
4 -import com.ruoyi.common.encrypt.EncryptContext;  
5 -import com.ruoyi.common.enums.AlgorithmType;  
6 -import com.ruoyi.common.enums.EncodeType;  
7 -import com.ruoyi.common.utils.EncryptUtils; 4 +import com.ruoyi.encrypt.core.EncryptContext;
  5 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  6 +import com.ruoyi.encrypt.enumd.EncodeType;
  7 +import com.ruoyi.encrypt.utils.EncryptUtils;
8 import com.ruoyi.common.utils.StringUtils; 8 import com.ruoyi.common.utils.StringUtils;
9 9
10 /** 10 /**
1 -package com.ruoyi.common.encrypt.encryptor; 1 +package com.ruoyi.encrypt.core.encryptor;
2 2
3 -import com.ruoyi.common.encrypt.EncryptContext;  
4 -import com.ruoyi.common.enums.AlgorithmType;  
5 -import com.ruoyi.common.enums.EncodeType;  
6 -import com.ruoyi.common.utils.EncryptUtils; 3 +import com.ruoyi.encrypt.core.EncryptContext;
  4 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  5 +import com.ruoyi.encrypt.enumd.EncodeType;
  6 +import com.ruoyi.encrypt.utils.EncryptUtils;
7 7
8 /** 8 /**
9 * sm4算法实现 9 * sm4算法实现
1 -package com.ruoyi.common.enums; 1 +package com.ruoyi.encrypt.enumd;
2 2
3 -import com.ruoyi.common.encrypt.encryptor.*; 3 +import com.ruoyi.encrypt.core.encryptor.*;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
5 import lombok.Getter; 5 import lombok.Getter;
6 6
1 -package com.ruoyi.framework.encrypt; 1 +package com.ruoyi.encrypt.interceptor;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.convert.Convert; 4 import cn.hutool.core.convert.Convert;
5 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
6 -import com.ruoyi.common.annotation.EncryptField;  
7 -import com.ruoyi.common.encrypt.EncryptContext;  
8 -import com.ruoyi.common.enums.AlgorithmType;  
9 -import com.ruoyi.common.enums.EncodeType;  
10 -import com.ruoyi.common.utils.StringUtils;  
11 -import com.ruoyi.framework.config.properties.EncryptorProperties;  
12 -import com.ruoyi.framework.manager.EncryptorManager; 6 +import com.baomidou.mybatisplus.core.toolkit.StringUtils;
  7 +import com.ruoyi.encrypt.annotation.EncryptField;
  8 +import com.ruoyi.encrypt.config.properties.EncryptorProperties;
  9 +import com.ruoyi.encrypt.core.EncryptContext;
  10 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  11 +import com.ruoyi.encrypt.enumd.EncodeType;
  12 +import com.ruoyi.encrypt.core.EncryptorManager;
13 import lombok.AllArgsConstructor; 13 import lombok.AllArgsConstructor;
14 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
15 import org.apache.ibatis.executor.resultset.ResultSetHandler; 15 import org.apache.ibatis.executor.resultset.ResultSetHandler;
1 -package com.ruoyi.framework.encrypt; 1 +package com.ruoyi.encrypt.interceptor;
2 2
3 import cn.hutool.core.collection.CollUtil; 3 import cn.hutool.core.collection.CollUtil;
4 import cn.hutool.core.convert.Convert; 4 import cn.hutool.core.convert.Convert;
5 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
6 -import com.ruoyi.common.annotation.EncryptField;  
7 -import com.ruoyi.common.encrypt.EncryptContext;  
8 -import com.ruoyi.common.enums.AlgorithmType;  
9 -import com.ruoyi.common.enums.EncodeType;  
10 -import com.ruoyi.common.utils.StringUtils;  
11 -import com.ruoyi.framework.config.properties.EncryptorProperties;  
12 -import com.ruoyi.framework.manager.EncryptorManager; 6 +import com.baomidou.mybatisplus.core.toolkit.StringUtils;
  7 +import com.ruoyi.encrypt.annotation.EncryptField;
  8 +import com.ruoyi.encrypt.config.properties.EncryptorProperties;
  9 +import com.ruoyi.encrypt.core.EncryptContext;
  10 +import com.ruoyi.encrypt.enumd.AlgorithmType;
  11 +import com.ruoyi.encrypt.enumd.EncodeType;
  12 +import com.ruoyi.encrypt.core.EncryptorManager;
13 import lombok.AllArgsConstructor; 13 import lombok.AllArgsConstructor;
14 import lombok.extern.slf4j.Slf4j; 14 import lombok.extern.slf4j.Slf4j;
15 import org.apache.ibatis.executor.parameter.ParameterHandler; 15 import org.apache.ibatis.executor.parameter.ParameterHandler;
1 -package com.ruoyi.common.utils; 1 +package com.ruoyi.encrypt.utils;
2 2
3 import cn.hutool.core.codec.Base64; 3 import cn.hutool.core.codec.Base64;
4 import cn.hutool.core.util.ArrayUtil; 4 import cn.hutool.core.util.ArrayUtil;
@@ -2,7 +2,6 @@ package ${packageName}.controller; @@ -2,7 +2,6 @@ package ${packageName}.controller;
2 2
3 import java.util.List; 3 import java.util.List;
4 import java.util.Arrays; 4 import java.util.Arrays;
5 -import java.util.concurrent.TimeUnit;  
6 5
7 import lombok.RequiredArgsConstructor; 6 import lombok.RequiredArgsConstructor;
8 import javax.servlet.http.HttpServletResponse; 7 import javax.servlet.http.HttpServletResponse;
@@ -17,7 +16,6 @@ import com.ruoyi.common.core.domain.PageQuery; @@ -17,7 +16,6 @@ import com.ruoyi.common.core.domain.PageQuery;
17 import com.ruoyi.common.core.domain.R; 16 import com.ruoyi.common.core.domain.R;
18 import com.ruoyi.common.core.validate.AddGroup; 17 import com.ruoyi.common.core.validate.AddGroup;
19 import com.ruoyi.common.core.validate.EditGroup; 18 import com.ruoyi.common.core.validate.EditGroup;
20 -import com.ruoyi.common.core.validate.QueryGroup;  
21 import com.ruoyi.common.enums.BusinessType; 19 import com.ruoyi.common.enums.BusinessType;
22 import com.ruoyi.common.utils.poi.ExcelUtil; 20 import com.ruoyi.common.utils.poi.ExcelUtil;
23 import ${packageName}.domain.vo.${ClassName}Vo; 21 import ${packageName}.domain.vo.${ClassName}Vo;
@@ -12,6 +12,9 @@ @@ -12,6 +12,9 @@
12 <artifactId>scm-mybatis</artifactId> 12 <artifactId>scm-mybatis</artifactId>
13 13
14 <dependencies> 14 <dependencies>
15 - 15 + <dependency>
  16 + <groupId>com.scm</groupId>
  17 + <artifactId>scm-common</artifactId>
  18 + </dependency>
16 </dependencies> 19 </dependencies>
17 </project> 20 </project>
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.mybatis.config;
2 2
3 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; 3 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
4 import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator; 4 import com.baomidou.dynamic.datasource.creator.DefaultDataSourceCreator;
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.mybatis.config;
2 2
3 import cn.hutool.core.net.NetUtil; 3 import cn.hutool.core.net.NetUtil;
4 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; 4 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
@@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
7 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; 7 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
8 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; 8 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
9 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; 9 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
10 -import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler;  
11 -import com.ruoyi.framework.interceptor.PlusDataPermissionInterceptor; 10 +import com.ruoyi.mybatis.handler.CreateAndUpdateMetaObjectHandler;
  11 +import com.ruoyi.mybatis.interceptor.PlusDataPermissionInterceptor;
12 import org.mybatis.spring.annotation.MapperScan; 12 import org.mybatis.spring.annotation.MapperScan;
13 import org.springframework.context.annotation.Bean; 13 import org.springframework.context.annotation.Bean;
14 import org.springframework.context.annotation.Configuration; 14 import org.springframework.context.annotation.Configuration;
1 -package com.ruoyi.framework.config.sharding; 1 +package com.ruoyi.mybatis.config.sharding;
2 2
3 import cn.hutool.extra.spring.SpringUtil; 3 import cn.hutool.extra.spring.SpringUtil;
4 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; 4 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
5 import com.ruoyi.common.utils.StringUtils; 5 import com.ruoyi.common.utils.StringUtils;
6 -import com.ruoyi.framework.config.sharding.enums.ShardingTableCacheEnum; 6 +import com.ruoyi.mybatis.config.sharding.enums.ShardingTableCacheEnum;
7 import lombok.extern.slf4j.Slf4j; 7 import lombok.extern.slf4j.Slf4j;
8 import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource; 8 import org.apache.shardingsphere.driver.jdbc.core.datasource.ShardingSphereDataSource;
9 import org.apache.shardingsphere.infra.config.RuleConfiguration; 9 import org.apache.shardingsphere.infra.config.RuleConfiguration;
1 -package com.ruoyi.framework.config.sharding; 1 +package com.ruoyi.mybatis.config.sharding;
2 2
3 import org.springframework.boot.CommandLineRunner; 3 import org.springframework.boot.CommandLineRunner;
4 import org.springframework.core.annotation.Order; 4 import org.springframework.core.annotation.Order;
1 -package com.ruoyi.framework.config.sharding; 1 +package com.ruoyi.mybatis.config.sharding;
2 2
3 import com.google.common.collect.Range; 3 import com.google.common.collect.Range;
4 -import com.ruoyi.framework.config.sharding.enums.ShardingTableCacheEnum; 4 +import com.ruoyi.mybatis.config.sharding.enums.ShardingTableCacheEnum;
5 import lombok.extern.slf4j.Slf4j; 5 import lombok.extern.slf4j.Slf4j;
6 import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue; 6 import org.apache.shardingsphere.sharding.api.sharding.standard.PreciseShardingValue;
7 import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue; 7 import org.apache.shardingsphere.sharding.api.sharding.standard.RangeShardingValue;
1 -package com.ruoyi.framework.config.sharding.enums; 1 +package com.ruoyi.mybatis.config.sharding.enums;
2 2
3 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; 3 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
4 4
5 import java.util.*; 5 import java.util.*;
6 6
7 -import static com.ruoyi.framework.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh; 7 +import static com.ruoyi.mybatis.config.sharding.ShardingAlgorithmTool.actualDataNodesRefresh;
8 8
9 9
10 /** 10 /**
1 -package com.ruoyi.framework.handler; 1 +package com.ruoyi.mybatis.handler;
2 2
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 import cn.hutool.http.HttpStatus; 4 import cn.hutool.http.HttpStatus;
1 -package com.ruoyi.framework.handler; 1 +package com.ruoyi.mybatis.handler;
2 2
3 import cn.hutool.core.annotation.AnnotationUtil; 3 import cn.hutool.core.annotation.AnnotationUtil;
4 import cn.hutool.core.collection.CollUtil; 4 import cn.hutool.core.collection.CollUtil;
1 -package com.ruoyi.framework.interceptor; 1 +package com.ruoyi.mybatis.interceptor;
2 2
3 import cn.hutool.core.collection.ConcurrentHashSet; 3 import cn.hutool.core.collection.ConcurrentHashSet;
4 import cn.hutool.core.util.ArrayUtil; 4 import cn.hutool.core.util.ArrayUtil;
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.PluginUtils; @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
7 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; 7 import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport;
8 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; 8 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
9 import com.ruoyi.common.annotation.DataColumn; 9 import com.ruoyi.common.annotation.DataColumn;
10 -import com.ruoyi.framework.handler.PlusDataPermissionHandler; 10 +import com.ruoyi.mybatis.handler.PlusDataPermissionHandler;
11 import net.sf.jsqlparser.expression.Expression; 11 import net.sf.jsqlparser.expression.Expression;
12 import net.sf.jsqlparser.statement.delete.Delete; 12 import net.sf.jsqlparser.statement.delete.Delete;
13 import net.sf.jsqlparser.statement.select.PlainSelect; 13 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -28,6 +28,11 @@ @@ -28,6 +28,11 @@
28 <artifactId>aws-java-sdk-s3</artifactId> 28 <artifactId>aws-java-sdk-s3</artifactId>
29 </dependency> 29 </dependency>
30 30
  31 + <dependency>
  32 + <groupId>com.scm</groupId>
  33 + <artifactId>scm-redis</artifactId>
  34 + </dependency>
  35 +
31 </dependencies> 36 </dependencies>
32 37
33 </project> 38 </project>
@@ -3,8 +3,8 @@ package com.ruoyi.oss.factory; @@ -3,8 +3,8 @@ package com.ruoyi.oss.factory;
3 import com.ruoyi.common.constant.CacheNames; 3 import com.ruoyi.common.constant.CacheNames;
4 import com.ruoyi.common.utils.JsonUtils; 4 import com.ruoyi.common.utils.JsonUtils;
5 import com.ruoyi.common.utils.StringUtils; 5 import com.ruoyi.common.utils.StringUtils;
6 -import com.ruoyi.common.utils.redis.CacheUtils;  
7 -import com.ruoyi.common.utils.redis.RedisUtils; 6 +import com.ruoyi.redis.utils.CacheUtils;
  7 +import com.ruoyi.redis.utils.RedisUtils;
8 import com.ruoyi.oss.constant.OssConstant; 8 import com.ruoyi.oss.constant.OssConstant;
9 import com.ruoyi.oss.core.OssClient; 9 import com.ruoyi.oss.core.OssClient;
10 import com.ruoyi.oss.exception.OssException; 10 import com.ruoyi.oss.exception.OssException;
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 + <parent>
  7 + <groupId>com.scm</groupId>
  8 + <artifactId>scm-framework</artifactId>
  9 + <version>4.8.2</version>
  10 + </parent>
  11 +
  12 + <artifactId>scm-ratelimiter</artifactId>
  13 +
  14 + <dependencies>
  15 + <dependency>
  16 + <groupId>com.scm</groupId>
  17 + <artifactId>scm-common</artifactId>
  18 + </dependency>
  19 +
  20 + <dependency>
  21 + <groupId>com.scm</groupId>
  22 + <artifactId>scm-redis</artifactId>
  23 + </dependency>
  24 + </dependencies>
  25 +</project>
1 -package com.ruoyi.common.annotation; 1 +package com.ruoyi.ratelimiter.annotation;
2 2
3 -import com.ruoyi.common.enums.LimitType; 3 +import com.ruoyi.ratelimiter.enums.LimitType;
4 4
5 import java.lang.annotation.*; 5 import java.lang.annotation.*;
6 6
1 -package com.ruoyi.common.annotation; 1 +package com.ruoyi.ratelimiter.annotation;
2 2
3 import java.lang.annotation.*; 3 import java.lang.annotation.*;
4 import java.util.concurrent.TimeUnit; 4 import java.util.concurrent.TimeUnit;
1 -package com.ruoyi.framework.aspectj; 1 +package com.ruoyi.ratelimiter.aspectj;
2 2
3 import cn.hutool.core.util.ArrayUtil; 3 import cn.hutool.core.util.ArrayUtil;
4 -import com.ruoyi.common.annotation.RateLimiter;  
5 import com.ruoyi.common.constant.CacheConstants; 4 import com.ruoyi.common.constant.CacheConstants;
6 -import com.ruoyi.common.enums.LimitType; 5 +import com.ruoyi.ratelimiter.enums.LimitType;
7 import com.ruoyi.common.exception.ServiceException; 6 import com.ruoyi.common.exception.ServiceException;
8 import com.ruoyi.common.utils.MessageUtils; 7 import com.ruoyi.common.utils.MessageUtils;
9 import com.ruoyi.common.utils.ServletUtils; 8 import com.ruoyi.common.utils.ServletUtils;
10 import com.ruoyi.common.utils.StringUtils; 9 import com.ruoyi.common.utils.StringUtils;
11 -import com.ruoyi.common.utils.redis.RedisUtils; 10 +import com.ruoyi.ratelimiter.annotation.RateLimiter;
  11 +import com.ruoyi.redis.utils.RedisUtils;
12 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
13 import org.aspectj.lang.JoinPoint; 13 import org.aspectj.lang.JoinPoint;
14 import org.aspectj.lang.annotation.Aspect; 14 import org.aspectj.lang.annotation.Aspect;
1 -package com.ruoyi.framework.aspectj; 1 +package com.ruoyi.ratelimiter.aspectj;
2 2
3 import cn.dev33.satoken.SaManager; 3 import cn.dev33.satoken.SaManager;
4 import cn.hutool.core.util.ArrayUtil; 4 import cn.hutool.core.util.ArrayUtil;
5 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
6 import cn.hutool.crypto.SecureUtil; 6 import cn.hutool.crypto.SecureUtil;
7 -import com.ruoyi.common.annotation.RepeatSubmit; 7 +import com.ruoyi.ratelimiter.annotation.RepeatSubmit;
8 import com.ruoyi.common.constant.CacheConstants; 8 import com.ruoyi.common.constant.CacheConstants;
9 import com.ruoyi.common.core.domain.R; 9 import com.ruoyi.common.core.domain.R;
10 import com.ruoyi.common.exception.ServiceException; 10 import com.ruoyi.common.exception.ServiceException;
@@ -12,7 +12,7 @@ import com.ruoyi.common.utils.JsonUtils; @@ -12,7 +12,7 @@ import com.ruoyi.common.utils.JsonUtils;
12 import com.ruoyi.common.utils.MessageUtils; 12 import com.ruoyi.common.utils.MessageUtils;
13 import com.ruoyi.common.utils.ServletUtils; 13 import com.ruoyi.common.utils.ServletUtils;
14 import com.ruoyi.common.utils.StringUtils; 14 import com.ruoyi.common.utils.StringUtils;
15 -import com.ruoyi.common.utils.redis.RedisUtils; 15 +import com.ruoyi.redis.utils.RedisUtils;
16 import org.aspectj.lang.JoinPoint; 16 import org.aspectj.lang.JoinPoint;
17 import org.aspectj.lang.annotation.AfterReturning; 17 import org.aspectj.lang.annotation.AfterReturning;
18 import org.aspectj.lang.annotation.AfterThrowing; 18 import org.aspectj.lang.annotation.AfterThrowing;
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 + <parent>
  7 + <groupId>com.scm</groupId>
  8 + <artifactId>scm-framework</artifactId>
  9 + <version>4.8.2</version>
  10 + </parent>
  11 +
  12 +
  13 + <artifactId>scm-redis</artifactId>
  14 +
  15 + <dependencies>
  16 + <dependency>
  17 + <groupId>com.scm</groupId>
  18 + <artifactId>scm-common</artifactId>
  19 + </dependency>
  20 + </dependencies>
  21 +</project>
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.redis.config;
2 2
3 import cn.hutool.core.util.ObjectUtil; 3 import cn.hutool.core.util.ObjectUtil;
4 import com.fasterxml.jackson.databind.ObjectMapper; 4 import com.fasterxml.jackson.databind.ObjectMapper;
5 -import com.ruoyi.framework.config.properties.RedissonProperties;  
6 -import com.ruoyi.framework.handler.KeyPrefixHandler;  
7 -import com.ruoyi.framework.manager.PlusSpringCacheManager; 5 +import com.ruoyi.redis.config.properties.RedissonProperties;
  6 +import com.ruoyi.redis.handler.KeyPrefixHandler;
  7 +import com.ruoyi.redis.manager.PlusSpringCacheManager;
8 import lombok.extern.slf4j.Slf4j; 8 import lombok.extern.slf4j.Slf4j;
9 import org.redisson.codec.JsonJacksonCodec; 9 import org.redisson.codec.JsonJacksonCodec;
10 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; 10 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
1 -package com.ruoyi.framework.config.properties; 1 +package com.ruoyi.redis.config.properties;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 import lombok.NoArgsConstructor; 4 import lombok.NoArgsConstructor;
1 -package com.ruoyi.framework.handler; 1 +package com.ruoyi.redis.handler;
2 2
3 import com.ruoyi.common.utils.StringUtils; 3 import com.ruoyi.common.utils.StringUtils;
4 import org.redisson.api.NameMapper; 4 import org.redisson.api.NameMapper;
@@ -13,9 +13,9 @@ @@ -13,9 +13,9 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package com.ruoyi.framework.manager; 16 +package com.ruoyi.redis.manager;
17 17
18 -import com.ruoyi.common.utils.redis.RedisUtils; 18 +import com.ruoyi.redis.utils.RedisUtils;
19 import org.redisson.api.RMap; 19 import org.redisson.api.RMap;
20 import org.redisson.api.RMapCache; 20 import org.redisson.api.RMapCache;
21 import org.redisson.spring.cache.CacheConfig; 21 import org.redisson.spring.cache.CacheConfig;
1 -package com.ruoyi.common.utils.redis; 1 +package com.ruoyi.redis.utils;
2 2
3 import com.ruoyi.common.utils.spring.SpringUtils; 3 import com.ruoyi.common.utils.spring.SpringUtils;
4 import lombok.AccessLevel; 4 import lombok.AccessLevel;
1 -package com.ruoyi.common.utils.redis; 1 +package com.ruoyi.redis.utils;
2 2
3 import com.ruoyi.common.utils.spring.SpringUtils; 3 import com.ruoyi.common.utils.spring.SpringUtils;
4 import lombok.AccessLevel; 4 import lombok.AccessLevel;
1 -package com.ruoyi.common.utils.redis; 1 +package com.ruoyi.redis.utils;
2 2
3 import com.ruoyi.common.utils.spring.SpringUtils; 3 import com.ruoyi.common.utils.spring.SpringUtils;
4 import lombok.AccessLevel; 4 import lombok.AccessLevel;
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 + <parent>
  7 + <artifactId>scm-framework</artifactId>
  8 + <groupId>com.scm</groupId>
  9 + <version>4.8.2</version>
  10 + </parent>
  11 +
  12 + <artifactId>scm-security</artifactId>
  13 +
  14 +
  15 + <dependencies>
  16 + <dependency>
  17 + <groupId>com.scm</groupId>
  18 + <artifactId>scm-common</artifactId>
  19 + </dependency>
  20 +
  21 + <dependency>
  22 + <groupId>com.scm</groupId>
  23 + <artifactId>scm-redis</artifactId>
  24 + </dependency>
  25 + </dependencies>
  26 +</project>
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.security.config;
2 2
3 import cn.dev33.satoken.dao.SaTokenDao; 3 import cn.dev33.satoken.dao.SaTokenDao;
4 import cn.dev33.satoken.interceptor.SaInterceptor; 4 import cn.dev33.satoken.interceptor.SaInterceptor;
@@ -8,10 +8,11 @@ import cn.dev33.satoken.stp.StpInterface; @@ -8,10 +8,11 @@ import cn.dev33.satoken.stp.StpInterface;
8 import cn.dev33.satoken.stp.StpLogic; 8 import cn.dev33.satoken.stp.StpLogic;
9 import cn.dev33.satoken.stp.StpUtil; 9 import cn.dev33.satoken.stp.StpUtil;
10 import com.ruoyi.common.utils.spring.SpringUtils; 10 import com.ruoyi.common.utils.spring.SpringUtils;
11 -import com.ruoyi.framework.config.properties.SecurityProperties;  
12 -import com.ruoyi.framework.handler.AllUrlHandler;  
13 -import com.ruoyi.framework.satoken.dao.PlusSaTokenDao;  
14 -import com.ruoyi.framework.satoken.service.SaPermissionImpl; 11 +import com.ruoyi.security.config.properties.SecurityProperties;
  12 +import com.ruoyi.security.handler.AllUrlHandler;
  13 +import com.ruoyi.security.satoken.dao.PlusSaTokenDao;
  14 +import com.ruoyi.security.satoken.service.SaPermissionImpl;
  15 +import com.ruoyi.security.handler.AllUrlHandler;
15 import lombok.RequiredArgsConstructor; 16 import lombok.RequiredArgsConstructor;
16 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
17 import org.springframework.context.annotation.Bean; 18 import org.springframework.context.annotation.Bean;
1 -package com.ruoyi.framework.config.properties; 1 +package com.ruoyi.security.config.properties;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 import org.springframework.boot.context.properties.ConfigurationProperties; 4 import org.springframework.boot.context.properties.ConfigurationProperties;
1 -package com.ruoyi.framework.handler; 1 +package com.ruoyi.security.handler;
2 2
3 import cn.hutool.core.util.ReUtil; 3 import cn.hutool.core.util.ReUtil;
4 import com.ruoyi.common.utils.spring.SpringUtils; 4 import com.ruoyi.common.utils.spring.SpringUtils;
1 -package com.ruoyi.framework.listener; 1 +package com.ruoyi.security.listener;
2 2
3 import cn.dev33.satoken.config.SaTokenConfig; 3 import cn.dev33.satoken.config.SaTokenConfig;
4 import cn.dev33.satoken.listener.SaTokenListener; 4 import cn.dev33.satoken.listener.SaTokenListener;
@@ -12,7 +12,7 @@ import com.ruoyi.common.enums.UserType; @@ -12,7 +12,7 @@ import com.ruoyi.common.enums.UserType;
12 import com.ruoyi.common.helper.LoginHelper; 12 import com.ruoyi.common.helper.LoginHelper;
13 import com.ruoyi.common.utils.ServletUtils; 13 import com.ruoyi.common.utils.ServletUtils;
14 import com.ruoyi.common.utils.ip.AddressUtils; 14 import com.ruoyi.common.utils.ip.AddressUtils;
15 -import com.ruoyi.common.utils.redis.RedisUtils; 15 +import com.ruoyi.redis.utils.RedisUtils;
16 import lombok.RequiredArgsConstructor; 16 import lombok.RequiredArgsConstructor;
17 import lombok.extern.slf4j.Slf4j; 17 import lombok.extern.slf4j.Slf4j;
18 import org.springframework.stereotype.Component; 18 import org.springframework.stereotype.Component;
1 -package com.ruoyi.framework.satoken.dao; 1 +package com.ruoyi.security.satoken.dao;
2 2
3 import cn.dev33.satoken.dao.SaTokenDao; 3 import cn.dev33.satoken.dao.SaTokenDao;
4 import cn.dev33.satoken.util.SaFoxUtil; 4 import cn.dev33.satoken.util.SaFoxUtil;
5 -import com.ruoyi.common.utils.redis.RedisUtils; 5 +import com.ruoyi.redis.utils.RedisUtils;
6 6
7 import java.time.Duration; 7 import java.time.Duration;
8 import java.util.ArrayList; 8 import java.util.ArrayList;
1 -package com.ruoyi.framework.satoken.service; 1 +package com.ruoyi.security.satoken.service;
2 2
3 import cn.dev33.satoken.stp.StpInterface; 3 import cn.dev33.satoken.stp.StpInterface;
4 import com.ruoyi.common.core.domain.model.LoginUser; 4 import com.ruoyi.common.core.domain.model.LoginUser;
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project xmlns="http://maven.apache.org/POM/4.0.0"
  3 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  4 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  5 + <modelVersion>4.0.0</modelVersion>
  6 + <parent>
  7 + <artifactId>scm-framework</artifactId>
  8 + <groupId>com.scm</groupId>
  9 + <version>4.8.2</version>
  10 + </parent>
  11 +
  12 + <artifactId>scm-web</artifactId>
  13 +
  14 + <dependencies>
  15 + <!-- <dependency>
  16 + <groupId>org.dromara</groupId>
  17 + <artifactId>ruoyi-common-json</artifactId>
  18 + </dependency>
  19 +
  20 + <dependency>
  21 + <groupId>org.dromara</groupId>
  22 + <artifactId>ruoyi-common-redis</artifactId>
  23 + </dependency>-->
  24 +
  25 + <!-- SpringBoot Web容器 -->
  26 + <dependency>
  27 + <groupId>org.springframework.boot</groupId>
  28 + <artifactId>spring-boot-starter-web</artifactId>
  29 + <exclusions>
  30 + <exclusion>
  31 + <artifactId>spring-boot-starter-tomcat</artifactId>
  32 + <groupId>org.springframework.boot</groupId>
  33 + </exclusion>
  34 + </exclusions>
  35 + </dependency>
  36 + <!-- web 容器使用 undertow 性能更强 -->
  37 + <dependency>
  38 + <groupId>org.springframework.boot</groupId>
  39 + <artifactId>spring-boot-starter-undertow</artifactId>
  40 + </dependency>
  41 +
  42 + <dependency>
  43 + <groupId>org.springframework.boot</groupId>
  44 + <artifactId>spring-boot-starter-actuator</artifactId>
  45 + </dependency>
  46 +
  47 + <dependency>
  48 + <groupId>com.alibaba</groupId>
  49 + <artifactId>transmittable-thread-local</artifactId>
  50 + </dependency>
  51 +
  52 + <dependency>
  53 + <groupId>com.scm</groupId>
  54 + <artifactId>scm-common</artifactId>
  55 + </dependency>
  56 +
  57 + </dependencies>
  58 +</project>
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.web.config;
2 2
3 import cn.hutool.captcha.CaptchaUtil; 3 import cn.hutool.captcha.CaptchaUtil;
4 import cn.hutool.captcha.CircleCaptcha; 4 import cn.hutool.captcha.CircleCaptcha;
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.web.config;
2 2
3 import com.ruoyi.common.filter.RepeatableFilter; 3 import com.ruoyi.common.filter.RepeatableFilter;
4 import com.ruoyi.common.filter.XssFilter; 4 import com.ruoyi.common.filter.XssFilter;
5 import com.ruoyi.common.utils.StringUtils; 5 import com.ruoyi.common.utils.StringUtils;
6 -import com.ruoyi.framework.config.properties.XssProperties; 6 +import com.ruoyi.web.config.properties.XssProperties;
7 import org.springframework.beans.factory.annotation.Autowired; 7 import org.springframework.beans.factory.annotation.Autowired;
8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; 8 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
9 import org.springframework.boot.web.servlet.FilterRegistrationBean; 9 import org.springframework.boot.web.servlet.FilterRegistrationBean;
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.web.config;
2 2
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import org.springframework.context.annotation.Bean; 4 import org.springframework.context.annotation.Bean;
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.web.config;
2 2
3 -import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor; 3 +import com.ruoyi.web.interceptor.PlusWebInvokeTimeInterceptor;
4 import org.springframework.context.annotation.Bean; 4 import org.springframework.context.annotation.Bean;
5 import org.springframework.context.annotation.Configuration; 5 import org.springframework.context.annotation.Configuration;
6 import org.springframework.web.cors.CorsConfiguration; 6 import org.springframework.web.cors.CorsConfiguration;
1 -package com.ruoyi.framework.config; 1 +package com.ruoyi.web.config;
2 2
3 import io.undertow.server.DefaultByteBufferPool; 3 import io.undertow.server.DefaultByteBufferPool;
4 import io.undertow.websockets.jsr.WebSocketDeploymentInfo; 4 import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
1 -package com.ruoyi.framework.config.properties; 1 +package com.ruoyi.web.config.properties;
2 2
3 -import com.ruoyi.common.enums.CaptchaCategory;  
4 -import com.ruoyi.common.enums.CaptchaType; 3 +import com.ruoyi.web.enmus.CaptchaCategory;
  4 +import com.ruoyi.web.enmus.CaptchaType;
5 import lombok.Data; 5 import lombok.Data;
6 import org.springframework.boot.context.properties.ConfigurationProperties; 6 import org.springframework.boot.context.properties.ConfigurationProperties;
7 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
1 -package com.ruoyi.framework.config.properties; 1 +package com.ruoyi.web.config.properties;
2 2
3 import lombok.Data; 3 import lombok.Data;
4 import org.springframework.boot.context.properties.ConfigurationProperties; 4 import org.springframework.boot.context.properties.ConfigurationProperties;
1 -package com.ruoyi.common.enums; 1 +package com.ruoyi.web.enmus;
2 2
3 import cn.hutool.captcha.AbstractCaptcha; 3 import cn.hutool.captcha.AbstractCaptcha;
4 import cn.hutool.captcha.CircleCaptcha; 4 import cn.hutool.captcha.CircleCaptcha;
1 -package com.ruoyi.common.enums; 1 +package com.ruoyi.web.enmus;
2 2
3 import cn.hutool.captcha.generator.CodeGenerator; 3 import cn.hutool.captcha.generator.CodeGenerator;
4 import cn.hutool.captcha.generator.RandomGenerator; 4 import cn.hutool.captcha.generator.RandomGenerator;
1 -package com.ruoyi.framework.web.exception; 1 +package com.ruoyi.web.exception;
2 2
3 import cn.dev33.satoken.exception.NotLoginException; 3 import cn.dev33.satoken.exception.NotLoginException;
4 import cn.dev33.satoken.exception.NotPermissionException; 4 import cn.dev33.satoken.exception.NotPermissionException;
1 -package com.ruoyi.framework.interceptor; 1 +package com.ruoyi.web.interceptor;
2 2
3 import cn.hutool.core.io.IoUtil; 3 import cn.hutool.core.io.IoUtil;
4 import cn.hutool.core.map.MapUtil; 4 import cn.hutool.core.map.MapUtil;
@@ -17,12 +17,6 @@ @@ -17,12 +17,6 @@
17 17
18 <dependencies> 18 <dependencies>
19 19
20 - <!-- 通用工具-->  
21 - <dependency>  
22 - <groupId>com.scm</groupId>  
23 - <artifactId>scm-common</artifactId>  
24 - </dependency>  
25 -  
26 <!-- OSS功能模块 --> 20 <!-- OSS功能模块 -->
27 <dependency> 21 <dependency>
28 <groupId>com.scm</groupId> 22 <groupId>com.scm</groupId>
@@ -35,6 +29,27 @@ @@ -35,6 +29,27 @@
35 <artifactId>scm-sms</artifactId> 29 <artifactId>scm-sms</artifactId>
36 </dependency> 30 </dependency>
37 31
  32 + <!-- 核心模块-->
  33 + <dependency>
  34 + <groupId>com.scm</groupId>
  35 + <artifactId>scm-core</artifactId>
  36 + </dependency>
  37 +
  38 + <dependency>
  39 + <groupId>com.scm</groupId>
  40 + <artifactId>scm-mybatis</artifactId>
  41 + </dependency>
  42 +
  43 + <dependency>
  44 + <groupId>com.scm</groupId>
  45 + <artifactId>scm-security</artifactId>
  46 + </dependency>
  47 +
  48 + <dependency>
  49 + <groupId>com.scm</groupId>
  50 + <artifactId>scm-web</artifactId>
  51 + </dependency>
  52 +
38 </dependencies> 53 </dependencies>
39 54
40 </project> 55 </project>
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
  3 +import com.baomidou.mybatisplus.annotation.TableField;
3 import com.baomidou.mybatisplus.annotation.TableId; 4 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableLogic; 5 import com.baomidou.mybatisplus.annotation.TableLogic;
5 import com.baomidou.mybatisplus.annotation.TableName; 6 import com.baomidou.mybatisplus.annotation.TableName;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 import com.alibaba.excel.annotation.ExcelProperty; 4 import com.alibaba.excel.annotation.ExcelProperty;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 import com.alibaba.excel.annotation.ExcelProperty; 4 import com.alibaba.excel.annotation.ExcelProperty;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableName; 4 import com.baomidou.mybatisplus.annotation.TableName;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; 3 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
4 import com.alibaba.excel.annotation.ExcelProperty; 4 import com.alibaba.excel.annotation.ExcelProperty;
1 -package com.ruoyi.common.core.domain.entity; 1 +package com.ruoyi.system.domain;
2 2
3 import com.baomidou.mybatisplus.annotation.*; 3 import com.baomidou.mybatisplus.annotation.*;
4 import com.fasterxml.jackson.annotation.JsonIgnore; 4 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil; @@ -5,7 +5,7 @@ import cn.hutool.core.bean.BeanUtil;
5 import cn.hutool.core.util.ObjectUtil; 5 import cn.hutool.core.util.ObjectUtil;
6 import com.alibaba.excel.context.AnalysisContext; 6 import com.alibaba.excel.context.AnalysisContext;
7 import com.alibaba.excel.event.AnalysisEventListener; 7 import com.alibaba.excel.event.AnalysisEventListener;
8 -import com.ruoyi.common.core.domain.entity.SysUser; 8 +import com.ruoyi.system.domain.SysUser;
9 import com.ruoyi.common.excel.ExcelListener; 9 import com.ruoyi.common.excel.ExcelListener;
10 import com.ruoyi.common.excel.ExcelResult; 10 import com.ruoyi.common.excel.ExcelResult;
11 import com.ruoyi.common.exception.ServiceException; 11 import com.ruoyi.common.exception.ServiceException;
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper; @@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
2 2
3 import com.ruoyi.common.core.mapper.BaseMapperPlus; 3 import com.ruoyi.common.core.mapper.BaseMapperPlus;
4 import com.ruoyi.system.domain.SysConfig; 4 import com.ruoyi.system.domain.SysConfig;
  5 +import org.apache.ibatis.annotations.Mapper;
5 6
6 /** 7 /**
7 * 参数配置 数据层 8 * 参数配置 数据层
8 * 9 *
9 * @author Lion Li 10 * @author Lion Li
10 */ 11 */
  12 +@Mapper
11 public interface SysConfigMapper extends BaseMapperPlus<SysConfigMapper, SysConfig, SysConfig> { 13 public interface SysConfigMapper extends BaseMapperPlus<SysConfigMapper, SysConfig, SysConfig> {
12 14
13 } 15 }
@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Constants; 4 import com.baomidou.mybatisplus.core.toolkit.Constants;
5 import com.ruoyi.common.annotation.DataColumn; 5 import com.ruoyi.common.annotation.DataColumn;
6 import com.ruoyi.common.annotation.DataPermission; 6 import com.ruoyi.common.annotation.DataPermission;
7 -import com.ruoyi.common.core.domain.entity.SysDept; 7 +import com.ruoyi.system.domain.SysDept;
8 import com.ruoyi.common.core.mapper.BaseMapperPlus; 8 import com.ruoyi.common.core.mapper.BaseMapperPlus;
  9 +import org.apache.ibatis.annotations.Mapper;
9 import org.apache.ibatis.annotations.Param; 10 import org.apache.ibatis.annotations.Param;
10 11
11 import java.util.List; 12 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.List; @@ -15,6 +16,7 @@ import java.util.List;
15 * 16 *
16 * @author Lion Li 17 * @author Lion Li
17 */ 18 */
  19 +@Mapper
18 public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, SysDept> { 20 public interface SysDeptMapper extends BaseMapperPlus<SysDeptMapper, SysDept, SysDept> {
19 21
20 /** 22 /**
@@ -2,8 +2,9 @@ package com.ruoyi.system.mapper; @@ -2,8 +2,9 @@ package com.ruoyi.system.mapper;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.ruoyi.common.constant.UserConstants; 4 import com.ruoyi.common.constant.UserConstants;
5 -import com.ruoyi.common.core.domain.entity.SysDictData; 5 +import com.ruoyi.system.domain.SysDictData;
6 import com.ruoyi.common.core.mapper.BaseMapperPlus; 6 import com.ruoyi.common.core.mapper.BaseMapperPlus;
  7 +import org.apache.ibatis.annotations.Mapper;
7 8
8 import java.util.List; 9 import java.util.List;
9 10
@@ -12,6 +13,7 @@ import java.util.List; @@ -12,6 +13,7 @@ import java.util.List;
12 * 13 *
13 * @author Lion Li 14 * @author Lion Li
14 */ 15 */
  16 +@Mapper
15 public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, SysDictData, SysDictData> { 17 public interface SysDictDataMapper extends BaseMapperPlus<SysDictDataMapper, SysDictData, SysDictData> {
16 18
17 default List<SysDictData> selectDictDataByType(String dictType) { 19 default List<SysDictData> selectDictDataByType(String dictType) {
1 package com.ruoyi.system.mapper; 1 package com.ruoyi.system.mapper;
2 2
3 -import com.ruoyi.common.core.domain.entity.SysDictType; 3 +import com.ruoyi.system.domain.SysDictType;
4 import com.ruoyi.common.core.mapper.BaseMapperPlus; 4 import com.ruoyi.common.core.mapper.BaseMapperPlus;
  5 +import org.apache.ibatis.annotations.Mapper;
5 6
6 /** 7 /**
7 * 字典表 数据层 8 * 字典表 数据层
8 * 9 *
9 * @author Lion Li 10 * @author Lion Li
10 */ 11 */
  12 +@Mapper
11 public interface SysDictTypeMapper extends BaseMapperPlus<SysDictTypeMapper, SysDictType, SysDictType> { 13 public interface SysDictTypeMapper extends BaseMapperPlus<SysDictTypeMapper, SysDictType, SysDictType> {
12 14
13 } 15 }
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper; @@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
2 2
3 import com.ruoyi.common.core.mapper.BaseMapperPlus; 3 import com.ruoyi.common.core.mapper.BaseMapperPlus;
4 import com.ruoyi.system.domain.SysLogininfor; 4 import com.ruoyi.system.domain.SysLogininfor;
  5 +import org.apache.ibatis.annotations.Mapper;
5 6
6 /** 7 /**
7 * 系统访问日志情况信息 数据层 8 * 系统访问日志情况信息 数据层
8 * 9 *
9 * @author Lion Li 10 * @author Lion Li
10 */ 11 */
  12 +@Mapper
11 public interface SysLogininforMapper extends BaseMapperPlus<SysLogininforMapper, SysLogininfor, SysLogininfor> { 13 public interface SysLogininforMapper extends BaseMapperPlus<SysLogininforMapper, SysLogininfor, SysLogininfor> {
12 14
13 } 15 }
@@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -4,8 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.toolkit.Constants; 5 import com.baomidou.mybatisplus.core.toolkit.Constants;
6 import com.ruoyi.common.constant.UserConstants; 6 import com.ruoyi.common.constant.UserConstants;
7 -import com.ruoyi.common.core.domain.entity.SysMenu; 7 +import com.ruoyi.system.domain.SysMenu;
8 import com.ruoyi.common.core.mapper.BaseMapperPlus; 8 import com.ruoyi.common.core.mapper.BaseMapperPlus;
  9 +import org.apache.ibatis.annotations.Mapper;
9 import org.apache.ibatis.annotations.Param; 10 import org.apache.ibatis.annotations.Param;
10 11
11 import java.util.List; 12 import java.util.List;
@@ -15,6 +16,7 @@ import java.util.List; @@ -15,6 +16,7 @@ import java.util.List;
15 * 16 *
16 * @author Lion Li 17 * @author Lion Li
17 */ 18 */
  19 +@Mapper
18 public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> { 20 public interface SysMenuMapper extends BaseMapperPlus<SysMenuMapper, SysMenu, SysMenu> {
19 21
20 /** 22 /**
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper; @@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
2 2
3 import com.ruoyi.common.core.mapper.BaseMapperPlus; 3 import com.ruoyi.common.core.mapper.BaseMapperPlus;
4 import com.ruoyi.system.domain.SysNotice; 4 import com.ruoyi.system.domain.SysNotice;
  5 +import org.apache.ibatis.annotations.Mapper;
5 6
6 /** 7 /**
7 * 通知公告表 数据层 8 * 通知公告表 数据层
8 * 9 *
9 * @author Lion Li 10 * @author Lion Li
10 */ 11 */
  12 +@Mapper
11 public interface SysNoticeMapper extends BaseMapperPlus<SysNoticeMapper, SysNotice, SysNotice> { 13 public interface SysNoticeMapper extends BaseMapperPlus<SysNoticeMapper, SysNotice, SysNotice> {
12 14
13 } 15 }
@@ -2,12 +2,14 @@ package com.ruoyi.system.mapper; @@ -2,12 +2,14 @@ package com.ruoyi.system.mapper;
2 2
3 import com.ruoyi.common.core.mapper.BaseMapperPlus; 3 import com.ruoyi.common.core.mapper.BaseMapperPlus;
4 import com.ruoyi.system.domain.SysOperLog; 4 import com.ruoyi.system.domain.SysOperLog;
  5 +import org.apache.ibatis.annotations.Mapper;
5 6
6 /** 7 /**
7 * 操作日志 数据层 8 * 操作日志 数据层
8 * 9 *
9 * @author Lion Li 10 * @author Lion Li
10 */ 11 */
  12 +@Mapper
11 public interface SysOperLogMapper extends BaseMapperPlus<SysOperLogMapper, SysOperLog, SysOperLog> { 13 public interface SysOperLogMapper extends BaseMapperPlus<SysOperLogMapper, SysOperLog, SysOperLog> {
12 14
13 } 15 }
@@ -3,6 +3,7 @@ package com.ruoyi.system.mapper; @@ -3,6 +3,7 @@ package com.ruoyi.system.mapper;
3 import com.ruoyi.common.core.mapper.BaseMapperPlus; 3 import com.ruoyi.common.core.mapper.BaseMapperPlus;
4 import com.ruoyi.system.domain.SysOssConfig; 4 import com.ruoyi.system.domain.SysOssConfig;
5 import com.ruoyi.system.domain.vo.SysOssConfigVo; 5 import com.ruoyi.system.domain.vo.SysOssConfigVo;
  6 +import org.apache.ibatis.annotations.Mapper;
6 7
7 /** 8 /**
8 * 对象存储配置Mapper接口 9 * 对象存储配置Mapper接口
@@ -11,6 +12,7 @@ import com.ruoyi.system.domain.vo.SysOssConfigVo; @@ -11,6 +12,7 @@ import com.ruoyi.system.domain.vo.SysOssConfigVo;
11 * @author 孤舟烟雨 12 * @author 孤舟烟雨
12 * @date 2021-08-13 13 * @date 2021-08-13
13 */ 14 */
  15 +@Mapper
14 public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> { 16 public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> {
15 17
16 } 18 }