diff --git a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/SpringContextUtil.java b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/SpringContextUtil.java index 279d455d0e..11f05c428d 100644 --- a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/SpringContextUtil.java +++ b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/SpringContextUtil.java @@ -46,12 +46,12 @@ public class SpringContextUtil implements ApplicationContextAware, DisposableBean { private final Environment environment; + @Getter private ApplicationContext applicationContext; /** * 获取工厂. - * * @return 工厂 */ public DefaultListableBeanFactory getFactory() { @@ -60,7 +60,6 @@ public DefaultListableBeanFactory getFactory() { /** * 根据名称获取Bean. - * * @param name 名称 * @return Bean */ @@ -70,7 +69,6 @@ public Object getBean(String name) { /** * 根据名称判断Bean. - * * @param name 名称 * @return 判断结果 */ @@ -80,7 +78,6 @@ public boolean containsBean(String name) { /** * 根据名称判断单例. - * * @param name 名称 * @return 判断结果 */ @@ -90,9 +87,8 @@ public boolean isSingleton(String name) { /** * 根据类型获取Bean. - * * @param requiredType 类型 - * @param 泛型 + * @param 泛型 * @return Bean */ public T getBean(Class requiredType) { @@ -101,10 +97,9 @@ public T getBean(Class requiredType) { /** * 根据名称和类型获取Bean. - * - * @param name 名称 + * @param name 名称 * @param requiredType 类型 - * @param 泛型 + * @param 泛型 * @return Bean */ public T getBean(String name, Class requiredType) { @@ -113,7 +108,6 @@ public T getBean(String name, Class requiredType) { /** * 根据名称获取类. - * * @param name 名称 * @return 类 */ @@ -123,9 +117,8 @@ public Class getType(String name) { /** * 根据类型获取类. - * * @param requiredType 类型 - * @param 泛型 + * @param 泛型 * @return 类 */ public Map getType(Class requiredType) { @@ -134,10 +127,9 @@ public Map getType(Class requiredType) { /** * 注册Bean. - * - * @param clazz 类 + * @param clazz 类 * @param beanName 名称 - * @param 泛型 + * @param 泛型 */ public void registerBean(Class clazz, String beanName) { BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder.genericBeanDefinition(clazz); @@ -146,7 +138,6 @@ public void registerBean(Class clazz, String beanName) { /** * 注销Bean. - * * @param beanName 名称 */ public void removeBean(String beanName) { @@ -158,7 +149,6 @@ public void removeBean(String beanName) { /** * 推送事件. - * * @param event 事件 */ public void publishEvent(ApplicationEvent event) { @@ -170,7 +160,8 @@ public void publishEvent(ApplicationEvent event) { public String getAppName() { try { return ObjectUtil.requireNotNull(environment.getProperty("spring.application.name")); - } catch (Exception e) { + } + catch (Exception e) { return "application"; } } diff --git a/laokou-common/laokou-common-elasticsearch/src/main/java/org/laokou/common/elasticsearch/template/ElasticsearchTemplate.java b/laokou-common/laokou-common-elasticsearch/src/main/java/org/laokou/common/elasticsearch/template/ElasticsearchTemplate.java index fd39f2ded4..8776e27465 100644 --- a/laokou-common/laokou-common-elasticsearch/src/main/java/org/laokou/common/elasticsearch/template/ElasticsearchTemplate.java +++ b/laokou-common/laokou-common-elasticsearch/src/main/java/org/laokou/common/elasticsearch/template/ElasticsearchTemplate.java @@ -87,7 +87,8 @@ public CompletableFuture asyncCreateIndex(String name, Stri if (response.acknowledged()) { log.info("索引:{} -> 创建索引成功", name); return Boolean.TRUE; - } else { + } + else { log.error("索引:{} -> 创建索引失败", name); return Boolean.FALSE; } @@ -109,7 +110,8 @@ public void createIndex(String name, String alias, Class boolean acknowledged = createIndexResponse.acknowledged(); if (acknowledged) { log.info("索引:{} -> 创建索引成功", name); - } else { + } + else { log.error("索引:{} -> 创建索引失败", name); } } @@ -124,7 +126,8 @@ public void deleteIndex(List names) { boolean acknowledged = deleteIndexResponse.acknowledged(); if (acknowledged) { log.info("索引:{} -> 删除索引成功", StringUtil.collectionToDelimitedString(names, COMMA)); - } else { + } + else { log.error("索引:{} -> 删除索引失败", StringUtil.collectionToDelimitedString(names, COMMA)); } } @@ -140,7 +143,8 @@ public void createDocument(String index, String id, Object obj) { .index(idx -> idx.index(index).refresh(Refresh.True).id(id).document(obj)); if (StringUtil.isNotEmpty(response.result().jsonValue())) { log.info("索引:{} -> 同步索引成功", index); - } else { + } + else { log.error("索引:{} -> 同步索引失败", index); } } @@ -152,7 +156,8 @@ public CompletableFuture asyncCreateDocument(String index, String id, O if (StringUtil.isNotEmpty(resp.result().jsonValue())) { log.info("索引:{} -> 异步同步索引成功", index); return Boolean.TRUE; - } else { + } + else { log.error("索引:{} -> 异步同步索引失败", index); return Boolean.FALSE; } @@ -166,7 +171,8 @@ public void bulkCreateDocument(String index, Map map) { .errors(); if (errors) { log.error("索引:{} -> 批量同步索引失败", index); - } else { + } + else { log.info("索引:{} -> 批量同步索引成功", index); } } @@ -179,7 +185,8 @@ public CompletableFuture asyncBulkCreateDocument(String index, Map 异步批量同步索引失败", index); return Boolean.FALSE; - } else { + } + else { log.info("索引:{} -> 异步批量同步索引成功", index); return Boolean.TRUE; } @@ -220,7 +227,8 @@ private void setHighlightFields(R source, Map> map) { Field field = clazz.getDeclaredField(k); field.setAccessible(true); ReflectionUtils.setField(field, source, v.getFirst()); - } catch (NoSuchFieldException e) { + } + catch (NoSuchFieldException e) { throw new RuntimeException(e); } }); @@ -231,7 +239,8 @@ private void setId(R source, String id) { Field field = source.getClass().getDeclaredField(PRIMARY_KEY); field.setAccessible(true); ReflectionUtils.setField(field, source, id); - } catch (Exception e) { + } + catch (Exception e) { log.error("ID赋值失败,错误信息:{}", e.getMessage(), e); } } @@ -276,7 +285,7 @@ private co.elastic.clients.elasticsearch.core.search.Highlight getHighlight(Sear } private Map getHighlightFieldMap( - List fields) { + List fields) { return fields.stream().collect(Collectors.toMap(Search.HighlightField::getName, j -> { co.elastic.clients.elasticsearch.core.search.HighlightField.Builder builder = new co.elastic.clients.elasticsearch.core.search.HighlightField.Builder(); builder.fragmentSize(j.getFragmentSize()); @@ -426,11 +435,11 @@ private void setProperties(TypeMapping.Builder mappingBuilder, Document.Mapping boolean eagerGlobalOrdinals = mapping.isEagerGlobalOrdinals(); switch (type) { case TEXT -> mappingBuilder.properties(field, - fn -> fn.text(t -> t.index(true) - .fielddata(fielddata) - .eagerGlobalOrdinals(eagerGlobalOrdinals) - .searchAnalyzer(searchAnalyzer) - .analyzer(analyzer))); + fn -> fn.text(t -> t.index(true) + .fielddata(fielddata) + .eagerGlobalOrdinals(eagerGlobalOrdinals) + .searchAnalyzer(searchAnalyzer) + .analyzer(analyzer))); case KEYWORD -> mappingBuilder.properties(field, fn -> fn.keyword(t -> t.eagerGlobalOrdinals(eagerGlobalOrdinals))); case LONG -> mappingBuilder.properties(field, fn -> fn.long_(t -> t)); @@ -484,12 +493,12 @@ private Search.Field getSearchField(Field field, SearchField searchField, S field.setAccessible(true); String value = String.valueOf(ReflectionUtils.getField(field, obj)); return new Search.Field(Arrays.asList(names), value, searchField.type(), searchField.query(), - searchField.condition()); + searchField.condition()); } private Search.Highlight getHighlight(Highlight highlight) { return new Search.Highlight(Arrays.asList(highlight.preTags()), Arrays.asList(highlight.postTags()), - highlight.requireFieldMatch(), getHighlightField(highlight.fields())); + highlight.requireFieldMatch(), getHighlightField(highlight.fields())); } private List getHighlightField(HighlightField[] fields) { diff --git a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java index d687880c44..3b25afeb07 100644 --- a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java +++ b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java @@ -53,7 +53,7 @@ * @author laokou */ @AutoConfiguration -@ConditionalOnClass({DataSource.class}) +@ConditionalOnClass({ DataSource.class }) @MapperScan("org.laokou.common.mybatisplus.mapper") public class MybatisPlusAutoConfig { @@ -90,14 +90,14 @@ public ConfigurationCustomizer slowSqlConfigurationCustomizer(SpringContextUtil @Bean @ConditionalOnMissingBean(MybatisPlusInterceptor.class) public MybatisPlusInterceptor mybatisPlusInterceptor(MybatisPlusExtProperties mybatisPlusExtProperties, - DataSource dataSource, Executor workStealingPoolExecutor) { + DataSource dataSource, Executor workStealingPoolExecutor) { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); // 数据权限插件 interceptor.addInnerInterceptor(new DataFilterInterceptor()); // 多租户插件 if (mybatisPlusExtProperties.getTenant().isEnabled()) { interceptor.addInnerInterceptor(new TenantLineInnerInterceptor( - new GlobalTenantLineHandler(mybatisPlusExtProperties.getTenant().getIgnoreTables()))); + new GlobalTenantLineHandler(mybatisPlusExtProperties.getTenant().getIgnoreTables()))); } // 动态表名插件 DynamicTableNameInnerInterceptor dynamicTableNameInnerInterceptor = new DynamicTableNameInnerInterceptor(); @@ -145,12 +145,12 @@ public TransactionTemplate transactionTemplate(PlatformTransactionManager transa * 异步分页. 解除每页500条限制. */ private AsyncPaginationInnerInterceptor asyncPaginationInnerInterceptor(DataSource dataSource, - Executor workStealingPoolExecutor) { + Executor workStealingPoolExecutor) { // 使用postgresql,如果使用其他数据库,需要修改DbType // 使用postgresql,如果使用其他数据库,需要修改DbType // 使用postgresql,如果使用其他数据库,需要修改DbType AsyncPaginationInnerInterceptor asyncPaginationInnerInterceptor = new AsyncPaginationInnerInterceptor( - DbType.POSTGRE_SQL, dataSource, workStealingPoolExecutor); + DbType.POSTGRE_SQL, dataSource, workStealingPoolExecutor); // -1表示不受限制 asyncPaginationInnerInterceptor.setMaxLimit(-1L); // 溢出总页数后是进行处理,查看源码就知道是干啥的 diff --git a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/SqlMonitorInterceptor.java b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/SqlMonitorInterceptor.java index bc8d60741f..de1257d2c5 100644 --- a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/SqlMonitorInterceptor.java +++ b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/SqlMonitorInterceptor.java @@ -47,7 +47,8 @@ */ @Slf4j @RequiredArgsConstructor -@Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})}) +@Intercepts({ + @Signature(type = StatementHandler.class, method = "prepare", args = { Connection.class, Integer.class }) }) public class SqlMonitorInterceptor implements Interceptor { private final SpringContextUtil springContextUtil; @@ -61,7 +62,8 @@ public Object intercept(Invocation invocation) throws Throwable { if (target instanceof StatementHandler statementHandler) { // 替换空格、制表符、换页符 String sql = getSql(invocation, statementHandler).replaceAll("\\s+", SPACE); - springContextUtil.publishEvent(new SqlLogEvent("SQL日志", springContextUtil.getAppName(), sql, time, DateUtil.now())); + springContextUtil + .publishEvent(new SqlLogEvent("SQL日志", springContextUtil.getAppName(), sql, time, DateUtil.now())); log.info("\nConsume Time:{} ms \nExecute SQL:{}\n", time, sql); } return obj; diff --git a/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java b/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java index 684575a2ef..b5cc85ef5e 100644 --- a/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java +++ b/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancer.java @@ -136,7 +136,7 @@ public class NacosLoadBalancer implements ReactorServiceInstanceLoadBalancer { private final InetIPv6Utils inetIPv6Utils; public NacosLoadBalancer(ObjectProvider serviceInstanceListSupplierProvider, - String serviceId, NacosDiscoveryProperties nacosDiscoveryProperties, InetIPv6Utils inetIPv6Utils) { + String serviceId, NacosDiscoveryProperties nacosDiscoveryProperties, InetIPv6Utils inetIPv6Utils) { this.serviceId = serviceId; this.inetIPv6Utils = inetIPv6Utils; this.serviceInstanceListSupplierProvider = serviceInstanceListSupplierProvider; @@ -151,14 +151,14 @@ public void init() { String ip = nacosDiscoveryProperties.getIp(); if (StringUtils.isNotEmpty(ip)) { ipv6 = Pattern.matches(IPV4_REGEX, ip) ? nacosDiscoveryProperties.getMetadata().get(IPV6_KEY) : ip; - } else { + } + else { ipv6 = inetIPv6Utils.findIPv6Address(); } } /** * 根据IP类型过滤服务实例. - * * @param instances 服务实例 * @return 服务实例列表 */ @@ -170,7 +170,8 @@ private List filterInstanceByIpType(List insta if (StringUtils.isNotEmpty(instance.getMetadata().get(IPV6_KEY))) { ipv6InstanceList.add(instance); } - } else { + } + else { ipv6InstanceList.add(instance); } } @@ -179,7 +180,8 @@ private List filterInstanceByIpType(List insta return instances.stream() .filter(instance -> Pattern.matches(IPV4_REGEX, instance.getHost())) .collect(Collectors.toList()); - } else { + } + else { return ipv6InstanceList; } } @@ -190,7 +192,6 @@ private List filterInstanceByIpType(List insta /** * 路由负载均衡. - * * @param request 请求 * @return 服务实例(响应式) */ @@ -204,9 +205,8 @@ public Mono> choose(Request request) { /** * 路由负载均衡. - * * @param serviceInstances 服务实例列表 - * @param request 请求 + * @param request 请求 * @return 服务实例响应体 */ private Response getInstanceResponse(List serviceInstances, Request request) { @@ -219,7 +219,7 @@ private Response getInstanceResponse(List serv String path = context.getClientRequest().getUrl().getPath(); HttpHeaders headers = context.getClientRequest().getHeaders(); if (ReactiveRequestUtil.pathMatcher(HttpMethod.GET.name(), path, - Map.of(HttpMethod.GET.name(), Collections.singleton(GRACEFUL_SHUTDOWN_URL)))) { + Map.of(HttpMethod.GET.name(), Collections.singleton(GRACEFUL_SHUTDOWN_URL)))) { ServiceInstance serviceInstance = serviceInstances.stream() .filter(instance -> match(instance, headers)) .findFirst() @@ -243,7 +243,6 @@ private Response getInstanceResponse(List serv /** * 服务实例响应. - * * @param serviceInstances 服务实例 * @return 响应结果 */ @@ -263,15 +262,17 @@ private Response getInstanceResponse(List serv if (!CollectionUtils.isEmpty(sameClusterInstances)) { instancesToChoose = sameClusterInstances; } - } else { + } + else { log.warn("A cross-cluster call occurs,name = {}, clusterName = {}, instance = {}", serviceId, - clusterName, serviceInstances); + clusterName, serviceInstances); } instancesToChoose = this.filterInstanceByIpType(instancesToChoose); // 路由权重 ServiceInstance instance = NacosBalancer.getHostByRandomWeight3(instancesToChoose); return new DefaultResponse(instance); - } catch (Exception e) { + } + catch (Exception e) { log.warn("NacosLoadBalancer error", e); return null; } @@ -279,7 +280,6 @@ private Response getInstanceResponse(List serv /** * 判断服务灰度路由. - * * @param headers 请求头 * @return 判断结果 */ @@ -290,9 +290,8 @@ private boolean isGrayRouter(HttpHeaders headers) { /** * 根据IP和端口匹配服务节点. - * * @param serviceInstance 服务实例 - * @param headers 请求头 + * @param headers 请求头 * @return 匹配结果 */ private boolean match(ServiceInstance serviceInstance, HttpHeaders headers) { @@ -301,7 +300,7 @@ private boolean match(ServiceInstance serviceInstance, HttpHeaders headers) { Assert.isTrue(StringUtil.isNotEmpty(host), "service-host is empty"); Assert.isTrue(StringUtil.isNotEmpty(port), "service-port is empty"); return ObjectUtil.equals(host, serviceInstance.getHost()) - && Integer.parseInt(port) == serviceInstance.getPort(); + && Integer.parseInt(port) == serviceInstance.getPort(); } } diff --git a/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancerClientConfiguration.java b/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancerClientConfiguration.java index 51de7fe6a7..09f2516e7c 100644 --- a/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancerClientConfiguration.java +++ b/laokou-common/laokou-common-nacos/src/main/java/com/alibaba/cloud/nacos/loadbalancer/NacosLoadBalancerClientConfiguration.java @@ -73,12 +73,11 @@ public class NacosLoadBalancerClientConfiguration { @Bean @ConditionalOnMissingBean public ReactorLoadBalancer nacosLoadBalancer(Environment environment, - LoadBalancerClientFactory loadBalancerClientFactory, - NacosDiscoveryProperties nacosDiscoveryProperties, - InetIPv6Utils inetIPv6Utils) { + LoadBalancerClientFactory loadBalancerClientFactory, NacosDiscoveryProperties nacosDiscoveryProperties, + InetIPv6Utils inetIPv6Utils) { String name = environment.getProperty(LoadBalancerClientFactory.PROPERTY_NAME); return new NacosLoadBalancer(loadBalancerClientFactory.getLazyProvider(name, ServiceInstanceListSupplier.class), - name, nacosDiscoveryProperties, inetIPv6Utils); + name, nacosDiscoveryProperties, inetIPv6Utils); } @Configuration(proxyBeanMethods = false) @@ -89,11 +88,11 @@ public static class ReactiveSupportConfiguration { @Bean @ConditionalOnBean(ReactiveDiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", + matchIfMissing = true) public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( - ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withDiscoveryClient() - .build(context); + ConfigurableApplicationContext context) { + return ServiceInstanceListSupplier.builder().withDiscoveryClient().build(context); } @Bean @@ -101,9 +100,8 @@ public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( @ConditionalOnMissingBean @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "zone-preference") public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier( - ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withDiscoveryClient() - .withZonePreference().build(context); + ConfigurableApplicationContext context) { + return ServiceInstanceListSupplier.builder().withDiscoveryClient().withZonePreference().build(context); } } @@ -116,11 +114,11 @@ public static class BlockingSupportConfiguration { @Bean @ConditionalOnBean(DiscoveryClient.class) @ConditionalOnMissingBean - @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", matchIfMissing = true) + @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "default", + matchIfMissing = true) public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( - ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient() - .build(context); + ConfigurableApplicationContext context) { + return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient().build(context); } @Bean @@ -128,9 +126,11 @@ public ServiceInstanceListSupplier discoveryClientServiceInstanceListSupplier( @ConditionalOnMissingBean @ConditionalOnProperty(value = "spring.cloud.loadbalancer.configurations", havingValue = "zone-preference") public ServiceInstanceListSupplier zonePreferenceDiscoveryClientServiceInstanceListSupplier( - ConfigurableApplicationContext context) { - return ServiceInstanceListSupplier.builder().withBlockingDiscoveryClient() - .withZonePreference().build(context); + ConfigurableApplicationContext context) { + return ServiceInstanceListSupplier.builder() + .withBlockingDiscoveryClient() + .withZonePreference() + .build(context); } } diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/common/utils/DsUtil.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/common/utils/DsUtil.java index 2e89917707..c7c40ac9ba 100644 --- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/common/utils/DsUtil.java +++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/common/utils/DsUtil.java @@ -65,7 +65,6 @@ public class DsUtil { /** * 根据数据源名称加载数据源至本地内存. - * * @param sourceName 数据源名称 * @return 数据源名称 */ @@ -114,7 +113,8 @@ private void validateDs(DataSourceProperty properties) { PreparedStatement ps = null; try { Class.forName(properties.getDriverClassName()); - } catch (Exception e) { + } + catch (Exception e) { log.error("加载数据源驱动失败,错误信息:{},详情见日志", LogUtil.record(e.getMessage()), e); // throw new DataSourceException(CUSTOM_SERVER_ERROR, "加载数据源驱动失败"); } @@ -122,8 +122,9 @@ private void validateDs(DataSourceProperty properties) { // 1秒后连接超时 DriverManager.setLoginTimeout(1); connection = DriverManager.getConnection(properties.getUrl(), properties.getUsername(), - properties.getPassword()); - } catch (Exception e) { + properties.getPassword()); + } + catch (Exception e) { log.error("数据源连接超时,错误信息:{},详情见日志", LogUtil.record(e.getMessage()), e); throw e; // throw new RuntimeException(CUSTOM_SERVER_ERROR, "数据源连接超时"); @@ -144,7 +145,8 @@ private void validateDs(DataSourceProperty properties) { list = defaultTenantTables.parallelStream() .filter(table -> !tables.contains(table)) .collect(Collectors.toSet()); - } else { + } + else { list = defaultTenantTables; } if (CollectionUtil.isNotEmpty(list)) { @@ -152,7 +154,8 @@ private void validateDs(DataSourceProperty properties) { // String.format("表 %s 不存在", StringUtil.collectionToDelimitedString(list, // DROP))); } - } finally { + } + finally { if (ObjectUtil.isNotNull(connection)) { connection.close(); } diff --git a/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java b/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java index 1ed2ed1c64..a286c7b897 100644 --- a/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java +++ b/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java @@ -149,7 +149,7 @@ public AuthA() { } public AuthA(String username, String password, String tenantId, String grantType, String uuid, String captcha, - HttpServletRequest request) { + HttpServletRequest request) { this.id = IdGenerator.defaultSnowflakeId(); this.username = username; this.password = password; @@ -191,7 +191,8 @@ public void updateUser(UserE user) { this.editor = user.getId(); this.deptId = user.getDeptId(); this.deptPath = user.getDeptPath(); - } else { + } + else { switch (this.grantType) { case PASSWORD: case AUTHORIZATION_CODE: