部分日志

用户编号不能为空 验证去掉

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/viewobject/BaseVO.java

@@ -1,5 +1,6 @@
 package com.win.framework.mybatis.core.viewobject;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -21,11 +22,11 @@ public abstract class BaseVO implements Serializable {
     private Long id;
 
     @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private LocalDateTime createTime;
 
     @Schema(description = "最后更新时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private LocalDateTime updateTime;
 
     @Schema(description = "创建者")

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/mybatis/core/viewobject/MasterVO.java

@@ -1,5 +1,6 @@
 package com.win.framework.mybatis.core.viewobject;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -23,18 +24,18 @@ public abstract class MasterVO extends BaseVO{
     private String available;
 
     @Schema(description = "生效时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private LocalDateTime activeTime;
 
     @Schema(description = "失效时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private LocalDateTime expireTime;
 
     @Schema(description = "备注", example = "你猜")
     private String remark;
 
     @Schema(description = "删除时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private LocalDateTime deletionTime;
 
     @Schema(description = "删除者")

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqblender/vo/EqBlenderBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqblender.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqBlenderBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqblender/vo/EqBlenderRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqblender.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class EqBlenderRespVO extends EqBlenderBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqcoater/vo/EqCoaterBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqcoater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqCoaterBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqcoater/vo/EqCoaterRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqcoater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class EqCoaterRespVO extends EqCoaterBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqfine/vo/EqFineBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqfine.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqFineBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqfine/vo/EqFineRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqfine.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class EqFineRespVO extends EqFineBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqpre/vo/EqPreBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqpre.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqPreBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqpre/vo/EqPreRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqpre.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class EqPreRespVO extends EqPreBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqrollsqueezer/vo/EqRollsqueezerBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqrollsqueezer.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqRollsqueezerBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqrollsqueezer/vo/EqRollsqueezerRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqrollsqueezer.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class EqRollsqueezerRespVO extends EqRollsqueezerBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqstacking/vo/EqStackingBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.eqstacking.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -29,6 +30,7 @@ public class EqStackingBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqstacking/vo/EqStackingPageReqVO.java

@@ -1,11 +1,11 @@
 package com.win.module.ccwin.controller.admin.eqstacking.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import com.win.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/eqstacking/vo/EqStackingRespVO.java

@@ -1,7 +1,10 @@
 package com.win.module.ccwin.controller.admin.eqstacking.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -16,6 +19,7 @@ public class EqStackingRespVO extends EqStackingBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paac/vo/PaAcBaseVO.java

@@ -1,14 +1,10 @@
 package com.win.module.ccwin.controller.admin.paac.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -34,6 +30,7 @@ public class PaAcBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paac/vo/PaAcExcelVO.java

@@ -37,7 +37,7 @@ public class PaAcExcelVO {
     @ExcelProperty("设备名称")
     private String mname;
 
-//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     @ExcelProperty("创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paac/vo/PaAcExportReqVO.java

@@ -1,10 +1,8 @@
 package com.win.module.ccwin.controller.admin.paac.vo;
 
-import lombok.*;
-import java.util.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
-import java.time.LocalDateTime;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -29,6 +27,7 @@ public class PaAcExportReqVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String[] createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paac/vo/PaAcRespVO.java

@@ -1,7 +1,10 @@
 package com.win.module.ccwin.controller.admin.paac.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -16,6 +19,7 @@ public class PaAcRespVO extends PaAcBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/padhu/vo/PaDhuRespVO.java

@@ -1,12 +1,16 @@
 package com.win.module.ccwin.controller.admin.padhu.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 除湿机 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -16,7 +20,9 @@ public class PaDhuRespVO extends PaDhuBaseVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2150")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paloopwater/vo/PaLoopwaterBaseVO.java

@@ -1,14 +1,10 @@
 package com.win.module.ccwin.controller.admin.paloopwater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -34,6 +30,7 @@ public class PaLoopwaterBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paloopwater/vo/PaLoopwaterExcelVO.java

@@ -37,7 +37,7 @@ public class PaLoopwaterExcelVO {
     @ExcelProperty("设备名称")
     private String mname;
 
-//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     @ExcelProperty("创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paloopwater/vo/PaLoopwaterRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.paloopwater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -16,6 +17,7 @@ public class PaLoopwaterRespVO extends PaLoopwaterBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paro/vo/PaRoBaseVO.java

@@ -1,14 +1,10 @@
 package com.win.module.ccwin.controller.admin.paro.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -34,6 +30,7 @@ public class PaRoBaseVO {
     private String mname;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paro/vo/PaRoExcelVO.java

@@ -32,7 +32,7 @@ public class PaRoExcelVO {
     @ExcelProperty("设备名称")
     private String mname;
 
-//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     @ExcelProperty("创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/paro/vo/PaRoRespVO.java

@@ -1,7 +1,10 @@
 package com.win.module.ccwin.controller.admin.paro.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -16,6 +19,7 @@ public class PaRoRespVO extends PaRoBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/pavacuo/vo/PaVacuoRespVO.java

@@ -1,12 +1,16 @@
 package com.win.module.ccwin.controller.admin.pavacuo.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
 
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
 @Schema(description = "管理后台 - 真空 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -16,7 +20,9 @@ public class PaVacuoRespVO extends PaVacuoBaseVO {
     @Schema(description = "主键、自增", requiredMode = Schema.RequiredMode.REQUIRED, example = "15968")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
-    private LocalDateTime createTime;
+    private String createTime;
 
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/pawastewater/vo/PaWastewaterBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.pawastewater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -30,6 +31,7 @@ public class PaWastewaterBaseVO {
 
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/pawastewater/vo/PaWastewaterExcelVO.java

@@ -37,7 +37,7 @@ public class PaWastewaterExcelVO {
     @ExcelProperty("设备名称")
     private String mname;
 
-//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+//    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     @ExcelProperty("创建时间")
     private String createTime;
 }

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/pawastewater/vo/PaWastewaterExportReqVO.java

@@ -1,10 +1,7 @@
 package com.win.module.ccwin.controller.admin.pawastewater.vo;
 
-import lombok.*;
-import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
-import com.win.framework.common.pojo.PageParam;
-import java.time.LocalDateTime;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;

win-module-ccwin/win-module-ccwin-biz/src/main/java/com/win/module/ccwin/controller/admin/pawastewater/vo/PaWastewaterRespVO.java

@@ -1,5 +1,6 @@
 package com.win.module.ccwin.controller.admin.pawastewater.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -18,6 +19,7 @@ public class PaWastewaterRespVO extends PaWastewaterBaseVO {
     private Long id;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "创建时间")
     private String createTime;
 

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/job/vo/log/JobLogBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.infra.controller.job.vo.log;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -10,9 +11,9 @@ import java.time.LocalDateTime;
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * 定时任务日志 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class JobLogBaseVO {
 
@@ -34,10 +35,12 @@ public class JobLogBaseVO {
     @Schema(description = "开始执行时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "开始执行时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime beginTime;
 
     @Schema(description = "结束执行时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @Schema(description = "执行时长", example = "123")

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/job/vo/log/JobLogExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.infra.controller.job.vo.log;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -19,10 +20,12 @@ public class JobLogExportReqVO {
     private String handlerName;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "开始执行时间")
     private LocalDateTime beginTime;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "结束执行时间")
     private LocalDateTime endTime;
 

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/job/vo/log/JobLogPageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.infra.controller.job.vo.log;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -24,10 +25,12 @@ public class JobLogPageReqVO extends PageParam {
     private String handlerName;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "开始执行时间")
     private LocalDateTime beginTime;
 
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     @Schema(description = "结束执行时间")
     private LocalDateTime endTime;
 

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/logger/vo/apiaccesslog/ApiAccessLogBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.infra.controller.logger.vo.apiaccesslog;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -10,9 +11,9 @@ import java.time.LocalDateTime;
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * API 访问日志 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class ApiAccessLogBaseVO {
 
@@ -21,7 +22,7 @@ public class ApiAccessLogBaseVO {
     private String traceId;
 
     @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
-    @NotNull(message = "用户编号不能为空")
+//    @NotNull(message = "用户编号不能为空")
     private Long userId;
 
     @Schema(description = "应用名", requiredMode = Schema.RequiredMode.REQUIRED, example = "dashboard")
@@ -50,11 +51,13 @@ public class ApiAccessLogBaseVO {
     @Schema(description = "开始请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "开始请求时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime beginTime;
 
     @Schema(description = "结束请求时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "结束请求时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime endTime;
 
     @Schema(description = "执行时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")

win-module-infra/win-module-infra-biz/src/main/java/com/win/module/infra/controller/logger/vo/apierrorlog/ApiErrorLogBaseVO.java

@@ -1,4 +1,6 @@
 package com.win.module.infra.controller.logger.vo.apierrorlog;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -9,9 +11,9 @@ import java.time.LocalDateTime;
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ * API 错误日志 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
 @Data
 public class ApiErrorLogBaseVO {
 
@@ -50,6 +52,7 @@ public class ApiErrorLogBaseVO {
     @Schema(description = "异常发生时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "异常发生时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime exceptionTime;
 
     @Schema(description = "异常名", requiredMode = Schema.RequiredMode.REQUIRED)

win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/vo/_column.vm

@@ -8,6 +8,6 @@
 #end
 #end
 #if (${column.javaType} == "LocalDateTime")## 时间类型
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
 #end
     private ${column.javaType} ${column.javaField};

win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/vo/exportReqVO.vm

@@ -28,7 +28,7 @@ public class ${sceneEnum.prefixClass}${table.className}ExportReqVO {
 #if (${column.listOperation})##查询操作
 #if (${column.listOperationCondition} == "BETWEEN")## 情况一，Between 的时候
     @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private ${column.javaType}[] ${column.javaField};
 #else##情况二，非 Between 的时间
     #columnTpl('', '')

win-module-infra/win-module-infra-biz/src/main/resources/codegen/java/controller/vo/pageReqVO.vm

@@ -30,7 +30,7 @@ public class ${sceneEnum.prefixClass}${table.className}PageReqVO extends PagePar
 #if (${column.listOperation})##查询操作
 #if (${column.listOperationCondition} == "BETWEEN")## 情况一，Between 的时候
     @Schema(description = "${column.columnComment}"#if ("$!column.example" != ""), example = "${column.example}"#end)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND,timezone="GMT+8")
     private ${column.javaType}[] ${column.javaField};
 #else##情况二，非 Between 的时间
     #columnTpl('', '')

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/automaticshellinsertion/vo/AutomaticShellInsertionRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.automaticshellinsertion.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 自动入壳 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class AutomaticShellInsertionRespVO extends AutomaticShellInsertionBaseVO
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8732")
     private Integer id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/covercode/vo/CoverCodeRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.covercode.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 顶盖刻码 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class CoverCodeRespVO extends CoverCodeBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "23037")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/diecutting/vo/DieCuttingRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.diecutting.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 模切 Response VO")
 @Data
@@ -13,4 +17,10 @@ public class DieCuttingRespVO extends DieCuttingBaseVO {
 
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "21060")
     private Long id;
+
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/hexinpatch/vo/HexinPatchRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.hexinpatch.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 合芯贴片 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class HexinPatchRespVO extends HexinPatchBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27452")
     private Long id;
 
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/hotpress/vo/HotPressRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.hotpress.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 热压 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class HotPressRespVO extends HotPressBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27008")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/laserwelding/vo/LaserWeldingRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.laserwelding.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 转接片激光焊 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class LaserWeldingRespVO extends LaserWeldingBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "28707")
     private Long id;
 
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/onehelium/vo/OneHeliumRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.onehelium.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 一次氦检 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class OneHeliumRespVO extends OneHeliumBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "15482")
     private Integer id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/packagemylar/vo/PackageMylarRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.packagemylar.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 包Mylar Response VO")
 @Data
@@ -14,4 +18,8 @@ public class PackageMylarRespVO extends PackageMylarBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8225")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/sealingnailwelding/vo/SealingNailWeldingRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.sealingnailwelding.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 密封钉焊接 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class SealingNailWeldingRespVO extends SealingNailWeldingBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16639")
     private Integer id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/secondaryinspection/vo/SecondaryInspectionRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.secondaryinspection.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 二次氦检 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class SecondaryInspectionRespVO extends SecondaryInspectionBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20188")
     private Integer id;
 
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/stackedcoreadhesive/vo/StackedCoreAdhesiveRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.stackedcoreadhesive.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 叠芯贴胶 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class StackedCoreAdhesiveRespVO extends StackedCoreAdhesiveBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "16407")
     private Long id;
 
+
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/topwelded/vo/TopWeldedRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.topwelded.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 顶盖预满焊 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class TopWeldedRespVO extends TopWeldedBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "9382")
     private Integer id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
+
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/ultrasonicfinalwelding/vo/UltrasonicFinalWeldingRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.ultrasonicfinalwelding.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 超声波终焊 Response VO")
 @Data
@@ -14,4 +18,9 @@ public class UltrasonicFinalWeldingRespVO extends UltrasonicFinalWeldingBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "8288")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
+
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/ultrasonicprewelding/vo/UltrasonicPreWeldingRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.ultrasonicprewelding.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 超声波预焊 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class UltrasonicPreWeldingRespVO extends UltrasonicPreWeldingBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "10143")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/weldadhesivebond/vo/WeldAdhesiveBondRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.weldadhesivebond.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 超声波焊后贴胶 Response VO")
 @Data
@@ -14,4 +18,8 @@ public class WeldAdhesiveBondRespVO extends WeldAdhesiveBondBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "19046")
     private Long id;
 
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-opc/win-module-opc-biz/src/main/java/com/win/module/opc/controller/admin/xray/vo/XRayRespVO.java

@@ -1,9 +1,13 @@
 package com.win.module.opc.controller.admin.xray.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - X-RAY Response VO")
 @Data
@@ -14,5 +18,8 @@ public class XRayRespVO extends XRayBaseVO {
     @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "27607")
     private Integer id;
 
-
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
+    @Schema(description = "创建时间")
+    private String createTime;
 }

win-module-system/win-module-system-api/src/main/java/com/win/module/system/api/logger/dto/OperateLogCreateReqDTO.java

@@ -21,7 +21,7 @@ public class OperateLogCreateReqDTO {
     /**
      * 用户编号
      */
-    @NotNull(message = "用户编号不能为空")
+//    @NotNull(message = "用户编号不能为空")
     private Long userId;
     /**
      * 操作模块

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/dict/vo/type/DictTypePageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.dict.vo.type;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/errorcode/vo/ErrorCodeExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.errorcode.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/errorcode/vo/ErrorCodePageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.errorcode.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/logger/vo/loginlog/LoginLogExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.logger.vo.loginlog;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/logger/vo/loginlog/LoginLogPageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.logger.vo.loginlog;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/tableactionrel/vo/TableActionRelBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.tableactionrel.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -32,10 +33,12 @@ public class TableActionRelBaseVO {
 
     @Schema(description = "生效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime activeTime;
 
     @Schema(description = "失效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime expireTime;
 
     @Schema(description = "备注", example = "你猜")
@@ -43,6 +46,7 @@ public class TableActionRelBaseVO {
 
     @Schema(description = "删除时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime deletionTime;
 
     @Schema(description = "删除者ID", example = "18254")

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/templaterel/vo/TemplateRelBaseVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.templaterel.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -41,10 +42,12 @@ public class TemplateRelBaseVO {
 
     @Schema(description = "生效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime activeTime;
 
     @Schema(description = "失效时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime expireTime;
 
     @Schema(description = "备注", example = "你猜")
@@ -52,6 +55,7 @@ public class TemplateRelBaseVO {
 
     @Schema(description = "删除时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = "GMT+8")
     private LocalDateTime deletionTime;
 
     @Schema(description = "删除者ID", example = "7880")

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/tenant/vo/packages/TenantPackagePageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.tenant.vo.packages;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/tenant/vo/tenant/TenantExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.tenant.vo.tenant;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/tenant/vo/tenant/TenantPageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.tenant.vo.tenant;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserExportReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.user.vo.user;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/controller/user/vo/user/UserPageReqVO.java

@@ -1,5 +1,6 @@
 package com.win.module.system.controller.user.vo.user;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.win.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

win-server/src/main/resources/application-dev.yaml

@@ -34,23 +34,23 @@ spring:
 #      master:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://localhost:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://172.16.1.230:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: root
-#        password: 123456
+#        password: Microdoft@2021
 #      # 读数据源
 #      slave0:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://localhost:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://172.16.1.230:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: root
-#        password: 123456
+#        password: Microdoft@2021
 #      # 读数据源
 #      slave1:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://localhost:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://172.16.1.230:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        username: root
-#        password: 123456
+#        password: Microdoft@2021
 
       # 主数据源
       master:

win-server/src/main/resources/application-prod.yaml

@@ -30,48 +30,48 @@ spring:
     ## 数据源配置
     datasource:
       names: master,slave0,slave1
-      # 主数据源
-      #      master:
-      #        type: com.alibaba.druid.pool.DruidDataSource
-      #        driverClassName: com.mysql.cj.jdbc.Driver
-      #        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-      #        username: intex
-      #        password: Microsoft@2024
-      #      # 读数据源
-      #      slave0:
-      #        type: com.alibaba.druid.pool.DruidDataSource
-      #        driverClassName: com.mysql.cj.jdbc.Driver
-      #        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-      #        username: intex
-      #        password: Microsoft@2024
-      #      # 读数据源
-      #      slave1:
-      #        type: com.alibaba.druid.pool.DruidDataSource
-      #        driverClassName: com.mysql.cj.jdbc.Driver
-      #        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-      #        username: intex
-      #        password: Microsoft@2024
-      master:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: root
-        password: Microdoft@2021
-      # 读数据源
-      slave0:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: root
-        password: Microdoft@2021
-      # 读数据源
-      slave1:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: root
-        password: Microdoft@2021
-
+    # 主数据源
+#      master:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
+#      # 读数据源
+#      slave0:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
+#      # 读数据源
+#      slave1:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
+    # 主数据源
+    master:
+      type: com.alibaba.druid.pool.DruidDataSource
+      driverClassName: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+      username: root
+      password: Microdoft@2021
+    # 读数据源
+    slave0:
+      type: com.alibaba.druid.pool.DruidDataSource
+      driverClassName: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+      username: root
+      password: Microdoft@2021
+    # 读数据源
+    slave1:
+      type: com.alibaba.druid.pool.DruidDataSource
+      driverClassName: com.mysql.cj.jdbc.Driver
+      url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+      username: root
+      password: Microdoft@2021
     # 读写分离类型，如: Static，Dynamic
     rules:
       readwrite-splitting:
@@ -172,9 +172,9 @@ spring:
       config:
         singleServerConfig:
           pingConnectionInterval: 60000
-    #    host: 192.168.122.43 # 地址
-    #    port: 23114 # 端口
-    #    database: 11 # 数据库索引
+#    host: 192.168.122.43 # 地址
+#    port: 23114 # 端口
+#    database: 11 # 数据库索引
     host: 10.56.17.106 # 地址
     port: 6379 # 端口
     database: 1 # 数据库索引

win-server/src/main/resources/application-test.yaml

@@ -31,46 +31,68 @@ spring:
     datasource:
       names: master,slave0,slave1
       # 主数据源
+#      master:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
+#      # 读数据源
+#      slave0:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
+#      # 读数据源
+#      slave1:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
       master:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: intex
-        password: Microsoft@2024
+        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+        username: root
+        password: Microdoft@2021
       # 读数据源
       slave0:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: intex
-        password: Microsoft@2024
+        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+        username: root
+        password: Microdoft@2021
       # 读数据源
       slave1:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.122.43:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-        username: intex
-        password: Microsoft@2024
+        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+        username: root
+        password: Microdoft@2021
+
+      # 主数据源
 #      master:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-#        username: root
-#        password: Microdoft@2021
+#        url: jdbc:mysql://dev.ccwin-in.com:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
 #      # 读数据源
 #      slave0:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-#        username: root
-#        password: Microdoft@2021
+#        url: jdbc:mysql://dev.ccwin-in.com:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
 #      # 读数据源
 #      slave1:
 #        type: com.alibaba.druid.pool.DruidDataSource
 #        driverClassName: com.mysql.cj.jdbc.Driver
-#        url: jdbc:mysql://10.56.17.106:3306/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
-#        username: root
-#        password: Microdoft@2021
+#        url: jdbc:mysql://dev.ccwin-in.com:23113/dcxny_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&failOverReadOnly=false&socketTimeout=600000&connectTimeout=600000
+#        username: intex
+#        password: Microsoft@2024
 
     # 读写分离类型，如: Static，Dynamic
     rules:
@@ -172,12 +194,15 @@ spring:
       config:
         singleServerConfig:
           pingConnectionInterval: 60000
-    host: 192.168.122.43 # 地址
-    port: 23114 # 端口
-    database: 11 # 数据库索引
-#    host: 172.16.1.230 # 地址
+#    host: 192.168.122.43 # 地址
+#    port: 23114 # 端口
+#    database: 11 # 数据库索引
+#    host: localhost # 地址
 #    port: 6379 # 端口
-#    database: 1 # 数据库索引
+#    database: 9 # 数据库索引 原来是4,保持一致的原因是开发本地增加了单据号，测试再次增加,查询的时候会有问题
+    host: 10.56.17.106 # 地址
+    port: 6379 # 端口
+    database: 1 # 数据库索引
 #    password:    # 密码，建议生产环境开启
     lettuce:
       pool:

win-server/src/main/resources/application.yaml

@@ -120,7 +120,7 @@ win:
     license-url: https://gitee.com/zhijiantianya/ruoyi-vue-pro/blob/master/LICENSE
   captcha:
     enable: true # 验证码的开关，默认为 true
-    captchaType: blockPuzzle # 验证码类型 math 数组计算 char字符验证  滑动验证blockPuzzle 字符点击clickWord
+    captchaType: char # 验证码类型 math 数组计算 char字符验证  滑动验证blockPuzzle 字符点击clickWord
     captchaExpiration: 2 # 验证码有效期分众
   codegen:
     base-package: ${win.info.base-package}