wyh
/
yunjiao-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multipart upload logging and date formats

main
王宇航 2026-11-03 13:59:58 +08:00
parent da4b2059ba
commit a715d4c6f7
8 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yj-admin/src/main/java/com/yj/admin/aop/aspect/LogAspect.java
View File

@ -22,7 +22,7 @@ import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile; 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.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -121,9 +121,8 @@ public class LogAspect {
if("POST".equals(request.getMethod())){ if("POST".equals(request.getMethod())){
if (RequestType.File.equals(logAnnotation.requestType())){ if (RequestType.File.equals(logAnnotation.requestType())){
//文件类型获取文件名称作为参数 //文件类型获取文件名称作为参数
StandardMultipartHttpServletRequest standardMultipartHttpServletRequest = (StandardMultipartHttpServletRequest) args[0]; if (request instanceof MultipartHttpServletRequest) {
//提取文件名 params = ((MultipartHttpServletRequest) request)
params = standardMultipartHttpServletRequest
.getMultiFileMap() .getMultiFileMap()
.values() .values()
.stream() .stream()
@ -131,6 +130,7 @@ public class LogAspect {
.map(MultipartFile::getOriginalFilename) .map(MultipartFile::getOriginalFilename)
.collect(Collectors.joining(","))) .collect(Collectors.joining(",")))
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
}
} else { } else {
params = JSON.toJSONString(args); params = JSON.toJSONString(args);
} }

2
yj-common/src/main/java/com/yj/common/mapper/RechargeOrderMapper.java
View File

@ -19,7 +19,7 @@ public interface RechargeOrderMapper extends IBaseMapper<RechargeOrder> {
* @return String * @return String
*/ */
default String randMakeOrderSn(String field) { default String randMakeOrderSn(String field) {
String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss");
String sn; String sn;
while (true) { while (true) {
sn = date + ToolUtils.randomInt(12); sn = date + ToolUtils.randomInt(12);

2
yj-common/src/main/java/com/yj/common/mapper/RefundLogMapper.java
View File

@ -21,7 +21,7 @@ public interface RefundLogMapper extends IBaseMapper<RefundLog> {
* @return String * @return String
*/ */
default String randMakeOrderSn(String field) { default String randMakeOrderSn(String field) {
String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss");
String sn; String sn;
while (true) { while (true) {
sn = date + ToolUtils.randomInt(12); sn = date + ToolUtils.randomInt(12);

2
yj-common/src/main/java/com/yj/common/mapper/RefundRecordMapper.java
View File

@ -21,7 +21,7 @@ public interface RefundRecordMapper extends IBaseMapper<RefundRecord> {
* @return String * @return String
*/ */
default String randMakeOrderSn(String field) { default String randMakeOrderSn(String field) {
String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss");
String sn; String sn;
while (true) { while (true) {
sn = date + ToolUtils.randomInt(12); sn = date + ToolUtils.randomInt(12);

2
yj-common/src/main/java/com/yj/common/mapper/log/UserAccountLogMapper.java
View File

@ -107,7 +107,7 @@ public interface UserAccountLogMapper extends IBaseMapper<UserAccountLog> {
* @return String * @return String
*/ */
default String randMakeOrderSn() { default String randMakeOrderSn() {
String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMyjHHmmss"); String date = TimeUtils.timestampToDate(System.currentTimeMillis()/1000, "yyyyMMddHHmmss");
String sn; String sn;
while (true) { while (true) {
sn = date + ToolUtils.randomInt(12); sn = date + ToolUtils.randomInt(12);

2
yj-common/src/main/java/com/yj/common/plugin/storage/StorageDriver.java
View File

@ -95,7 +95,7 @@ public class StorageDriver {
private String buildSaveName(MultipartFile multipartFile) { private String buildSaveName(MultipartFile multipartFile) {
String name = multipartFile.getOriginalFilename(); String name = multipartFile.getOriginalFilename();
String ext = Objects.requireNonNull(name).substring(name.lastIndexOf(".")); 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(); return date + "/" + UUID.randomUUID() + ext.toLowerCase();
} }

8
yj-common/src/main/java/com/yj/common/util/TimeUtils.java
View File

@ -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}\\D+\\d{2}$", "yyyy-MM-dd");//2014-03-12
dateRegFormat.put("^\\d{4}\\D+\\d{2}$", "yyyy-MM");//2014-03 dateRegFormat.put("^\\d{4}\\D+\\d{2}$", "yyyy-MM");//2014-03
dateRegFormat.put("^\\d{4}$", "yyyy");//2014 dateRegFormat.put("^\\d{4}$", "yyyy");//2014
dateRegFormat.put("^\\d{14}$", "yyyyMyjHHmmss");//20140312120534 dateRegFormat.put("^\\d{14}$", "yyyyMMddHHmmss");//20140312120534
dateRegFormat.put("^\\d{12}$", "yyyyMyjHHmm");//201403121205 dateRegFormat.put("^\\d{12}$", "yyyyMMddHHmm");//201403121205
dateRegFormat.put("^\\d{10}$", "yyyyMyjHH");//2014031212 dateRegFormat.put("^\\d{10}$", "yyyyMMddHH");//2014031212
dateRegFormat.put("^\\d{8}$", "yyyyMyj");//20140312 dateRegFormat.put("^\\d{8}$", "yyyyMMdd");//20140312
dateRegFormat.put("^\\d{6}$", "yyyyMM");//201403 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}\\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 拼接当前日期 dateRegFormat.put("^\\d{2}\\s*:\\s*\\d{2}$", "yyyy-MM-dd-HH-mm");//13:05 拼接当前日期

2
yj-front/src/main/java/com/yj/front/service/impl/LoginServiceImpl.java
View File

@ -384,7 +384,7 @@ public class LoginServiceImpl implements ILoginService {
if (StringUtils.isNotEmpty(avatar)) { if (StringUtils.isNotEmpty(avatar)) {
try { try {
Long time = System.currentTimeMillis(); 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 name = ToolUtils.makeMd5(ToolUtils.makeUUID()+time) + ".jpg";
String path = "avatar" + date + "/" + name; String path = "avatar" + date + "/" + name;
String savePath = YmlUtils.get("like.upload-directory") + path; String savePath = YmlUtils.get("like.upload-directory") + path;