From a715d4c6f770f5816e1de130aecd4afdeed408f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Tue, 3 Nov 2026 13:59:58 +0800 Subject: [PATCH] Fix multipart upload logging and date formats --- .../com/yj/admin/aop/aspect/LogAspect.java | 22 +++++++++---------- .../yj/common/mapper/RechargeOrderMapper.java | 2 +- .../com/yj/common/mapper/RefundLogMapper.java | 2 +- .../yj/common/mapper/RefundRecordMapper.java | 2 +- .../mapper/log/UserAccountLogMapper.java | 2 +- .../common/plugin/storage/StorageDriver.java | 2 +- .../java/com/yj/common/util/TimeUtils.java | 8 +++---- .../front/service/impl/LoginServiceImpl.java | 2 +- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/yj-admin/src/main/java/com/yj/admin/aop/aspect/LogAspect.java b/yj-admin/src/main/java/com/yj/admin/aop/aspect/LogAspect.java index 397f8cf..0bca01f 100644 --- a/yj-admin/src/main/java/com/yj/admin/aop/aspect/LogAspect.java +++ b/yj-admin/src/main/java/com/yj/admin/aop/aspect/LogAspect.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest; +import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -121,16 +121,16 @@ public class LogAspect { if("POST".equals(request.getMethod())){ if (RequestType.File.equals(logAnnotation.requestType())){ //文件类型获取文件名称作为参数 - StandardMultipartHttpServletRequest standardMultipartHttpServletRequest = (StandardMultipartHttpServletRequest) args[0]; - //提取文件名 - params = standardMultipartHttpServletRequest - .getMultiFileMap() - .values() - .stream() - .map(m -> m.stream() - .map(MultipartFile::getOriginalFilename) - .collect(Collectors.joining(","))) - .collect(Collectors.joining(",")); + if (request instanceof MultipartHttpServletRequest) { + params = ((MultipartHttpServletRequest) request) + .getMultiFileMap() + .values() + .stream() + .map(m -> m.stream() + .map(MultipartFile::getOriginalFilename) + .collect(Collectors.joining(","))) + .collect(Collectors.joining(",")); + } } else { params = JSON.toJSONString(args); } diff --git a/yj-common/src/main/java/com/yj/common/mapper/RechargeOrderMapper.java b/yj-common/src/main/java/com/yj/common/mapper/RechargeOrderMapper.java index 37d9f45..f8eb3c7 100644 --- a/yj-common/src/main/java/com/yj/common/mapper/RechargeOrderMapper.java +++ b/yj-common/src/main/java/com/yj/common/mapper/RechargeOrderMapper.java @@ -19,7 +19,7 @@ public interface RechargeOrderMapper extends IBaseMapper { * @return String */ default String randMakeOrderSn(String field) { - String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); + String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); String sn; while (true) { sn = date + ToolUtils.randomInt(12); diff --git a/yj-common/src/main/java/com/yj/common/mapper/RefundLogMapper.java b/yj-common/src/main/java/com/yj/common/mapper/RefundLogMapper.java index 38c2163..de513f3 100644 --- a/yj-common/src/main/java/com/yj/common/mapper/RefundLogMapper.java +++ b/yj-common/src/main/java/com/yj/common/mapper/RefundLogMapper.java @@ -21,7 +21,7 @@ public interface RefundLogMapper extends IBaseMapper { * @return String */ default String randMakeOrderSn(String field) { - String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); + String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); String sn; while (true) { sn = date + ToolUtils.randomInt(12); diff --git a/yj-common/src/main/java/com/yj/common/mapper/RefundRecordMapper.java b/yj-common/src/main/java/com/yj/common/mapper/RefundRecordMapper.java index b58b089..4bbf1f3 100644 --- a/yj-common/src/main/java/com/yj/common/mapper/RefundRecordMapper.java +++ b/yj-common/src/main/java/com/yj/common/mapper/RefundRecordMapper.java @@ -21,7 +21,7 @@ public interface RefundRecordMapper extends IBaseMapper { * @return String */ default String randMakeOrderSn(String field) { - String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); + String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); String sn; while (true) { sn = date + ToolUtils.randomInt(12); diff --git a/yj-common/src/main/java/com/yj/common/mapper/log/UserAccountLogMapper.java b/yj-common/src/main/java/com/yj/common/mapper/log/UserAccountLogMapper.java index c5b9183..defe6c7 100644 --- a/yj-common/src/main/java/com/yj/common/mapper/log/UserAccountLogMapper.java +++ b/yj-common/src/main/java/com/yj/common/mapper/log/UserAccountLogMapper.java @@ -107,7 +107,7 @@ public interface UserAccountLogMapper extends IBaseMapper { * @return String */ default String randMakeOrderSn() { - String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); + String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss"); String sn; while (true) { sn = date + ToolUtils.randomInt(12); diff --git a/yj-common/src/main/java/com/yj/common/plugin/storage/StorageDriver.java b/yj-common/src/main/java/com/yj/common/plugin/storage/StorageDriver.java index 51abdb5..6c6ddf7 100644 --- a/yj-common/src/main/java/com/yj/common/plugin/storage/StorageDriver.java +++ b/yj-common/src/main/java/com/yj/common/plugin/storage/StorageDriver.java @@ -95,7 +95,7 @@ public class StorageDriver { private String buildSaveName(MultipartFile multipartFile) { String name = multipartFile.getOriginalFilename(); String ext = Objects.requireNonNull(name).substring(name.lastIndexOf(".")); - String date = TimeUtils.timestampToDate(TimeUtils.timestamp(), "yyyyMyj"); + String date = TimeUtils.timestampToDate(TimeUtils.timestamp(), "yyyyMMdd"); return date + "/" + UUID.randomUUID() + ext.toLowerCase(); } diff --git a/yj-common/src/main/java/com/yj/common/util/TimeUtils.java b/yj-common/src/main/java/com/yj/common/util/TimeUtils.java index 7195d33..e74af27 100644 --- a/yj-common/src/main/java/com/yj/common/util/TimeUtils.java +++ b/yj-common/src/main/java/com/yj/common/util/TimeUtils.java @@ -150,10 +150,10 @@ public class TimeUtils { dateRegFormat.put("^\\d{4}\\D+\\d{2}\\D+\\d{2}$", "yyyy-MM-dd");//2014-03-12 dateRegFormat.put("^\\d{4}\\D+\\d{2}$", "yyyy-MM");//2014-03 dateRegFormat.put("^\\d{4}$", "yyyy");//2014 - dateRegFormat.put("^\\d{14}$", "yyyyMyjHHmmss");//20140312120534 - dateRegFormat.put("^\\d{12}$", "yyyyMyjHHmm");//201403121205 - dateRegFormat.put("^\\d{10}$", "yyyyMyjHH");//2014031212 - dateRegFormat.put("^\\d{8}$", "yyyyMyj");//20140312 + dateRegFormat.put("^\\d{14}$", "yyyyMMddHHmmss");//20140312120534 + dateRegFormat.put("^\\d{12}$", "yyyyMMddHHmm");//201403121205 + dateRegFormat.put("^\\d{10}$", "yyyyMMddHH");//2014031212 + dateRegFormat.put("^\\d{8}$", "yyyyMMdd");//20140312 dateRegFormat.put("^\\d{6}$", "yyyyMM");//201403 dateRegFormat.put("^\\d{2}\\s*:\\s*\\d{2}\\s*:\\s*\\d{2}$", "yyyy-MM-dd-HH-mm-ss");//13:05:34 拼接当前日期 dateRegFormat.put("^\\d{2}\\s*:\\s*\\d{2}$", "yyyy-MM-dd-HH-mm");//13:05 拼接当前日期 diff --git a/yj-front/src/main/java/com/yj/front/service/impl/LoginServiceImpl.java b/yj-front/src/main/java/com/yj/front/service/impl/LoginServiceImpl.java index 34b961f..5482d15 100644 --- a/yj-front/src/main/java/com/yj/front/service/impl/LoginServiceImpl.java +++ b/yj-front/src/main/java/com/yj/front/service/impl/LoginServiceImpl.java @@ -384,7 +384,7 @@ public class LoginServiceImpl implements ILoginService { if (StringUtils.isNotEmpty(avatar)) { try { Long time = System.currentTimeMillis(); - String date = TimeUtils.millisecondToDate(time, "yyyyMyj"); + String date = TimeUtils.millisecondToDate(time, "yyyyMMdd"); String name = ToolUtils.makeMd5(ToolUtils.makeUUID()+time) + ".jpg"; String path = "avatar" + date + "/" + name; String savePath = YmlUtils.get("like.upload-directory") + path;