From 30029e0fd61f1ea28538bc0de39c68ea399ebc63 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 9 Jan 2026 11:44:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E7=94=A8=E6=88=B7=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/admin/user/vo/user/UserRespVO.java | 5 ++++- .../com/zt/plat/module/system/convert/user/UserConvert.java | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserRespVO.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserRespVO.java index 4fc49f77..e86723bd 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserRespVO.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/user/vo/user/UserRespVO.java @@ -59,9 +59,12 @@ public class UserRespVO{ private Integer sex; @Schema(description = "用户来源，参见 UserSourceEnum 枚举类", example = "1") - @ExcelProperty("用户来源") private Integer userSource; + @Schema(description = "用户来源标签", example = "外部用户") + @ExcelProperty("用户来源") + private String userSourceLabel; + @Schema(description = "用户头像", example = "123456789") private String avatar; diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/convert/user/UserConvert.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/convert/user/UserConvert.java index d424c824..73d94ca4 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/convert/user/UserConvert.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/convert/user/UserConvert.java @@ -12,6 +12,7 @@ import com.zt.plat.module.system.dal.dataobject.dept.DeptDO; import com.zt.plat.module.system.dal.dataobject.dept.PostDO; import com.zt.plat.module.system.dal.dataobject.permission.RoleDO; import com.zt.plat.module.system.dal.dataobject.user.AdminUserDO; +import com.zt.plat.module.system.enums.user.UserSourceEnum; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -32,6 +33,10 @@ public interface UserConvert { default UserRespVO convert(AdminUserDO user) { UserRespVO vo = BeanUtils.toBean(user, UserRespVO.class); vo.setAvatar(user.getAvatar()); + if (user.getUserSource() != null) { + UserSourceEnum sourceEnum = UserSourceEnum.of(user.getUserSource()); + vo.setUserSourceLabel(sourceEnum != null ? sourceEnum.getName() : null); + } if (user.getDeptIds() != null) { vo.setDeptIds(CollectionUtils.convertList(user.getDeptIds(), Long::longValue)); } From 5b660f5a11107cbdb0eaa98e9e1a8d6e9d4567bd Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 9 Jan 2026 11:46:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.=E4=B8=8D=E5=86=8D=E8=BF=87=E6=BB=A4=20ge?= =?UTF-8?q?t=20=E5=BC=80=E5=A4=B4=E7=9A=84=20url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/config/ZtBusinessAutoConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/config/ZtBusinessAutoConfiguration.java b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/config/ZtBusinessAutoConfiguration.java index e42bd4f8..868a0f6d 100644 --- a/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/config/ZtBusinessAutoConfiguration.java +++ b/zt-framework/zt-spring-boot-starter-biz-business/src/main/java/com/zt/plat/framework/business/config/ZtBusinessAutoConfiguration.java @@ -21,9 +21,11 @@ public class ZtBusinessAutoConfiguration implements WebMvcConfigurer { public void addInterceptors(InterceptorRegistry registry) { // 拦截所有 url，统一进行业务与文件上传请求头校验 registry.addInterceptor(new BusinessHeaderInterceptor()) - .addPathPatterns("/**"); + .addPathPatterns("/**") + .excludePathPatterns("/get*"); registry.addInterceptor(new FileUploadHeaderInterceptor()) - .addPathPatterns("/**"); + .addPathPatterns("/**") + .excludePathPatterns("/get*"); } @Bean From c3502e78c80e69abf819b1edcf4e606f73091cbd Mon Sep 17 00:00:00 2001 From: chenbowen Date: Fri, 9 Jan 2026 15:25:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=20databus=20?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E9=87=8D=E8=AF=95=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integration/gateway/step/impl/HttpStepHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java b/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java index 7f00b6ce..db205143 100644 --- a/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java +++ b/zt-module-databus/zt-module-databus-server/src/main/java/com/zt/plat/module/databus/framework/integration/gateway/step/impl/HttpStepHandler.java @@ -46,9 +46,9 @@ public class HttpStepHandler implements ApiStepHandler { private final WebClient.Builder webClientBuilder; private final ExpressionExecutor expressionExecutor; - private static final Duration RETRY_DELAY = Duration.ofMillis(200); - private static final int RETRY_ATTEMPTS = 3; - private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(20); + private static final Duration RETRY_DELAY = Duration.ofSeconds(5); + private static final int RETRY_ATTEMPTS = 5; + private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(40); private static final Set DEFAULT_FORWARDED_HEADERS = Set.of( "authorization",