From e5f8a9374f2ca24cd2a092c042b52a87c762ca7a Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Wed, 17 Apr 2024 09:51:01 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 .../resources/views/ServiceUserLogBackup-grid.xml    |  4 ++--
 .../main/resources/views/SystemManageUser-grid.xml   |  1 +
 .../resources/views/SystemManageUserBackup-grid.xml  | 12 ++++++++++++
 .../test/src/main/resources/views/actionGroup.xml    |  9 ++++++---
 src/main/resources/application.properties            |  1 +
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 modules/test/src/main/resources/views/SystemManageUserBackup-grid.xml

diff --git a/modules/test/src/main/resources/views/ServiceUserLogBackup-grid.xml b/modules/test/src/main/resources/views/ServiceUserLogBackup-grid.xml
index e382cf9..1e1e6ce 100644
--- a/modules/test/src/main/resources/views/ServiceUserLogBackup-grid.xml
+++ b/modules/test/src/main/resources/views/ServiceUserLogBackup-grid.xml
@@ -1,8 +1,8 @@
 <?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">
   <grid canEdit="false" canNew="false" title="业务用户日志备份" model="Log.LogConfig" canDelete="false" edit-icon="false" canArchive="false" freeSearch="all" name="ServiceUserLogBackup-grid" width="large">
-    <field name="logStartTime" title="日志起始时间"/>
-    <field name="logEndTime" title="日志结束时间"/>
+    <field search-field="true" canSuggest="true" name="logStartTime" title="日志起始时间"/>
+    <field search-field="true" canSuggest="true" name="logEndTime" title="日志结束时间"/>
     <field name="thresholdSize" title="备份大小"/>
     <field search-field="true" canSuggest="true" name="status" title="日志状态"/>
     <field search-field="true" canSuggest="true" name="backupTime" title="备份时间"/>
diff --git a/modules/test/src/main/resources/views/SystemManageUser-grid.xml b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
index 318bff0..ca47f89 100644
--- a/modules/test/src/main/resources/views/SystemManageUser-grid.xml
+++ b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
@@ -3,6 +3,7 @@
   <grid title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large">
     <toolbar>
       <button onClick="action.view.Export.Log" title="导出" name="导出"/>
+      <button onClick="action.view.SystemManageUserLogBackup.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/SystemManageUserBackup-grid.xml b/modules/test/src/main/resources/views/SystemManageUserBackup-grid.xml
new file mode 100644
index 0000000..6b0beb7
--- /dev/null
+++ b/modules/test/src/main/resources/views/SystemManageUserBackup-grid.xml
@@ -0,0 +1,12 @@
+<?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">
+  <grid canEdit="false" canNew="false" title="系统管理员日志备份" model="Log.LogConfig" canDelete="false" edit-icon="false" canArchive="false" freeSearch="all" name="SystemManageUserBackup-grid" width="large">
+    <field name="logStartTime" title="日志起始时间"/>
+    <field name="logEndTime" title="日志结束时间"/>
+    <field name="thresholdSize" title="备份大小"/>
+    <field name="status" title="日志状态"/>
+    <field search-field="true" canSuggest="true" name="backupTime" title="备份时间"/>
+    <button onClick="action.method.system.logBackup" icon="fa-edit" title="备份" showIf="status=='备份失败'" name="备份"/>
+    <button onClick="action.method.system.logDeleteBackup" icon="fa-edit" title="删除备份" showIf="status=='已备份'" name="删除备份"/>
+  </grid>
+</object-views>
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index d76c11b..8f7d639 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -3,7 +3,7 @@
   <action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户">
     <view name="ServiceUser-grid" type="grid"/>
     <view name="ServiceUser-form" type="form"/>
-    <domain>self.userAuth=16</domain>
+    <domain>self.userAuth=3</domain>
   </action-view>
   <action-view name="action.view.SecurityUser.Log" model="Log.LogEntity" title="安全保密员">
     <view name="SecurityUser-grid" type="grid"/>
@@ -20,7 +20,7 @@
   <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" title="业务用户日志备份">
+  <action-view name="action.view.ServiceUserLogBackup.Log" model="Log.LogConfig" title="业务用户日志备份">
     <view name="ServiceUserLogBackup-grid" type="grid"/>
   </action-view>
   <action-method name="action.method.system.logDeleteBackup" model="Log.LogConfig">
@@ -37,9 +37,12 @@
   <action-view name="action.view.SystemManageUser.Log" model="Log.LogEntity" title="系统管理员">
     <view name="SystemManageUser-grid" type="grid"/>
     <view name="SystemManageUser-form" type="form"/>
-    <domain>self.userAuth=4</domain>
+    <domain>self.userAuth=16</domain>
   </action-view>
   <action-view name="action.view.System.Log" title="查询系统日志">
     <view name="SystemManageUser-grid" type="grid"/>
   </action-view>
+  <action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份">
+    <view name="SystemManageUserBackup-grid" type="grid"/>
+  </action-view>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 97a478c..57ce924 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -463,5 +463,6 @@ application.gatewaycontext=/lowcode-portal-logmanage/
 
 
 
+