Merge remote-tracking branch 'origin/master'

modules/test/src/main/resources/domains/OperateType.xml

@@ -1,7 +1,7 @@
 <?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="com.module.enmus" package="module"/>
-  <enum name="OperateType">
+  <enum name="OperateType" numeric="false">
     <item name="Login" title="登录" value="登录"/>
     <item name="Exit" title="退出" value="退出"/>
     <item name="New" title="新建" value="新建"/>
@@ -10,6 +10,5 @@
     <item name="Select" title="查询" value="查询"/>
     <item name="BatchImport" title="批量导入" value="批量导入"/>
     <item name="BatchExport" title="批量导出" value="批量导出"/>
-    <item name="Normal" title="一般" value="一般"/>
   </enum>
 </domain-models>

modules/test/src/main/resources/views/actionGroup.xml

@@ -33,13 +33,4 @@
   <action-view name="action.view.System.Log" title="查询系统日志">
     <view name="SystemManageUser-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>
-
 </object-views>

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-System-Log"/>
   <menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-Config-Log" action="action.view.Config.Log"/>
 </object-views>

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 # Application Information
 # ~~~~~
 application.name=\u004c\u006f\u0067\u004d\u0061\u006e\u0061\u0067\u0065
-application.id=
+application.id=a6e3f3cc-1fec-484a-8c1a-858738e67bae
 application.sid=1719173642480254976
 application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/
 application.description=
@@ -62,11 +62,11 @@ auth.logout.local=true
 #db.default.password = hypaas
 
 # MySQL
-db.default.driver=
+db.default.driver=com.mysql.cj.jdbc.Driver
 db.default.ddl=update
-db.default.url=jdbc:://?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&nullCatalogMeansCurrent=true
-db.default.user=
-db.default.password=
+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!@#
 
 system.operate.log.switch=true
 event.center.url=http://123.57.213.228:1117/prod-api/event/send_event_info
@@ -445,5 +445,6 @@ application.gatewaycontext=/lowcode-portal-logmanage/
 
 
 
+