修改包含 reghao.cn 域名的代码

common/src/main/java/cn/reghao/devops/common/machine/Machine.java

@@ -1,12 +1,8 @@
 package cn.reghao.devops.common.machine;
 
-import cn.reghao.devops.common.msg.constant.Protocol;
 import cn.reghao.devops.common.msg.event.EvtAgentHeartbeat;
 import cn.reghao.devops.common.msg.event.EvtAgentStart;
 import cn.reghao.devops.common.version.AppVersion;
-import cn.reghao.jutil.jdk.http.WebClient;
-import cn.reghao.jutil.jdk.http.WebRequest;
-import cn.reghao.jutil.jdk.http.WebResponse;
 import cn.reghao.jutil.jdk.machine.data.detail.*;
 import cn.reghao.jutil.jdk.machine.id.MachineId;
 import cn.reghao.jutil.jdk.machine.id.MachineIdLinux;
@@ -29,7 +25,6 @@ public class Machine {
         IPV4 = machineId.ipv4();
     }
 
-    private final WebRequest webRequest;
     private final Os os;
     private final Network network;
     private final Cpu cpu;
@@ -38,7 +33,6 @@ public class Machine {
 
     public Machine() {
         SystemInfo si = new SystemInfo();
-        this.webRequest = new WebClient();
         this.os = new Os(si.getOperatingSystem());
         this.network = new Network();
         this.cpu = new Cpu(si.getHardware().getProcessor());
@@ -54,10 +48,7 @@ public class Machine {
         machineDetail.setOsDetail(os.detail());
         List<NetworkDetail> list = network.detail().stream()
                 .peek(networkDetail -> {
-                    WebResponse webResponse = webRequest.get("http://ip.reghao.cn");
-                    if (webResponse.getStatusCode() == 200) {
-                        networkDetail.setPubicIpv4(webResponse.getBody());
-                    }
+                    networkDetail.setPubicIpv4("0.0.0.0");
                 })
                 .collect(Collectors.toList());
         machineDetail.setNetworkDetails(list);

logstash/src/main/java/cn/reghao/devops/logstash/service/FileReader.java

@@ -23,7 +23,9 @@ public class FileReader {
     }
 
     public void start() {
-        String params = String.format("app=%s&host=%s", "nginx", "api.reghao.cn");
+        String app = "nginx";
+        String host = "nginx";
+        String params = String.format("app=%s&host=%s", app, host);
         String url = String.format("%s?%s", wsUrl, params);
         WsClient wsClient = new WsClient(url);
         wsClient.connect();

manager/src/main/java/cn/reghao/devops/manager/config/spring/AppLifecycle.java

@@ -61,7 +61,7 @@ public class AppLifecycle implements ApplicationRunner, DisposableBean {
 
     private void initLogConfig() {
         String app = "devops-manager";
-        String host = "devops.reghao.cn";
+        String host = "localhost";
         LoggerConfig.initLogger(List.of(
                 Appenders.pushAppender(app, host, logHandler),
                 Appenders.consoleAppender()));

manager/src/main/java/cn/reghao/devops/manager/log/service/LoggingService.java

@@ -21,7 +21,7 @@ import java.util.*;
 public class LoggingService {
     public List getChartData() throws ParseException {
         TextFile textFile = new TextFile();
-        String filePath = "api.reghao.cn.access.log";
+        String filePath = "nginx.log";
         List<String> list = textFile.read(filePath);
 
         List<NginxLog> nginxLogs = new ArrayList<>();

manager/src/main/resources/static/js/websocket.js

@@ -21,7 +21,8 @@ WebSocketClient.prototype._generateEndpoint = function () {
         }
     }
 
-    var url = 'wss://devops.reghao.cn/ws/ssh?token=12345678'
+    var host1 = window.location.host
+    var url = 'wss://' + host1 + '/ws/ssh?token=12345678'
     return  url;
 };
 

manager/src/main/resources/templates/app/stat/log.html

@@ -97,7 +97,9 @@
             var app = 'admin-service'
             var host = '172.16.90.200'
             var params = 'token=' + token + '&app=' + app + '&host=' + host;
-            var url = "wss://devops.reghao.cn/ws/log/pull?" + params
+
+            var host1 = window.location.host
+            var url = 'wss://' + host1 + '/ws/log/pull?' + params
             ws = new WebSocket(url);
             ws.onopen = function() {
                 connected = true

manager/src/main/resources/templates/app/stat/nginxlog.html

@@ -149,7 +149,9 @@
             var app = 'admin-service'
             var host = '172.16.90.200'
             var params = 'token=' + token + '&app=' + app + '&host=' + host;
-            var url = "wss://devops.reghao.cn/ws/log/pull?" + params
+
+            var host1 = window.location.host
+            var url = 'wss://' + host1 + '/ws/log/pull?' + params
             ws = new WebSocket(url);
             ws.onopen = function() {
                 connected = true

manager/src/main/resources/templates/home/index.html

@@ -215,7 +215,8 @@
     var ws
     function initWebSocket() {
         if ("WebSocket" in window) {
-            var url = "wss://devops.reghao.cn/ws/message"
+            var host1 = window.location.host
+            var url = 'wss://' + host1 + '/ws/message'
             ws = new WebSocket(url);
             ws.onopen = function() {
                 connected = true

manager/src/main/resources/templates/sys/syslog.html

@@ -61,9 +61,11 @@
         if ("WebSocket" in window) {
             var token = '0123456789'
             var app = 'devops-manager'
-            var host = 'devops.reghao.cn'
+            var host = 'localhost'
             var params = 'token=' + token + '&app=' + app + '&host=' + host;
-            var url = "wss://devops.reghao.cn/ws/log/pull?" + params
+
+            var host1 = window.location.host
+            var url = 'wss://' + host1 + '/ws/log/pull?' + params
             ws = new WebSocket(url);
             ws.onopen = function() {
                 connected = true