From 7e2c49d6660a0d7b0755bc2745abcc8d141a791f Mon Sep 17 00:00:00 2001 From: huxin02 Date: Fri, 21 Mar 2025 20:21:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=85=AC=E5=85=B1?= =?UTF-8?q?=E7=B1=BB=E8=B0=83=E6=95=B4=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/aisino/iles/common/config/HttpClientConfig.java | 1 - .../iles/common/controller/DynamicLogSwitcherController.java | 1 - .../aisino/iles/common/controller/FileManagerController.java | 1 - .../aisino/iles/common/controller/FilesUploadController.java | 1 - .../aisino/iles/common/controller/ImgTransformController.java | 2 ++ .../src/main/java/com/aisino/iles/common/util/Base64Util.java | 1 + server/src/main/java/com/aisino/iles/common/util/Constants.java | 1 + server/src/main/java/com/aisino/iles/common/util/DateUtil.java | 1 + 8 files changed, 5 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/com/aisino/iles/common/config/HttpClientConfig.java b/server/src/main/java/com/aisino/iles/common/config/HttpClientConfig.java index 22f0e55..e435713 100644 --- a/server/src/main/java/com/aisino/iles/common/config/HttpClientConfig.java +++ b/server/src/main/java/com/aisino/iles/common/config/HttpClientConfig.java @@ -5,7 +5,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.FormHttpMessageConverter; import org.springframework.web.client.RestTemplate; - /** * http客户端配置 * @author hx diff --git a/server/src/main/java/com/aisino/iles/common/controller/DynamicLogSwitcherController.java b/server/src/main/java/com/aisino/iles/common/controller/DynamicLogSwitcherController.java index b89295f..d6a31ba 100644 --- a/server/src/main/java/com/aisino/iles/common/controller/DynamicLogSwitcherController.java +++ b/server/src/main/java/com/aisino/iles/common/controller/DynamicLogSwitcherController.java @@ -27,7 +27,6 @@ public class DynamicLogSwitcherController { private final String LOG_SWITCHER_URI = "/log-switcher"; // 获取日志工厂会话 private final LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory(); - /** * 日志开关 * @param logger 日志 diff --git a/server/src/main/java/com/aisino/iles/common/controller/FileManagerController.java b/server/src/main/java/com/aisino/iles/common/controller/FileManagerController.java index a83751a..fab21db 100644 --- a/server/src/main/java/com/aisino/iles/common/controller/FileManagerController.java +++ b/server/src/main/java/com/aisino/iles/common/controller/FileManagerController.java @@ -38,7 +38,6 @@ public class FileManagerController { * 下载数据 */ private static final String DOWNLOAD_DATA = "/download-data/**"; - public FileManagerController(FtpService ftpService) { this.ftpService = ftpService; } diff --git a/server/src/main/java/com/aisino/iles/common/controller/FilesUploadController.java b/server/src/main/java/com/aisino/iles/common/controller/FilesUploadController.java index 826ab18..b536410 100644 --- a/server/src/main/java/com/aisino/iles/common/controller/FilesUploadController.java +++ b/server/src/main/java/com/aisino/iles/common/controller/FilesUploadController.java @@ -30,7 +30,6 @@ public class FilesUploadController { private final String[] allowFileType = new String[] {"JPG","GIF","PNG","JPEG","BMP","DOC","DOCX","XLS" ,"XLSX","PDF","PPT","PPTX","TXT","CVS","TIF","WEBP","TIFF","ZIP","RAR","7Z","MP4","AVI","WMV" ,"MOV","JSON","MD","PSD","EXE"}; - public FilesUploadController(FtpService ftpService) { this.ftpService = ftpService; } diff --git a/server/src/main/java/com/aisino/iles/common/controller/ImgTransformController.java b/server/src/main/java/com/aisino/iles/common/controller/ImgTransformController.java index cac474c..a1d8afb 100644 --- a/server/src/main/java/com/aisino/iles/common/controller/ImgTransformController.java +++ b/server/src/main/java/com/aisino/iles/common/controller/ImgTransformController.java @@ -42,4 +42,6 @@ public class ImgTransformController { String base64 = Base64Util.FileBase64FromUrl(ftpService.getFileUrl(savePathName, true)); return Ok.of(base64); } + + } diff --git a/server/src/main/java/com/aisino/iles/common/util/Base64Util.java b/server/src/main/java/com/aisino/iles/common/util/Base64Util.java index ab37e0c..bd48020 100644 --- a/server/src/main/java/com/aisino/iles/common/util/Base64Util.java +++ b/server/src/main/java/com/aisino/iles/common/util/Base64Util.java @@ -24,6 +24,7 @@ public class Base64Util { } else { base64 = imgbase64;// 这是base64字符串 } + byte[] imageString; imageString = Base64.decodeBase64(base64); return new ByteArrayInputStream(imageString); diff --git a/server/src/main/java/com/aisino/iles/common/util/Constants.java b/server/src/main/java/com/aisino/iles/common/util/Constants.java index 1229328..e16f871 100644 --- a/server/src/main/java/com/aisino/iles/common/util/Constants.java +++ b/server/src/main/java/com/aisino/iles/common/util/Constants.java @@ -40,6 +40,7 @@ public class Constants { public static final int PERSONNEL_FORGOT_IDENTIFY_NOT_AGREEMENT = 50000; } + /** * 异常代码 */ diff --git a/server/src/main/java/com/aisino/iles/common/util/DateUtil.java b/server/src/main/java/com/aisino/iles/common/util/DateUtil.java index b4ef9c0..d6b5aa8 100644 --- a/server/src/main/java/com/aisino/iles/common/util/DateUtil.java +++ b/server/src/main/java/com/aisino/iles/common/util/DateUtil.java @@ -21,6 +21,7 @@ public class DateUtil { calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); return calendar.getTime(); + } public static Date str2Date(String dateStr, String format) {