Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MaxKey单点登录官方(MaxKeyTop)
MaxKey
提交
0306cc54
MaxKey
项目概览
MaxKey单点登录官方(MaxKeyTop)
/
MaxKey
9 个月 前同步成功
通知
75
Star
3
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
MaxKey
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
0306cc54
编写于
5月 25, 2021
作者:
M
MaxKey
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
HistorySynchronizer
上级
a154e435
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
234 addition
and
2 deletion
+234
-2
maxkey-core/src/main/java/org/maxkey/entity/HistorySynchronizer.java
.../src/main/java/org/maxkey/entity/HistorySynchronizer.java
+16
-0
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
...ersistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
+15
-0
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java
...c/main/java/org/maxkey/web/contorller/LogsController.java
+25
-2
maxkey-web-manage/src/main/resources/messages/message.properties
...web-manage/src/main/resources/messages/message.properties
+11
-0
maxkey-web-manage/src/main/resources/messages/message_en.properties
...-manage/src/main/resources/messages/message_en.properties
+10
-0
maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
...nage/src/main/resources/messages/message_zh_CN.properties
+10
-0
maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
...age/src/main/resources/templates/views/layout/sidenav.ftl
+6
-0
maxkey-web-manage/src/main/resources/templates/views/logs/historySynchronizerList.ftl
...esources/templates/views/logs/historySynchronizerList.ftl
+141
-0
未找到文件。
maxkey-core/src/main/java/org/maxkey/entity/HistorySynchronizer.java
浏览文件 @
0306cc54
...
...
@@ -37,6 +37,9 @@ public class HistorySynchronizer extends JpaBaseEntity implements Serializable
@Column
String
result
;
String
startDate
;
String
endDate
;
public
String
getId
()
{
return
id
;
}
...
...
@@ -88,6 +91,19 @@ public class HistorySynchronizer extends JpaBaseEntity implements Serializable
public
HistorySynchronizer
()
{
super
();
}
public
String
getStartDate
()
{
return
startDate
;
}
public
void
setStartDate
(
String
startDate
)
{
this
.
startDate
=
startDate
;
}
public
String
getEndDate
()
{
return
endDate
;
}
public
void
setEndDate
(
String
endDate
)
{
this
.
endDate
=
endDate
;
}
@Override
public
String
toString
()
{
StringBuilder
builder
=
new
StringBuilder
();
...
...
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/HistorySynchronizerMapper.xml
浏览文件 @
0306cc54
...
...
@@ -6,6 +6,21 @@
<if
test=
"id != null and id != ''"
>
and id = #{id}
</if>
<if
test=
"syncId != null and syncId != ''"
>
and syncid = #{syncId}
</if>
<if
test=
"objectName != null and objectName != ''"
>
and objectname = #{objectName}
</if>
<if
test=
"result != null and result != ''"
>
and result = #{result}
</if>
<if
test=
"startDate != null and startDate != ''"
>
and synctime >= #{startDate}
</if>
<if
test=
"endDate != null and endDate != ''"
>
and #{endDate} >= synctime
</if>
</sql>
...
...
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/LogsController.java
浏览文件 @
0306cc54
...
...
@@ -24,13 +24,16 @@ import org.apache.mybatis.jpa.persistence.JpaPageResults;
import
org.maxkey.entity.HistoryLogin
;
import
org.maxkey.entity.HistoryLoginApps
;
import
org.maxkey.entity.HistoryLogs
;
import
org.maxkey.entity.HistorySynchronizer
;
import
org.maxkey.persistence.service.HistoryLoginAppsService
;
import
org.maxkey.persistence.service.HistoryLoginService
;
import
org.maxkey.persistence.service.HistoryLogsService
;
import
org.maxkey.persistence.service.HistorySynchronizerService
;
import
org.maxkey.util.DateUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.propertyeditors.CustomDateEditor
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.bind.WebDataBinder
;
...
...
@@ -60,6 +63,10 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class);
@Autowired
HistoryLogsService
logsService
;
@Autowired
@Qualifier
(
"historySynchronizerService"
)
HistorySynchronizerService
historySynchronizerService
;
/**
* 查询操作日志
* @param logs
...
...
@@ -90,7 +97,7 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class);
@RequestMapping
(
value
={
"/loginHistory/grid"
})
@ResponseBody
public
JpaPageResults
<
HistoryLogin
>
logAuthsGrid
(
@ModelAttribute
(
"loginHistory"
)
HistoryLogin
loginHistory
){
_logger
.
debug
(
"logs/loginHistory/datagrid/
logsGrid()
"
+
loginHistory
);
_logger
.
debug
(
"logs/loginHistory/datagrid/ "
+
loginHistory
);
return
loginHistoryService
.
queryPageResults
(
loginHistory
);
}
...
...
@@ -109,11 +116,27 @@ final static Logger _logger = LoggerFactory.getLogger(LogsController.class);
@RequestMapping
(
value
={
"/loginAppsHistory/grid"
})
@ResponseBody
public
JpaPageResults
<
HistoryLoginApps
>
loginAppsHistoryGrid
(
@ModelAttribute
(
"loginAppsHistory"
)
HistoryLoginApps
loginAppsHistory
){
_logger
.
debug
(
"logs/loginAppsHistory/datagrid/
logsGrid()
"
+
loginAppsHistory
);
_logger
.
debug
(
"logs/loginAppsHistory/datagrid/ "
+
loginAppsHistory
);
loginAppsHistory
.
setId
(
null
);
return
loginAppsHistoryService
.
queryPageResults
(
loginAppsHistory
);
}
@RequestMapping
(
value
={
"/historySynchronizerList"
})
public
String
historySynchronizerList
(){
return
"logs/historySynchronizerList"
;
}
/**
* @param historySynchronizer
* @return
*/
@RequestMapping
(
value
={
"/historySynchronizer/grid"
})
@ResponseBody
public
JpaPageResults
<
HistorySynchronizer
>
historySynchronizerGrid
(
@ModelAttribute
(
"historySynchronizer"
)
HistorySynchronizer
historySynchronizer
){
_logger
.
debug
(
"logs/historySynchronizer/grid/ "
+
historySynchronizer
);
return
historySynchronizerService
.
queryPageResults
(
historySynchronizer
);
}
@RequestMapping
(
value
={
"/provisioningEventList"
})
public
String
provisioningEntryList
(){
...
...
maxkey-web-manage/src/main/resources/messages/message.properties
浏览文件 @
0306cc54
...
...
@@ -515,6 +515,16 @@ log.operate.content=\u5185\u5bb9
log.operate.messageType
=
\u
6d88
\u
606f
\u
7c7b
\u
578b
log.operate.operateType
=
\u
64cd
\u
4f5c
\u
7c7b
\u
578b
log.operate.username
=
\u
64cd
\u
4f5c
\u
4eba
#log.synchronizer
log.synchronizer.id
=
\u
7F16
\u
53F7
log.synchronizer.syncId
=
\u
540C
\u
6B65
\u5668\u
7F16
\u
53F7
log.synchronizer.syncName
=
\u
540C
\u
6B65
\u5668
log.synchronizer.objectId
=
\u
5BF9
\u
8C61
\u
7F16
\u
53F7
log.synchronizer.objectType
=
\u
5BF9
\u
8C61
\u
540D
\u
79F0
log.synchronizer.objectName
=
\u
5BF9
\u
8C61
\u
540D
\u
79F0
log.synchronizer.syncTime
=
\u
540C
\u
6B65
\u
65F6
\u
95F4
log.synchronizer.result
=
\u
7ED3
\u
679C
#message
message.action.insert.success
=
\u
65b0
\u
589e
\u
64cd
\u
4f5c
\u6210\u
529f
message.action.insert.error
=
\u
65b0
\u
589e
\u
64cd
\u
4f5c
\u5931\u
8d25
...
...
@@ -549,6 +559,7 @@ navs.audit=\u65e5\u5fd7\u5ba1\u8ba1
navs.audit.login
=
\u
767b
\u
5f55
\u
65e5
\u
5fd7
navs.audit.loginapps
=
\u
8bbf
\u
95ee
\u
65e5
\u
5fd7
navs.audit.operate
=
\u
64cd
\u
4f5c
\u
65e5
\u
5fd7
navs.audit.synchronizer
=
\u
540C
\u
6B65
\u
65E5
\u
5FD7
navs.roles
=
\u
89d2
\u8272\u
7ba1
\u7406
navs.role.member
=
\u
89d2
\u8272\u7528\u6237
navs.role.permissions
=
\u
89d2
\u8272\u6743\u9650\u
7ba1
\u7406
...
...
maxkey-web-manage/src/main/resources/messages/message_en.properties
浏览文件 @
0306cc54
...
...
@@ -526,6 +526,15 @@ log.operate.messageType=messageType
log.operate.operateType
=
operateType
log.operate.username
=
username
log.synchronizer.id
=
Id
log.synchronizer.syncId
=
SyncId
log.synchronizer.syncName
=
SyncName
log.synchronizer.objectId
=
ObjectId
log.synchronizer.objectType
=
ObjectType
log.synchronizer.objectName
=
ObjectName
log.synchronizer.syncTime
=
SyncTime
log.synchronizer.result
=
Result
message.action.insert.success
=
Insert Success
message.action.insert.error
=
Insert Error
message.action.update.success
=
Update Success
...
...
@@ -560,6 +569,7 @@ navs.audit=Audit
navs.audit.login
=
Login
navs.audit.loginapps
=
LoginApps
navs.audit.operate
=
Operate
navs.audit.synchronizer
=
Synchronizer
navs.roles
=
Roles
navs.role.member
=
RoleMember
navs.role.permissions
=
Permissions
...
...
maxkey-web-manage/src/main/resources/messages/message_zh_CN.properties
浏览文件 @
0306cc54
...
...
@@ -524,6 +524,15 @@ log.operate.messageType=\u6d88\u606f\u7c7b\u578b
log.operate.operateType
=
\u
64cd
\u
4f5c
\u
7c7b
\u
578b
log.operate.username
=
\u
64cd
\u
4f5c
\u
4eba
log.synchronizer.id
=
\u
7F16
\u
53F7
log.synchronizer.syncId
=
\u
540C
\u
6B65
\u5668\u
7F16
\u
53F7
log.synchronizer.syncName
=
\u
540C
\u
6B65
\u5668
log.synchronizer.objectId
=
\u
5BF9
\u
8C61
\u
7F16
\u
53F7
log.synchronizer.objectType
=
\u
5BF9
\u
8C61
\u
540D
\u
79F0
log.synchronizer.objectName
=
\u
5BF9
\u
8C61
\u
540D
\u
79F0
log.synchronizer.syncTime
=
\u
540C
\u
6B65
\u
65F6
\u
95F4
log.synchronizer.result
=
\u
7ED3
\u
679C
message.action.insert.success
=
\u
65b0
\u
589e
\u
64cd
\u
4f5c
\u6210\u
529f
message.action.insert.error
=
\u
65b0
\u
589e
\u
64cd
\u
4f5c
\u5931\u
8d25
message.action.update.success
=
\u
66f4
\u
65b0
\u
64cd
\u
4f5c
\u6210\u
529f
...
...
@@ -558,6 +567,7 @@ navs.audit=\u65e5\u5fd7\u5ba1\u8ba1
navs.audit.login
=
\u
767b
\u
5f55
\u
65e5
\u
5fd7
navs.audit.loginapps
=
\u
8bbf
\u
95ee
\u
65e5
\u
5fd7
navs.audit.operate
=
\u
64cd
\u
4f5c
\u
65e5
\u
5fd7
navs.audit.synchronizer
=
\u
540C
\u
6B65
\u
65E5
\u
5FD7
navs.roles
=
\u
89d2
\u8272\u
7ba1
\u7406
navs.role.member
=
\u
89d2
\u8272\u7528\u6237
navs.role.permissions
=
\u
89d2
\u8272\u6743\u9650\u
7ba1
\u7406
...
...
maxkey-web-manage/src/main/resources/templates/views/layout/sidenav.ftl
浏览文件 @
0306cc54
...
...
@@ -141,6 +141,12 @@
<span class="fa fa-fw fa-eraser"></span>
</a>
</li>
<li>
<a class="side-nav-menu" href="<@base />/logs/historySynchronizerList/">
<@locale code="navs.audit.synchronizer"/>
<span class="fa fa-fw fa-eraser"></span>
</a>
</li>
<li>
<a class="side-nav-menu" href="<@base />/logs/list/">
<@locale code="navs.audit.operate"/>
...
...
maxkey-web-manage/src/main/resources/templates/views/logs/historySynchronizerList.ftl
0 → 100644
浏览文件 @
0306cc54
<!DOCTYPE HTML>
<html
xmlns=
"http://www.w3.org/1999/xhtml"
>
<head>
<
#include
"../
layout
/
header.ftl
"
/>
<
#include
"../
layout
/
common.cssjs.ftl
"
/>
<script
type=
"text/javascript"
>
</script>
</head>
<body>
<div
class=
"app header-default side-nav-dark"
>
<div
class=
"layout"
>
<div
class=
"header navbar"
>
<
#include
"../
layout
/
top.ftl
"
/>
</div>
<div
class=
"col-md-3 sidebar-nav side-nav"
>
<
#include
"../
layout
/
sidenav.ftl
"
/>
</div>
<div
class=
"page-container"
>
<div
class=
"main-content"
>
<div
class=
"container-fluid"
>
<div
class=
"breadcrumb-wrapper row"
>
<div
class=
"col-12 col-lg-3 col-md-6"
>
<h4
class=
"page-title"
><
@
locale
code=
"navs.audit.synchronizer"
/></h4>
</div>
<div
class=
"col-12 col-lg-9 col-md-6"
>
<ol
class=
"breadcrumb float-right"
>
<li><a
href=
"<@base/>/main"
><
@
locale
code=
"navs.home"
/></a></li>
<li
class=
"inactive"
>
/
<
@
locale
code=
"navs.audit"
/></li>
<li
class=
"active"
>
/
<
@
locale
code=
"navs.audit.synchronizer"
/></li>
</ol>
</div>
</div>
</div>
<div
class=
"container-fluid"
>
<div
class=
"content-wrapper row"
>
<div
class=
"col-12 grid-margin"
>
<div
class=
"card"
>
<div
class=
"card-body"
>
<div
id=
"tool_box"
>
<table
class=
"table table-bordered"
>
<tr>
<td
width=
"120px"
>
<
@
locale
code=
"log.synchronizer.syncId"
/>
:
</td>
<td
width=
"375px"
>
<form
id=
"basic_search_form"
>
<input
class=
"form-control"
name=
"syncId"
type=
"text"
style =
"width:150px;float:left;"
>
<input
class=
"button btn btn-primary mr-3"
id=
"searchBtn"
type=
"button"
size=
"50"
value=
"<@locale code="
button.text.search
"
/>
">
<input
class=
"button btn btn-secondary"
id=
"advancedSearchExpandBtn"
type=
"button"
size=
"50"
value=
"<@locale code="
button.text.expandsearch
"
/>
" expandValue="
<
@
locale
code=
"button.text.expandsearch"
/>
" collapseValue="
<
@
locale
code=
"button.text.collapsesearch"
/>
">
</form>
</td>
<td
colspan=
"2"
>
<div
id=
"tool_box_right"
>
</div>
</td>
</tr>
</table>
</div>
<div
id=
"advanced_search"
>
<form
id=
"advanced_search_form"
>
<table
class=
"table table-bordered"
>
<tr>
<td
width=
"120px"
><
@
locale
code=
"log.synchronizer.objectName"
/></td>
<td
width=
"360px"
>
<input
class=
"form-control"
name=
"objectName"
type=
"text"
>
</td>
<td
width=
"120px"
><
@
locale
code=
"log.synchronizer.result"
/></td>
<td
width=
"360px"
>
<input
class=
"form-control"
type=
"text"
id=
"result"
name=
"result"
title=
""
value=
""
/>
</td>
</tr>
<tr>
<td
width=
"120px"
><
@
locale
code=
"common.text.startdate"
/></td>
<td
width=
"360px"
>
<input
class=
"form-control datetimepicker"
type=
"text"
id=
"startDate"
name=
"startDate"
title=
""
value=
""
/>
</td>
<td
width=
"120px"
><
@
locale
code=
"common.text.enddate"
/></td>
<td
width=
"360px"
>
<input
class=
"form-control datetimepicker"
type=
"text"
id=
"endDate"
name=
"endDate"
title=
""
value=
""
/>
</td>
</tr>
</table>
</form>
</div>
<table
data-url=
"<@base />/logs/historySynchronizer/grid"
id=
"datagrid"
data-toggle=
"table"
data-classes=
"table table-bordered table-hover table-striped"
data-pagination=
"true"
data-total-field=
"records"
data-page-list=
"[10, 25, 50, 100]"
data-search=
"false"
data-locale=
"zh-CN"
data-query-params=
"dataGridQueryParams"
data-query-params-type=
"pageSize"
data-side-pagination=
"server"
>
<thead>
<tr>
<th
data-sortable=
"true"
data-field=
"id"
data-visible=
"false"
><
@
locale
code=
"log.synchronizer.id"
/></th>
<th
data-field=
"syncId"
><
@
locale
code=
"log.synchronizer.syncId"
/></th>
<th
data-field=
"syncName"
><
@
locale
code=
"log.synchronizer.syncName"
/></th>
<th
data-field=
"objectId"
><
@
locale
code=
"log.synchronizer.objectId"
/></th>
<th
data-field=
"objectType"
><
@
locale
code=
"log.synchronizer.objectType"
/></th>
<th
data-field=
"objectName"
><
@
locale
code=
"log.synchronizer.objectName"
/></th>
<th
data-field=
"syncTime"
><
@
locale
code=
"log.synchronizer.syncTime"
/></th>
<th
data-field=
"result"
><
@
locale
code=
"log.synchronizer.result"
/></th>
</tr>
</thead>
</table>
</div>
</div>
</div>
</div>
<footer
class=
"content-footer"
>
<
#include
"../
layout
/
footer.ftl
"
/>
</footer>
</div>
</div>
</div>
<div
id=
"preloader"
>
<div
class=
"loader"
id=
"loader-1"
></div>
</div>
</body>
</html>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录