From 9dccab715ded054667c46727793f90a0011ad817 Mon Sep 17 00:00:00 2001
From: zhangqiyang <1066386929@qq.com>
Date: Thu, 18 Apr 2024 09:52:02 +0800
Subject: [PATCH] 4-18 9:51
---
build.gradle | 6 ++---
modules/test/build.gradle | 9 ++++----
.../resources/main/domains/LogEntity.xml | 8 ++++++-
.../views/SecurityAuditUser-grid.xml | 1 -
.../resources/views/ServiceUser-grid.xml | 1 -
.../resources/views/SystemManageUser-grid.xml | 1 -
.../src/main/resources/views/actionGroup.xml | 12 ++++++++++
.../test/src/main/resources/views/menu.xml | 4 ++--
settings.gradle | 2 --
.../com/system/log/service/LogService.java | 23 +++++++++++--------
10 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/build.gradle b/build.gradle
index b169a37..a0d08c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
//mavenCentral()
// maven { url 'https://plugins.gradle.org/m2/' }
//jcenter()
- maven { url 'http://192.168.0.200:3081/repository/GradleRep/' }
+ maven { url 'http://139.9.112.197:3081/repository/GradleRep/' }
}
ext.platformVersion = '1.0.+'
ext.appVersion = '1.0.0'
@@ -43,8 +43,7 @@ configurations {
runtime.exclude group: 'javax.ws.rs', module: 'jsr311-api'
}
dependencies {
- implementation project(":modules:test")
-
+ implementation project(':modules:test')
implementation 'com.alibaba:easyexcel:2.2.6'
implementation 'com.alibaba:fastjson:1.2.83'
//aem
@@ -70,4 +69,3 @@ dependencies {
wrapper {
gradleVersion = "6.3"
}
-
diff --git a/modules/test/build.gradle b/modules/test/build.gradle
index b18e7f2..34eb976 100644
--- a/modules/test/build.gradle
+++ b/modules/test/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'com.hypaas.app-module'
-hypaas {
- title = "test"
+hypaas {
+ title = "test"
+}
+dependencies {
}
-dependencies {
-}
-
diff --git a/modules/test/build/resources/main/domains/LogEntity.xml b/modules/test/build/resources/main/domains/LogEntity.xml
index f660b4d..345960a 100644
--- a/modules/test/build/resources/main/domains/LogEntity.xml
+++ b/modules/test/build/resources/main/domains/LogEntity.xml
@@ -1,6 +1,6 @@
-
+
@@ -22,6 +22,12 @@
+
+
+
+
+
+
diff --git a/modules/test/out/production/resources/views/SecurityAuditUser-grid.xml b/modules/test/out/production/resources/views/SecurityAuditUser-grid.xml
index c8a532c..85bcced 100644
--- a/modules/test/out/production/resources/views/SecurityAuditUser-grid.xml
+++ b/modules/test/out/production/resources/views/SecurityAuditUser-grid.xml
@@ -15,4 +15,3 @@
-
diff --git a/modules/test/out/production/resources/views/ServiceUser-grid.xml b/modules/test/out/production/resources/views/ServiceUser-grid.xml
index e41f821..4eb37cc 100644
--- a/modules/test/out/production/resources/views/ServiceUser-grid.xml
+++ b/modules/test/out/production/resources/views/ServiceUser-grid.xml
@@ -15,4 +15,3 @@
-
diff --git a/modules/test/out/production/resources/views/SystemManageUser-grid.xml b/modules/test/out/production/resources/views/SystemManageUser-grid.xml
index f46789c..1a302d0 100644
--- a/modules/test/out/production/resources/views/SystemManageUser-grid.xml
+++ b/modules/test/out/production/resources/views/SystemManageUser-grid.xml
@@ -15,4 +15,3 @@
-
diff --git a/modules/test/src/main/resources/views/actionGroup.xml b/modules/test/src/main/resources/views/actionGroup.xml
index dd4d727..bc0fc05 100644
--- a/modules/test/src/main/resources/views/actionGroup.xml
+++ b/modules/test/src/main/resources/views/actionGroup.xml
@@ -45,4 +45,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/test/src/main/resources/views/menu.xml b/modules/test/src/main/resources/views/menu.xml
index f765997..7ea9f9b 100644
--- a/modules/test/src/main/resources/views/menu.xml
+++ b/modules/test/src/main/resources/views/menu.xml
@@ -5,6 +5,6 @@
-
-
+
+
diff --git a/settings.gradle b/settings.gradle
index 6162fa6..9a71af0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,3 @@
rootProject.name = 'hy-iot-paas'
include "modules:test"
-
-
diff --git a/src/main/java/com/system/log/service/LogService.java b/src/main/java/com/system/log/service/LogService.java
index 2fa7901..ffb2c18 100644
--- a/src/main/java/com/system/log/service/LogService.java
+++ b/src/main/java/com/system/log/service/LogService.java
@@ -619,15 +619,20 @@ public class LogService {
}
String filePath = logConfig.getFilePath();
File file = new File(filePath + "systemManageUser.zip");
- if (file.delete()) {
- logConfig.setStatus(LogStatus.alreadyDelete);
- response.setNotify("日志备份文件删除成功！");
- saveConfig(logConfig);
- response.setReload(true);
- } else {
- response.setError("日志备份文件删除失败！");
- response.setReload(true);
- }
+ // if (file.delete()) {
+ // logConfig.setStatus(LogStatus.alreadyDelete);
+ // response.setNotify("日志备份文件删除成功！");
+ // saveConfig(logConfig);
+ // response.setReload(true);
+ // } else {
+ // response.setError("日志备份文件删除失败！");
+ // response.setReload(true);
+ // }
+ file.delete();
+ logConfig.setStatus(LogStatus.alreadyDelete);
+ response.setNotify("日志备份文件删除成功！");
+ saveConfig(logConfig);
+ response.setReload(true);
}
public void secondBackup(ActionRequest request, ActionResponse response) {