diff --git a/jcpp-app-bootstrap/src/main/resources/app-service.yml b/jcpp-app-bootstrap/src/main/resources/app-service.yml index 70bbdc0..8a58bd0 100644 --- a/jcpp-app-bootstrap/src/main/resources/app-service.yml +++ b/jcpp-app-bootstrap/src/main/resources/app-service.yml @@ -164,6 +164,14 @@ service: type: "${SERVICE_TYPE:monolith}" # 可自定义的服务ID,如果不指定,则默认为HOSTNAME id: "${SERVICE_ID:}" + thread-pool: + sharding: + hash_function_name: "${THREAD_POOL_SHARDING_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256 + parallelism: "${THREAD_POOL_SHARDING_PARALLELISM:8}" + stats-print-interval-ms: "${THREAD_POOL_SHARDING_STATS_PRINT_INTERVAL_MS:10000}" + downlink: + rpc: + type: "${DOWNLINK_RPC_TYPE:grpc}" # rest or grpc protocol: sessions: default-inactivity-timeout-in-sec: "${PROTOCOLS_SESSIONS_DEFAULT_INACTIVITY_TIMEOUT_IN_SEC:600}" @@ -260,12 +268,3 @@ service: buffer-memory: "${PROTOCOLS_YUNKUAICHONGV160_FORWARD_BUFFER_MEMORY:33554432}" other-properties: "${PROTOCOLS_YUNKUAICHONGV160_FORWARD_QUEUE_KAFKA_OTHER_PROPERTIES:}" -thread-pool: - sharding: - hash_function_name: "${THREAD_POOL_SHARDING_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256 - parallelism: "${THREAD_POOL_SHARDING_PARALLELISM:8}" - stats-print-interval-ms: "${THREAD_POOL_SHARDING_STATS_PRINT_INTERVAL_MS:10000}" - -downlink: - rpc: - type: "${DOWNLINK_RPC_TYPE:grpc}" # rest or grpc \ No newline at end of file diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java index 2152b24..7941611 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/GrpcDownlinkCallService.java @@ -22,7 +22,7 @@ import static sanbing.jcpp.infrastructure.proto.ProtoConverter.toTracerProto; */ @Service @Slf4j -@ConditionalOnExpression("'${downlink.rpc.type:null}'=='grpc'") +@ConditionalOnExpression("'${service.downlink.rpc.type:null}'=='grpc'") public class GrpcDownlinkCallService extends DownlinkCallService { @Resource diff --git a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java index 795c949..6ad1c80 100644 --- a/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java +++ b/jcpp-app/src/main/java/sanbing/jcpp/app/service/impl/RestDownlinkCallService.java @@ -26,7 +26,7 @@ import static sanbing.jcpp.infrastructure.util.trace.TracerContextUtil.*; */ @Service @Slf4j -@ConditionalOnExpression("'${downlink.rpc.type:null}'=='rest'") +@ConditionalOnExpression("'${service.downlink.rpc.type:null}'=='rest'") public class RestDownlinkCallService extends DownlinkCallService { @Resource diff --git a/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java b/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java index c334e7e..f92ca6c 100644 --- a/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java +++ b/jcpp-infrastructure-util/src/main/java/sanbing/jcpp/infrastructure/util/config/ShardingThreadPool.java @@ -30,10 +30,10 @@ import static sanbing.jcpp.infrastructure.util.JCPPHashUtil.hash; @Component @Slf4j public class ShardingThreadPool { - @Value("${thread-pool.sharding.hash_function_name:murmur3_128}") + @Value("${service.thread-pool.sharding.hash_function_name:murmur3_128}") private String hashFunctionName; - @Value("${thread-pool.sharding.parallelism:8}") + @Value("${service.thread-pool.sharding.parallelism:8}") private int parallelism; private HashFunction hashFunction; @@ -53,7 +53,7 @@ public class ShardingThreadPool { } } - @Scheduled(fixedDelayString = "${thread-pool.sharding.stats-print-interval-ms:10000}") + @Scheduled(fixedDelayString = "${service.thread-pool.sharding.stats-print-interval-ms:10000}") public void printStats() { executorServiceMap.forEach((k, v) -> { diff --git a/jcpp-protocol-bootstrap/src/main/resources/protocol-service.yml b/jcpp-protocol-bootstrap/src/main/resources/protocol-service.yml index 381692b..fc63432 100644 --- a/jcpp-protocol-bootstrap/src/main/resources/protocol-service.yml +++ b/jcpp-protocol-bootstrap/src/main/resources/protocol-service.yml @@ -40,6 +40,11 @@ service: type: "${SERVICE_TYPE:protocol}" # 可自定义的服务ID,如果不指定,则默认为HOSTNAME id: "${SERVICE_ID:}" + thread-pool: + sharding: + hash_function_name: "${THREAD_POOL_SHARDING_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256 + parallelism: "${THREAD_POOL_SHARDING_PARALLELISM:8}" + stats-print-interval-ms: "${THREAD_POOL_SHARDING_STATS_PRINT_INTERVAL_MS:10000}" protocol: sessions: default-inactivity-timeout-in-sec: "${PROTOCOLS_SESSIONS_DEFAULT_INACTIVITY_TIMEOUT_IN_SEC:600}" @@ -192,9 +197,3 @@ queue: enabled: "${QUEUE_APP_STATS_ENABLED:true}" print-interval-ms: "${QUEUE_APP_STATS_PRINT_INTERVAL_MS:60000}" -thread-pool: - sharding: - hash_function_name: "${THREAD_POOL_SHARDING_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256 - parallelism: "${THREAD_POOL_SHARDING_PARALLELISM:8}" - stats-print-interval-ms: "${THREAD_POOL_SHARDING_STATS_PRINT_INTERVAL_MS:10000}" -