From f8d774d1a152d28a2298c368daedfd7b1fefc20d Mon Sep 17 00:00:00 2001
From: hypaas <181620720@qq.com>
Date: Fri, 24 Nov 2023 15:20:19 +0800
Subject: [PATCH] Configure Continuous Integration ....

---
 .../src/main/resources/domains/LogEntity.xml   |  2 +-
 .../resources/views/Log-ServiceUser-form.xml   | 18 +++++++++---------
 src/main/resources/application.properties      | 11 ++++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/modules/test/src/main/resources/domains/LogEntity.xml b/modules/test/src/main/resources/domains/LogEntity.xml
index cce4ae3..1713328 100644
--- a/modules/test/src/main/resources/domains/LogEntity.xml
+++ b/modules/test/src/main/resources/domains/LogEntity.xml
@@ -2,7 +2,6 @@
 <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="LogManage">
-    <string actOverwrite="false" copy="true" column="ADDRESS" massUpdate="false" name="address" isJudg="false"/>
     <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"/>
@@ -22,5 +21,6 @@
     <integer nullable="true" column="USERAUTH" actOverwrite="false" required="false" massUpdate="false" name="userAuth" copy="true" isJudg="false"/>
     <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" copy="true" massUpdate="false" name="address" isJudg="false"/>
   </entity>
 </domain-models>
diff --git a/modules/test/src/main/resources/views/Log-ServiceUser-form.xml b/modules/test/src/main/resources/views/Log-ServiceUser-form.xml
index dc17b40..af6f151 100644
--- a/modules/test/src/main/resources/views/Log-ServiceUser-form.xml
+++ b/modules/test/src/main/resources/views/Log-ServiceUser-form.xml
@@ -1,15 +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 canNew="true" title="业务用户操作日志(表单)" model="Log.LogEntity" name="Log-ServiceUser-form" width="large">
-    <panel hidden="false" title="搜索日志" itemSpan="6" onTabSelect="action.view.LogManage.Log" showFrame="true" depends="address" colSpan="12" showTitle="true" name="查找记录" attached="false">
-      <field form-view="Log-ServiceUser-form" depends="time" canSuggest="true" showTitle="true" domain="self.time=:time" name="time" title="操作时间" canView="false" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="userId" canSuggest="true" showTitle="true" domain="self.userId=:userId" name="userId" title="用户Id" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="objectName" canSuggest="true" showTitle="true" domain="self.objectName=:objectName" name="objectName" title="客体" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="content" canSuggest="true" showTitle="true" domain="self.content=:content" name="content" title="操作内容" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="address" canSuggest="true" showTitle="true" domain="self.address=:address" name="address" canNew="false" title="IP地址" canView="false" grid-view="Log-ServiceUser-grid" colSpan="3" canSelect="false"/>
-      <field form-view="Log-ServiceUser-form" depends="levelNum" canSuggest="true" showTitle="true" domain="self. levelNum=: levelNum" name="levelNum" title="告警级别" onSelect="action.view.LogManage.Log" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="module" canSuggest="true" showTitle="true" domain="self.module=:module" name="module" title="操作模块" grid-view="Log-ServiceUser-grid" colSpan="3"/>
-      <field form-view="Log-ServiceUser-form" depends="opType" canSuggest="true" showTitle="true" domain="self.opType=:opType" name="opType" title="操作类型" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+    <panel hidden="false" title="搜索日志" itemSpan="6" onTabSelect="action.view.LogManage.Log" showFrame="true" colSpan="12" showTitle="true" name="查找记录" attached="false">
+      <field type="datetime" depends="time" canSuggest="true" showTitle="true" domain="self.time=:time" name="time" widget="DateTime" title="操作时间" canView="false" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="userId" canSuggest="true" showTitle="true" domain="self.userId=:userId" name="userId" title="用户Id" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="objectName" canSuggest="true" showTitle="true" domain="self.objectName=:objectName" name="objectName" title="客体" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="content" canSuggest="true" showTitle="true" domain="self.content=:content" name="content" title="操作内容" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="address" canSuggest="true" showTitle="true" domain="self.address=:address" name="address" canNew="false" title="IP地址" canView="false" grid-view="Log-ServiceUser-grid" colSpan="3" canSelect="false"/>
+      <field depends="levelNum" canSuggest="true" showTitle="true" domain="self. levelNum=: levelNum" name="levelNum" title="告警级别" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="module" canSuggest="true" showTitle="true" domain="self.module=:module" name="module" title="操作模块" grid-view="Log-ServiceUser-grid" colSpan="3"/>
+      <field depends="opType" canSuggest="true" showTitle="true" domain="self.opType=:opType" name="opType" title="操作类型" grid-view="Log-ServiceUser-grid" colSpan="3"/>
     </panel>
   </form>
 </object-views>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 464bc19..bb83f8b 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,7 +1,7 @@
 # Application Information
 # ~~~~~
 application.name=\u004c\u006f\u0067\u004d\u0061\u006e\u0061\u0067\u0065
-application.id=8f5762ae-e23b-47b5-802d-f39704bb4960
+application.id=
 application.sid=1719173642480254976
 application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/
 application.description=
@@ -64,11 +64,11 @@ auth.logout.local=true
 # MySQL
 #db.default.driver = com.mysql.jdbc.Driver
 #db.default.visible=false
-db.default.driver=com.mysql.cj.jdbc.Driver
+db.default.driver=
 db.default.ddl=update
-db.default.url=jdbc:mysql://117.78.10.170:3006/app_331617a15c45392328b161de78a9aa81_master_pre?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=app_zhangqiyang
-db.default.password=Asdf123!@#
+db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
+db.default.user=
+db.default.password=
 
 db.company1.name=Company 1
 db.company1.driver=com.mysql.cj.jdbc.Driver
@@ -341,5 +341,6 @@ logging.level.com.hypaas=INFO
 
 
 
+