Update LogAspect.java

搜云库 · web-flow · commit eded3cd844a3 · 2018-06-16T00:38:17.000+08:00
去掉 try catch
diff --git a/spring-boot-logback/src/main/java/io/ymq/logback/config/commons/LogAspect.java b/spring-boot-logback/src/main/java/io/ymq/logback/config/commons/LogAspect.java
@@ -33,56 +33,43 @@ public class LogAspect{
 public void serviceLog(){
 }
 
- @Around("serviceLog()")
- public Object around(ProceedingJoinPoint joinPoint){
- try{
-
- String requestUUID = MDC.get("requestUUID");
- if (requestUUID == null || "".equals(requestUUID)){
- String uuid = UUID.randomUUID().toString();
- uuid = uuid.replaceAll("-", "").toUpperCase();
- MDC.put("requestUUID", uuid);
- log.info("around 在请求处理之前生成 logback requestUUID:{}", uuid);
- }
-
- MethodSignature signature = (MethodSignature) joinPoint.getSignature();
- Method method = signature.getMethod();
- Class<?> targetClass = method.getDeclaringClass();
+ @Around("serviceLog()")
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable{
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ Method method = signature.getMethod();
+ Class<?> targetClass = method.getDeclaringClass();
 
- StringBuffer classAndMethod = new StringBuffer();
+ StringBuffer classAndMethod = new StringBuffer();
 
- Log classAnnotation = targetClass.getAnnotation(Log.class);
- Log methodAnnotation = method.getAnnotation(Log.class);
+ Log classAnnotation = targetClass.getAnnotation(Log.class);
+ Log methodAnnotation = method.getAnnotation(Log.class);
 
- if (classAnnotation != null){
- if (classAnnotation.ignore()){
- return joinPoint.proceed();
- }
- classAndMethod.append(classAnnotation.value()).append("-");
+ if (classAnnotation != null){
+ if (classAnnotation.ignore()){
+ return joinPoint.proceed();
 }
+ classAndMethod.append(classAnnotation.value()).append("-");
+ }
 
- if (methodAnnotation != null){
- if (methodAnnotation.ignore()){
- return joinPoint.proceed();
- }
- classAndMethod.append(methodAnnotation.value());
+ if (methodAnnotation != null){
+ if (methodAnnotation.ignore()){
+ return joinPoint.proceed();
 }
+ classAndMethod.append(methodAnnotation.value());
+ }
 
- String target = targetClass.getName() + "#" + method.getName();
- String params = JSONObject.toJSONStringWithDateFormat(joinPoint.getArgs(), dateFormat, SerializerFeature.WriteMapNullValue);
+ String target = targetClass.getName() + "#" + method.getName();
 
- log.info(STRING_START + "{} 开始调用-->{} 参数:{}", classAndMethod.toString(), target, params);
+ String params = null;
+ params = JSONObject.toJSONStringWithDateFormat(joinPoint.getArgs(), dateFormat, SerializerFeature.WriteMapNullValue);
 
- long start = System.currentTimeMillis();
- Object result = joinPoint.proceed();
- long timeConsuming = System.currentTimeMillis() - start;
+ log.info(STRING_START + "{} 开始调用-->{} 参数:{}", classAndMethod.toString(), target, params);
 
- log.info("\n{} 调用结束<--{} 返回值:{} 耗时:{}ms" + STRING_END, classAndMethod.toString(), target, JSONObject.toJSONStringWithDateFormat(result, dateFormat, SerializerFeature.WriteMapNullValue), timeConsuming);
- return result;
- } catch (Throwable throwable){
- log.error(throwable.getMessage(), throwable);
- }
- return null;
- }
+ long start = System.currentTimeMillis();
+ Object result = joinPoint.proceed();
+ long timeConsuming = System.currentTimeMillis() - start;
 
+ log.info("\n{} 调用结束<--{} 返回值:{} 耗时:{}ms" + STRING_END, classAndMethod.toString(), target, JSONObject.toJSONStringWithDateFormat(result, dateFormat, SerializerFeature.WriteMapNullValue), timeConsuming);
+ return result;
+ }
 }

-Original file line number
+Diff line change
 publicvoidserviceLog(){
+ }
 -@Around("serviceLog()")
 -publicObjectaround(ProceedingJoinPointjoinPoint){
 -try{
+-
 -StringrequestUUID = MDC.get("requestUUID");
 -if (requestUUID == null || "".equals(requestUUID)){
 -Stringuuid = UUID.randomUUID().toString();
 -uuid = uuid.replaceAll("-", "").toUpperCase();
 -MDC.put("requestUUID", uuid);
 -log.info("around 在请求处理之前生成 logback requestUUID:{}", uuid);
 - }
+-
 -MethodSignaturesignature = (MethodSignature) joinPoint.getSignature();
 -Methodmethod = signature.getMethod();
 -Class<?> targetClass = method.getDeclaringClass();
 +@Around("serviceLog()")
 +publicObjectaround(ProceedingJoinPointjoinPoint) throwsThrowable{
 +MethodSignaturesignature = (MethodSignature) joinPoint.getSignature();
 +Methodmethod = signature.getMethod();
 +Class<?> targetClass = method.getDeclaringClass();
 -StringBufferclassAndMethod = newStringBuffer();
 +StringBufferclassAndMethod = newStringBuffer();
 -LogclassAnnotation = targetClass.getAnnotation(Log.class);
 -LogmethodAnnotation = method.getAnnotation(Log.class);
 +LogclassAnnotation = targetClass.getAnnotation(Log.class);
 +LogmethodAnnotation = method.getAnnotation(Log.class);
 -if (classAnnotation != null){
 -if (classAnnotation.ignore()){
 -returnjoinPoint.proceed();
 - }
 -classAndMethod.append(classAnnotation.value()).append("-");
 +if (classAnnotation != null){
 +if (classAnnotation.ignore()){
 +returnjoinPoint.proceed();
+ }
 +classAndMethod.append(classAnnotation.value()).append("-");
 + }
 -if (methodAnnotation != null){
 -if (methodAnnotation.ignore()){
 -returnjoinPoint.proceed();
 - }
 -classAndMethod.append(methodAnnotation.value());
 +if (methodAnnotation != null){
 +if (methodAnnotation.ignore()){
 +returnjoinPoint.proceed();
+ }
 +classAndMethod.append(methodAnnotation.value());
 + }
 -Stringtarget = targetClass.getName() + "#" + method.getName();
 -Stringparams = JSONObject.toJSONStringWithDateFormat(joinPoint.getArgs(), dateFormat, SerializerFeature.WriteMapNullValue);
 +Stringtarget = targetClass.getName() + "#" + method.getName();
 -log.info(STRING_START + "{} 开始调用-->{} 参数:{}", classAndMethod.toString(), target, params);
 +Stringparams = null;
 +params = JSONObject.toJSONStringWithDateFormat(joinPoint.getArgs(), dateFormat, SerializerFeature.WriteMapNullValue);
 -longstart = System.currentTimeMillis();
 -Objectresult = joinPoint.proceed();
 -longtimeConsuming = System.currentTimeMillis() - start;
 +log.info(STRING_START + "{} 开始调用-->{} 参数:{}", classAndMethod.toString(), target, params);
 -log.info("\n{} 调用结束<--{} 返回值:{} 耗时:{}ms" + STRING_END, classAndMethod.toString(), target, JSONObject.toJSONStringWithDateFormat(result, dateFormat, SerializerFeature.WriteMapNullValue), timeConsuming);
 -returnresult;
 - } catch (Throwablethrowable){
 -log.error(throwable.getMessage(), throwable);
 - }
 -returnnull;
 - }
 +longstart = System.currentTimeMillis();
 +Objectresult = joinPoint.proceed();
 +longtimeConsuming = System.currentTimeMillis() - start;
 +log.info("\n{} 调用结束<--{} 返回值:{} 耗时:{}ms" + STRING_END, classAndMethod.toString(), target, JSONObject.toJSONStringWithDateFormat(result, dateFormat, SerializerFeature.WriteMapNullValue), timeConsuming);
 +returnresult;
 + }
+}