From bd187400b4f21d4cba7d71a531075be7bfa149f4 Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Sun, 31 Dec 2023 12:10:39 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 .../test/src/main/resources/domains/LogEntity.xml |  2 +-
 .../src/main/resources/domains/OperateType.xml    | 11 ++++++++---
 .../resources/views/SecurityAuditUser-form.xml    | 15 +++++++++++++++
 .../main/resources/views/SecurityUser-form.xml    | 15 +++++++++++++++
 .../src/main/resources/views/ServiceUser-form.xml | 15 +++++++++++++++
 .../src/main/resources/views/ServiceUser-grid.xml |  2 +-
 .../resources/views/SystemManageUser-form.xml     | 15 +++++++++++++++
 .../test/src/main/resources/views/actionGroup.xml |  5 ++++-
 modules/test/src/main/resources/views/menu.xml    |  5 ++++-
 src/main/resources/application.properties         |  1 +
 10 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 modules/test/src/main/resources/views/SecurityAuditUser-form.xml
 create mode 100644 modules/test/src/main/resources/views/SecurityUser-form.xml
 create mode 100644 modules/test/src/main/resources/views/ServiceUser-form.xml
 create mode 100644 modules/test/src/main/resources/views/SystemManageUser-form.xml

diff --git a/modules/test/src/main/resources/domains/LogEntity.xml b/modules/test/src/main/resources/domains/LogEntity.xml
index b688876..e22182d 100644
--- a/modules/test/src/main/resources/domains/LogEntity.xml
+++ b/modules/test/src/main/resources/domains/LogEntity.xml
@@ -10,7 +10,7 @@
     <long nullable="true" column="HASHVALUE" actOverwrite="false" massUpdate="false" name="hashValue" copy="true" isJudg="false"/>
     <string nullable="true" actOverwrite="false" copy="true" column="LEVELDESC" massUpdate="false" name="levelDesc" isJudg="false"/>
     <enum column="LEVELNUM" massUpdate="false" ref="module.AlarmLevel" name="levelNum" copy="true"/>
-    <enum column="MODULE" massUpdate="false" ref="module.Module" name="module" copy="true"/>
+    <string actOverwrite="false" copy="true" column="MODULE" massUpdate="false" name="module" isJudg="false"/>
     <string actOverwrite="false" copy="true" column="OBJECTNAME" massUpdate="false" name="objectName" isJudg="false"/>
     <enum column="OPTYPE" massUpdate="false" ref="module.OperateType" name="opType" copy="true"/>
     <string nullable="true" actOverwrite="false" copy="true" column="PROGRAM" massUpdate="false" name="program" isJudg="false"/>
diff --git a/modules/test/src/main/resources/domains/OperateType.xml b/modules/test/src/main/resources/domains/OperateType.xml
index d4be4fe..18b3303 100644
--- a/modules/test/src/main/resources/domains/OperateType.xml
+++ b/modules/test/src/main/resources/domains/OperateType.xml
@@ -2,8 +2,13 @@
 <domain-models  xmlns="http://hypaas.com/xml/ns/domain-models" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://hypaas.com/xml/ns/domain-models http://hypaas.com/xml/ns/domain-models/domain-models_5.2.xsd">
   <module name="com.module.enmus" package="module"/>
   <enum name="OperateType">
-    <item name="DataOperation" value="数据操作"/>
-    <item name="TextOperation" value="文本操作"/>
-    <item name="AssistOperation" value="辅助操作"/>
+    <item name="Login" title="登录" value="Login"/>
+    <item name="Exit" title="退出" value="Exit"/>
+    <item name="New" title="新建" value="New"/>
+    <item name="Update" title="修改" value="Update"/>
+    <item name="Delete" title="删除" value="Delete"/>
+    <item name="Select" title="查询" value="Select"/>
+    <item name="BatchImport" title="批量导入" value="BatchImport"/>
+    <item name="BatchExport" title="批量导出" value="BatchExport"/>
   </enum>
 </domain-models>
