zhangqiyang
/
logManage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Configure Continuous Integration ....

master
hypaas 7 months ago
parent
59e9c75196
commit
8b0c8a45d1
11 changed files with 74 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
  2. 2
      modules/test/src/main/resources/views/SecurityUser-grid.xml
  3. 2
      modules/test/src/main/resources/views/ServiceUser-grid.xml
  4. 2
      modules/test/src/main/resources/views/SystemManageUser-grid.xml
  5. 25
      modules/test/src/main/resources/views/actionGroup.xml
  6. 4
      modules/test/src/main/resources/views/menu.xml
  7. 14
      modules/test/src/main/resources/views/securityAuditUserExport-form.xml
  8. 14
      modules/test/src/main/resources/views/securityUserExport-form.xml
  9. 14
      modules/test/src/main/resources/views/serviceUserExport-form.xml
  10. 14
      modules/test/src/main/resources/views/systemManageUserExport-form.xml
  11. 1
      src/main/resources/application.properties

2
modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large"> <grid title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.method.system.securityAuditUserLogExport" title="导出" name="导出"/> <button onClick="action.view.securityAuditUserExport.Log" title="导出" name="导出"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
<field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/> <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>

2
modules/test/src/main/resources/views/SecurityUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large"> <grid title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.method.system.securityUserLogExport" title="导出" name="导出"/> <button onClick="action.view.securityUserExport.Log" title="导出" name="导出"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
<field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/> <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>

2
modules/test/src/main/resources/views/ServiceUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid canMove="false" canNew="true" title="业务用户操作日志" model="Log.LogEntity" canDelete="true" edit-icon="true" canArchive="false" editable="false" canSave="false" freeSearch="all" name="ServiceUser-grid" width="large" customSearch="true"> <grid canMove="false" canNew="true" title="业务用户操作日志" model="Log.LogEntity" canDelete="true" edit-icon="true" canArchive="false" editable="false" canSave="false" freeSearch="all" name="ServiceUser-grid" width="large" customSearch="true">
<toolbar> <toolbar>
<button onClick="action.method.system.serviceUserLogExport" title="导出" name="导出"/> <button onClick="action.view.serviceUserExport.Log" title="导出" name="导出"/>
<button onClick="action.view.ServiceUserLogBackup.Log" title="日志备份" name="日志备份"/> <button onClick="action.view.ServiceUserLogBackup.Log" title="日志备份" name="日志备份"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>

2
modules/test/src/main/resources/views/SystemManageUser-grid.xml
Unescape View File

@ -2,7 +2,7 @@
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd"> <object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large"> <grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large">
<toolbar> <toolbar>
<button onClick="action.method.system.systemManageUserLogExport" title="导出" name="导出"/> <button onClick="action.view.systemManageUserExport.Log" title="导出" name="导出"/>
<button onClick="action.view.SystemManageUserLogBackup.Log" title="日志备份" name="日志备份"/> <button onClick="action.view.SystemManageUserLogBackup.Log" title="日志备份" name="日志备份"/>
</toolbar> </toolbar>
<field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/> <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>

25
modules/test/src/main/resources/views/actionGroup.xml
Unescape View File

