From 601cbc79b38de6ab9d068769fd73670c8640ba5c Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Thu, 29 Feb 2024 14:52:05 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 .../resources/main/domains/LogEntity.xml      | 27 +++++++++++++++++++
 .../resources/domains/LogEntity.xml           |  1 +
 .../main/resources/domains/OperateType.xml    |  2 +-
 .../views/SecurityAuditUser-grid.xml          | 10 ++++---
 .../resources/views/SecurityUser-grid.xml     | 10 ++++---
 .../main/resources/views/ServiceUser-grid.xml | 10 ++++---
 .../resources/views/SystemManageUser-grid.xml | 10 ++++---
 src/main/resources/application.properties     |  9 ++++---
 8 files changed, 62 insertions(+), 17 deletions(-)
 create mode 100644 modules/test/build/resources/main/domains/LogEntity.xml

diff --git a/modules/test/build/resources/main/domains/LogEntity.xml b/modules/test/build/resources/main/domains/LogEntity.xml
new file mode 100644
index 0000000..f660b4d
--- /dev/null
+++ b/modules/test/build/resources/main/domains/LogEntity.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="Log" package="Log"/>
+  <entity hashAll="false" logUpdates="true" persistable="true" name="LogEntity" cacheable="false" lang="java" strategy="SINGLE" table="sys_log">
+    <string actOverwrite="false" copy="true" column="CONTENT" massUpdate="false" name="content" isJudg="false"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="DEPT" massUpdate="false" name="dept" isJudg="false"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="EXMSG" massUpdate="false" name="exceptionMessage" isJudg="false"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="EXSTACK" massUpdate="false" name="exceptionStackTrace" isJudg="false"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="EXTYPE" massUpdate="false" name="exceptionType" isJudg="false"/>
+    <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"/>
+    <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"/>
+    <integer nullable="true" column="RESULT" actOverwrite="false" massUpdate="false" name="result" copy="true" isJudg="false"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="RESULTDESC" massUpdate="false" name="resultDesc" isJudg="false"/>
+    <integer nullable="true" column="STATUS" actOverwrite="false" massUpdate="false" name="status" copy="true" isJudg="false"/>
+    <datetime nullable="true" tz="false" column="TIME" actOverwrite="false" massUpdate="false" name="time" copy="true" isJudg="false"/>
+    <enum column="USERAUTH" required="false" massUpdate="false" ref="module.UserAuth" name="userAuth" copy="true"/>
+    <string nullable="true" actOverwrite="false" copy="true" column="USERAUTHDESC" massUpdate="false" name="userAuthDesc" isJudg="false"/>
+    <string actOverwrite="false" copy="true" column="USERID" massUpdate="false" name="userId" isJudg="false"/>
+    <string actOverwrite="false" title="应用" copy="true" massUpdate="false" name="app" isJudg="false"/>
+    <string actOverwrite="false" copy="true" massUpdate="false" name="address" isJudg="false"/>
+  </entity>
+</domain-models>
diff --git a/modules/test/out/production/resources/domains/LogEntity.xml b/modules/test/out/production/resources/domains/LogEntity.xml
index e22182d..f660b4d 100644
--- a/modules/test/out/production/resources/domains/LogEntity.xml
+++ b/modules/test/out/production/resources/domains/LogEntity.xml
@@ -21,6 +21,7 @@
     <enum column="USERAUTH" required="false" massUpdate="false" ref="module.UserAuth" name="userAuth" copy="true"/>
     <string nullable="true" actOverwrite="false" copy="true" column="USERAUTHDESC" massUpdate="false" name="userAuthDesc" isJudg="false"/>
     <string actOverwrite="false" copy="true" column="USERID" massUpdate="false" name="userId" isJudg="false"/>
+    <string actOverwrite="false" title="应用" copy="true" massUpdate="false" name="app" isJudg="false"/>
     <string actOverwrite="false" copy="true" massUpdate="false" name="address" isJudg="false"/>
   </entity>
 </domain-models>
diff --git a/modules/test/src/main/resources/domains/OperateType.xml b/modules/test/src/main/resources/domains/OperateType.xml
index b477387..ca94a8c 100644
--- a/modules/test/src/main/resources/domains/OperateType.xml
+++ b/modules/test/src/main/resources/domains/OperateType.xml
@@ -10,6 +10,6 @@
     <item name="Select" title="查询" value="Select"/>
     <item name="BatchImport" title="批量导入" value="BatchImport"/>
     <item name="BatchExport" title="批量导出" value="BatchExport"/>
-    <item name="Normal" title="一般" value="一般"/>
+    <item name="Normal" title="一般" value="()"/>
   </enum>
 </domain-models>
diff --git a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
index 7a80027..85bcced 100644
--- a/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityAuditUser-grid.xml
@@ -1,13 +1,17 @@
 <?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 title="安全审计员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityAuditUser-grid" width="large">
-    <field search-field="true" canSuggest="true" name="userId" title="用户ID"/>
     <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="userId" title="用户名"/>
+    <field search-field="true" canSuggest="true" name="dept" title="所属部门"/>
+    <field search-field="true" canSuggest="true" name="address" title="IP地址"/>
     <field search-field="true" canSuggest="true" name="time" title="操作时间"/>
-    <field search-field="true" canSuggest="true" name="address" title="IP"/>
     <field search-field="true" canSuggest="true" name="objectName" title="客体"/>
