manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/resources/config/jeesite-core.yml
View File

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

10
modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html
View File

@@ -3,7 +3,7 @@
<div class="box box-main">
<div class="box-header with-border">
<div class="box-title">
<i class="fa fa-list-alt"></i> ${user.isNewRecord ? op == 'addCorp' ? '新增集团' : '新增管理员' : '编辑管理员'}
<i class="fa fa-list-alt"></i> ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员
</div>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -19,9 +19,9 @@
<div class="col-xs-6">
<div class="form-group">
<label class="col-sm-4 control-label" title="">
<span class="required">*</span> 集团代码：<i class="fa icon-question hide"></i></label>
<span class="required">*</span> 租户代码：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="corpCode_" placeholder="请输入集团代码" maxlength="20"
<#form:input path="corpCode_" placeholder="请输入租户代码" maxlength="20"
readonly="${!user.isNewRecord || op=='addAdmin'}" class="form-control abc required"/>
</div>
</div>
@@ -29,9 +29,9 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required">*</span> 集团名称：<i class="fa icon-question hide"></i></label>
<span class="required">*</span> 租户名称：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="corpName_" placeholder="请输入集团名称" maxlength="32"
<#form:input path="corpName_" placeholder="请输入租户名称" maxlength="32"
readonly="${!user.isNewRecord || op=='addAdmin'}" class="form-control required"/>
</div>
</div>

10
modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
View File

@@ -9,7 +9,7 @@
<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
<% if(hasPermi('sys:corpAdmin:edit')){ %>
<% if(@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))){ %>
<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title="新增集团"><i class="fa fa-plus"></i> 新增集团</a>
<a href="${ctx}/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title="新增租户管理员"><i class="fa fa-plus"></i> 新增租户管理员</a>
<% }else{ %>
<a href="${ctx}/sys/corpAdmin/form?corpCode_=${user.currentUser.corpCode_}&corpName_=${user.currentUser.corpName_}&op=addAdmin" class="btn btn-default btnTool" title="新增管理员"><i class="fa fa-plus"></i> 新增管理员</a>
<% } %>
@@ -32,13 +32,13 @@
</div>
</div>
<div class="form-group ${@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))?'':'hide'}">
<label class="control-label">集团代码：</label>
<label class="control-label">租户代码：</label>
<div class="control-inline">
<#form:input path="corpCode_" maxlength="100" class="form-control width-90"/>
</div>
</div>
<div class="form-group ${@ObjectUtils.toBoolean(@Global.getConfig('user.useCorpModel'))?'':'hide'}">
<label class="control-label">集团名称：</label>
<label class="control-label">租户名称：</label>
<div class="control-inline">
<#form:input path="corpName_" maxlength="100" class="form-control width-90"/>
</div>
@@ -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 '<a href="javascript:" onclick="$(\'#corpCode_\').val(\''+val+'\');$(\'#searchForm\').submit()">'+val+'</a>';
}},
{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"},