Skip to content

Commit beddc69

Browse files
kimmkingkimmking
committed
update some config
1 parent c7c24d0 commit beddc69

File tree

8 files changed

+58
-53
lines changed

8 files changed

+58
-53
lines changed

‎07rpc/rpc01/client-rest.http‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
http://127.0.0.1:8080/api/hello
1+
http://127.0.0.1:8091/api/hello

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/meta/InstanceMeta.java‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package io.kimmking.rpcfx.meta;
22

33
import com.google.common.base.Strings;
4-
import lombok.AllArgsConstructor;
5-
import lombok.Builder;
6-
import lombok.Data;
7-
import lombok.NoArgsConstructor;
4+
import lombok.*;
85

96
import java.net.URI;
107
import java.util.Map;
@@ -21,13 +18,14 @@
2118
@Builder
2219
@NoArgsConstructor
2320
@AllArgsConstructor
21+
@EqualsAndHashCode(of = {"scheme", "host", "port", "context"})
2422
public class InstanceMeta {
2523

2624
private String scheme;
27-
private String ip;
25+
private String host;
2826
private Integer port;
2927
private String context;
30-
private String status;
28+
private boolean status;
3129
private Map<String, String> metadata;
3230

3331
public static InstanceMeta from(String instance) {
@@ -36,27 +34,15 @@ public static InstanceMeta from(String instance) {
3634
path = Strings.isNullOrEmpty(path) ? "" : path.substring(1);
3735
return InstanceMeta.builder()
3836
.scheme(uri.getScheme())
39-
.ip(uri.getHost())
37+
.host(uri.getHost())
4038
.port(uri.getPort())
4139
.context(path)
4240
.build();
4341
}
4442

4543
@Override
4644
public String toString() {
47-
return scheme + "://" + ip + ":" + port + "/" + context;
45+
return scheme + "://" + host + ":" + port + "/" + context;
4846
}
4947

50-
@Override
51-
public boolean equals(Object o) {
52-
if (this == o) return true;
53-
if (o == null || getClass() != o.getClass()) return false;
54-
InstanceMeta that = (InstanceMeta) o;
55-
return Objects.equals(scheme, that.scheme) && Objects.equals(ip, that.ip) && Objects.equals(port, that.port) && Objects.equals(context, that.context);
56-
}
57-
58-
@Override
59-
public int hashCode() {
60-
return Objects.hash(scheme, ip, port, context);
61-
}
6248
}

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/provider/ProviderBootstrap.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private void registerServices() {
112112
.app(app).namespace(ns).env(env).build();
113113

114114
InstanceMeta im = InstanceMeta.builder()
115-
.scheme(SCHEME).ip(ip).port(port).context("").build();
115+
.scheme(SCHEME).host(ip).port(port).context("").build();
116116
try {
117117
registry.registerService(sm, im);
118118
registry.heartbeat(sm, im);
@@ -136,7 +136,7 @@ private void unregisterServices() {
136136
ServiceMeta sm = ServiceMeta.builder().name(x)
137137
.app(app).namespace(ns).env(env).build();
138138
InstanceMeta im = InstanceMeta.builder()
139-
.scheme(SCHEME).ip(ip).port(port).context("").build();
139+
.scheme(SCHEME).host(ip).port(port).context("").build();
140140
try {
141141
registry.unregisterService(sm, im);
142142
} catch (Exception e) {

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/registry/RegistryConfiguration.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ public class RegistryConfiguration {
1717

1818
@Bean
1919
RegistryCenter createRC() {
20-
return new ZookeeperRegistryCenter(); //KKRegistryCenter();
20+
return new KKRegistryCenter();
21+
//return new ZookeeperRegistryCenter(); //KKRegistryCenter();
2122
}
2223

2324
}

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/registry/kkregistry/KKRegistryCenter.java‎

Lines changed: 42 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,48 +48,62 @@ public void stop() {
4848

4949
@Override
5050
public void registerService(ServiceMeta service, InstanceMeta instance) throws Exception {
51-
String reqJson = "{\n" +
52-
" \"scheme\": \"http\",\n" +
53-
" \"ip\": \"" + instance.getIp() + "\",\n" +
54-
" \"port\": \"" + instance.getPort() + "\",\n" +
55-
" \"context\": \"\",\n" +
56-
" \"status\": \"online\",\n" +
57-
" \"metadata\": {\n" +
58-
" \"env\": \"dev\",\n" +
59-
" \"tag\": \"RED\"\n" +
60-
" }\n" +
61-
"}";
51+
instance.setStatus(true);
52+
String reqJson = JSON.toJSONString(instance);
53+
String url = "http://localhost:8484/reg?service=" + service;
54+
System.out.println(" ====> reg service: " + url);
6255
final Request request = new Request.Builder()
63-
.url("http://localhost:8484/reg?service=" + service)
56+
.url(url)
6457
.post(RequestBody.create(JSONTYPE, reqJson))
6558
.build();
6659
String respJson = client.newCall(request).execute().body().string();
67-
System.out.println(respJson);
60+
System.out.println(" ====> reg response: " + respJson);
61+
// String reqJson = "{\n" +
62+
// " \"scheme\": \"http\",\n" +
63+
// " \"ip\": \"" + instance.getIp() + "\",\n" +
64+
// " \"port\": \"" + instance.getPort() + "\",\n" +
65+
// " \"context\": \"\",\n" +
66+
// " \"status\": \"online\",\n" +
67+
// " \"metadata\": {\n" +
68+
// " \"env\": \"dev\",\n" +
69+
// " \"tag\": \"RED\"\n" +
70+
// " }\n" +
71+
// "}";
72+
// final Request request = new Request.Builder()
73+
// .url("http://localhost:8484/reg?service=" + service)
74+
// .post(RequestBody.create(JSONTYPE, reqJson))
75+
// .build();
76+
// String respJson = client.newCall(request).execute().body().string();
77+
// System.out.println(respJson);
6878
}
6979

7080
@Override
7181
public void unregisterService(ServiceMeta service, InstanceMeta instance) throws Exception {
7282
String reqJson = "{\n" +
7383
" \"scheme\": \"http\",\n" +
74-
" \"ip\": \"" + instance.getIp() + "\",\n" +
84+
" \"host\": \"" + instance.getHost() + "\",\n" +
7585
" \"port\": \"" + instance.getPort() + "\",\n" +
7686
" \"context\": \"\"\n" +
7787
"}";
88+
String url = "http://localhost:8484/unreg?service=" + service;
89+
System.out.println(" ====> unreg service: " + url);
7890
final Request request = new Request.Builder()
79-
.url("http://localhost:8484/unreg?service=" + service)
91+
.url(url)
8092
.post(RequestBody.create(JSONTYPE, reqJson))
8193
.build();
8294
String respJson = client.newCall(request).execute().body().string();
83-
System.out.println(respJson);
95+
System.out.println(" ====> unreg response: " + respJson);
8496
}
8597

8698
public List<InstanceMeta> fetchInstances(ServiceMeta service) throws Exception {
99+
String url = "http://localhost:8484/findAll?service=" + service;
100+
System.out.println(" ====> fetchInstances: " + url);
87101
final Request request = new Request.Builder()
88-
.url("http://localhost:8484/list?service=" + service)
102+
.url(url)
89103
.get()
90104
.build();
91105
String respJson = client.newCall(request).execute().body().string();
92-
System.out.println(respJson);
106+
System.out.println(" ====> fetchInstances response: " + respJson);
93107
List<InstanceMeta> instances = JSON.parseObject(respJson, new TypeReference<List<InstanceMeta>>() {
94108
});
95109
return instances;
@@ -115,12 +129,14 @@ public void subscribe(ServiceMeta service, final ChangedListener listener) {
115129

116130
private boolean hb(ServiceMeta service, ChangedListener listener) throws Exception {
117131
String svc = service.toString();
132+
String url = "http://localhost:8484/version?service=" + svc;
133+
System.out.println(" ====> consumer version: " + url);
118134
final Request request = new Request.Builder()
119-
.url("http://localhost:8484/hb?service=" + svc)
135+
.url(url)
120136
.get()
121137
.build();
122138
String respJson = client.newCall(request).execute().body().string();
123-
System.out.println("hb:"+respJson);
139+
System.out.println(" ====> consumer version: "+respJson);
124140
Long v = Long.valueOf(respJson);
125141
Long o = TV.getOrDefault(svc, -1L);
126142
if ( v > o) {
@@ -141,17 +157,19 @@ public void heartbeat(ServiceMeta service, InstanceMeta instance) {
141157
Long heart(ServiceMeta service, InstanceMeta instance) throws Exception {
142158
String reqJson = "{\n" +
143159
" \"scheme\": \"http\",\n" +
144-
" \"ip\": \"" + instance.getIp() + "\",\n" +
160+
" \"host\": \"" + instance.getHost() + "\",\n" +
145161
" \"port\": \"" + instance.getPort() + "\",\n" +
146162
" \"context\": \"\",\n" +
147-
" \"status\": \"online\"\n" +
163+
" \"status\": true\n" +
148164
"}";
165+
String url = "http://localhost:8484/renew?service=" + service;
166+
System.out.println(" ====> provider renew: " + url);
149167
final Request request = new Request.Builder()
150-
.url("http://localhost:8484/heart?service=" + service)
168+
.url(url)
151169
.post(RequestBody.create(JSONTYPE, reqJson))
152170
.build();
153171
String respJson = client.newCall(request).execute().body().string();
154-
System.out.println("heart:"+respJson);
172+
System.out.println(" ====> provider renew: "+respJson);
155173
return Long.valueOf(respJson);
156174
}
157175

‎07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/registry/zookeeper/ZookeeperRegistryCenter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void stop(){
4242

4343
public void registerService(ServiceMeta service, InstanceMeta instance) throws Exception {
4444
ServiceProviderDesc userServiceSesc = ServiceProviderDesc.builder()
45-
.host(instance.getIp())
45+
.host(instance.getHost())
4646
.port(instance.getPort()).serviceClass(service.getName()).build();
4747
// String userServiceSescJson = JSON.toJSONString(userServiceSesc);
4848

@@ -63,9 +63,9 @@ public void unregisterService(ServiceMeta service, InstanceMeta instance) throws
6363
if (null == client.checkExists().forPath("/" + service)) {
6464
return;
6565
}
66-
System.out.println("delete " + "/" + service + "/" + instance.getIp() + "_" + instance.getPort());
66+
System.out.println("delete " + "/" + service + "/" + instance.getHost() + "_" + instance.getPort());
6767
client.delete().quietly().
68-
forPath( "/" + service + "/" + instance.getIp() + "_" + instance.getPort());
68+
forPath( "/" + service + "/" + instance.getHost() + "_" + instance.getPort());
6969
}
7070

7171
public List<InstanceMeta> fetchInstances(ServiceMeta service) throws Exception {

‎07rpc/rpc01/rpcfx-demo-consumer/src/main/java/io/kimmking/rpcfx/demo/consumer/RpcfxClientApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.context.annotation.ComponentScan;
1212

1313
@SpringBootApplication
14-
@ComponentScan("io.kimmking.rpcfx")
14+
@ComponentScan({"io.kimmking.rpcfx.consumer","io.kimmking.rpcfx.demo.consumer"})
1515
public class RpcfxClientApplication {
1616

1717
public static void main(String[] args) {

‎07rpc/rpc01/rpcfx-demo-provider/src/main/java/io/kimmking/rpcfx/demo/provider/RpcfxServerApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@SpringBootApplication
1919
@RestController
20-
@ComponentScan("io.kimmking.rpcfx")
20+
@ComponentScan({"io.kimmking.rpcfx.provider", "io.kimmking.rpcfx.demo.provider"})
2121
public class RpcfxServerApplication implements CommandLineRunner {
2222

2323
@Autowired

0 commit comments

Comments
 (0)