This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new 281b0b9ba [type:refactor] fix wrong alignment (#3342)
281b0b9ba is described below
commit 281b0b9baef6e519d971b7e0f2ab9fa45654b1b5
Author: dragon-zhang <hail...@webuy.ai>
AuthorDate: Tue Apr 26 19:16:13 2022 +0800
[type:refactor] fix wrong alignment (#3342)
* [type:refactor] fix wrong alignment
* [type:refactor] fix wrong alignment
---
.../src/main/resources/application.yml | 126 ++++++++++-----------
.../httpclient/HttpClientPluginConfiguration.java | 2 +-
2 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/shenyu-bootstrap/src/main/resources/application.yml
b/shenyu-bootstrap/src/main/resources/application.yml
index 21685858d..00226ddda 100644
--- a/shenyu-bootstrap/src/main/resources/application.yml
+++ b/shenyu-bootstrap/src/main/resources/application.yml
@@ -95,46 +95,46 @@ shenyu:
writeSpinCount: 16
autoRead: true
allocType: "pooled"
- # httpclient:
- # strategy: webClient
- # connectTimeout: 45000
- # responseTimeout: 3000
- # readerIdleTime: 3000
- # writerIdleTime: 3000
- # allIdleTime: 3000
- # readTimeout: 3000
- # writeTimeout: 3000
- # wiretap: false
- # keepAlive: false
- # pool:
- # type: ELASTIC
- # name: proxy
- # maxConnections: 16
- # acquireTimeout: 45000
- # maxIdleTime: 3000
- # proxy:
- # host:
- # port:
- # username:
- # password:
- # nonProxyHostsPattern:
- # ssl:
- # useInsecureTrustManager: true
- # keyStoreType: PKCS12
- # keyStorePath: classpath:keystore.p12
- # keyStorePassword: 123456
- # keyStoreProvider:
- # keyPassword: 123456
- # trustedX509Certificates:
- # handshakeTimeout:
- # closeNotifyFlushTimeout:
- # closeNotifyReadTimeout:
- # defaultConfigurationType:
- # threadPool:
- # prefix: shenyu
- # selectCount: 1
- # workerCount: 8
- # daemon: true
+# httpclient:
+# strategy: webClient
+# connectTimeout: 45000
+# responseTimeout: 3000
+# readerIdleTime: 3000
+# writerIdleTime: 3000
+# allIdleTime: 3000
+# readTimeout: 3000
+# writeTimeout: 3000
+# wiretap: false
+# keepAlive: false
+# pool:
+# type: ELASTIC
+# name: proxy
+# maxConnections: 16
+# acquireTimeout: 45000
+# maxIdleTime: 3000
+# proxy:
+# host:
+# port:
+# username:
+# password:
+# nonProxyHostsPattern:
+# ssl:
+# useInsecureTrustManager: true
+# keyStoreType: PKCS12
+# keyStorePath: classpath:keystore.p12
+# keyStorePassword: 123456
+# keyStoreProvider:
+# keyPassword: 123456
+# trustedX509Certificates:
+# handshakeTimeout:
+# closeNotifyFlushTimeout:
+# closeNotifyReadTimeout:
+# defaultConfigurationType:
+# threadPool:
+# prefix: shenyu
+# selectCount: 1
+# workerCount: 8
+# daemon: true
instance:
enabled: false
registerType: zookeeper #etcd #consul
@@ -156,29 +156,29 @@ shenyu:
sync:
websocket:
urls: ws://localhost:9095/websocket
- # zookeeper:
- # url: localhost:2181
- # sessionTimeout: 5000
- # connectionTimeout: 2000
- # http:
- # url: http://localhost:9095
- # nacos:
- # url: localhost:8848
- # namespace: 1c10d748-af86-43b9-8265-75f487d20c6c
- # username:
- # password:
- # acm:
- # enabled: false
- # endpoint: acm.aliyun.com
- # namespace:
- # accessKey:
- # secretKey:
- # etcd:
- # url: http://localhost:2379
- # consul:
- # url: http://localhost:8500
- # waitTime: 1000
- # watchDelay: 1000
+# zookeeper:
+# url: localhost:2181
+# sessionTimeout: 5000
+# connectionTimeout: 2000
+# http:
+# url: http://localhost:9095
+# nacos:
+# url: localhost:8848
+# namespace: 1c10d748-af86-43b9-8265-75f487d20c6c
+# username:
+# password:
+# acm:
+# enabled: false
+# endpoint: acm.aliyun.com
+# namespace:
+# accessKey:
+# secretKey:
+# etcd:
+# url: http://localhost:2379
+# consul:
+# url: http://localhost:8500
+# waitTime: 1000
+# watchDelay: 1000
exclude:
enabled: false
paths:
diff --git
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/main/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/main/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java
index a7c68d689..1c5c7a29d 100644
---
a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/main/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java
+++
b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-plugin/shenyu-spring-boot-starter-plugin-httpclient/src/main/java/org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java
@@ -72,7 +72,7 @@ public class HttpClientPluginConfiguration {
* @return the http client loop resource
*/
@Bean
- @ConditionalOnProperty("shenyu.netty.httpclient.threadPool.prefix")
+ @ConditionalOnProperty("shenyu.httpclient.threadPool.prefix")
public LoopResources httpClientLoopResource(final HttpClientProperties
properties) {
HttpClientProperties.ThreadPool threadPool =
properties.getThreadPool();
return LoopResources.create(threadPool.getPrefix(),
threadPool.getSelectCount(),