diff --git a/modules/test/src/main/resources/views/SecurityAuditUser-form.xml b/modules/test/src/main/resources/views/SecurityAuditUser-form.xml
new file mode 100644
index 0000000..21c82a9
--- /dev/null
+++ b/modules/test/src/main/resources/views/SecurityAuditUser-form.xml
@@ -0,0 +1,15 @@
+<?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" name="SecurityAuditUser-form" width="large">
+    <panel title="安全审计员操作日志" itemSpan="6" showFrame="true" name="panel_5">
+      <field canSuggest="true" name="userId" title="用户id"/>
+      <field canSuggest="true" name="objectName" title="客体"/>
+      <field canSuggest="true" name="content" title="操作内容"/>
+      <field canSuggest="true" name="address" title="IP地址"/>
+      <field canSuggest="true" name="levelNum" title="告警级别"/>
+      <field canSuggest="true" name="module" title="操作模块"/>
+      <field canSuggest="true" name="opType" title="操作类型"/>
+      <field canSuggest="true" name="time" title="操作时间"/>
+    </panel>
+  </form>
+</object-views>
diff --git a/modules/test/src/main/resources/views/SecurityUser-form.xml b/modules/test/src/main/resources/views/SecurityUser-form.xml
new file mode 100644
index 0000000..9664bd6
--- /dev/null
+++ b/modules/test/src/main/resources/views/SecurityUser-form.xml
@@ -0,0 +1,15 @@
+<?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" name="SecurityUser-form" width="large">
+    <panel title="安全保密员操作日志" itemSpan="6" showFrame="true" name="panel_15">
+      <field canSuggest="true" name="userId" title="用户id"/>
+      <field canSuggest="true" name="objectName" title="客体"/>
+      <field canSuggest="true" name="content" title="操作内容"/>
+      <field canSuggest="true" name="address" title="IP地址"/>
+      <field canSuggest="true" name="levelNum" title="日志级别"/>
+      <field canSuggest="true" name="module" title="操作模块"/>
+      <field canSuggest="true" name="opType" title="操作类型"/>
+      <field canSuggest="true" name="time" title="操作时间"/>
+    </panel>
+  </form>
+</object-views>
diff --git a/modules/test/src/main/resources/views/ServiceUser-form.xml b/modules/test/src/main/resources/views/ServiceUser-form.xml
new file mode 100644
index 0000000..87f7e98
--- /dev/null
+++ b/modules/test/src/main/resources/views/ServiceUser-form.xml
@@ -0,0 +1,15 @@
+<?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" name="ServiceUser-form" width="large">
+    <panel title="业务用户操作日志" itemSpan="6" showFrame="true" name="panel_6">
+      <field canSuggest="true" name="userId" title="用户id"/>
+      <field canSuggest="true" name="objectName" title="客体"/>
+      <field canSuggest="true" name="content" title="操作内容"/>
+      <field canSuggest="true" name="address" title="IP地址"/>
+      <field canSuggest="true" name="levelNum" title="日志级别"/>
+      <field canSuggest="true" name="module" title="操作模块"/>
+      <field canSuggest="true" name="opType" title="操作类型"/>
+      <field canSuggest="true" name="time" title="操作时间"/>
+    </panel>
+  </form>
+</object-views>
diff --git a/modules/test/src/main/resources/views/ServiceUser-grid.xml b/modules/test/src/main/resources/views/ServiceUser-grid.xml
index 40064c6..cce2d50 100644
--- a/modules/test/src/main/resources/views/ServiceUser-grid.xml
+++ b/modules/test/src/main/resources/views/ServiceUser-grid.xml
@@ -1,6 +1,6 @@
 <?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 canMove="false" canEdit="false" canNew="false" title="业务用户操作日志" model="Log.LogEntity" canDelete="false" 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">
     <field type="string" search-field="true" canSuggest="true" name="userId" title="用户ID"/>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
     <field type="datetime" search-field="true" canSuggest="true" name="time" title="操作时间"/>
diff --git a/modules/test/src/main/resources/views/SystemManageUser-form.xml b/modules/test/src/main/resources/views/SystemManageUser-form.xml
new file mode 100644
index 0000000..b38f765
--- /dev/null
+++ b/modules/test/src/main/resources/views/SystemManageUser-form.xml
@@ -0,0 +1,15 @@
+<?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" name="SystemManageUser-form" width="large">
+    <panel title="系统管理员操作日志表单" itemSpan="6" showFrame="true" name="panel_3">
+      <field canSuggest="true" name="userId" title="用户id"/>
+      <field canSuggest="true" name="objectName" title="客体"/>
+      <field canSuggest="true" name="content" title="操作类型"/>
+      <field canSuggest="true" name="address" title="IP地址"/>
+      <field canSuggest="true" name="levelNum" title="告警级别"/>
+      <field canSuggest="true" name="module" title="操作模块"/>
+      <field canSuggest="true" name="opType" title="操作类型"/>
+      <field canSuggest="true" name="time" title="操作时间"/>
+    </panel>
+  </form>
+</object-views>
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index 7fd5205..b5147d1 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -2,19 +2,22 @@
 <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">
   <action-view name="action.view.ServiceUser.Log" model="Log.LogEntity" title="业务用户操作日志">
     <view name="ServiceUser-grid" type="grid"/>
-    <view name="Log-ServiceUser-form" type="form"/>
+    <view name="ServiceUser-form" type="form"/>
     <domain>self.userAuth=3</domain>
   </action-view>
   <action-view name="action.view.SecurityUser.Log" title="业务用户动作">
     <view name="SecurityUser-grid" type="grid"/>
+    <view name="SecurityUser-form" type="form"/>
     <domain>self.userAuth=1</domain>
   </action-view>
   <action-view name="action.view.SecurityAuditUser.Log" title="安全审计员动作">
     <view name="SecurityAuditUser-grid" type="grid"/>
+    <view name="SecurityAuditUser-form" type="form"/>
     <domain>self.userAuth=2</domain>
   </action-view>
   <action-view name="action.view.SystemManageUser.Log" title="系统管理员动作">
     <view name="SystemManageUser-grid" type="grid"/>
+    <view name="SystemManageUser-form" type="form"/>
     <domain>self.userAuth= 0</domain>
   </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 dd9e59f..3c95913 100644
--- a/modules/test/src/main/resources/views/menu.xml
+++ b/modules/test/src/main/resources/views/menu.xml
@@ -1,5 +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">
   <menuitem title="日志管理" left="true" name="menu-LogManage" action="action.view.LogManage.Log"/>
-  <menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-LogManage-Log" action="action.view.SecurityUser.Log"/>
+  <menuitem parent="menu-LogManage" title="业务用户操作日志" left="true" name="menu-LogManageServiceUser-Log" action="action.view.ServiceUser.Log"/>
+  <menuitem parent="menu-LogManage" title="安全审计员操作日志" left="true" name="menu-LogManageSecurityAuditUser-Log" action="action.view.SecurityAuditUser.Log"/>
+  <menuitem parent="menu-LogManage" title="系统管理员操作日志" left="true" name="menu-LogManageSystemManageUser-Log" action="action.view.SystemManageUser.Log"/>
+  <menuitem parent="menu-LogManage" title="安全保密员操作日志" left="true" name="menu-LogManageSecurityUser-Log" action="action.view.SecurityUser.Log"/>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b8e0bde..edbd322 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -371,5 +371,6 @@ logging.level.com.hypaas=INFO
 
 
 
+