Skip to content

Commit a641780

Browse files
committed
[fit] 为 NacosConfig 增加详细注释; 修改heartBeat错误拼写; 修改部分未修改的fitableId
1 parent d97680b commit a641780

File tree

7 files changed

+22
-18
lines changed

7 files changed

+22
-18
lines changed

framework/fit/java/fit-builtin/plugins/fit-service-coordination-nacos/src/main/java/modelengine/fit/heartbeat/server/HeartbeatConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public class HeartbeatConfig {
3636
* Heartbeat interval time (unit: milliseconds).
3737
* Defines the time interval for services to send heartbeats.
3838
*/
39-
private Long heartBeatInterval;
39+
private Long heartbeatInterval;
4040

4141
/**
4242
* Heartbeat timeout time (unit: milliseconds).
4343
* Defines the time after which a service is considered timed out when no heartbeat is received.
4444
*/
45-
private Long heartBeatTimeout;
45+
private Long heartbeatTimeout;
4646
}

framework/fit/java/fit-builtin/plugins/fit-service-coordination-nacos/src/main/java/modelengine/fit/service/server/NacosConfig.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,32 +21,38 @@
2121
@Data
2222
public class NacosConfig {
2323
/**
24-
* Nacos server address
24+
* Nacos server address.
25+
* Specifies the connection address for the Nacos server, typically in the format "host:port".
2526
*/
2627
private String serverAddr;
2728

2829
/**
29-
* Login username
30+
* Login username for Nacos authentication.
31+
* Required when Nacos server has authentication enabled.
3032
*/
3133
private String username;
3234

3335
/**
34-
* Login password
36+
* Login password for Nacos authentication.
37+
* Used together with username for authentication when connecting to secured Nacos server.
3538
*/
3639
private String password;
3740

3841
/**
39-
* Access key
42+
* Access key for Nacos authentication.
43+
* Used for access control in cloud environments or when using AK/SK authentication.
4044
*/
4145
private String accessKey;
4246

4347
/**
44-
* Secret key
48+
* Secret key for Nacos authentication.
49+
* Used together with access key for AK/SK authentication mechanism.
4550
*/
4651
private String secretKey;
4752

4853
/**
49-
* Namespace
54+
* Namespace for logical isolation in Nacos.
55+
* Used to isolate different environments or tenants within the same Nacos server.
5056
*/
5157
private String namespace;
5258
}

framework/fit/java/fit-builtin/plugins/fit-service-coordination-nacos/src/main/java/modelengine/fit/service/server/NacosRegistryServer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,11 +180,11 @@ private List<Instance> createInstance(Worker worker, Application application, Fi
180180
*/
181181
private HashMap<String, String> buildInstanceMetadata(Worker worker, Application application, FitableMeta meta) {
182182
HashMap<String, String> metadata = new HashMap<>();
183-
if (this.heartbeatConfig.getHeartBeatInterval() != null) {
184-
metadata.put(HEART_BEAT_INTERVAL, String.valueOf(this.heartbeatConfig.getHeartBeatInterval()));
183+
if (this.heartbeatConfig.getHeartbeatInterval() != null) {
184+
metadata.put(HEART_BEAT_INTERVAL, String.valueOf(this.heartbeatConfig.getHeartbeatInterval()));
185185
}
186-
if (this.heartbeatConfig.getHeartBeatTimeout() != null) {
187-
metadata.put(HEART_BEAT_TIMEOUT, String.valueOf(this.heartbeatConfig.getHeartBeatTimeout()));
186+
if (this.heartbeatConfig.getHeartbeatTimeout() != null) {
187+
metadata.put(HEART_BEAT_TIMEOUT, String.valueOf(this.heartbeatConfig.getHeartbeatTimeout()));
188188
}
189189
try {
190190
metadata.put(WORKER_KEY, this.objectMapper.writeValueAsString(worker));

framework/fit/java/fit-builtin/plugins/fit-service-coordination-nacos/src/main/resources/application.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ nacos:
33
heartbeat:
44
isEphemeral: true
55
weight: 1
6-
heartBeatInterval: 5000
76

87
fit:
98
beans:
109
packages:
11-
- 'modelengine.fit.service'
12-
- 'modelengine.fit.heartbeat'
10+
- 'modelengine.fit.service'
11+
- 'modelengine.fit.heartbeat'

framework/fit/java/fit-builtin/services/fit-service/definition/src/main/java/modelengine/fit/service/RegistryService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public interface RegistryService {
4040
* @param fitables 表示待取消注册的服务实现列表的 {@link List}{@code <}{@link FitableInfo}{@code >}。
4141
* @param workerId 表示服务实现所在的进程的唯一标识的 {@link String}。
4242
*/
43-
@Genericable(id = "c02af9dafb5b4a609f8c586a8e884710")
43+
@Genericable(id = "unregister-fitables")
4444
void unregisterFitables(List<FitableInfo> fitables, String workerId);
4545

4646
/**

framework/fit/java/fit-runtime/src/main/resources/fitframework.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ matata:
8484
genericable-id: "modelengine.fit.registry.registry-service.register-fitables"
8585
# 向注册中心服务端取消注册服务实现列表
8686
- genericable-name: "modelengine.fit.registry.RegistryService.unregisterFitables"
87-
genericable-id: "c02af9dafb5b4a609f8c586a8e884710"
87+
genericable-id: "unregister-fitables"
8888
# 向注册中心服务端取消订阅指定服务实现的实例信息
8989
- genericable-name: "modelengine.fit.registry.RegistryService.unsubscribeFitables"
9090
genericable-id: "modelengine.fit.registry.registry-service.unsubscribe-fitables"

framework/fit/python/plugin/fit_py_registry_client/conf/application.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ registry-center:
1515
context-path: ""
1616
service_ids:
1717
- "modelengine.fit.registry.registry-service.register-fitables"
18-
- "bcad5d59d90b4ee88f195cd7356389fc"
1918
- "modelengine.fit.registry.registry-service.query-fitables-addresses"
2019
- "modelengine.fit.registry.registry-service.subscribe-fitables"
2120
- "modelengine.fit.registry.registry-service.query-running-fitables"

0 commit comments

Comments
 (0)