-    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
     <field search-field="true" canSuggest="true" name="opType" title="操作类型"/>
     <field search-field="true" canSuggest="true" name="content" title="操作内容"/>
+    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
+    <field search-field="true" canSuggest="true" name="resultDesc" title="操作结果"/>
+    <field search-field="true" canSuggest="true" name="app" title="所属应用"/>
   </grid>
 </object-views>
diff --git a/modules/test/src/main/resources/views/SecurityUser-grid.xml b/modules/test/src/main/resources/views/SecurityUser-grid.xml
index 4c3d7c0..967e3da 100644
--- a/modules/test/src/main/resources/views/SecurityUser-grid.xml
+++ b/modules/test/src/main/resources/views/SecurityUser-grid.xml
@@ -1,13 +1,17 @@
 <?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 title="安全保密员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SecurityUser-grid" width="large">
-    <field search-field="true" canSuggest="true" name="userId" title="用户ID"/>
     <field search-field="true" canSuggest="true" name="levelNum" title="告警级别"/>
-    <field search-field="true" canSuggest="true" name="time" title="操作时间"/>
+    <field search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>
+    <field search-field="true" canSuggest="true" name="userId" title="用户名"/>
+    <field search-field="true" canSuggest="true" name="dept" title="所属部门"/>
     <field search-field="true" canSuggest="true" name="address" title="IP"/>
+    <field search-field="true" canSuggest="true" name="time" title="操作时间"/>
     <field search-field="true" canSuggest="true" name="objectName" title="客体"/>
-    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
     <field search-field="true" canSuggest="true" name="opType" title="操作类型"/>
     <field search-field="true" canSuggest="true" name="content" title="操作内容"/>
+    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
+    <field search-field="true" canSuggest="true" name="resultDesc" title="操作结果"/>
+    <field search-field="true" canSuggest="true" name="app" title="所属应用"/>
   </grid>
 </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 5fa345e..4eb37cc 100644
--- a/modules/test/src/main/resources/views/ServiceUser-grid.xml
+++ b/modules/test/src/main/resources/views/ServiceUser-grid.xml
@@ -1,13 +1,17 @@
 <?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" 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 search-field="true" canSuggest="true" name="userAuthDesc" title="用户角色"/>
+    <field type="string" search-field="true" canSuggest="true" name="userId" title="用户名"/>
+    <field search-field="true" canSuggest="true" name="dept" title="所属部门"/>
+    <field type="string" search-field="true" canSuggest="true" name="address" title="IP地址"/>
     <field type="datetime" search-field="true" canSuggest="true" name="time" title="操作时间"/>
-    <field type="string" search-field="true" canSuggest="true" name="address" title="IP"/>
     <field type="string" search-field="true" canSuggest="true" name="objectName" title="客体"/>
-    <field type="enum" search-field="true" canSuggest="true" name="module" canNew="false" title="操作模块" canView="false"/>
     <field type="enum" search-field="true" canSuggest="true" name="opType" title="操作类型"/>
     <field canRemove="false" search-field="true" canSuggest="true" name="content" canEdit="false" canNew="false" title="操作内容"/>
+    <field type="enum" search-field="true" canSuggest="true" name="module" canNew="false" title="操作模块" canView="false"/>
+    <field search-field="true" canSuggest="true" name="resultDesc" title="操作结果"/>
+    <field search-field="true" canSuggest="true" name="app" title="所属应用"/>
   </grid>
 </object-views>
diff --git a/modules/test/src/main/resources/views/SystemManageUser-grid.xml b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
index b155bf6..1a302d0 100644
--- a/modules/test/src/main/resources/views/SystemManageUser-grid.xml
+++ b/modules/test/src/main/resources/views/SystemManageUser-grid.xml
@@ -1,13 +1,17 @@
 <?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 title="系统管理员操作日志" model="Log.LogEntity" edit-icon="true" freeSearch="all" name="SystemManageUser-grid" width="large">
-    <field search-field="true" canSuggest="true" name="userId" title="用户ID"/>
     <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="userId" title="用户名"/>
+    <field search-field="true" canSuggest="true" name="dept" title="所属部门"/>
+    <field search-field="true" canSuggest="true" name="address" title="IP地址"/>
     <field search-field="true" canSuggest="true" name="time" title="操作时间"/>
-    <field search-field="true" canSuggest="true" name="address" title="IP"/>
     <field search-field="true" canSuggest="true" name="objectName" title="客体"/>
-    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
     <field search-field="true" canSuggest="true" name="opType" title="操作类型"/>
     <field search-field="true" canSuggest="true" name="content" title="操作内容"/>
+    <field search-field="true" canSuggest="true" name="module" title="操作模块"/>
+    <field search-field="true" canSuggest="true" name="result" title="操作结果"/>
+    <field search-field="true" canSuggest="true" name="app" title="所属应用"/>
   </grid>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index ecfb17a..264c80f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -62,11 +62,11 @@ auth.logout.local=true
 #db.default.password = hypaas
 
 # MySQL
-db.default.driver=com.mysql.cj.jdbc.Driver
+db.default.driver=
 db.default.ddl=update
-db.default.url=jdbc:mysql://139.9.112.197:3308/portal-gateway?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=portal
-db.default.password=Sun@qc2023
+db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
+db.default.user=
+db.default.password=
 
 system.operate.log.switch=true
 event.center.url=http://123.57.213.228:1117/prod-api/event/send_event_info
@@ -422,5 +422,6 @@ application.gatewaycontext=/lowcode-portal-logmanage/
 
 
 
+