From e187ad8280c83d5a19c09c0b4f43ccf87239960f Mon Sep 17 00:00:00 2001
From: Cruvie <cruvie@foxmail.com>
Date: Thu, 12 Sep 2024 00:54:04 +0800
Subject: [PATCH] 1.4.0

---
 lib/pages/page_server/logic/state_server.dart    | 16 ++++++++--------
 .../page_server/view/cpts/page_server_base.dart  |  8 ++++----
 lib/pages/page_server/view/page_server.dart      |  4 ++--
 pubspec.yaml                                     |  4 ++++
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/pages/page_server/logic/state_server.dart b/lib/pages/page_server/logic/state_server.dart
index ac6098b..46bc127 100644
--- a/lib/pages/page_server/logic/state_server.dart
+++ b/lib/pages/page_server/logic/state_server.dart
@@ -26,12 +26,12 @@ class Server extends _$Server {
     bool finished = false;
     await ApiServer.serverList(param, HttpTool.postReq, okFunc: (res) {
       switch (param.serverType) {
-        case ServiceType.Http:
+        case ServerType.Http:
           {
             state.pbListServerHttp.clear();
             state.pbListServerHttp.listServer.addAll(res.serverList.listServer);
           }
-        case ServiceType.Grpc:
+        case ServerType.Grpc:
           {
             state.pbListServerGrpc.clear();
             state.pbListServerGrpc.listServer.addAll(res.serverList.listServer);
@@ -52,18 +52,18 @@ class Server extends _$Server {
     bool finished = false;
     await ApiServer.deregisterServer(param, HttpTool.postReq, okFunc: (res) {
       switch (param.server.serverType) {
-        case ServiceType.Http:
+        case ServerType.Http:
           {
             state.pbListServerHttp.listServer.removeWhere((e) {
-              return (e.serverName == param.server.serverName) &&
-                  (e.serverAddr == param.server.serverAddr);
+              return (e.endpointKey == param.server.endpointKey) &&
+                  (e.endpointAddr == param.server.endpointAddr);
             });
           }
-        case ServiceType.Grpc:
+        case ServerType.Grpc:
           {
             state.pbListServerGrpc.listServer.removeWhere((e) {
-              return (e.serverName == param.server.serverName) &&
-                  (e.serverAddr == param.server.serverAddr);
+              return (e.endpointKey == param.server.endpointKey) &&
+                  (e.endpointAddr == param.server.endpointAddr);
             });
           }
       }
diff --git a/lib/pages/page_server/view/cpts/page_server_base.dart b/lib/pages/page_server/view/cpts/page_server_base.dart
index ddfa63c..f83124b 100644
--- a/lib/pages/page_server/view/cpts/page_server_base.dart
+++ b/lib/pages/page_server/view/cpts/page_server_base.dart
@@ -121,12 +121,12 @@ class _PageServerBaseState extends ConsumerState<PageServerBase> {
 
   List<DataRow> assembleData() {
     // switch (widget.serverType) {
-    //   case ServiceType.Http:
+    //   case ServerType.Http:
     //     {
     //       state.pbListServerHttp.clear();
     //       state.pbListServerHttp.listServer.addAll(res.serverList.listServer);
     //     }
-    //   case ServiceType.Grpc:
+    //   case ServerType.Grpc:
     //     {
     //       state.pbListServerGrpc.clear();
     //       state.pbListServerGrpc.listServer.addAll(res.serverList.listServer);
@@ -140,8 +140,8 @@ class _PageServerBaseState extends ConsumerState<PageServerBase> {
         DataRow(
           cells: <DataCell>[
             //remove prefix
-            DataCell(Text(element.serverName)),
-            DataCell(Text(element.serverAddr)),
+            DataCell(Text(element.endpointKey)),
+            DataCell(Text(element.endpointAddr)),
             DataCell(
               getServerStatus(element.status),
             ),
diff --git a/lib/pages/page_server/view/page_server.dart b/lib/pages/page_server/view/page_server.dart
index ec2eff5..c3ef168 100644
--- a/lib/pages/page_server/view/page_server.dart
+++ b/lib/pages/page_server/view/page_server.dart
@@ -43,9 +43,9 @@ class _PageServerState extends ConsumerState<PageServer>
         controller: tabController,
         children: [
           PageServerBase(
-              ServiceType.Http, ref.watch(serverProvider).pbListServerHttp),
+              ServerType.Http, ref.watch(serverProvider).pbListServerHttp),
           PageServerBase(
-              ServiceType.Grpc, ref.watch(serverProvider).pbListServerGrpc),
+              ServerType.Grpc, ref.watch(serverProvider).pbListServerGrpc),
         ],
       ),
     );
diff --git a/pubspec.yaml b/pubspec.yaml
index 0010462..3018298 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,6 +29,10 @@ dependencies:
     git:
       url: https://github.com/cruvie/kk_etcd_go.git
 
+#  kk_etcd_go:
+#    git:
+#      url: https://gitee.com/cruvie/kk_etcd_go_gitee.git
+
   kk_go_kit:
     git:
       url: https://gitee.com/cruvie/kk_go_kit.git