@ -3,9 +3,15 @@
<action-method name="action.method.system.securityAuditUserLogExport" model="Log.LogEntity"> <action-method name="action.method.system.securityAuditUserLogExport" model="Log.LogEntity">
<call method="exportSecurityAuditUserLog" class="com.system.log.controller.LogController"/> <call method="exportSecurityAuditUserLog" class="com.system.log.controller.LogController"/>
</action-method> </action-method>
<action-view name="action.view.systemManageUserExport.Log" model="Log.LogEntity" title="系统管理员日志导出">
<view name="systemManageUserExport-form" type="form"/>
</action-view>
<action-method name="action.method.system.systemManageUserLogExport" model="Log.LogEntity"> <action-method name="action.method.system.systemManageUserLogExport" model="Log.LogEntity">
<call method="exportSystemManageUserLog" class="com.system.log.controller.LogController"/> <call method="exportSystemManageUserLog" class="com.system.log.controller.LogController"/>
</action-method> </action-method>
<action-view name="action.view.securityAuditUserExport.Log" model="Log.LogEntity" title="安全审计员日志导出">
<view name="securityAuditUserExport-form" type="form"/>
</action-view>
<action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户"> <action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户">
<view name="ServiceUser-grid" type="grid"/> <view name="ServiceUser-grid" type="grid"/>
<view name="ServiceUser-form" type="form"/> <view name="ServiceUser-form" type="form"/>
@ -29,12 +35,12 @@
<action-method name="action.method.system.serviceUserLogExport" model="Log.LogEntity"> <action-method name="action.method.system.serviceUserLogExport" model="Log.LogEntity">
<call method="exportServiceUserLog" class="com.system.log.controller.LogController"/> <call method="exportServiceUserLog" class="com.system.log.controller.LogController"/>
</action-method> </action-method>
<action-view name="action.view.Export.Log" model="Log.LogEntity" title="日志导出">
<view name="export-form" type="form"/>
</action-view>
<action-view name="action.view.ServiceUserLogBackup.Log" model="Log.LogConfig" title="业务用户日志备份"> <action-view name="action.view.ServiceUserLogBackup.Log" model="Log.LogConfig" title="业务用户日志备份">
<view name="ServiceUserLogBackup-grid" type="grid"/> <view name="ServiceUserLogBackup-grid" type="grid"/>
</action-view> </action-view>
<action-view name="action.view.serviceUserExport.Log" model="Log.LogEntity" title="业务用户日志导出">
<view name="serviceUserExport-form" type="form"/>
</action-view>
<action-view name="action.view.SecurityAuditUser.Log" model="Log.LogEntity" title="安全审计员"> <action-view name="action.view.SecurityAuditUser.Log" model="Log.LogEntity" title="安全审计员">
<view name="SecurityAuditUser-grid" type="grid"/> <view name="SecurityAuditUser-grid" type="grid"/>
<view name="SecurityAuditUser-form" type="form"/> <view name="SecurityAuditUser-form" type="form"/>
@ -54,16 +60,7 @@
<action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份"> <action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份">
<view name="SystemManageUserBackup-grid" type="grid"/> <view name="SystemManageUserBackup-grid" type="grid"/>
</action-view> </action-view>
<action-view name="action.view.securityUserExport.Log" model="Log.LogEntity" title="安全保密员日志导出">
<action-method name="action.method.system.logManage.systemLog" model="Log.LogEntity"> <view name="securityUserExport-form" type="form"/>
<call method="getFileZip" class="com.system.log.controller.LogController"/>
</action-method>
<action-view name="action.view.selectSystemLog.Log" model="Log.LogEntity" title="系统运行日志查询">
<view name="LogWeb/index.html" type="html"/>
</action-view>
<action-view name="action.view.SecurityUser.LogConfig" model="Log.LogConfig" title="日志配置">
<view name="LogBackup/index.html" type="html"/>
</action-view> </action-view>
</object-views> </object-views>

4
modules/test/src/main/resources/views/menu.xml
Unescape View File

@ -5,6 +5,6 @@
<menuitem parent="menu-LogManage" title="安全审计员操作日志" left="true" name="menu-SecurityAuditUser-Log" action="action.view.SecurityAuditUser.Log"/> <menuitem parent="menu-LogManage" title="安全审计员操作日志" left="true" name="menu-SecurityAuditUser-Log" action="action.view.SecurityAuditUser.Log"/>
<menuitem parent="menu-LogManage" title="系统管理员操作日志" left="true" name="menu-SystemManageUser-Log" action="action.view.SystemManageUser.Log"/> <menuitem parent="menu-LogManage" title="系统管理员操作日志" left="true" name="menu-SystemManageUser-Log" action="action.view.SystemManageUser.Log"/>
<menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-SecurityUser-Log" action="action.view.SecurityUser.Log"/> <menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-SecurityUser-Log" action="action.view.SecurityUser.Log"/>
<menuitem parent="menu-LogManage" title="系统运行日志" left="true" name="menu-System-Log" action="action.view.selectSystemLog.Log"/> <menuitem parent="menu-LogManage" title="系统运行日志" left="true" name="menu-System-Log"/>
<menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log" action="action.view.SecurityUser.LogConfig"/> <menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log"/>
</object-views> </object-views>

