feat(loki-query): 拆分服务和hudi使用的loki，查询服务分开部署

service-cli/service-cli-core/src/main/java/com/lanyuanxiaoyao/service/cli/core/RuntimeInfo.java

@@ -13,9 +13,9 @@ public class RuntimeInfo {
     private String logPath;
     private String dataPath;
     private String kerberosKeytabPath;
-    private String lokiUrl;
+    private LokiInfo loki;
     private String zkUrl;
-    private String eurekaUrl;
+    private String connectorZkUrl;
     private HudiInfo hudi;
     private SecurityInfo security;
 
@@ -67,12 +67,12 @@ public class RuntimeInfo {
         this.kerberosKeytabPath = kerberosKeytabPath;
     }
 
-    public String getLokiUrl() {
-        return lokiUrl;
+    public LokiInfo getLoki() {
+        return loki;
     }
 
-    public void setLokiUrl(String lokiUrl) {
-        this.lokiUrl = lokiUrl;
+    public void setLoki(LokiInfo loki) {
+        this.loki = loki;
     }
 
     public String getZkUrl() {
@@ -83,12 +83,12 @@ public class RuntimeInfo {
         this.zkUrl = zkUrl;
     }
 
-    public String getEurekaUrl() {
-        return eurekaUrl;
+    public String getConnectorZkUrl() {
+        return connectorZkUrl;
     }
 
-    public void setEurekaUrl(String eurekaUrl) {
-        this.eurekaUrl = eurekaUrl;
+    public void setConnectorZkUrl(String connectorZkUrl) {
+        this.connectorZkUrl = connectorZkUrl;
     }
 
     public HudiInfo getHudi() {
@@ -110,18 +110,116 @@ public class RuntimeInfo {
     @Override
     public String toString() {
         return "RuntimeInfo{" +
-                "user='" + user + '\'' +
-                ", jarPath='" + jarPath + '\'' +
-                ", jdkPath='" + jdkPath + '\'' +
-                ", logPath='" + logPath + '\'' +
-                ", dataPath='" + dataPath + '\'' +
-                ", kerberosKeytabPath='" + kerberosKeytabPath + '\'' +
-                ", lokiUrl='" + lokiUrl + '\'' +
-                ", zkUrl='" + zkUrl + '\'' +
-                ", eurekaUrl='" + eurekaUrl + '\'' +
-                ", hudi=" + hudi +
-                ", security=" + security +
-                '}';
+               "user='" + user + '\'' +
+               ", jarPath='" + jarPath + '\'' +
+               ", jdkPath='" + jdkPath + '\'' +
+               ", logPath='" + logPath + '\'' +
+               ", dataPath='" + dataPath + '\'' +
+               ", kerberosKeytabPath='" + kerberosKeytabPath + '\'' +
+               ", loki=" + loki +
+               ", zkUrl='" + zkUrl + '\'' +
+               ", connectorZkUrl='" + connectorZkUrl + '\'' +
+               ", hudi=" + hudi +
+               ", security=" + security +
+               '}';
+    }
+
+    public static final class LokiInfo {
+        private String serviceUrl;
+        private String servicePushUrl;
+        private String hudiUrl;
+        private String hudiPushUrl;
+
+        public String getServiceUrl() {
+            return serviceUrl;
+        }
+
+        public void setServiceUrl(String serviceUrl) {
+            this.serviceUrl = serviceUrl;
+        }
+
+        public String getServicePushUrl() {
+            return servicePushUrl;
+        }
+
+        public void setServicePushUrl(String servicePushUrl) {
+            this.servicePushUrl = servicePushUrl;
+        }
+
+        public String getHudiUrl() {
+            return hudiUrl;
+        }
+
+        public void setHudiUrl(String hudiUrl) {
+            this.hudiUrl = hudiUrl;
+        }
+
+        public String getHudiPushUrl() {
+            return hudiPushUrl;
+        }
+
+        public void setHudiPushUrl(String hudiPushUrl) {
+            this.hudiPushUrl = hudiPushUrl;
+        }
+
+        @Override
+        public String toString() {
+            return "LokiInfo{" +
+                   "serviceUrl='" + serviceUrl + '\'' +
+                   ", servicePushUrl='" + servicePushUrl + '\'' +
+                   ", hudiUrl='" + hudiUrl + '\'' +
+                   ", hudiPushUrl='" + hudiPushUrl + '\'' +
+                   '}';
+        }
+    }
+
+    public static final class ExecutorInfo {
+        private String stagingPath;
+        private String archiveHdfsPath;
+        private String taskJarPath;
+        private String taskResultPath;
+
+        public String getStagingPath() {
+            return stagingPath;
+        }
+
+        public void setStagingPath(String stagingPath) {
+            this.stagingPath = stagingPath;
+        }
+
+        public String getArchiveHdfsPath() {
+            return archiveHdfsPath;
+        }
+
+        public void setArchiveHdfsPath(String archiveHdfsPath) {
+            this.archiveHdfsPath = archiveHdfsPath;
+        }
+
+        public String getTaskJarPath() {
+            return taskJarPath;
+        }
+
+        public void setTaskJarPath(String taskJarPath) {
+            this.taskJarPath = taskJarPath;
+        }
+
+        public String getTaskResultPath() {
+            return taskResultPath;
+        }
+
+        public void setTaskResultPath(String taskResultPath) {
+            this.taskResultPath = taskResultPath;
+        }
+
+        @Override
+        public String toString() {
+            return "ExecutorInfo{" +
+                   "stagingPath='" + stagingPath + '\'' +
+                   ", archiveHdfsPath='" + archiveHdfsPath + '\'' +
+                   ", taskJarPath='" + taskJarPath + '\'' +
+                   ", taskResultPath='" + taskResultPath + '\'' +
+                   '}';
+        }
     }
 
     public static final class HudiInfo {
@@ -156,10 +254,10 @@ public class RuntimeInfo {
         @Override
         public String toString() {
             return "HudiInfo{" +
-                    "appHdfsPath='" + appHdfsPath + '\'' +
-                    ", archiveHdfsPath='" + archiveHdfsPath + '\'' +
-                    ", victoriaPushUrl='" + victoriaPushUrl + '\'' +
-                    '}';
+                   "appHdfsPath='" + appHdfsPath + '\'' +
+                   ", archiveHdfsPath='" + archiveHdfsPath + '\'' +
+                   ", victoriaPushUrl='" + victoriaPushUrl + '\'' +
+                   '}';
         }
     }
 
@@ -195,10 +293,10 @@ public class RuntimeInfo {
         @Override
         public String toString() {
             return "SecurityInfo{" +
-                    "authority='" + authority + '\'' +
-                    ", username='" + username + '\'' +
-                    ", darkcode='" + darkcode + '\'' +
-                    '}';
+                   "authority='" + authority + '\'' +
+                   ", username='" + username + '\'' +
+                   ", darkcode='" + darkcode + '\'' +
+                   '}';
         }
     }
 }