更新 PageList

agent/src/main/java/cn/reghao/devops/agent/event/ws/WebSocketListenerImpl.java

@@ -57,7 +57,7 @@ public class WebSocketListenerImpl extends WebSocketListener {
 
     @Override
     public void onFailure(WebSocket webSocket, Throwable throwable, Response response) {
-        log.info("WebSocket 异常事件: {}", throwable.getMessage());
+        log.info("WebSocket 异常事件: {}", throwable.toString());
         if (throwable instanceof ConnectException) {
             wsClient.setConnected(false);
             if (wsClient.isRetry()) {

manager/src/main/java/cn/reghao/devops/manager/app/controller/page/StatusPageController.java

@@ -58,7 +58,7 @@ public class StatusPageController {
 
         if (appName != null) {
             Page<AppRunningVO> page = new PageImpl<>(Collections.emptyList());
-            PageList<AppRunningVO> pageList = PageList.empty(1, 1);
+            PageList<AppRunningVO> pageList = PageList.empty();
 
             model.addAttribute("env", env);
             model.addAttribute("page", page);

manager/src/main/java/cn/reghao/devops/manager/app/service/bd/impl/DeployStatImpl.java

@@ -218,7 +218,7 @@ public class DeployStatImpl implements DeployStat {
 
         int total = list0.size();
         if (total == 0) {
-            return PageList.empty(pageNumber, pageSize);
+            return PageList.empty();
         }
 
         PageBound pageBound = PageBound.getPageBound(pageNumber, pageSize, total);

manager/src/main/java/cn/reghao/devops/manager/machine/controller/page/MachineHostPageController.java

@@ -61,7 +61,7 @@ public class MachineHostPageController {
         PageList<MachineHostVO> pageList;
         if (machineIpv4 != null) {
             //page = machineHostPage.searchResultPage(machineIpv4);
-            pageList = PageList.empty(1, 1);
+            pageList = PageList.empty();
         } else {
             int pageNumber = pageRequest.getPageNumber();
             int pageSize = pageRequest.getPageSize();

manager/src/main/java/cn/reghao/devops/manager/machine/service/MachineService.java

@@ -84,7 +84,7 @@ public class MachineService {
 
         int total = list.size();
         if (total == 0) {
-            return PageList.empty(pageNumber, pageSize);
+            return PageList.empty();
         }
 
         PageBound pageBound = PageBound.getPageBound(pageNumber, pageSize, total);

manager/src/main/java/cn/reghao/devops/manager/util/ConsulService.java

@@ -9,7 +9,13 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -59,4 +65,24 @@ public class ConsulService {
         }
         return Collections.emptyList();
     }
+
+    public void deregister(String service) throws URISyntaxException, IOException, InterruptedException {
+        String url = "http://s75.iquizoo.com:8500/v1/agent/service/deregister/" + service;
+        HttpRequest.Builder builder = HttpRequest.newBuilder(new URI(url)).version(HttpClient.Version.HTTP_1_1);
+
+        HttpRequest httpRequest = builder.PUT(HttpRequest.BodyPublishers.noBody()).build();
+        HttpClient httpClient = HttpClient.newBuilder().build();
+        HttpResponse<String> httpResponse = httpClient.send(httpRequest, HttpResponse.BodyHandlers.ofString());
+        int statusCode = httpResponse.statusCode();
+        String body = httpResponse.body();
+    }
+
+    public static void main(String[] args) throws URISyntaxException, IOException, InterruptedException {
+        ConsulService consulService = new ConsulService();
+        //List<String> list = consulService.getCriticalServices();
+        //System.out.println(list);
+        String service = "FileGrpcService_172_16_45_66_8104";
+        service = "FileService-WebApi_172_16_45_66_8004";
+        consulService.deregister(service);
+    }
 }