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 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", diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserProviderApiImpl.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserProviderApiImpl.java index f6b9050a..4e2f53e8 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserProviderApiImpl.java +++ b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserProviderApiImpl.java @@ -54,8 +54,8 @@ public class DatabusUserProviderApiImpl implements DatabusUserProviderApi { // 构建游标查询条件 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - // ⚠️ 只同步 userSource = 2 的用户 - queryWrapper.eq(AdminUserDO::getUserSource, 2); + // ⚠️ 只同步 userSource = 3 的用户 + queryWrapper.eq(AdminUserDO::getUserSource, 3); // 游标条件:create_time > cursorTime OR (create_time = cursorTime AND id > cursorId) if (!reqDTO.isFirstPage()) { 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)); }