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

访问日志完成提交

Browse Source
This commit is contained in:
thinkgem
2018-01-18 21:06:15 +08:00
parent 5bc6bc9e6b
commit 10fadeb317
10 changed files with 409 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,6 @@ web:
${adminPath}/login,
${adminPath}/desktop,
${adminPath}/sys/online/count,
${adminPath}/**/listData,
${adminPath}/**/treeData,
${adminPath}/file/**,
${adminPath}/tags/*

119
modules/core/src/main/resources/views/modules/sys/logForm.html
View File

@@ -1,23 +1,22 @@
<% layout('/layouts/default.html', {title: '操作日志表管理', libs: ['validate']}){ %>
<% layout('/layouts/default.html', {title: '日志详情', libs: ['validate']}){ %>
<div class="main-content">
<div class="box box-main">
<div class="box-header with-border">
<div class="box-title">
<i class="fa fa-list-alt"></i> ${log.isNewRecord ? '新增操作日志表' : '编辑操作日志表'}
<i class="fa fa-bug"></i> 日志详情
</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>
</div>
</div>
<#form:form id="inputForm" model="${log}" action="${ctx}/sys/log/save" method="post" class="form-horizontal">
<div class="box-body">
<div class="form-unit">基本信息</div>
<div class="box-body"><br/>
<#form:hidden path="id"/>
<div class="row">
<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 hide">*</span> 日志标题：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="logTitle" maxlength="500" class="form-control required "/>
</div>
@@ -26,18 +25,44 @@
<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 hide">*</span> 日志类型：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:select path="logType" dictType="sys_log_type" class="form-control required " />
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 请求地址：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<div class="input-group">
<span class="input-group-addon control-label">&nbsp;${log.serverAddr} &nbsp;</span>
<#form:input value="${log.requestUri}" maxlength="255" class="form-control "/>
<span class="input-group-addon control-label">&nbsp;${log.requestMethod} &nbsp;</span>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 提交的数据：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:input path="requestParams" class="form-control "/>
</div>
</div>
</div>
</div>
<div class="row">
<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 hide">*</span> 操作用户：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="createByName" maxlength="100" class="form-control required "/>
</div>
@@ -46,33 +71,26 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 请求URI：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> 操作账号：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="requestUri" maxlength="255" class="form-control "/>
<#form:input path="createBy" maxlength="100" class="form-control required "/>
</div>
</div>
</div>
</div>
<% if(@Global.YES.equals(log.isException)){ %>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 操作方式：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="requestMethod" maxlength="10" class="form-control "/>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 操作提交的数据：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="requestParams" class="form-control "/>
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 异常信息：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="exceptionInfo" rows="10" class="form-control "/>
</div>
</div>
</div>
</div>
<% } %>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
@@ -97,63 +115,43 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required ">*</span> 操作IP地址：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> 操作时间：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="createDate" dataFormat="datetime" class="form-control required "/>
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 客户端IP：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="remoteAddr" maxlength="255" class="form-control required "/>
</div>
</div>
</div>
<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>
<div class="col-sm-8">
<#form:input path="serverAddr" maxlength="255" class="form-control required "/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 是否异常：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:select path="isException" dictType="sys_yes_no" blankOption="true" class="form-control " />
</div>
</div>
</div>
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 异常信息：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="exceptionInfo" class="form-control "/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 用户代理：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<div class="col-sm-10">
<#form:input path="userAgent" maxlength="500" class="form-control "/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 设备名称/操作系统：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> 设备名称：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="deviceName" maxlength="100" class="form-control "/>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
@@ -168,9 +166,6 @@
<div class="box-footer">
<div class="row">
<div class="col-sm-offset-2 col-sm-10">
<% if (hasPermi('sys:log:edit')){ %>
<button type="submit" class="btn btn-sm btn-primary" id="btnSubmit"><i class="fa fa-check"></i> 保 存</button>&nbsp;
<% } %>
<button type="button" class="btn btn-sm btn-default" id="btnCancel" onclick="js.closeCurrentTabPage()"><i class="fa fa-reply-all"></i> 关 闭</button>
</div>
</div>

96
modules/core/src/main/resources/views/modules/sys/logList.html
View File

@@ -30,28 +30,30 @@
<div class="form-group">
<label class="control-label">日志类型：</label>
<div class="control-inline width-90">
<#form:select path="logType" dictType="sys_log_type" class="form-control required " />
<#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
</div>
</div>
<div class="form-group">
<label class="control-label">操作账号：</label>
<div class="control-inline">
<#form:input path="createBy.userCode" maxlength="64" class="form-control width-90"/>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="control-label">操作账号：</label> -->
<!-- <div class="control-inline"> -->
<!-- <#form:input path="createBy" maxlength="64" class="form-control width-90"/> -->
<!-- </div> -->
<!-- </div> -->
<div class="form-group">
<label class="control-label">操作用户：</label>
<div class="control-inline">
<#form:input path="createBy.userName" maxlength="100" class="form-control width-90"/>
<div class="control-inline width-120">
<#form:listselect id="userSelect" title="用户" path="createBy"
url="${ctx}/sys/user/userSelect?userType=" allowClear="false"
checkbox="false" itemCode="userCode" itemName="userName"/>
</div>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">是否异常：</label>
<div class="control-inline width-90">
<div class="control-inline width-60">
<#form:select path="isException" dictType="sys_yes_no" blankOption="true" class="form-control"/>
</div>
</div>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">业务主键：</label>
<div class="control-inline">
@@ -74,31 +76,30 @@
dataFormat="date" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
</div>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">客户端IP：</label>
<div class="control-inline">
<#form:input path="remoteAddr" maxlength="255" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">服务器IP：</label>
<div class="control-inline">
<#form:input path="serverAddr" maxlength="255" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">设备名称：</label>
<div class="control-inline">
<#form:input path="deviceName" maxlength="100" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">浏览器名：</label>
<div class="control-inline">
<#form:input path="browserName" maxlength="100" class="form-control width-90"/>
</div>
</div>
<!-- <div class="form-group"> -->
<!-- <label class="control-label">服务器IP：</label> -->
<!-- <div class="control-inline"> -->
<!-- <#form:input path="serverAddr" maxlength="255" class="form-control width-90"/> -->
<!-- </div> -->
<!-- </div> -->
<!-- <div class="form-group"> -->
<!-- <label class="control-label">设备名称：</label> -->
<!-- <div class="control-inline"> -->
<!-- <#form:input path="deviceName" maxlength="100" class="form-control width-90"/> -->
<!-- </div> -->
<!-- </div> -->
<!-- <div class="form-group"> -->
<!-- <label class="control-label">浏览器名：</label> -->
<!-- <div class="control-inline"> -->
<!-- <#form:input path="browserName" maxlength="100" class="form-control width-90"/> -->
<!-- </div> -->
<!-- </div> -->
<div class="form-group">
<button type="submit" class="btn btn-primary btn-sm">查询</button>
<button type="reset" class="btn btn-default btn-sm">重置</button>
@@ -116,32 +117,33 @@ $('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'日志标题', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" data-title="编辑操作日志表">'+(val ? val : row.id)+'</a>';
return '<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" data-title="日志详情">'+(val ? val : row.id)+'</a>';
}},
{header:'请求URI', name:'requestUri', index:'a.request_uri', width:200, align:"left"},
{header:'操作方式', name:'requestMethod', index:'a.request_method', width:200, align:"left"},
{header:'日志类型', name:'logType', index:'a.log_type', width:200, align:"left", formatter: function(val, obj, row, act){
{header:'请求地址', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){
return '<span title="['+row.requestMethod+'] '+row.serverAddr+row.requestUri+'">'+ row.requestUri;
}},
{header:'日志类型', name:'logType', index:'a.log_type', width:100, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_log_type')}, val, '未知', true);
}},
{header:'操作账号', name:'createBy.userCode', index:'a.create_by', width:200, align:"left"},
{header:'操作用户', name:'createByName.userCode', index:'a.create_by_name', width:200, align:"left"},
{header:'是否异常', name:'isException', index:'a.is_exception', width:200, align:"center", formatter: function(val, obj, row, act){
{header:'操作用户', name:'createByName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){
return '<span title="账号：'+row.createBy+'">'+ row.createByName;
}},
{header:'异常', name:'isException', index:'a.is_exception', width:60, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_yes_no')}, val, '未知', true);
}},
{header:'业务主键', name:'bizKey', index:'a.biz_key', width:200, align:"left"},
{header:'业务类型', name:'bizType', index:'a.biz_type', width:200, align:"left"},
{header:'操作时间', name:'createDate', index:'a.create_date', width:200, align:"left"},
{header:'客户端IP', name:'remoteAddr', index:'a.remote_addr', width:200, align:"left"},
{header:'服务器IP', name:'serverAddr', index:'a.server_addr', width:200, align:"left"},
{header:'设备名称', name:'deviceName', index:'a.device_name', width:200, align:"left"},
{header:'浏览器名', name:'browserName', index:'a.browser_name', width:200, align:"left"},
{header:'业务主键', name:'bizKey', index:'a.biz_key', width:90, align:"center"},
{header:'业务类型', name:'bizType', index:'a.biz_type', width:90, align:"center"},
{header:'操作时间', name:'createDate', index:'a.create_date', width:100, align:"center"},
{header:'客户端IP', name:'remoteAddr', index:'a.remote_addr', width:100, align:"center"},
{header:'设备名称', name:'deviceName', index:'a.device_name', width:100, align:"center"},
{header:'浏览器名', name:'browserName', index:'a.browser_name', width:100, align:"center"}/* ,
{header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];
<% if(hasPermi('sys:log:edit')){ %>
actions.push('<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" title="编辑操作日志表"><i class="fa fa-pencil"></i></a>&nbsp;');
actions.push('<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" title="日志详情"><i class="fa fa-pencil"></i></a>&nbsp;');
<% } %>
return actions.join('');
}}
}} */
],
// 加载成功后执行事件
ajaxSuccess: function(data){

2
modules/core/src/main/resources/views/modules/sys/user/empUserForm.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> ${empUser.isNewRecord ? '新增用户' : op == 'auth' ? '用户授权角色' : '编辑用户'}
<i class="fa icon-people"></i> ${empUser.isNewRecord ? '新增用户' : op == 'auth' ? '用户授权角色' : '编辑用户'}
</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>