Merge remote-tracking branch 'origin/master'

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

@@ -45,16 +45,4 @@
   <action-view name="action.view.SystemManageUserLogBackup.Log" model="Log.LogConfig" title="系统管理员日志备份">
     <view name="SystemManageUserBackup-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>
-
-  <action-view name="action.view.SecurityUser.LogConfig" model="Log.LogConfig" title="业务用户日志配置">
-    <view name="LogBackup/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-Config-Log" action="action.view.SecurityUser.LogConfig"/>
+  <menuitem parent="menu-LogManage" title="系统运行日志" left="true" name="menu-System-Log"/>
+  <menuitem parent="menu-LogManage" title="日志配置" left="true" name="menu-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=b7e60204-649b-4998-86e1-ec33090a8744
 application.sid=1719173642480254976
 application.callback.url=http://117.78.10.170:3000/api/v1/message/preview/
 application.description=
@@ -64,9 +64,9 @@ auth.logout.local=true
 # MySQL
 db.default.driver=com.mysql.cj.jdbc.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: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=false
@@ -465,5 +465,6 @@ logging.level.com.hypaas=INFO
 
 
 
+