集团模式修改为通俗名称:多租户、租户代码、租户名称;代码生成config.xml支持自定义,放同目录下config-custom.xml文件即可覆盖。

This commit is contained in:
thinkgem
2018-05-04 21:37:58 +08:00
parent 4d44442e53
commit b2f308148e
20 changed files with 142 additions and 154 deletions

View File

@@ -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',

View File

@@ -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';

View File

@@ -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';

View File

@@ -178,8 +178,8 @@
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description>归属集团公司Code</description>
<logical_name>归属集团Code</logical_name>
<description>租户代码</description>
<logical_name>租户代码</logical_name>
<physical_name>corp_code</physical_name>
<type>varchar(n)</type>
</word>
@@ -194,8 +194,8 @@
<binary>false</binary>
<args></args>
<char_semantics>false</char_semantics>
<description>归属集团公司Name</description>
<logical_name>归属集团Name</logical_name>
<description>租户名称</description>
<logical_name>租户名称</logical_name>
<physical_name>corp_name</physical_name>
<type>nvarchar(n)</type>
</word>

View File

@@ -30,6 +30,7 @@
<dependencies>
<!-- Spring Boot -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
@@ -73,6 +74,7 @@
<outputDirectory>${project.basedir}/src/main/webapp/WEB-INF/classes/</outputDirectory>
<plugins>
<!-- Spring Boot -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>

View File

@@ -18,7 +18,7 @@
<!-- 用户数据相关缓存 -->
<cache name="userCache" maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="false" diskPersistent="false" statistics="true"/>
<!-- 集团数据相关缓存 -->
<!-- 租户数据相关缓存 -->
<cache name="corpCache" maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="false" diskPersistent="false" statistics="true"/>
<!-- 内容管理模块缓存 -->

View File

@@ -48,7 +48,7 @@
<cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory" properties="replicatePuts=false,replicateUpdatesViaCopy=false"/>
</cache>
<!-- 集团数据相关缓存 -->
<!-- 租户数据相关缓存 -->
<cache name="corpCache" maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="false" diskPersistent="false" statistics="true">
<cacheEventListenerFactory class="net.sf.ehcache.distribution.RMICacheReplicatorFactory" properties="replicatePuts=false,replicateUpdatesViaCopy=false"/>
</cache>

View File

@@ -194,7 +194,7 @@ jdbc:
# remarks: ""
# }]
#
# # 集团模式(多公司、多租户、SAAS模式
# # 多租户模式(SAAS模式
# useCorpModel: false
#
## 任务调度

View File

@@ -2,7 +2,7 @@
<configuration debug="false" scan="false">
<!-- Log file path -->
<property name="log.path" value="${logPath:-../}/logs" />
<property name="log.path" value="${logPath:-..}/logs" />
<!-- Spring boot default -->
<include resource="org/springframework/boot/logging/logback/defaults.xml" />