14
modules/test/src/main/resources/views/securityAuditUserExport-form.xml
Unescape View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<form title="安全审计员日志导出表单" model="Log.LogEntity" canSave="false" name="securityAuditUserExport-form" width="large">
<toolbar>
<button onClick="action.method.system.securityAuditUserLogExport" title="保存并导出" name="保存并导出"/>
</toolbar>
<panel title="导出信息填写" itemSpan="6" showFrame="true" name="panel_12">
<field required="true" canSuggest="true" name="password" title="密码(需要包含6-16位数字+大写字母+小写字母+特殊字符)"/>
<field required="true" canSuggest="true" name="confirmPassword" title="确认密码"/>
<field canSuggest="true" name="exportStartTime" title="开始时间"/>
<field canSuggest="true" name="exportEndTime" title="结束时间"/>
</panel>
</form>
</object-views>

14
modules/test/src/main/resources/views/securityUserExport-form.xml
Unescape View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<form title="安全保密员日志导出表单" model="Log.LogEntity" canSave="false" name="securityUserExport-form" width="large">
<toolbar>
<button onClick="action.method.system.securityUserLogExport" title="保存并导出" name="保存并导出"/>
</toolbar>
<panel title="导出信息填写" itemSpan="6" showFrame="true" name="panel_12">
<field required="true" canSuggest="true" name="password" title="密码(需要包含6-16位数字+大写字母+小写字母+特殊字符)"/>
<field required="true" canSuggest="true" name="confirmPassword" title="确认密码"/>
<field canSuggest="true" name="exportStartTime" title="开始时间"/>
<field canSuggest="true" name="exportEndTime" title="结束时间"/>
</panel>
</form>
</object-views>

14
modules/test/src/main/resources/views/serviceUserExport-form.xml
Unescape View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<form title="业务用户日志导出表单" model="Log.LogEntity" canSave="false" name="serviceUserExport-form" width="large">
<toolbar>
<button onClick="action.method.system.serviceUserLogExport" title="保存并导出" name="保存并导出"/>
</toolbar>
<panel title="导出信息填写" itemSpan="6" showFrame="true" name="panel_12">
<field required="true" canSuggest="true" name="password" title="密码(需要包含6-16位数字+大写字母+小写字母+特殊字符)"/>
<field required="true" canSuggest="true" name="confirmPassword" title="确认密码"/>
<field canSuggest="true" name="exportStartTime" title="开始时间"/>
<field canSuggest="true" name="exportEndTime" title="结束时间"/>
</panel>
</form>
</object-views>

14
modules/test/src/main/resources/views/systemManageUserExport-form.xml
Unescape View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<object-views xmlns="http://hypaas.com/xml/ns/object-views" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/object-views http://hypaas.com/xml/ns/object-views/object-views_5.3.xsd">
<form title="系统管理员日志导出表单" model="Log.LogEntity" canSave="false" name="systemManageUserExport-form" width="large">
<toolbar>
<button onClick="action.method.system.systemManageUserLogExport" title="保存并导出" name="保存并导出"/>
</toolbar>
<panel title="导出信息填写" itemSpan="6" showFrame="true" name="panel_12">
<field required="true" canSuggest="true" name="password" title="密码(需要包含6-16位数字+大写字母+小写字母+特殊字符)"/>
<field required="true" canSuggest="true" name="confirmPassword" title="确认密码"/>
<field canSuggest="true" name="exportStartTime" title="开始时间"/>
<field canSuggest="true" name="exportEndTime" title="结束时间"/>
</panel>
</form>
</object-views>

1
src/main/resources/application.properties
Unescape View File

@ -467,5 +467,6 @@ logging.level.com.hypaas=INFO

Write Preview
Loading…
Cancel
Save