From cbcc133c2f2fc2ed3e6f4ff1b2401e513e5e0dd5 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 26 Feb 2025 13:52:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=93=8D=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/backup/controller/FileController.java | 2 +- .../industry/software/backup/service/FileService.java | 2 +- .../industry/software/backup/serviceimp/FileServiceImpl.java | 4 ++-- .../industry/software/manage/config/LoginInterceptor.java | 3 ++- .../industry/software/manage/pojo/models/UserAccessLog.java | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java index 727999b..18a56f8 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java @@ -32,7 +32,7 @@ public class FileController { public ElectromagneticResult upload(@RequestParam("file") MultipartFile file, @RequestParam("path") String path) { BackupFileResLog backupFileResLog = BackupFileResLog.builder().backupStartTime(new Date()).fileName(file.getOriginalFilename()).backupStatus(true).build(); try { - fileService.upload(file, path); + fileService.upload(file); } catch (Exception e) { String details = ExceptionUtil.stacktraceToString(e); backupFileResLog.setBackupStatus(false); diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java index 8234da0..0e41156 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/service/FileService.java @@ -6,6 +6,6 @@ import java.io.IOException; public interface FileService { - void upload(MultipartFile file, String path) throws IOException; + void upload(MultipartFile file) throws IOException; } diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java index c62d818..138556a 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/serviceimp/FileServiceImpl.java @@ -17,10 +17,10 @@ public class FileServiceImpl implements FileService { private BackupPro backupPro; @Override - public void upload(MultipartFile file, String path) throws IOException { + public void upload(MultipartFile file) throws IOException { String saveFolder = backupPro.getSaveFolder(); String fileName = file.getOriginalFilename(); - String destPath = saveFolder + File.separator + path + File.separator + fileName; + String destPath = saveFolder + File.separator + File.separator + fileName; if (!FileUtil.exist(destPath)) { FileUtil.writeFromStream(file.getInputStream(), destPath); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java index 5de6b67..4232375 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java @@ -2,6 +2,7 @@ package com.electromagnetic.industry.software.manage.config; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.SystemClock; +import cn.hutool.json.JSONUtil; import com.electromagnetic.industry.software.common.annotations.UserOperation; import com.electromagnetic.industry.software.common.cons.UserConstants; import com.electromagnetic.industry.software.common.enums.AdminTypeEnum; @@ -131,6 +132,7 @@ public class LoginInterceptor implements HandlerInterceptor { ElectromagneticResult result = user.getResult(); if (result != null) { + userAccessLog.setResponse(JSONUtil.toJsonStr(result)); if (!result.getSuccess()) { userAccessLog.setAccessSuccess(false); userAccessLog.setOperationMsg(result.getErrorMessage()); @@ -139,7 +141,6 @@ public class LoginInterceptor implements HandlerInterceptor { } else { // 返回为ResponseEntity，且状态为失败。 userAccessLog.setAccessSuccess(false); } - userAccessLogMapper.insert(userAccessLog); UserThreadLocal.remove(); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java index 9af36a7..9b35745 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java @@ -61,4 +61,7 @@ public class UserAccessLog { // 父id，最权限需要 private String parentId; + // 请求返回的结果 + private String response; + }