From 45ac0f23e12ac2a45c6affe9e39d0897e4fad618 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 16 二月 2023 17:06:10 +0800 Subject: [PATCH] !286 合并 多租户功能 * add 新增 ruoyi-common-tenant 多租户模块 全框架适配多租户改动 * update 优化 隐藏页面主键 * remove 移除 缓存列表功能(多租户缓存功能繁杂多样 没有办法在页面管理) * update 重构 全局缓存KEY 与 常用缓存KEY做区分 * update 重构 OssFactory 加载方式 改为每次比对配置做实例更新 * update 优化 SaTokenDao 改为 Bean 注入 便于扩展 * update 重构 项目初始化数据改为懒加载 不提供热加载 * update 重构 验证码开关使用配置文件(经调查少有动态开启需求) * update 优化 启用 sqlserver 高版本语法 简化sql脚本语法 * update 优化 DataPermissionHelper 增加 开启/关闭 忽略数据权限功能 * update 优化 连接池增加 keepaliveTime 探活参数 * update 优化 调整连接池最长生命周期 防止出现警告 * update 优化 代码生成页面模板 校验不必要的表单数据 * add 新增 StringUtils splitTo 与 splitList 方法 优化业务代码 --- ruoyi-common/pom.xml | 176 +++++++++------------------------------------------------- 1 files changed, 28 insertions(+), 148 deletions(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index da4a13b..4f8e1f1 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,160 +5,40 @@ <parent> <artifactId>ruoyi-vue-plus</artifactId> <groupId>com.ruoyi</groupId> - <version>3.4.0</version> + <version>${revision}</version> + <relativePath>../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> + <modules> + <module>ruoyi-common-bom</module> + <module>ruoyi-common-core</module> + <module>ruoyi-common-doc</module> + <module>ruoyi-common-excel</module> + <module>ruoyi-common-idempotent</module> + <module>ruoyi-common-job</module> + <module>ruoyi-common-log</module> + <module>ruoyi-common-mail</module> + <module>ruoyi-common-mybatis</module> + <module>ruoyi-common-oss</module> + <module>ruoyi-common-ratelimiter</module> + <module>ruoyi-common-redis</module> + <module>ruoyi-common-satoken</module> + <module>ruoyi-common-security</module> + <module>ruoyi-common-sms</module> + <module>ruoyi-common-web</module> + <module>ruoyi-common-translation</module> + <module>ruoyi-common-sensitive</module> + <module>ruoyi-common-json</module> + <module>ruoyi-common-encrypt</module> + <module>ruoyi-common-tenant</module> + </modules> + <artifactId>ruoyi-common</artifactId> + <packaging>pom</packaging> <description> - common閫氱敤宸ュ叿 + common 閫氱敤妯″潡 </description> - - <dependencies> - - <!-- Spring妗嗘灦鍩烘湰鐨勬牳蹇冨伐鍏� --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - </dependency> - - <!-- SpringWeb妯″潡 --> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - </dependency> - - <!-- spring security 瀹夊叏璁よ瘉 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-security</artifactId> - </dependency> - - <!-- 鑷畾涔夐獙璇佹敞瑙� --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-validation</artifactId> - </dependency> - - <!--甯哥敤宸ュ叿绫� --> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <!-- JSON宸ュ叿绫� --> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - - <!-- excel宸ュ叿 --> - <dependency> - <groupId>org.apache.poi</groupId> - <artifactId>poi-ooxml</artifactId> - </dependency> - - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>easyexcel</artifactId> - </dependency> - - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - </dependency> - - <!-- yml瑙f瀽鍣� --> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - </dependency> - - <!-- jdk11 缂哄け渚濊禆 jaxb--> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - - <!-- servlet鍖� --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-boot-starter</artifactId> - </dependency> - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>mybatis-plus-extension</artifactId> - </dependency> - - <!-- dynamic-datasource 澶氭暟鎹簮--> - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>dynamic-datasource-spring-boot-starter</artifactId> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-core</artifactId> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-http</artifactId> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-captcha</artifactId> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-jwt</artifactId> - </dependency> - - <dependency> - <groupId>cn.hutool</groupId> - <artifactId>hutool-extra</artifactId> - </dependency> - - <dependency> - <groupId>org.projectlombok</groupId> - <artifactId>lombok</artifactId> - </dependency> - - <dependency> - <groupId>com.github.xiaoymin</groupId> - <artifactId>knife4j-spring-boot-starter</artifactId> - </dependency> - - <dependency> - <groupId>io.swagger</groupId> - <artifactId>swagger-annotations</artifactId> - </dependency> - - <!-- 鑷姩鐢熸垚YML閰嶇疆鍏宠仈JSON鏂囦欢 --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-configuration-processor</artifactId> - </dependency> - - <!--redisson--> - <dependency> - <groupId>org.redisson</groupId> - <artifactId>redisson-spring-boot-starter</artifactId> - </dependency> - - <dependency> - <groupId>com.baomidou</groupId> - <artifactId>lock4j-redisson-spring-boot-starter</artifactId> - </dependency> - - </dependencies> </project> -- Gitblit v1.9.3