From b2f308148e8709a5ec77e0fbdf99493433d6b95a Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 4 May 2018 21:37:58 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E6=A8=A1=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E9=80=9A=E4=BF=97=E5=90=8D=E7=A7=B0=EF=BC=9A?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E3=80=81=E7=A7=9F=E6=88=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E3=80=81=E7=A7=9F=E6=88=B7=E5=90=8D=E7=A7=B0=EF=BC=9B?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90config.xml=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89=EF=BC=8C=E6=94=BE=E5=90=8C?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8Bconfig-custom.xml=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=8D=B3=E5=8F=AF=E8=A6=86=E7=9B=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 8 ++--- modules/core/db/mysql/core.sql | 32 +++++++++---------- modules/core/db/oracle/core.sql | 32 +++++++++---------- modules/core/db/postgresql/core.sql | 32 +++++++++---------- .../jeesite/modules/sys/entity/Office.java | 18 ++++------- .../jeesite/modules/sys/utils/EmpUtils.java | 2 +- .../modules/sys/web/LoginController.java | 10 +----- .../sys/web/user/CorpAdminController.java | 26 +++++++-------- .../main/resources/config/jeesite-core.yml | 2 +- .../views/modules/sys/user/corpAdminForm.html | 10 +++--- .../views/modules/sys/user/corpAdminList.html | 10 +++--- web/db/mysql/core.sql | 32 +++++++++---------- web/db/oracle/core.sql | 32 +++++++++---------- web/db/postgresql/core.sql | 32 +++++++++---------- web/db/test.erm | 8 ++--- web/pom.xml | 2 ++ .../main/resources/cache/ehcache-local.xml | 2 +- web/src/main/resources/cache/ehcache-rmi.xml | 2 +- web/src/main/resources/config/jeesite.yml | 2 +- web/src/main/resources/logback.xml | 2 +- 20 files changed, 142 insertions(+), 154 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 38c63b9b..c6e5f006 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -578,8 +578,8 @@ false false - 归属集团公司Code - 归属集团Code + 租户代码 + 租户代码 corp_code varchar(n) @@ -594,8 +594,8 @@ false false - 归属集团公司Name - 归属集团Name + 租户名称 + 租户名称 corp_name nvarchar(n) diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index bfbd13cc..6dc53253 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -135,8 +135,8 @@ CREATE TABLE js_sys_company update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -211,8 +211,8 @@ CREATE TABLE js_sys_dict_data update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -271,8 +271,8 @@ CREATE TABLE js_sys_employee update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (emp_code) ) COMMENT = '员工表'; @@ -395,8 +395,8 @@ CREATE TABLE js_sys_log device_name varchar(100) COMMENT '设备名称/操作系统', browser_name varchar(100) COMMENT '浏览器名称', execute_time decimal(19) COMMENT '执行时间', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (id) ) COMMENT = '操作日志表'; @@ -615,8 +615,8 @@ CREATE TABLE js_sys_office update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -654,8 +654,8 @@ CREATE TABLE js_sys_post update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (post_code) ) COMMENT = '员工岗位表'; @@ -676,8 +676,8 @@ CREATE TABLE js_sys_role update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (role_code) ) COMMENT = '角色表'; @@ -742,8 +742,8 @@ CREATE TABLE js_sys_user update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 203880d5..0b72caba 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -993,8 +993,8 @@ COMMENT ON COLUMN js_sys_company.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_company.update_by IS '更新者'; COMMENT ON COLUMN js_sys_company.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_company.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_company.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_company.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_company.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_company.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_company.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_company.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_company.extend_s3 IS '扩展 String 3'; @@ -1051,8 +1051,8 @@ COMMENT ON COLUMN js_sys_dict_data.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_dict_data.update_by IS '更新者'; COMMENT ON COLUMN js_sys_dict_data.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_dict_data.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_dict_data.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_dict_data.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_dict_data.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_dict_data.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_dict_data.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_dict_data.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_dict_data.extend_s3 IS '扩展 String 3'; @@ -1098,8 +1098,8 @@ COMMENT ON COLUMN js_sys_employee.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_employee.update_by IS '更新者'; COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_employee.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_employee.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表'; COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码'; @@ -1179,8 +1179,8 @@ COMMENT ON COLUMN js_sys_log.user_agent IS '用户代理'; COMMENT ON COLUMN js_sys_log.device_name IS '设备名称/操作系统'; COMMENT ON COLUMN js_sys_log.browser_name IS '浏览器名称'; COMMENT ON COLUMN js_sys_log.execute_time IS '执行时间'; -COMMENT ON COLUMN js_sys_log.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_log.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_log.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_log.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_menu IS '菜单表'; COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码'; COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号'; @@ -1351,8 +1351,8 @@ COMMENT ON COLUMN js_sys_office.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_office.update_by IS '更新者'; COMMENT ON COLUMN js_sys_office.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_office.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_office.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_office.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_office.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_office.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_office.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_office.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_office.extend_s3 IS '扩展 String 3'; @@ -1384,8 +1384,8 @@ COMMENT ON COLUMN js_sys_post.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_post.update_by IS '更新者'; COMMENT ON COLUMN js_sys_post.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_post.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_post.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_post.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_post.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role IS '角色表'; COMMENT ON COLUMN js_sys_role.role_code IS '角色编码'; COMMENT ON COLUMN js_sys_role.role_name IS '角色名称'; @@ -1400,8 +1400,8 @@ COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_role.update_by IS '更新者'; COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_role.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_role.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; @@ -1448,8 +1448,8 @@ COMMENT ON COLUMN js_sys_user.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_user.update_by IS '更新者'; COMMENT ON COLUMN js_sys_user.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_user.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_user.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_user.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_user.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_user.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_user.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_user.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_user.extend_s3 IS '扩展 String 3'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 8bb731a2..80996a44 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -993,8 +993,8 @@ COMMENT ON COLUMN js_sys_company.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_company.update_by IS '更新者'; COMMENT ON COLUMN js_sys_company.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_company.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_company.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_company.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_company.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_company.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_company.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_company.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_company.extend_s3 IS '扩展 String 3'; @@ -1051,8 +1051,8 @@ COMMENT ON COLUMN js_sys_dict_data.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_dict_data.update_by IS '更新者'; COMMENT ON COLUMN js_sys_dict_data.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_dict_data.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_dict_data.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_dict_data.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_dict_data.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_dict_data.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_dict_data.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_dict_data.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_dict_data.extend_s3 IS '扩展 String 3'; @@ -1098,8 +1098,8 @@ COMMENT ON COLUMN js_sys_employee.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_employee.update_by IS '更新者'; COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_employee.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_employee.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表'; COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码'; @@ -1179,8 +1179,8 @@ COMMENT ON COLUMN js_sys_log.user_agent IS '用户代理'; COMMENT ON COLUMN js_sys_log.device_name IS '设备名称/操作系统'; COMMENT ON COLUMN js_sys_log.browser_name IS '浏览器名称'; COMMENT ON COLUMN js_sys_log.execute_time IS '执行时间'; -COMMENT ON COLUMN js_sys_log.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_log.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_log.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_log.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_menu IS '菜单表'; COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码'; COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号'; @@ -1351,8 +1351,8 @@ COMMENT ON COLUMN js_sys_office.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_office.update_by IS '更新者'; COMMENT ON COLUMN js_sys_office.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_office.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_office.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_office.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_office.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_office.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_office.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_office.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_office.extend_s3 IS '扩展 String 3'; @@ -1384,8 +1384,8 @@ COMMENT ON COLUMN js_sys_post.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_post.update_by IS '更新者'; COMMENT ON COLUMN js_sys_post.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_post.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_post.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_post.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_post.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role IS '角色表'; COMMENT ON COLUMN js_sys_role.role_code IS '角色编码'; COMMENT ON COLUMN js_sys_role.role_name IS '角色名称'; @@ -1400,8 +1400,8 @@ COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_role.update_by IS '更新者'; COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_role.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_role.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; @@ -1448,8 +1448,8 @@ COMMENT ON COLUMN js_sys_user.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_user.update_by IS '更新者'; COMMENT ON COLUMN js_sys_user.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_user.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_user.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_user.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_user.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_user.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_user.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_user.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_user.extend_s3 IS '扩展 String 3'; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java index 3384c360..8b0de704 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java @@ -41,19 +41,10 @@ import com.jeesite.modules.sys.utils.EmpUtils; }, extWhereKeys="dsf", orderBy="a.tree_sort, a.office_code" ) public class Office extends TreeEntity { - - /** 机构类型（0：集团） */ - public static final String TYPE_GROUP = "0"; - /** 机构类型（1：公司） */ - public static final String TYPE_COMPANY = "1"; - /** 机构类型（2：部门） */ - public static final String TYPE_DEPT = "2"; - /** 机构类型（3：小组） */ - public static final String TYPE_TEAM = "3"; - + private static final long serialVersionUID = 1L; private String officeCode; // 机构编码 - private String viewCode; // 机构代码（作为显示用，集团内唯一） + private String viewCode; // 机构代码（作为显示用，多租户内唯一） private String officeName; // 机构名称 private String fullName; // 机构全称 private String officeType; // 机构类型（1：公司；2：部门；3：小组） @@ -195,7 +186,10 @@ public class Office extends TreeEntity { /** * 根据类型查找上级部门 - * @param type 机构类型 0：集团TYPE_GROUP 1：公司TYPE_COMPANY 2：部门TYPE_DEPT 3：小组TYPE_TEAM + * 1、例如当前机构类型为部门，你想获取部门所在的省公司名称 + * 2、例如当前机构类型为部门的子部门，你想获取部门所在省公司名称 + * 3、例如当前机构类型为小组，你想获取所在公司名称 + * @param type 机构类型 * @return */ @JsonIgnore diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java index 9a7b8fa9..67f7be21 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/utils/EmpUtils.java @@ -25,7 +25,7 @@ public class EmpUtils { // public static final String CACHE_OFFICE_LIST = "officeList"; // public static final String CACHE_COMPANY_LIST = "companyList"; - // 集团缓存常量 + // 部门和公司缓存常量 public static final String CACHE_OFFICE_ALL_LIST = "officeAllList"; public static final String CACHE_COMPANY_ALL_LIST = "companyAllList"; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java index 8d07130e..9d741c06 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java @@ -169,15 +169,7 @@ public class LoginController extends BaseController{ // 非授权异常，登录失败，验证码加1。 if (!UnauthorizedException.class.getName().equals(exception)){ -// // 如果使用了集团用户模式，则获取集团Code -// String corpCode = null; -// if (Global.isUseCorpModel()){ -// corpCode = (String)paramMap.get("corpCode"); -// if (StringUtils.isBlank(corpCode)){ -// throw new AuthenticationException("msg:请选择您要登录的集团公司."); -// } -// } - model.addAttribute("isValidCodeLogin", BaseAuthorizingRealm.isValidCodeLogin(username, /*corpCode, */(String)paramMap.get("deviceType"), "failed")); + model.addAttribute("isValidCodeLogin", BaseAuthorizingRealm.isValidCodeLogin(username, (String)paramMap.get("deviceType"), "failed")); } //获取当前会话对象 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 74ed4168..c4e518b7 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -29,7 +29,7 @@ import com.jeesite.modules.sys.service.UserService; import com.jeesite.modules.sys.utils.UserUtils; /** - * 集团公司管理员Controller + * 系统管理员Controller * @author ThinkGem * @version 2017-03-26 */ @@ -58,8 +58,8 @@ public class CorpAdminController extends BaseController { @ResponseBody public Page listData(User user, HttpServletRequest request, HttpServletResponse response) { user.setUserType(User.USER_TYPE_NONE); // 仅登录用户 - user.setMgrType(User.MGR_TYPE_CORP_ADMIN); // 集团管理员 - // 禁用自动添加集团代码条件，添加自定义集团查询条件 + user.setMgrType(User.MGR_TYPE_CORP_ADMIN); // 租户管理员 + // 禁用自动添加租户代码条件，添加自定义租户查询条件 user.getSqlMap().getWhere().disableAutoAddCorpCodeWhere() .and("corp_code", QueryType.EQ, user.getCorpCode_()) .and("corp_name", QueryType.LIKE, user.getCorpName_()); @@ -71,13 +71,13 @@ public class CorpAdminController extends BaseController { @RequestMapping(value = "form") public String form(User user, String op, Model model) { if (user.getIsNewRecord()){ - // 新增集团，如果已存在集团，则不能保存 + // 新增租户管理员，如果已存在，则不能保存 if ("addCorp".equals(op)){ - user.setCorpCode_(StringUtils.EMPTY); // 归属集团Code - user.setCorpName_(StringUtils.EMPTY); // 归属集团Name + user.setCorpCode_(StringUtils.EMPTY); // 租户代码 + user.setCorpName_(StringUtils.EMPTY); // 租户名称 } } - // 操作类型：addCorp: 添加集团； addAdmin: 添加管理员； edit: 编辑 + // 操作类型：addCorp: 添加租户； addAdmin: 添加管理员； edit: 编辑 model.addAttribute("op", op); model.addAttribute("user", user); return "modules/sys/user/corpAdminForm"; @@ -97,24 +97,24 @@ public class CorpAdminController extends BaseController { return renderResult(Global.FALSE, "非法操作，不能够操作此用户！"); } if (StringUtils.isBlank(user.getCorpCode_())){ - return renderResult(Global.FALSE, "集团编码不能为空！"); + return renderResult(Global.FALSE, "租户代码不能为空！"); } if (!Global.TRUE.equals(userService.checkLoginCode(oldLoginCode, user.getLoginCode()/*, user.getCorpCode_()*/))) { return renderResult(Global.FALSE, "保存用户'" + user.getLoginCode() + "'失败，登录账号已存在"); } user.setUserType(User.USER_TYPE_NONE); // 仅登录用户 - user.setMgrType(User.MGR_TYPE_CORP_ADMIN); // 集团管理员 - // 如果新增，则验证集团代码合法性 + user.setMgrType(User.MGR_TYPE_CORP_ADMIN); // 租户管理员 + // 如果新增，则验证租户代码合法性 if (user.getIsNewRecord()){ User where = new User(); where.setCorpCode_(user.getCorpCode_()); List list = userService.findCorpList(user); if (list.size() > 0){ - // 新增集团，如果已存在集团，则不能保存 + // 新增租户，如果已存在，则不能保存 if ("addCorp".equals(op)){ - return renderResult(Global.FALSE, "保存用户失败，集团编码已存在"); + return renderResult(Global.FALSE, "保存用户失败，租户代码已存在"); } - // 新增管理员，则使用已有的集团代码和名称 + // 新增管理员，则使用已有的租户代码和名称 else if ("addAdmin".equals(op)){ user.setCorpCode_(list.get(0).getCorpCode_()); user.setCorpName_(list.get(0).getCorpName_()); diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index b2cf9bc3..c34a9474 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -195,7 +195,7 @@ user: remarks: "" }] - # 集团模式（多公司、多租户、SAAS模式） + # 多租户模式（SAAS模式） useCorpModel: false # 任务调度 diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index a2c412f8..940f56b1 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -3,7 +3,7 @@
- ${user.isNewRecord ? op == 'addCorp' ? '新增集团' : '新增管理员' : '编辑管理员'} + ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员
@@ -19,9 +19,9 @@
+ * 租户代码：
- <#form:input path="corpCode_" placeholder="请输入集团代码" maxlength="20" + <#form:input path="corpCode_" placeholder="请输入租户代码" maxlength="20" readonly="${!user.isNewRecord || op=='addAdmin'}" class="form-control abc required"/>
@@ -29,9 +29,9 @@
+ * 租户名称：
- <#form:input path="corpName_" placeholder="请输入集团名称" maxlength="32" + <#form:input path="corpName_" placeholder="请输入租户名称" maxlength="32" readonly="${!user.isNewRecord || op=='addAdmin'}" class="form-control required"/>
diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index a56456dc..fea46798 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -9,7 +9,7 @@ 查询 <% if(hasPermi('sys:corpAdmin:edit')){ %> <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %> - 新增集团 + 新增租户管理员 <% }else{ %> 新增管理员 <% } %> @@ -32,13 +32,13 @@
- +
<#form:input path="corpCode_" maxlength="100" class="form-control width-90"/>
- +
<#form:input path="corpName_" maxlength="100" class="form-control width-90"/>
@@ -70,10 +70,10 @@ $('#dataGrid').dataGrid({ }}, {header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"}, <% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %> - {header:'集团代码', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){ + {header:'租户代码', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){ return ''+val+''; }}, - {header:'集团名称', name:'corpName_', index:'a.corp_name', width:200, align:"center"}, + {header:'租户名称', name:'corpName_', index:'a.corp_name', width:200, align:"center"}, <% } %> {header:'电子邮箱', name:'email', index:'a.email', width:200, align:"center"}, {header:'手机号码', name:'mobile', index:'a.mobile', width:200, align:"center"}, diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index bfbd13cc..6dc53253 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -135,8 +135,8 @@ CREATE TABLE js_sys_company update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -211,8 +211,8 @@ CREATE TABLE js_sys_dict_data update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -271,8 +271,8 @@ CREATE TABLE js_sys_employee update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (emp_code) ) COMMENT = '员工表'; @@ -395,8 +395,8 @@ CREATE TABLE js_sys_log device_name varchar(100) COMMENT '设备名称/操作系统', browser_name varchar(100) COMMENT '浏览器名称', execute_time decimal(19) COMMENT '执行时间', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (id) ) COMMENT = '操作日志表'; @@ -615,8 +615,8 @@ CREATE TABLE js_sys_office update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', @@ -654,8 +654,8 @@ CREATE TABLE js_sys_post update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (post_code) ) COMMENT = '员工岗位表'; @@ -676,8 +676,8 @@ CREATE TABLE js_sys_role update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', PRIMARY KEY (role_code) ) COMMENT = '角色表'; @@ -742,8 +742,8 @@ CREATE TABLE js_sys_user update_by varchar(64) NOT NULL COMMENT '更新者', update_date datetime NOT NULL COMMENT '更新时间', remarks varchar(500) COMMENT '备注信息', - corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '归属集团Code', - corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '归属集团Name', + corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', + corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', extend_s1 varchar(500) COMMENT '扩展 String 1', extend_s2 varchar(500) COMMENT '扩展 String 2', extend_s3 varchar(500) COMMENT '扩展 String 3', diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 203880d5..0b72caba 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -993,8 +993,8 @@ COMMENT ON COLUMN js_sys_company.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_company.update_by IS '更新者'; COMMENT ON COLUMN js_sys_company.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_company.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_company.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_company.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_company.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_company.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_company.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_company.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_company.extend_s3 IS '扩展 String 3'; @@ -1051,8 +1051,8 @@ COMMENT ON COLUMN js_sys_dict_data.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_dict_data.update_by IS '更新者'; COMMENT ON COLUMN js_sys_dict_data.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_dict_data.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_dict_data.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_dict_data.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_dict_data.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_dict_data.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_dict_data.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_dict_data.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_dict_data.extend_s3 IS '扩展 String 3'; @@ -1098,8 +1098,8 @@ COMMENT ON COLUMN js_sys_employee.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_employee.update_by IS '更新者'; COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_employee.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_employee.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表'; COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码'; @@ -1179,8 +1179,8 @@ COMMENT ON COLUMN js_sys_log.user_agent IS '用户代理'; COMMENT ON COLUMN js_sys_log.device_name IS '设备名称/操作系统'; COMMENT ON COLUMN js_sys_log.browser_name IS '浏览器名称'; COMMENT ON COLUMN js_sys_log.execute_time IS '执行时间'; -COMMENT ON COLUMN js_sys_log.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_log.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_log.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_log.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_menu IS '菜单表'; COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码'; COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号'; @@ -1351,8 +1351,8 @@ COMMENT ON COLUMN js_sys_office.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_office.update_by IS '更新者'; COMMENT ON COLUMN js_sys_office.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_office.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_office.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_office.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_office.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_office.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_office.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_office.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_office.extend_s3 IS '扩展 String 3'; @@ -1384,8 +1384,8 @@ COMMENT ON COLUMN js_sys_post.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_post.update_by IS '更新者'; COMMENT ON COLUMN js_sys_post.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_post.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_post.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_post.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_post.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role IS '角色表'; COMMENT ON COLUMN js_sys_role.role_code IS '角色编码'; COMMENT ON COLUMN js_sys_role.role_name IS '角色名称'; @@ -1400,8 +1400,8 @@ COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_role.update_by IS '更新者'; COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_role.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_role.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; @@ -1448,8 +1448,8 @@ COMMENT ON COLUMN js_sys_user.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_user.update_by IS '更新者'; COMMENT ON COLUMN js_sys_user.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_user.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_user.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_user.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_user.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_user.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_user.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_user.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_user.extend_s3 IS '扩展 String 3'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 8bb731a2..80996a44 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -993,8 +993,8 @@ COMMENT ON COLUMN js_sys_company.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_company.update_by IS '更新者'; COMMENT ON COLUMN js_sys_company.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_company.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_company.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_company.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_company.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_company.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_company.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_company.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_company.extend_s3 IS '扩展 String 3'; @@ -1051,8 +1051,8 @@ COMMENT ON COLUMN js_sys_dict_data.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_dict_data.update_by IS '更新者'; COMMENT ON COLUMN js_sys_dict_data.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_dict_data.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_dict_data.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_dict_data.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_dict_data.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_dict_data.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_dict_data.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_dict_data.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_dict_data.extend_s3 IS '扩展 String 3'; @@ -1098,8 +1098,8 @@ COMMENT ON COLUMN js_sys_employee.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_employee.update_by IS '更新者'; COMMENT ON COLUMN js_sys_employee.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_employee.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_employee.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_employee.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_employee.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_employee.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_employee_post IS '员工与岗位关联表'; COMMENT ON COLUMN js_sys_employee_post.emp_code IS '员工编码'; COMMENT ON COLUMN js_sys_employee_post.post_code IS '岗位编码'; @@ -1179,8 +1179,8 @@ COMMENT ON COLUMN js_sys_log.user_agent IS '用户代理'; COMMENT ON COLUMN js_sys_log.device_name IS '设备名称/操作系统'; COMMENT ON COLUMN js_sys_log.browser_name IS '浏览器名称'; COMMENT ON COLUMN js_sys_log.execute_time IS '执行时间'; -COMMENT ON COLUMN js_sys_log.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_log.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_log.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_log.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_menu IS '菜单表'; COMMENT ON COLUMN js_sys_menu.menu_code IS '菜单编码'; COMMENT ON COLUMN js_sys_menu.parent_code IS '父级编号'; @@ -1351,8 +1351,8 @@ COMMENT ON COLUMN js_sys_office.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_office.update_by IS '更新者'; COMMENT ON COLUMN js_sys_office.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_office.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_office.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_office.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_office.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_office.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_office.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_office.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_office.extend_s3 IS '扩展 String 3'; @@ -1384,8 +1384,8 @@ COMMENT ON COLUMN js_sys_post.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_post.update_by IS '更新者'; COMMENT ON COLUMN js_sys_post.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_post.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_post.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_post.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_post.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_post.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role IS '角色表'; COMMENT ON COLUMN js_sys_role.role_code IS '角色编码'; COMMENT ON COLUMN js_sys_role.role_name IS '角色名称'; @@ -1400,8 +1400,8 @@ COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_role.update_by IS '更新者'; COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_role.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_role.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; @@ -1448,8 +1448,8 @@ COMMENT ON COLUMN js_sys_user.create_date IS '创建时间'; COMMENT ON COLUMN js_sys_user.update_by IS '更新者'; COMMENT ON COLUMN js_sys_user.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_user.remarks IS '备注信息'; -COMMENT ON COLUMN js_sys_user.corp_code IS '归属集团Code'; -COMMENT ON COLUMN js_sys_user.corp_name IS '归属集团Name'; +COMMENT ON COLUMN js_sys_user.corp_code IS '租户代码'; +COMMENT ON COLUMN js_sys_user.corp_name IS '租户名称'; COMMENT ON COLUMN js_sys_user.extend_s1 IS '扩展 String 1'; COMMENT ON COLUMN js_sys_user.extend_s2 IS '扩展 String 2'; COMMENT ON COLUMN js_sys_user.extend_s3 IS '扩展 String 3'; diff --git a/web/db/test.erm b/web/db/test.erm index c6222110..0e62cfae 100644 --- a/web/db/test.erm +++ b/web/db/test.erm @@ -178,8 +178,8 @@ false false - 归属集团公司Code - 归属集团Code + 租户代码 + 租户代码 corp_code varchar(n) @@ -194,8 +194,8 @@ false false - 归属集团公司Name - 归属集团Name + 租户名称 + 租户名称 corp_name nvarchar(n) diff --git a/web/pom.xml b/web/pom.xml index 8bd49b36..0268970f 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,6 +30,7 @@ + org.springframework.boot spring-boot-starter-tomcat @@ -73,6 +74,7 @@ ${project.basedir}/src/main/webapp/WEB-INF/classes/ + org.springframework.boot spring-boot-maven-plugin diff --git a/web/src/main/resources/cache/ehcache-local.xml b/web/src/main/resources/cache/ehcache-local.xml index 5de6d7cf..519f6daa 100644 --- a/web/src/main/resources/cache/ehcache-local.xml +++ b/web/src/main/resources/cache/ehcache-local.xml @@ -18,7 +18,7 @@ - + diff --git a/web/src/main/resources/cache/ehcache-rmi.xml b/web/src/main/resources/cache/ehcache-rmi.xml index 15bcd67c..3725caf9 100644 --- a/web/src/main/resources/cache/ehcache-rmi.xml +++ b/web/src/main/resources/cache/ehcache-rmi.xml @@ -48,7 +48,7 @@ - + diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml index 63619e5e..75edafa9 100644 --- a/web/src/main/resources/config/jeesite.yml +++ b/web/src/main/resources/config/jeesite.yml @@ -194,7 +194,7 @@ jdbc: # remarks: "" # }] # -# # 集团模式（多公司、多租户、SAAS模式） +# # 多租户模式（SAAS模式） # useCorpModel: false # ## 任务调度 diff --git a/web/src/main/resources/logback.xml b/web/src/main/resources/logback.xml index 4ac1d483..2c949195 100644 --- a/web/src/main/resources/logback.xml +++ b/web/src/main/resources/logback.xml @@ -2,7 +2,7 @@ - +