diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java index fe4cd2303..d757dca43 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/SpringDocConfiguration.java @@ -11,15 +11,8 @@ import org.springdoc.core.SwaggerUiConfigProperties; import org.springframework.beans.factory.InitializingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Lazy; -import org.springframework.core.io.Resource; -import org.springframework.web.reactive.resource.ResourceResolverChain; -import org.springframework.web.server.ServerWebExchange; -import reactor.core.publisher.Mono; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -29,9 +22,9 @@ import java.util.stream.Collectors; *

* swagger 3.0 展示 */ -@RequiredArgsConstructor @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(value = "springdoc.api-docs.enabled", matchIfMissing = true) +@RequiredArgsConstructor +@ConditionalOnProperty(name = "springdoc.api-docs.enabled", matchIfMissing = true) public class SpringDocConfiguration implements InitializingBean { private final SwaggerUiConfigProperties swaggerUiConfigProperties; @@ -68,16 +61,16 @@ class SwaggerDocRegister extends Subscriber { @Override public void onEvent(InstancesChangeEvent event) { Set swaggerUrlSet = discoveryClient.getServices() - .stream() - .flatMap(serviceId -> discoveryClient.getInstances(serviceId).stream()) - .filter(instance -> StringUtils.isNotBlank(instance.getMetadata().get("spring-doc"))) - .map(instance -> { - AbstractSwaggerUiConfigProperties.SwaggerUrl swaggerUrl = new AbstractSwaggerUiConfigProperties.SwaggerUrl(); - swaggerUrl.setName(instance.getServiceId()); - swaggerUrl.setUrl(String.format("/%s/v3/api-docs", instance.getMetadata().get("spring-doc"))); - return swaggerUrl; - }) - .collect(Collectors.toSet()); + .stream() + .flatMap(serviceId -> discoveryClient.getInstances(serviceId).stream()) + .filter(instance -> StringUtils.isNotBlank(instance.getMetadata().get("spring-doc"))) + .map(instance -> { + AbstractSwaggerUiConfigProperties.SwaggerUrl swaggerUrl = new AbstractSwaggerUiConfigProperties.SwaggerUrl(); + swaggerUrl.setName(instance.getServiceId()); + swaggerUrl.setUrl(String.format("/%s/v3/api-docs", instance.getMetadata().get("spring-doc"))); + return swaggerUrl; + }) + .collect(Collectors.toSet()); swaggerUiConfigProperties.setUrls(swaggerUrlSet); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index 5e44474aa..5ddaad281 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -491,7 +491,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } else if (type.equals("tencent")) { wrapper = Wrappers.lambdaUpdate() - .set(SysUser::getTenantId, null) + .set(SysUser::getQqOpenid, null) .eq(SysUser::getUserId, user.getId()); } if (wrapper == null) {