diff --git a/common-common/pom.xml b/common-common/pom.xml index 6279c4e..6925f39 100644 --- a/common-common/pom.xml +++ b/common-common/pom.xml @@ -6,7 +6,7 @@ cn.axzo.framework common-common - 1.0.4 + 1.0.5 UTF-8 diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java b/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java new file mode 100644 index 0000000..1bfa130 --- /dev/null +++ b/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerCallback.java @@ -0,0 +1,19 @@ +package cn.azxo.framework.common.logger; + +/** + * 任务日志模板回调 + * + * @author zhaoyong + * @see JobLoggerCallback + * @since 2021-05-20 19:20 + */ +@FunctionalInterface +public interface JobLoggerCallback { + + /** + * 任务操作 + * @return + */ + T doInExecute(); + +} diff --git a/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java b/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java new file mode 100644 index 0000000..2dbe5f2 --- /dev/null +++ b/common-common/src/main/java/cn/azxo/framework/common/logger/JobLoggerTemplate.java @@ -0,0 +1,26 @@ +package cn.azxo.framework.common.logger; + +import org.slf4j.MDC; + +import java.util.UUID; + +/** + * 定时傻日志模板类 + * + * @author zhaoyong + * @see JobLoggerTemplate + * @since 2021-06-17 19:35 + */ +public class JobLoggerTemplate { + + public T execute(String mdcKey, JobLoggerCallback action){ + String uuid = UUID.randomUUID().toString(); + MDC.put(mdcKey, uuid); + try { + return action.doInExecute(); + } finally { + MDC.clear(); + } + } + +} diff --git a/common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java b/common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java index 2fd0c79..548c5e1 100644 --- a/common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java +++ b/common-common/src/main/java/cn/azxo/framework/common/model/CommonResponse.java @@ -18,25 +18,25 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class CommonResponse { - private String code; + private Integer code; private String msg; private T data; public static CommonResponse success(Object data) { - return new CommonResponse("200", "success", null); + return new CommonResponse(200, "success", null); } - public static CommonResponse success(String code, String message, Object data) { + public static CommonResponse success(Integer code, String message, Object data) { return new CommonResponse(code, message, data); } - public static CommonResponse error(String code, String message){ + public static CommonResponse error(Integer code, String message){ return new CommonResponse(code, message, null); } - public static CommonResponse error(String code, String message, Object data){ + public static CommonResponse error(Integer code, String message, Object data){ return new CommonResponse(code, message, data); }