diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java new file mode 100644 index 0000000..2244887 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ThreadModel.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-5-29 下午3:40 + * @Modify: + **/ +@Data +public class ThreadModel implements Serializable { + + @ApiParam(value ="自定义调用ID") + private Long requestId; + @ApiParam(value ="当前用户ID") + private Long userId; + @ApiParam(value ="当前用户名称") + private String userName; + @ApiParam(value ="用户登录IP") + private String userHost; + @ApiParam(value ="用户登录浏览器") + private String userBrowser; + @ApiParam(value ="用户登录操作系统") + private String userOs; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java index b9e2fea..da9d71f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogConsole.java @@ -47,6 +47,7 @@ public class SysLogConsole extends BaseBean { @Column(name="LOG_PID") @ApiParam(value ="应用PID") + @JsonSerialize(using = ToStringSerializer.class) private Long logPid; @Column(name="LOG_PORT") @@ -89,6 +90,10 @@ public class SysLogConsole extends BaseBean { private String userLoginName; /******** 日志信息 ********/ + @Column(name="REQUEST_ID") + @ApiParam(value ="请求ID") + @JsonSerialize(using = ToStringSerializer.class) + private Long requestId; @Column(name="EXECUTE_THREAD_ID") @ApiParam(value ="执行线程") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index b06be17..a515e18 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "是否推送MQ") private Integer isPushMQ; - @Column(name = "RESULT_SOFT_TYPE") + @Column(name = "RESULT_SOFT_TYPE",columnDefinition = "int default 0") @ApiParam(value = "同步调用微服务") private Integer resultSoftType; public String getResultSoftTypeTxt() {