From 34b2641f4a039d4e1dcf8f4a93dd7928616c4b11 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 15:17:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/config/AspectConfig.java | 51 +++++++++++++++++++++++++++++----------------------
1 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/common/config/AspectConfig.java b/src/main/java/com/zy/common/config/AspectConfig.java
index 07f14cc..91fa0b6 100644
--- a/src/main/java/com/zy/common/config/AspectConfig.java
+++ b/src/main/java/com/zy/common/config/AspectConfig.java
@@ -47,24 +47,26 @@
@Around("@within(org.springframework.web.bind.annotation.RestController)" +
"||@within(org.springframework.stereotype.Controller)")
public Object after(ProceedingJoinPoint joinPoint) throws Throwable {
- ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder
+ .getRequestAttributes();
HttpServletRequest request = requestAttributes != null ? requestAttributes.getRequest() : null;
long start = System.currentTimeMillis();
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
- OpenApiLog annotation = method.isAnnotationPresent(OpenApiLog.class) ? method.getAnnotation(OpenApiLog.class) : null;
+ OpenApiLog annotation = method.isAnnotationPresent(OpenApiLog.class) ? method.getAnnotation(OpenApiLog.class)
+ : null;
Object result = null;
Object errorResponse = null;
try {
- if (licenseTimer != null && !licenseTimer.getSystemSupport()) {
- Object fail = R.error("璁稿彲璇佸け鏁�");
- if (annotation != null && !Cools.isEmpty(annotation.memo())) {
- saveErrLog(joinPoint, request, fail, new CoolException("璁稿彲璇佸け鏁�"), annotation.memo());
- }
- return fail;
- }
result = joinPoint.proceed(joinPoint.getArgs());
if (annotation != null && !Cools.isEmpty(annotation.memo())) {
+ if (licenseTimer != null && !licenseTimer.getSystemSupport()) {
+ Object fail = R.error("璁稿彲璇佸け鏁�");
+ if (annotation != null && !Cools.isEmpty(annotation.memo())) {
+ saveErrLog(joinPoint, request, fail, new CoolException("璁稿彲璇佸け鏁�"), annotation.memo());
+ }
+ return fail;
+ }
saveLog(joinPoint, request, result, annotation.memo());
}
return result;
@@ -73,16 +75,22 @@
if (annotation != null && !Cools.isEmpty(annotation.memo())) {
saveErrLog(joinPoint, request, errorResponse, ex, annotation.memo());
}
- return errorResponse;
+ if (ex instanceof Exception) {
+ throw (Exception) ex;
+ }
+ throw new RuntimeException(ex);
} finally {
long end = System.currentTimeMillis();
-// log.info("璇锋眰鏃ュ織鐨勬墦鍗�");
-// log.info("璇锋眰鍦板潃:{}", request != null ? Optional.ofNullable(request.getRequestURI()).orElse(null) : null);
-// log.info("璇锋眰鏂瑰紡:{}", request != null ? request.getMethod() : null);
-// log.info("璇锋眰绫绘柟娉�:{}", joinPoint.getSignature());
-// log.info("璇锋眰绫绘柟娉曞弬鏁�:{}", JSONObject.toJSONString(filterArgs(joinPoint.getArgs())));
-// log.info("璇锋眰鍝嶅簲鍙傛暟{}", JSONObject.toJSONString(result != null ? result : errorResponse));
-// log.info("鎵ц鑰楁椂:{}", end - start);
+ // log.info("璇锋眰鏃ュ織鐨勬墦鍗�");
+ // log.info("璇锋眰鍦板潃:{}", request != null ?
+ // Optional.ofNullable(request.getRequestURI()).orElse(null) : null);
+ // log.info("璇锋眰鏂瑰紡:{}", request != null ? request.getMethod() : null);
+ // log.info("璇锋眰绫绘柟娉�:{}", joinPoint.getSignature());
+ // log.info("璇锋眰绫绘柟娉曞弬鏁�:{}",
+ // JSONObject.toJSONString(filterArgs(joinPoint.getArgs())));
+ // log.info("璇锋眰鍝嶅簲鍙傛暟{}", JSONObject.toJSONString(result != null ? result :
+ // errorResponse));
+ // log.info("鎵ц鑰楁椂:{}", end - start);
}
}
@@ -107,11 +115,11 @@
1,
new Date(),
null,
- null
- ));
+ null));
}
- private void saveErrLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object response, Throwable ex, String memo) {
+ private void saveErrLog(ProceedingJoinPoint joinPoint, HttpServletRequest request, Object response, Throwable ex,
+ String memo) {
apiLogService.insert(new ApiLog(
null,
memo,
@@ -126,8 +134,7 @@
1,
new Date(),
null,
- null
- ));
+ null));
}
private Object buildErrorResponse(Throwable ex) {
--
Gitblit v1.9.1