diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index d30244e..7c8d679 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,13 +9,9 @@
-
+
-
-
-
-
-
+
@@ -73,58 +69,58 @@
- {
+ "keyToString": {
+ "Application.DivPassDataImpl.executor": "Run",
+ "Application.ImageUtils.executor": "Run",
+ "Application.PubTools.executor": "Run",
+ "Application.QCodeInfoServiceImpl.executor": "Debug",
+ "Application.SensitiveFilter.executor": "Run",
+ "Application.main.executor": "Debug",
+ "Application.redisConfigUtil.executor": "Debug",
+ "Maven.IntegraManager [clean].executor": "Run",
+ "Maven.IntegraManager [install].executor": "Run",
+ "Maven.IntegralManager [clean].executor": "Run",
+ "Maven.IntegralManager [install].executor": "Run",
+ "Maven.IntegralManager [validate].executor": "Run",
+ "Maven.IntegralManagerSys [clean].executor": "Run",
+ "Maven.IntegralManagerSys [install].executor": "Run",
+ "Maven.devProject [clean].executor": "Run",
+ "Maven.devProject [install].executor": "Run",
+ "Maven.dev_project [clean].executor": "Run",
+ "Maven.dev_project [install].executor": "Run",
+ "Maven.special_event [clean].executor": "Run",
+ "Maven.special_event [install].executor": "Run",
+ "Maven.special_event [org.apache.maven.plugins:maven-assembly-plugin:3.3.0:single].executor": "Run",
+ "Maven.special_event [org.springframework.boot:spring-boot-maven-plugin:2.7.11:repackage].executor": "Run",
+ "Maven.special_event [package].executor": "Run",
+ "Maven.special_event [validate].executor": "Run",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "TomEE Server.special_event.executor": "Debug",
+ "Tomcat Server.Tomcat 9.0.80.executor": "Debug",
+ "deletionFromPopupRequiresConfirmation": "false",
+ "git-widget-placeholder": "master",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "E:/work/TGGLT-WorkSpace/IntegralManager",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "project.structure.last.edited": "Modules",
+ "project.structure.proportion": "0.15",
+ "project.structure.side.proportion": "0.37169158",
+ "settings.editor.selected.configurable": "vcs.Git",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "DatabaseDriversLRU": [
- "oracle"
+ "keyToStringList": {
+ "DatabaseDriversLRU": [
+ "oracle"
]
}
-}]]>
+}
@@ -533,7 +529,9 @@
-
+
+
+
@@ -631,7 +629,23 @@
1731025181036
-
+
+
+ 1731483975031
+
+
+
+ 1731483975031
+
+
+
+ 1731484036275
+
+
+
+ 1731484036276
+
+
@@ -648,7 +662,8 @@
-
+
+
diff --git a/src/main/java/com/nmgs/controller/FileUploadController.java b/src/main/java/com/nmgs/controller/FileUploadController.java
index 6dd9e03..83a949d 100644
--- a/src/main/java/com/nmgs/controller/FileUploadController.java
+++ b/src/main/java/com/nmgs/controller/FileUploadController.java
@@ -29,7 +29,7 @@ public class FileUploadController {
public ResultData uploadAllFile(@RequestParam("filedata") MultipartFile filedata, @RequestParam("fileType") String fileType, @RequestParam("uuid") String uuid) {
String fileName = "";
try {
- LogUtil.WriteLog_Info("附件上传接口执行开始===========" + PubTools.getCurrentDate(), "FileController");
+ LogUtil.WriteLog_Info("附件上传接口执行开始===========" + PubTools.getCurrentDate(), "FileUploadController");
Properties props = System.getProperties();
String os = props.getProperty("os.name").toLowerCase();
String fileAddressLocal = PathUtil.uploadPath;
@@ -39,7 +39,7 @@ public class FileUploadController {
} else {
// fileAddressLocal = PropertiesUtil.getValue("fileAddressLinux");
}
- LogUtil.WriteLog_Info("附件上传接口====fileAddressLocal====" + fileAddressLocal, "FileController");
+ LogUtil.WriteLog_Info("附件上传接口====fileAddressLocal====" + fileAddressLocal, "FileUploadController");
if (!PubTools.isNull(fileAddressLocal)) {
File filePath = new File(fileAddressLocal);
if (!filePath.exists()) {
@@ -84,12 +84,12 @@ public class FileUploadController {
file.delete();
}
// 保存文件
- LogUtil.WriteLog_Info("附件开始上传到服务器===========" + PubTools.getCurrentDate(), "FileController");
+ LogUtil.WriteLog_Info("附件开始上传到服务器===========" + PubTools.getCurrentDate(), "FileUploadController");
FileUtils.writeByteArrayToFile(file, imageBytes);
- LogUtil.WriteLog_Info("附件上传到服务器结束===========" + PubTools.getCurrentDate(), "FileController");
+ LogUtil.WriteLog_Info("附件上传到服务器结束===========" + PubTools.getCurrentDate(), "FileUploadController");
}
}
- LogUtil.WriteLog_Info("附件上传接口执行结束===========" + PubTools.getCurrentDate(), "FileController");
+ LogUtil.WriteLog_Info("附件上传接口执行结束===========" + PubTools.getCurrentDate(), "FileUploadController");
} catch (Exception e) {
e.printStackTrace();
return ResultData.fail("上传附件失败:" + e.getMessage());
diff --git a/src/main/java/com/nmgs/util/ImageUtils.java b/src/main/java/com/nmgs/util/ImageUtils.java
index 925cf4e..212e19b 100644
--- a/src/main/java/com/nmgs/util/ImageUtils.java
+++ b/src/main/java/com/nmgs/util/ImageUtils.java
@@ -12,8 +12,6 @@ import javax.imageio.ImageIO;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
@Async
public class ImageUtils {
@@ -218,12 +216,12 @@ public class ImageUtils {
public static String byteToBase64(byte[] b) {
try {
- BASE64Encoder encoder = new BASE64Encoder();
- return encoder.encode(b);
+ return Base64.getEncoder().encodeToString(b);
} catch (Exception e) {
e.printStackTrace();
+ LogUtil.WriteLog_Info("ImageUtil===file转base64==执行结果====" + e.getMessage(), "FileUploadController");
+ return "";
}
- return null;
}
/**
@@ -255,6 +253,6 @@ public class ImageUtils {
}
}
// 对字节数组Base64编码
- return new BASE64Encoder().encode(buffer);
+ return Base64.getEncoder().encodeToString(buffer);
}
}
\ No newline at end of file