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-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java
index f2c59c9..eb0d12f 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/constant/GenConstants.java
@@ -69,35 +69,30 @@
* BO瀵硅薄 涓嶉渶瑕佹坊鍔犲瓧娈�
*/
String[] COLUMNNAME_NOT_ADD = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "version"};
+ "update_time", "version", "tenant_id"};
/**
* BO瀵硅薄 涓嶉渶瑕佺紪杈戝瓧娈�
*/
String[] COLUMNNAME_NOT_EDIT = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "version"};
+ "update_time", "version", "tenant_id"};
/**
* VO瀵硅薄 涓嶉渶瑕佽繑鍥炲瓧娈�
*/
String[] COLUMNNAME_NOT_LIST = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "version"};
+ "update_time", "version", "tenant_id"};
/**
* BO瀵硅薄 涓嶉渶瑕佹煡璇㈠瓧娈�
*/
String[] COLUMNNAME_NOT_QUERY = {"id", "create_dept", "create_by", "create_time", "del_flag", "update_by",
- "update_time", "remark", "version"};
+ "update_time", "remark", "version", "tenant_id"};
/**
* Entity鍩虹被瀛楁
*/
- String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime"};
-
- /**
- * Tree鍩虹被瀛楁
- */
- String[] TREE_ENTITY = {"parentName", "parentId", "children"};
+ String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime", "tenantId"};
/**
* 鏂囨湰妗�
--
Gitblit v1.9.3