mirror of
http://git.pig4cloud.com/pig/pigx.git
synced 2026-11-10 21:19:00 +08:00
🎨 Improving structure / format of the code. 格式化代码
This commit is contained in:
1 parent
bf2ce5cffd
commit
dbbba889c0
8 files changed
+35
-41
No files matched your search
+1
@@ -290,4 +290,5 @@ class DefaultRedisCacheWriter implements RedisCacheWriter {
|
||||
public CacheStatistics getCacheStatistics(String s) {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
+2
-7
@@ -33,15 +33,13 @@ import java.lang.annotation.*;
|
||||
@Documented
|
||||
@EnableFeignClients
|
||||
@Import(PigxFeignClientsRegistrar.class)
|
||||
@EnableAutoConfiguration(excludeName =
|
||||
"org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration")
|
||||
@EnableAutoConfiguration(excludeName = "org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration")
|
||||
public @interface EnablePigxFeignClients {
|
||||
|
||||
/**
|
||||
* Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
|
||||
* declarations e.g.: {@code @ComponentScan("org.my.pkg")} instead of
|
||||
* {@code @ComponentScan(basePackages="org.my.pkg")}.
|
||||
*
|
||||
* @return the array of 'basePackages'.
|
||||
*/
|
||||
String[] value() default {};
|
||||
@@ -53,10 +51,9 @@ public @interface EnablePigxFeignClients {
|
||||
* <p>
|
||||
* Use {@link #basePackageClasses()} for a type-safe alternative to String-based
|
||||
* package names.
|
||||
*
|
||||
* @return the array of 'basePackages'.
|
||||
*/
|
||||
String[] basePackages() default {"com.pig4cloud.pigx"};
|
||||
String[] basePackages() default { "com.pig4cloud.pigx" };
|
||||
|
||||
/**
|
||||
* Type-safe alternative to {@link #basePackages()} for specifying the packages to
|
||||
@@ -64,7 +61,6 @@ public @interface EnablePigxFeignClients {
|
||||
* <p>
|
||||
* Consider creating a special no-op marker class or interface in each package that
|
||||
* serves no purpose other than being referenced by this attribute.
|
||||
*
|
||||
* @return the array of 'basePackageClasses'.
|
||||
*/
|
||||
Class<?>[] basePackageClasses() default {};
|
||||
@@ -81,7 +77,6 @@ public @interface EnablePigxFeignClients {
|
||||
/**
|
||||
* List of classes annotated with @FeignClient. If not empty, disables classpath
|
||||
* scanning.
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
Class<?>[] clients() default {};
|
||||
|
||||
+1
-2
@@ -47,8 +47,7 @@ public class GrayLoadBalancerClientConfiguration {
|
||||
|
||||
@Bean
|
||||
public ReactiveLoadBalancerClientFilter gatewayLoadBalancerClientFilter(GrayLoadBalancer grayLoadBalancer,
|
||||
LoadBalancerProperties properties,
|
||||
GatewayLoadBalancerProperties loadBalancerProperties) {
|
||||
LoadBalancerProperties properties, GatewayLoadBalancerProperties loadBalancerProperties) {
|
||||
return new GrayReactiveLoadBalancerClientFilter(loadBalancerProperties, properties, grayLoadBalancer);
|
||||
}
|
||||
|
||||
|
||||
+4
-5
@@ -50,9 +50,8 @@ public class GrayReactiveLoadBalancerClientFilter extends ReactiveLoadBalancerCl
|
||||
|
||||
private GrayLoadBalancer grayLoadBalancer;
|
||||
|
||||
|
||||
public GrayReactiveLoadBalancerClientFilter(GatewayLoadBalancerProperties loadBalancerProperties
|
||||
, LoadBalancerProperties properties, GrayLoadBalancer grayLoadBalancer) {
|
||||
public GrayReactiveLoadBalancerClientFilter(GatewayLoadBalancerProperties loadBalancerProperties,
|
||||
LoadBalancerProperties properties, GrayLoadBalancer grayLoadBalancer) {
|
||||
super(null, loadBalancerProperties, properties);
|
||||
this.properties = properties;
|
||||
this.grayLoadBalancer = grayLoadBalancer;
|
||||
@@ -81,8 +80,8 @@ public class GrayReactiveLoadBalancerClientFilter extends ReactiveLoadBalancerCl
|
||||
return choose(exchange).doOnNext(response -> {
|
||||
|
||||
if (!response.hasServer()) {
|
||||
throw NotFoundException.create(loadBalancerProperties.isUse404()
|
||||
, "Unable to find instance for " + url.getHost());
|
||||
throw NotFoundException.create(loadBalancerProperties.isUse404(),
|
||||
"Unable to find instance for " + url.getHost());
|
||||
}
|
||||
|
||||
URI uri = exchange.getRequest().getURI();
|
||||
|
||||
+2
-1
@@ -18,9 +18,10 @@ public class GrayLoadBalancerClientConfiguration extends LoadBalancerClientConfi
|
||||
@Bean
|
||||
@ConditionalOnMissingBean
|
||||
public ReactorLoadBalancer<ServiceInstance> reactorServiceInstanceLoadBalancer(Environment environment,
|
||||
LoadBalancerClientFactory loadBalancerClientFactory) {
|
||||
LoadBalancerClientFactory loadBalancerClientFactory) {
|
||||
String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME);
|
||||
return new GrayRoundRobinLoadBalancer(
|
||||
loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), name);
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -16,9 +16,8 @@ import java.lang.reflect.Field;
|
||||
*/
|
||||
public class GrayLoadBalancerClientConfigurationRegistrar implements ImportBeanDefinitionRegistrar {
|
||||
|
||||
|
||||
private static void registerClientConfiguration(BeanDefinitionRegistry registry, Object name,
|
||||
Object configuration) {
|
||||
Object configuration) {
|
||||
BeanDefinitionBuilder builder = BeanDefinitionBuilder
|
||||
.genericBeanDefinition(LoadBalancerClientSpecification.class);
|
||||
builder.addConstructorArgValue(name);
|
||||
@@ -36,4 +35,5 @@ public class GrayLoadBalancerClientConfigurationRegistrar implements ImportBeanD
|
||||
registerClientConfiguration(registry, fieldValue, GrayLoadBalancerClientConfiguration.class);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+23
-23
@@ -25,31 +25,31 @@ import java.util.Map;
|
||||
@Slf4j
|
||||
public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer {
|
||||
|
||||
private ObjectProvider<ServiceInstanceListSupplier> serviceInstanceListSupplierProvider;
|
||||
private ObjectProvider<ServiceInstanceListSupplier> serviceInstanceListSupplierProvider;
|
||||
|
||||
private String serviceId;
|
||||
private String serviceId;
|
||||
|
||||
/**
|
||||
* @param serviceInstanceListSupplierProvider a provider of
|
||||
* {@link ServiceInstanceListSupplier} that will be used to get available instances
|
||||
* @param serviceId id of the service for which to choose an instance
|
||||
*/
|
||||
public GrayRoundRobinLoadBalancer(ObjectProvider<ServiceInstanceListSupplier> serviceInstanceListSupplierProvider, String serviceId) {
|
||||
super(serviceInstanceListSupplierProvider, serviceId);
|
||||
this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider;
|
||||
this.serviceId = serviceId;
|
||||
}
|
||||
/**
|
||||
* @param serviceInstanceListSupplierProvider a provider of
|
||||
* {@link ServiceInstanceListSupplier} that will be used to get available instances
|
||||
* @param serviceId id of the service for which to choose an instance
|
||||
*/
|
||||
public GrayRoundRobinLoadBalancer(ObjectProvider<ServiceInstanceListSupplier> serviceInstanceListSupplierProvider,
|
||||
String serviceId) {
|
||||
super(serviceInstanceListSupplierProvider, serviceId);
|
||||
this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider;
|
||||
this.serviceId = serviceId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Mono<Response<ServiceInstance>> choose(Request request) {
|
||||
ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider
|
||||
.getIfAvailable(NoopServiceInstanceListSupplier::new);
|
||||
return supplier.get(request).next().map(serviceInstances -> getInstanceResponse(serviceInstances, request));
|
||||
|
||||
@Override
|
||||
public Mono<Response<ServiceInstance>> choose(Request request) {
|
||||
ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider
|
||||
.getIfAvailable(NoopServiceInstanceListSupplier::new);
|
||||
return supplier.get(request).next().map(serviceInstances -> getInstanceResponse(serviceInstances, request));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Response<ServiceInstance> getInstanceResponse(List<ServiceInstance> instances, Request request) {
|
||||
Response<ServiceInstance> getInstanceResponse(List<ServiceInstance> instances, Request request) {
|
||||
|
||||
// 注册中心无可用实例 抛出异常
|
||||
if (CollUtil.isEmpty(instances)) {
|
||||
@@ -77,8 +77,8 @@ public class GrayRoundRobinLoadBalancer extends RoundRobinLoadBalancer {
|
||||
}
|
||||
}
|
||||
|
||||
// 降级策略,使用轮询策略
|
||||
return super.choose(request).block();
|
||||
}
|
||||
// 降级策略,使用轮询策略
|
||||
return super.choose(request).block();
|
||||
}
|
||||
|
||||
}
|
||||
-1
@@ -81,7 +81,6 @@ public class TaskInvokUtil {
|
||||
ITaskInvok iTaskInvok = TaskInvokFactory.getInvoker(sysJob.getJobType());
|
||||
// 确保租户上下文有值,使得当前线程中的多租户特性生效。
|
||||
TenantBroker.runAs(sysJob.getTenantId(), tenantId -> iTaskInvok.invokMethod(sysJob));
|
||||
;
|
||||
|
||||
// 记录成功状态
|
||||
sysJobLog.setJobMessage(PigxQuartzEnum.JOB_LOG_STATUS_SUCCESS.getDescription());
|
||||
|
||||
Reference in new issue
Block a user