diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/aop/Log.java b/server/like-admin/src/main/java/com/mdd/admin/config/aop/Log.java index 473843aeeb434962aee3c8d6b4d2a57c90860c4f..accee6c8e033fc50eb703861fadc9867b1947f18 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/aop/Log.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/aop/Log.java @@ -13,4 +13,10 @@ public @interface Log { */ String title() default ""; + /** + * 模块 + * @return String + */ + RequestType requestType() default RequestType.Default; + } diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java index ffbf11ba07d48f97d6f919d8a55db495857ecb1f..63fb2293e2e8de14e8cdeb89721b03e45290449e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java +++ b/server/like-admin/src/main/java/com/mdd/admin/config/aop/LogAspect.java @@ -16,12 +16,18 @@ import org.aspectj.lang.reflect.MethodSignature; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; +import org.springframework.util.MultiValueMap; 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 javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; @Aspect @Component @@ -96,9 +102,24 @@ public class LogAspect { String queryString = request.getQueryString(); Object[] args = joinPoint.getArgs(); String params = ""; - if(args.length>0){ + if (args.length > 0) { if("POST".equals(request.getMethod())){ - params = JSON.toJSONString(args); + if (RequestType.File.equals(logAnnotation.requestType())){ + //文件类型获取文件名称作为参数 + StandardMultipartHttpServletRequest standardMultipartHttpServletRequest = (StandardMultipartHttpServletRequest) args[0]; + //提取文件名 + params = standardMultipartHttpServletRequest + .getMultiFileMap() + .values() + .stream() + .map(m -> m.stream() + .map(mf-> mf.getOriginalFilename()) + .collect(Collectors.joining(","))) + .collect(Collectors.joining(",")); + } else { + params = JSON.toJSONString(args); + } + } else if("GET".equals(request.getMethod())){ params = queryString; } diff --git a/server/like-admin/src/main/java/com/mdd/admin/config/aop/RequestType.java b/server/like-admin/src/main/java/com/mdd/admin/config/aop/RequestType.java new file mode 100644 index 0000000000000000000000000000000000000000..abc398d2f2f7f51375ee00174e7ab68cf24c2615 --- /dev/null +++ b/server/like-admin/src/main/java/com/mdd/admin/config/aop/RequestType.java @@ -0,0 +1,17 @@ +package com.mdd.admin.config.aop; + +/** + * 请求参数类 + */ +public enum RequestType { + /** + * 文件类型 + */ + File, + /** + * 默认数据类型 + */ + Default + ; + +} diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java index aaa9fee43685e20af7bff6741ad87e2e76a70113..45b78e8ee0359d7963667ff4db52d644adb66986 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java @@ -2,6 +2,7 @@ package com.mdd.admin.controller.common; import com.mdd.admin.LikeAdminThreadLocal; import com.mdd.admin.config.aop.Log; +import com.mdd.admin.config.aop.RequestType; import com.mdd.admin.service.common.IAlbumService; import com.mdd.common.core.AjaxResult; import com.mdd.common.enums.AlbumEnum; @@ -36,7 +37,7 @@ public class UploadController { * @param request 请求对象 * @return Object */ - @Log(title = "上传图片") + @Log(title = "上传图片", requestType = RequestType.File) @PostMapping("/image") public Object image(HttpServletRequest request) { MultipartFile multipartFile;