manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review code.

Browse Source
This commit is contained in:
lijiahang
2023-07-03 11:08:41 +08:00
parent 0793463da6
commit f18cba1cb6
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/BaseLogPrinterInterceptor.java → orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/AbstractLogPrinterInterceptor.java
View File

@@ -36,7 +36,7 @@ import java.util.function.Predicate;
* @version 1.0.0
* @since 2023/6/29 10:36
*/
public abstract class BaseLogPrinterInterceptor implements LogPrinterInterceptor {
public abstract class AbstractLogPrinterInterceptor implements LogPrinterInterceptor {
/**
* 请求头过滤器
@@ -68,7 +68,7 @@ public abstract class BaseLogPrinterInterceptor implements LogPrinterInterceptor
@Qualifier("desensitizeValueSerializeFilter")
private ValueFilter desensitizeValueSerializeFilter;
public BaseLogPrinterInterceptor(LogPrinterConfig config) {
public AbstractLogPrinterInterceptor(LogPrinterConfig config) {
this.config = config;
this.summaryMapping = Maps.newMap();
this.ignoreParameter = Maps.newMap();
@@ -109,7 +109,7 @@ public abstract class BaseLogPrinterInterceptor implements LogPrinterInterceptor
// 执行方法
Object ret = invocation.proceed();
// 打印响应日志
this.responsePrinter(startTime, traceId, ret);
this.responsePrinter(startTime, traceId, invocation, ret);
return ret;
} catch (Throwable t) {
// 打印异常日志
@@ -130,11 +130,12 @@ public abstract class BaseLogPrinterInterceptor implements LogPrinterInterceptor
/**
* 打印响应信息
*
* @param startTime 开始时间
* @param traceId traceId
* @param ret return
* @param startTime 开始时间
* @param traceId traceId
* @param invocation invocation
* @param ret return
*/
protected abstract void responsePrinter(Date startTime, String traceId, Object ret);
protected abstract void responsePrinter(Date startTime, String traceId, MethodInvocation invocation, Object ret);
/**
* 打印异常信息

2
orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/LogPrinterInterceptor.java
View File

@@ -15,6 +15,8 @@ public interface LogPrinterInterceptor extends MethodInterceptor {
String ERROR_ARG = "<ERROR>";
String VOID_RES = "<VOID>";
/**
* 初始化
*/

13
orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/PrettyLogPrinterInterceptor.java
View File

@@ -23,7 +23,7 @@ import java.util.Optional;
* @since 2023/6/29 10:36
*/
@Slf4j
public class PrettyLogPrinterInterceptor extends BaseLogPrinterInterceptor {
public class PrettyLogPrinterInterceptor extends AbstractLogPrinterInterceptor {
public PrettyLogPrinterInterceptor(LogPrinterConfig config) {
super(config);
@@ -75,14 +75,19 @@ public class PrettyLogPrinterInterceptor extends BaseLogPrinterInterceptor {
}
@Override
protected void responsePrinter(Date startTime, String traceId, Object ret) {
protected void responsePrinter(Date startTime, String traceId, MethodInvocation invocation, Object ret) {
Date endTime = new Date();
// 响应日志
StringBuilder responseLog = new StringBuilder("\napi请求-结束\n")
.append("\ttraceId: ").append(traceId).append('\n')
.append("\tend: ").append(Dates.format(endTime, Dates.YMD_HMSS)).append('\n')
.append("\tused: ").append(endTime.getTime() - startTime.getTime()).append("ms \n")
.append("\tresponse: ").append(this.responseToString(ret));
.append("\tused: ").append(endTime.getTime() - startTime.getTime()).append("ms \n");
if (invocation.getMethod().getReturnType().equals(Void.TYPE)) {
responseLog.append("\tresponse: ").append(VOID_RES);
} else {
responseLog.append("\tresponse: ").append(this.responseToString(ret));
}
log.info(responseLog.toString());
}

13
orion-ops-framework/orion-ops-spring-boot-starter-log/src/main/java/com/orion/ops/framework/log/core/interceptor/RowLogPrinterInterceptor.java
View File

@@ -27,7 +27,7 @@ import java.util.Optional;
* @since 2023/6/29 10:36
*/
@Slf4j
public class RowLogPrinterInterceptor extends BaseLogPrinterInterceptor implements LogFieldConst {
public class RowLogPrinterInterceptor extends AbstractLogPrinterInterceptor implements LogFieldConst {
public RowLogPrinterInterceptor(LogPrinterConfig config) {
super(config);
@@ -76,21 +76,23 @@ public class RowLogPrinterInterceptor extends BaseLogPrinterInterceptor implemen
fields.put(PARAMETER, this.requestToString(method, invocation.getArguments()));
log.info("api请求-开始 {}", JSON.toJSONString(fields));
fields.clear();
fields = null;
}
@Override
protected void responsePrinter(Date startTime, String traceId, Object ret) {
protected void responsePrinter(Date startTime, String traceId, MethodInvocation invocation, Object ret) {
Date endTime = new Date();
// 响应日志
Map<String, Object> fields = new LinkedHashMap<>();
fields.put(TRACE_ID, traceId);
fields.put(END, Dates.format(endTime, Dates.YMD_HMSS));
fields.put(USED, endTime.getTime() - startTime.getTime() + "ms");
fields.put(RESPONSE, this.responseToString(ret));
if (invocation.getMethod().getReturnType().equals(Void.TYPE)) {
fields.put(RESPONSE, VOID_RES);
} else {
fields.put(RESPONSE, this.responseToString(ret));
}
log.info("api请求-结束 {}", JSON.toJSONString(fields));
fields.clear();
fields = null;
}
@Override
@@ -104,7 +106,6 @@ public class RowLogPrinterInterceptor extends BaseLogPrinterInterceptor implemen
fields.put(ERROR_DIGEST, Exceptions.getDigest(throwable));
log.error("api请求-异常 {}", JSON.toJSONString(fields));
fields.clear();
fields = null;
}
}

1
orion-ops-framework/orion-ops-spring-boot-starter-web/src/main/java/com/orion/ops/framework/web/core/handler/WrapperResultHandler.java
View File

@@ -34,7 +34,6 @@ public class WrapperResultHandler implements ResponseBodyAdvice<Object> {
return false;
}
return !methodParameter.hasMethodAnnotation(IgnoreWrapper.class);
// && methodParameter.getExecutable().getAnnotatedReturnType().getType() != Void.TYPE;
}
@Override