diff --git a/fire-bundle/fire-bundle-flink/pom.xml b/fire-bundle/fire-bundle-flink/pom.xml index 12da3d318d4aab419328214092451dd99cba9e86..db9157da1f33a5528014b664a924bd0b77b61aa1 100644 --- a/fire-bundle/fire-bundle-flink/pom.xml +++ b/fire-bundle/fire-bundle-flink/pom.xml @@ -8,7 +8,7 @@ com.zto.fire fire-bundle - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-bundle/fire-bundle-spark/pom.xml b/fire-bundle/fire-bundle-spark/pom.xml index 7e9b5d6a3bbc007d0ab36574c2cc661f6f51e6db..71300ae46663b1efddde642fb9aa1708b4e481aa 100644 --- a/fire-bundle/fire-bundle-spark/pom.xml +++ b/fire-bundle/fire-bundle-spark/pom.xml @@ -8,7 +8,7 @@ com.zto.fire fire-bundle - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-bundle/pom.xml b/fire-bundle/pom.xml index 0eaca317435c353c162247b5d7326fd73fa1db2d..0aa88610d84db9db8337b1c4c1df4e05c82da1c9 100644 --- a/fire-bundle/pom.xml +++ b/fire-bundle/pom.xml @@ -15,7 +15,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-common/pom.xml b/fire-common/pom.xml index 57e71d411ff543de7c6ce35275fb85e7358f28a4..638f0685248419ab803ca31fbecdf0bee359daf1 100644 --- a/fire-common/pom.xml +++ b/fire-common/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-common/src/main/java/com/zto/fire/common/bean/config/ConfigurationParam.java b/fire-common/src/main/java/com/zto/fire/common/bean/config/ConfigurationParam.java index 046db3ddbf2d8b6dd75fa04aa305543e08294191..94c1a7bde2ec34e72b5ef45ed558dc3620d61723 100644 --- a/fire-common/src/main/java/com/zto/fire/common/bean/config/ConfigurationParam.java +++ b/fire-common/src/main/java/com/zto/fire/common/bean/config/ConfigurationParam.java @@ -18,6 +18,8 @@ package com.zto.fire.common.bean.config; import com.zto.fire.common.enu.ConfigureLevel; +import lombok.Getter; +import lombok.Setter; import java.util.Map; @@ -30,23 +32,58 @@ import java.util.Map; * @since 2.2.0 */ public class ConfigurationParam { - private Integer code; - private Map> content; + private boolean status; + private String statusCode; + private String message; + private Map> result; + private String solution; + private String exception; - public Integer getCode() { - return code; + public boolean isStatus() { + return status; } - public void setCode(Integer code) { - this.code = code; + public void setStatus(boolean status) { + this.status = status; } - public Map> getContent() { - return content; + public String getStatusCode() { + return statusCode; } - public void setContent(Map> content) { - this.content = content; + public void setStatusCode(String statusCode) { + this.statusCode = statusCode; } + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public Map> getResult() { + return result; + } + + public void setResult(Map> result) { + this.result = result; + } + + public String getSolution() { + return solution; + } + + public void setSolution(String solution) { + this.solution = solution; + } + + public String getException() { + return exception; + } + + public void setException(String exception) { + this.exception = exception; + } } \ No newline at end of file diff --git a/fire-common/src/main/scala/com/zto/fire/common/util/ConfigurationCenterManager.scala b/fire-common/src/main/scala/com/zto/fire/common/util/ConfigurationCenterManager.scala index 47ced12915d8d5c63c7919c1745de4445e577ca9..dd72cde660dc395283eff37cc213f23d0d119beb 100644 --- a/fire-common/src/main/scala/com/zto/fire/common/util/ConfigurationCenterManager.scala +++ b/fire-common/src/main/scala/com/zto/fire/common/util/ConfigurationCenterManager.scala @@ -44,7 +44,7 @@ private[fire] object ConfigurationCenterManager extends Serializable with Loggin val rest = FireFrameworkConf.fireRestUrl if (StringUtils.isBlank(rest)) logWarning("Fire Rest Server 地址为空，将无法完成注册") s""" - |{ "url": "$rest", "fireVersion": "${FireFrameworkConf.fireVersion}", "engine": "${PropUtils.engine}", "taskId": "${getFireAppId}"} + |{ "url": "$rest", "fireVersion": "${FireFrameworkConf.fireVersion}", "taskId": "${getFireAppId}"} """.stripMargin } @@ -75,6 +75,7 @@ private[fire] object ConfigurationCenterManager extends Serializable with Loggin * 通过参数调用指定的接口 */ private[this] def invoke(url: String, param: String): String = { + logInfo(s"开始调用接口：$url,参数为：$param") try { HttpClientUtils.doPost(url, param,new Header(FireFrameworkConf.configCenterZdpHeaderKey,FireFrameworkConf.configCenterZdpHeaderValue)) } catch { @@ -101,9 +102,12 @@ private[fire] object ConfigurationCenterManager extends Serializable with Loggin FireUtils.exitError } else { val param = JSONUtils.parseObject[ConfigurationParam](json) - if (noEmpty(param, param.getCode, param.getContent) && param.getCode == 200) { - this.configCenterProperties.putAll(param.getContent) + if (param.isStatus && noEmpty(param, param.getResult) ) { + this.configCenterProperties.putAll(param.getResult) logInfo("配置中心参数已生效") + } else{ + logError(s"配置中心接口未生效导致任务发布失败。请直接联系平台管理人员确认。 接口返回为：$json") + FireUtils.exitError } } this.configCenterProperties diff --git a/fire-connectors/base-connectors/fire-hbase/pom.xml b/fire-connectors/base-connectors/fire-hbase/pom.xml index 4a13d52b89f00b9173d70448d631db75996ceba3..b2f5d39f448c9a0315b35d84d5caafef28607544 100644 --- a/fire-connectors/base-connectors/fire-hbase/pom.xml +++ b/fire-connectors/base-connectors/fire-hbase/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-connectors-common - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/base-connectors/fire-jdbc/pom.xml b/fire-connectors/base-connectors/fire-jdbc/pom.xml index 1f23b1471ec00a05a4a8d65829197c954ad36204..e639d43b16d718ea4e41dd77999185987cc0a6f8 100644 --- a/fire-connectors/base-connectors/fire-jdbc/pom.xml +++ b/fire-connectors/base-connectors/fire-jdbc/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-connectors-common - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/base-connectors/pom.xml b/fire-connectors/base-connectors/pom.xml index 6b5a6b8d12aac3812eb0a55ef7fa82641f2e37bb..2af2b75ec1592ed964e8229de674e5523b39a7bb 100644 --- a/fire-connectors/base-connectors/pom.xml +++ b/fire-connectors/base-connectors/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-connectors - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/flink-connectors/flink-clickhouse/pom.xml b/fire-connectors/flink-connectors/flink-clickhouse/pom.xml index 2723621f6b0231043097f1c5f31c3bff65b60679..9da552ffd98ca60ca92263d23f741b5da83bda60 100644 --- a/fire-connectors/flink-connectors/flink-clickhouse/pom.xml +++ b/fire-connectors/flink-connectors/flink-clickhouse/pom.xml @@ -26,7 +26,7 @@ fire-flink-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT diff --git a/fire-connectors/flink-connectors/flink-format/pom.xml b/fire-connectors/flink-connectors/flink-format/pom.xml index dcde4e3a0a22916f56528e9aae070866b985e12b..6218571145ec8a39060afe43d0c2ff3f6cba4017 100644 --- a/fire-connectors/flink-connectors/flink-format/pom.xml +++ b/fire-connectors/flink-connectors/flink-format/pom.xml @@ -8,7 +8,7 @@ fire-flink-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/flink-connectors/flink-paimon/pom.xml b/fire-connectors/flink-connectors/flink-paimon/pom.xml index 80b9eed413b7cc5af763e606ffd7f96b600cecaa..9ca3c722f704a8f6be378eb3423b3680f1169d03 100644 --- a/fire-connectors/flink-connectors/flink-paimon/pom.xml +++ b/fire-connectors/flink-connectors/flink-paimon/pom.xml @@ -10,7 +10,7 @@ fire-flink-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/flink-connectors/flink-rocketmq/pom.xml b/fire-connectors/flink-connectors/flink-rocketmq/pom.xml index 70a400604c89c568ad3b6de22e7777b45ced7d2f..f54612030d4778fd49973cc973a2aa715a236e1f 100644 --- a/fire-connectors/flink-connectors/flink-rocketmq/pom.xml +++ b/fire-connectors/flink-connectors/flink-rocketmq/pom.xml @@ -25,7 +25,7 @@ com.zto.fire fire-flink-connectors - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/flink-connectors/pom.xml b/fire-connectors/flink-connectors/pom.xml index fc590250f3e3fd9535e995fab107e0c6837afcb6..ae6da1aa0b8a18cd4046f401c3028af27ef53c07 100644 --- a/fire-connectors/flink-connectors/pom.xml +++ b/fire-connectors/flink-connectors/pom.xml @@ -32,7 +32,7 @@ fire-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/pom.xml b/fire-connectors/pom.xml index dd564fe29df8a46fde85936d4bb788bffb7e5ca3..71ed9443861161e21ff3f2c017b40793c47e46a6 100644 --- a/fire-connectors/pom.xml +++ b/fire-connectors/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/spark-connectors/pom.xml b/fire-connectors/spark-connectors/pom.xml index c0a56f1ec0e03823baf5adc7bf192945fc477464..5fd4392dfe101ccddc014440bdc9c2430ee49b8f 100644 --- a/fire-connectors/spark-connectors/pom.xml +++ b/fire-connectors/spark-connectors/pom.xml @@ -31,7 +31,7 @@ fire-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/spark-connectors/spark-hbase/pom.xml b/fire-connectors/spark-connectors/spark-hbase/pom.xml index 13bb4000d1d68e9b0366358c2ad1f310bb8a97e4..536e067fed92832b1f61975d9e60d679d275b892 100644 --- a/fire-connectors/spark-connectors/spark-hbase/pom.xml +++ b/fire-connectors/spark-connectors/spark-hbase/pom.xml @@ -26,7 +26,7 @@ fire-spark-connectors com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT diff --git a/fire-connectors/spark-connectors/spark-hudi/pom.xml b/fire-connectors/spark-connectors/spark-hudi/pom.xml index 87ff0e359f16d034977cf565e27391ce2e92d2b5..d13f5e34e0576bd830dc1b1d08821012a90d0baa 100644 --- a/fire-connectors/spark-connectors/spark-hudi/pom.xml +++ b/fire-connectors/spark-connectors/spark-hudi/pom.xml @@ -27,7 +27,7 @@ com.zto.fire fire-spark-connectors - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-connectors/spark-connectors/spark-rocketmq/pom.xml b/fire-connectors/spark-connectors/spark-rocketmq/pom.xml index 71794a2f4e96c1276ef65cde5fc733d0395f2526..a24fd3137f26c489ae9786e3724c63c42bca8a56 100644 --- a/fire-connectors/spark-connectors/spark-rocketmq/pom.xml +++ b/fire-connectors/spark-connectors/spark-rocketmq/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-spark-connectors - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-core/pom.xml b/fire-core/pom.xml index 2bce08ebbca0e2bd470b4f649be72fb8b57f0452..005b23c271fbbf6a0f392f04a8991aff99f4e8b6 100644 --- a/fire-core/pom.xml +++ b/fire-core/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-engines/fire-flink/pom.xml b/fire-engines/fire-flink/pom.xml index 27272e50d8d2e6946a7e341dacd3de862212b921..8ad2003e2086ce7691cc02ed0b2e26ecb3724b26 100644 --- a/fire-engines/fire-flink/pom.xml +++ b/fire-engines/fire-flink/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-engines - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-engines/fire-spark/pom.xml b/fire-engines/fire-spark/pom.xml index dff0abba3f081376708334b0beafe9ae6393ad91..42e4724c8fe4efad576da8d20fb20d4a5a055a10 100644 --- a/fire-engines/fire-spark/pom.xml +++ b/fire-engines/fire-spark/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-engines - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-engines/pom.xml b/fire-engines/pom.xml index 8891ea48448a7f5496edbb28b8f2f8d2450f3c71..1b47fbbcddf5f240570551922a57951fc0342d06 100644 --- a/fire-engines/pom.xml +++ b/fire-engines/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-enhance/apache-arthas/pom.xml b/fire-enhance/apache-arthas/pom.xml index 0cd2eb03e08013b89fc9404d91d9957a67366b8c..000d1563cc341b213887c9f818fe2309d13098e0 100644 --- a/fire-enhance/apache-arthas/pom.xml +++ b/fire-enhance/apache-arthas/pom.xml @@ -19,14 +19,14 @@ 4.0.0 fire-enhance-arthas_${scala.binary.version} - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT jar Fire : Enhance : Arthas com.zto.fire fire-enhance - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-enhance/apache-flink/pom.xml b/fire-enhance/apache-flink/pom.xml index c0b1b4af8e5ceb5e5b9a2db9e38ac6e208fd54d3..449ea271ef00b5ca6ac74400b4dc530d65b7724d 100644 --- a/fire-enhance/apache-flink/pom.xml +++ b/fire-enhance/apache-flink/pom.xml @@ -19,14 +19,14 @@ 4.0.0 fire-enhance-flink_${flink.reference} - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT jar Fire : Enhance : Flink com.zto.fire fire-enhance - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-enhance/apache-spark/pom.xml b/fire-enhance/apache-spark/pom.xml index ddb4676a747da6743d11e2bd9aa955738ee3ec3a..9d6409a7cd8b7c81844b8e14d5edf12764b38dd8 100644 --- a/fire-enhance/apache-spark/pom.xml +++ b/fire-enhance/apache-spark/pom.xml @@ -19,14 +19,14 @@ 4.0.0 fire-enhance-spark_${spark.reference} - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT jar Fire : Enhance : Spark com.zto.fire fire-enhance - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-enhance/pom.xml b/fire-enhance/pom.xml index b5ab7fa14ec400ad9b04bf4eb3b2c72351bf43e8..bf53754d75ae83e7e532cc4855e0fb5c67066380 100644 --- a/fire-enhance/pom.xml +++ b/fire-enhance/pom.xml @@ -25,7 +25,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-examples/flink-examples/pom.xml b/fire-examples/flink-examples/pom.xml index 513d2621160c11c9d0d9ac2230a341f8c086cbf8..8cc6bfa8b4f2fcfe61adf563b4bdba08220b9097 100644 --- a/fire-examples/flink-examples/pom.xml +++ b/fire-examples/flink-examples/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-examples - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-examples/pom.xml b/fire-examples/pom.xml index 48bb45bf8b055ed4d351bdd0bc8cb68877635758..d4e3a382e9d0541f1dac2f5bf2a5e9fd93ce37fa 100644 --- a/fire-examples/pom.xml +++ b/fire-examples/pom.xml @@ -31,7 +31,7 @@ com.zto.fire fire-parent - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml @@ -47,7 +47,7 @@ com.zto.bigdata cluster-env - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT diff --git a/fire-examples/spark-examples/pom.xml b/fire-examples/spark-examples/pom.xml index bb9705835efb2a9b1cb7615c407ebde6fda3be96..90e7cf8c7ac156ad3faf9a770be94f44dc4e071c 100644 --- a/fire-examples/spark-examples/pom.xml +++ b/fire-examples/spark-examples/pom.xml @@ -26,7 +26,7 @@ com.zto.fire fire-examples - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT ../pom.xml diff --git a/fire-shell/flink-shell/pom.xml b/fire-shell/flink-shell/pom.xml index c41238802b62df8080ddaaf455799a3a23daf69d..ffdf62618c922dedb421ec57d194ef43a96753ff 100644 --- a/fire-shell/flink-shell/pom.xml +++ b/fire-shell/flink-shell/pom.xml @@ -7,7 +7,7 @@ fire-shell com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT diff --git a/fire-shell/pom.xml b/fire-shell/pom.xml index ccd6717818af8a7a2795fb56d9e77dcf72bf5e0d..bcb2250d66380879938771dccafb61c03daae406 100644 --- a/fire-shell/pom.xml +++ b/fire-shell/pom.xml @@ -15,7 +15,7 @@ fire-parent com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT diff --git a/fire-shell/spark-shell/pom.xml b/fire-shell/spark-shell/pom.xml index 9eaef0e8a0927ddf67252f405b8a793f7d285d31..31dd184eb8638489f15baf85acaea2651d10ab7a 100644 --- a/fire-shell/spark-shell/pom.xml +++ b/fire-shell/spark-shell/pom.xml @@ -9,7 +9,7 @@ fire-shell com.zto.fire - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 408bee7a5b138f4350d1b97ebd30e7d5f07b80bd..092d7a4fd66f431fff7519890bb80eae119695ae 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ com.zto.fire fire-parent pom - 2.5.3-SNAPSHOT + 2.5.4-SNAPSHOT Fire : Fire framework is a development framework for real-time computing task development . The framework provides a simple and easy to use API that can significantly reduce the development threshold of Spark and Flink and improve development efficiency. https://github.com/fire-framework/fire @@ -861,7 +861,7 @@ com.zto.bigdata cluster-env - 1.0.4-SNAPSHOT + 1.0.5-SNAPSHOT