From 8b0c8a45d118c0aa74f9107331d7721ed958a55c Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Thu, 18 Apr 2024 16:36:43 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 .../views/SecurityAuditUser-grid.xml          |  2 +-
 .../resources/views/SecurityUser-grid.xml     |  2 +-
 .../main/resources/views/ServiceUser-grid.xml |  2 +-
 .../resources/views/SystemManageUser-grid.xml |  2 +-
 .../src/main/resources/views/actionGroup.xml  | 25 ++++++++-----------
 .../test/src/main/resources/views/menu.xml    |  4 +--
 .../views/securityAuditUserExport-form.xml    | 14 +++++++++++
 .../views/securityUserExport-form.xml         | 14 +++++++++++
 .../views/serviceUserExport-form.xml          | 14 +++++++++++
 .../views/systemManageUserExport-form.xml     | 14 +++++++++++
 src/main/resources/application.properties     |  1 +
 11 files changed, 74 insertions(+), 20 deletions(-)
 create mode 100644 modules/test/src/main/resources/views/securityAuditUserExport-form.xml
 create mode 100644 modules/test/src/main/resources/views/securityUserExport-form.xml
 create mode 100644 modules/test/src/main/resources/views/serviceUserExport-form.xml
 create mode 100644 modules/test/src/main/resources/views/systemManageUserExport-form.xml

diff --git a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
index ba0ff57..c5d8966 100644
--- a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
@@ -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">
   <grid title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large">
     <toolbar>
-      <button onClick="action.method.system.securityAuditUserLogExport" title="导出" name="导出"/>
+      <button onClick="action.view.securityAuditUserExport.Log" title="导出" name="导出"/>
     </toolbar>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
     <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>
diff --git a/modules/test/src/main/resources/views/SecurityUser-grid.xml b/modules/test/src/main/resources/views/SecurityUser-grid.xml
index ecdbe62..46889fe 100644
--- a/modules/test/src/main/resources/views/SecurityUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityUser-grid.xml
@@ -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">
   <grid title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large">
     <toolbar>
-      <button onClick="action.method.system.securityUserLogExport" title="导出" name="导出"/>
+      <button onClick="action.view.securityUserExport.Log" title="导出" name="导出"/>
     </toolbar>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
     <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>
diff --git a/modules/test/src/main/resources/views/ServiceUser-grid.xml b/modules/test/src/main/resources/views/ServiceUser-grid.xml
index 10afe8a..1f975e7 100644
--- a/modules/test/src/main/resources/views/ServiceUser-grid.xml
+++ b/modules/test/src/main/resources/views/ServiceUser-grid.xml
@@ -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">
   <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>
-      <button onClick="action.method.system.serviceUserLogExport" title="导出" name="导出"/>
+      <button onClick="action.view.serviceUserExport.Log" title="导出" name="导出"/>
       <button onClick="action.view.ServiceUserLogBackup.Log" title="日志备份" name="日志备份"/>
     </toolbar>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
diff --git a/modules/test/src/main/resources/views/SystemManageUser-grid.xml b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
index d3b238c..18c7fed 100644
--- a/modules/test/src/main/resources/views/SystemManageUser-grid.xml
+++ b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
@@ -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">
   <grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large">
     <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="日志备份"/>
     </toolbar>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index 8a42612..932e806 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -3,9 +3,15 @@
   <action-method name="action.method.system.securityAuditUserLogExport" model="Log.LogEntity">
     <call method="exportSecurityAuditUserLog" class="com.system.log.controller.LogController"/>
   </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">
     <call method="exportSystemManageUserLog" class="com.system.log.controller.LogController"/>
   </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="业务用户">
     <view name="ServiceUser-grid" type="grid"/>
     <view name="ServiceUser-form" type="form"/>
@@ -29,12 +35,12 @@
   <action-method name="action.method.system.serviceUserLogExport" model="Log.LogEntity">
     <call method="exportServiceUserLog" class="com.system.log.controller.LogController"/>
   </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="业务用户日志备份">
     <view name="ServiceUserLogBackup-grid" type="grid"/>
   </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="安全审计员">
     <view name="SecurityAuditUser-grid" type="grid"/>
     <view name="SecurityAuditUser-form" type="form"/>
@@ -54,16 +60,7 @@
   <action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份">
     <view name="SystemManageUserBackup-grid" type="grid"/>
   </action-view>
-
-  <action-method name="action.method.system.logManage.systemLog" model="Log.LogEntity">
-    <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 name="action.view.securityUserExport.Log" model="Log.LogEntity" title="安全保密员日志导出">
+    <view name="securityUserExport-form" type="form"/>
   </action-view>
 </object-views>
diff --git a/modules/test/src/main/resources/views/menu.xml b/modules/test/src/main/resources/views/menu.xml
index 7ea9f9b..f765997 100644
--- a/modules/test/src/main/resources/views/menu.xml
+++ b/modules/test/src/main/resources/views/menu.xml
@@ -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-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-System-Log"  action="action.view.selectSystemLog.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-System-Log"/>
+  <menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log"/>
 </object-views>
diff --git a/modules/test/src/main/resources/views/securityAuditUserExport-form.xml b/modules/test/src/main/resources/views/securityAuditUserExport-form.xml
new file mode 100644
index 0000000..140236e
--- /dev/null
+++ b/modules/test/src/main/resources/views/securityAuditUserExport-form.xml
@@ -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>
diff --git a/modules/test/src/main/resources/views/securityUserExport-form.xml b/modules/test/src/main/resources/views/securityUserExport-form.xml
new file mode 100644
index 0000000..fd0f638
--- /dev/null
+++ b/modules/test/src/main/resources/views/securityUserExport-form.xml
@@ -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>
diff --git a/modules/test/src/main/resources/views/serviceUserExport-form.xml b/modules/test/src/main/resources/views/serviceUserExport-form.xml
new file mode 100644
index 0000000..6e7206b
--- /dev/null
+++ b/modules/test/src/main/resources/views/serviceUserExport-form.xml
@@ -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>
diff --git a/modules/test/src/main/resources/views/systemManageUserExport-form.xml b/modules/test/src/main/resources/views/systemManageUserExport-form.xml
new file mode 100644
index 0000000..91e6c4f
--- /dev/null
+++ b/modules/test/src/main/resources/views/systemManageUserExport-form.xml
@@ -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>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 056e8ec..ea9da8a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -467,5 +467,6 @@ logging.level.com.hypaas=INFO
 
 
 
+