This is an automated email from the ASF dual-hosted git repository.
eights pushed a commit to branch 1.3.6-prepare
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.6-prepare by this push:
new c92bdcc micrometer & log conf & ui
c92bdcc is described below
commit c92bdcc1d79eea108ac0657ddbc3e4aa9f8f6408
Author: eights <[email protected]>
AuthorDate: Wed Mar 10 11:36:07 2021 +0800
micrometer & log conf & ui
---
.../src/main/resources/logback-alert.xml | 1 +
.../src/main/resources/application-api.properties | 5 +
.../src/main/resources/logback-api.xml | 1 +
.../common/task/FlinkParametersTest.java | 114 +++++++--------
.../release-docs/licenses/LICENSE-javax.mail.txt | 2 +-
.../release-docs/licenses/LICENSE-jta.txt | 20 +--
.../licenses/LICENSE-transaction-api.txt | 20 +--
.../remote/command/TaskExecuteAckCommand.java | 132 ++++++++++++++++-
.../remote/command/TaskExecuteRequestCommand.java | 68 ++++++++-
.../remote/command/TaskExecuteResponseCommand.java | 128 ++++++++++++++++-
.../remote/command/TaskKillRequestCommand.java | 62 +++++++-
.../remote/command/TaskKillResponseCommand.java | 121 +++++++++++++++-
dolphinscheduler-server/pom.xml | 16 +++
.../server/master/MasterServer.java | 2 +-
.../server/worker/WorkerServer.java | 8 +-
.../src/main/resources/logback-master.xml | 1 +
.../src/main/resources/logback-worker.xml | 1 +
.../src/main/resources/master.properties | 8 ++
.../src/main/resources/worker.properties | 8 ++
.../service/zk/DefaultEnsembleProviderTest.java | 128 ++++++++---------
dolphinscheduler-ui/src/images/favicon.ico | Bin 4286 -> 4286 bytes
.../src/js/conf/home/router/index.js | 4 +-
.../src/js/conf/login/img/login-logo.svg | 159 +++++++++------------
.../src/js/module/components/nav/logo.svg | 158 +++++++++-----------
dolphinscheduler-ui/src/view/login/index.html | 4 +-
pom.xml | 16 ++-
script/dolphinscheduler-daemon.sh | 4 +-
27 files changed, 848 insertions(+), 343 deletions(-)
diff --git a/dolphinscheduler-alert/src/main/resources/logback-alert.xml
b/dolphinscheduler-alert/src/main/resources/logback-alert.xml
index b46c0a0..c3896d8 100644
--- a/dolphinscheduler-alert/src/main/resources/logback-alert.xml
+++ b/dolphinscheduler-alert/src/main/resources/logback-alert.xml
@@ -35,6 +35,7 @@
<fileNamePattern>${log.base}/dolphinscheduler-alert.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
<maxHistory>20</maxHistory>
<maxFileSize>64MB</maxFileSize>
+ <totalSizeCap>4GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>
diff --git a/dolphinscheduler-api/src/main/resources/application-api.properties
b/dolphinscheduler-api/src/main/resources/application-api.properties
index 0d73f13..fd3340a 100644
--- a/dolphinscheduler-api/src/main/resources/application-api.properties
+++ b/dolphinscheduler-api/src/main/resources/application-api.properties
@@ -18,6 +18,11 @@
# server port
server.port=12345
+# application name
+spring.application.name=ds-api
+management.endpoints.web.exposure.include=*
+management.metrics.tags.application=${spring.application.name}
+
# session config
server.servlet.session.timeout=7200
diff --git a/dolphinscheduler-api/src/main/resources/logback-api.xml
b/dolphinscheduler-api/src/main/resources/logback-api.xml
index 44f4702..b509357 100644
--- a/dolphinscheduler-api/src/main/resources/logback-api.xml
+++ b/dolphinscheduler-api/src/main/resources/logback-api.xml
@@ -39,6 +39,7 @@
<fileNamePattern>${log.base}/dolphinscheduler-api-server.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
<maxHistory>168</maxHistory>
<maxFileSize>64MB</maxFileSize>
+ <totalSizeCap>8GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>
diff --git
a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/FlinkParametersTest.java
b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/FlinkParametersTest.java
index cd7b4f2..63a862a 100644
---
a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/FlinkParametersTest.java
+++
b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/FlinkParametersTest.java
@@ -1,57 +1,57 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.common.task;
-
-import org.apache.dolphinscheduler.common.process.ResourceInfo;
-import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
-import org.apache.dolphinscheduler.common.utils.CollectionUtils;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class FlinkParametersTest {
- @Test
- public void getResourceFilesList() {
- FlinkParameters flinkParameters = new FlinkParameters();
-
Assert.assertTrue(CollectionUtils.isEmpty(flinkParameters.getResourceFilesList()));
-
- ResourceInfo mainResource = new ResourceInfo();
- mainResource.setRes("testFlinkMain-1.0.0-SNAPSHOT.jar");
- flinkParameters.setMainJar(mainResource);
-
- List<ResourceInfo> resourceInfos = new LinkedList<>();
- ResourceInfo resourceInfo1 = new ResourceInfo();
- resourceInfo1.setRes("testFlinkParameters1.jar");
- resourceInfos.add(resourceInfo1);
-
- flinkParameters.setResourceList(resourceInfos);
- List<ResourceInfo> resourceFilesList =
flinkParameters.getResourceFilesList();
- Assert.assertNotNull(resourceFilesList);
- Assert.assertEquals(2, resourceFilesList.size());
-
- ResourceInfo resourceInfo2 = new ResourceInfo();
- resourceInfo2.setRes("testFlinkParameters2.jar");
- resourceInfos.add(resourceInfo2);
-
- flinkParameters.setResourceList(resourceInfos);
- resourceFilesList = flinkParameters.getResourceFilesList();
- Assert.assertNotNull(resourceFilesList);
- Assert.assertEquals(3, resourceFilesList.size());
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.common.task;
+
+import org.apache.dolphinscheduler.common.process.ResourceInfo;
+import org.apache.dolphinscheduler.common.task.flink.FlinkParameters;
+import org.apache.dolphinscheduler.common.utils.CollectionUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class FlinkParametersTest {
+ @Test
+ public void getResourceFilesList() {
+ FlinkParameters flinkParameters = new FlinkParameters();
+
Assert.assertTrue(CollectionUtils.isEmpty(flinkParameters.getResourceFilesList()));
+
+ ResourceInfo mainResource = new ResourceInfo();
+ mainResource.setRes("testFlinkMain-1.0.0-SNAPSHOT.jar");
+ flinkParameters.setMainJar(mainResource);
+
+ List<ResourceInfo> resourceInfos = new LinkedList<>();
+ ResourceInfo resourceInfo1 = new ResourceInfo();
+ resourceInfo1.setRes("testFlinkParameters1.jar");
+ resourceInfos.add(resourceInfo1);
+
+ flinkParameters.setResourceList(resourceInfos);
+ List<ResourceInfo> resourceFilesList =
flinkParameters.getResourceFilesList();
+ Assert.assertNotNull(resourceFilesList);
+ Assert.assertEquals(2, resourceFilesList.size());
+
+ ResourceInfo resourceInfo2 = new ResourceInfo();
+ resourceInfo2.setRes("testFlinkParameters2.jar");
+ resourceInfos.add(resourceInfo2);
+
+ flinkParameters.setResourceList(resourceInfos);
+ resourceFilesList = flinkParameters.getResourceFilesList();
+ Assert.assertNotNull(resourceFilesList);
+ Assert.assertEquals(3, resourceFilesList.size());
+ }
+}
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
b/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
index 5ad62c4..a4c7fec 100644
--- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-javax.mail.txt
@@ -307,7 +307,7 @@ COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.1
The Covered Software is a "commercial item," as that term is defined
in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
- software" (as that term is defined at 48 C.F.R. �
+ software" (as that term is defined at 48 C.F.R. �
252.227-7014(a)(1)) and "commercial computer software documentation"
as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-jta.txt
b/dolphinscheduler-dist/release-docs/licenses/LICENSE-jta.txt
index 1154e0a..55ce20a 100644
--- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-jta.txt
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-jta.txt
@@ -32,7 +32,7 @@ C. Any new file that is contributed or otherwise made
available under the terms
1.12. Source Code means (a) the common form of computer software code in which
modifications are made and (b) associated documentation included in or with
such code.
-1.13. You (or Your) means an individual or a legal entity exercising rights
under, and complying with all of the terms of, this License. For legal
entities, You includes any entity which controls, is controlled by, or is under
common control with You. For purposes of this definition, control means (a)�the
power, direct or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b)�ownership of more than fifty percent
(50%) of the outstanding sh [...]
+1.13. You (or Your) means an individual or a legal entity exercising rights
under, and complying with all of the terms of, this License. For legal
entities, You includes any entity which controls, is controlled by, or is under
common control with You. For purposes of this definition, control means (a)�the
power, direct or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b)�ownership of more than fifty percent
(50%) of the outstanding sh [...]
2. License Grants.
@@ -40,15 +40,15 @@ C. Any new file that is contributed or otherwise made
available under the terms
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, the Initial Developer hereby grants You a
world-wide, royalty-free, non-exclusive license:
(a) under intellectual property rights (other than patent or trademark)
Licensable by Initial Developer, to use, reproduce, modify, display, perform,
sublicense and distribute the Original Software (or portions thereof), with or
without Modifications, and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making, using or selling of Original
Software, to make, have made, use, practice, sell, and offer for sale, and/or
otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date
Initial Developer first distributes or otherwise makes the Original Software
available to a third party under the terms of this License.
-(d) Notwithstanding Section�2.1(b) above, no patent license is granted:
(1)�for code that You delete from the Original Software, or (2)�for
infringements caused by: (i)�the modification of the Original Software, or
(ii)�the combination of the Original Software with other software or devices.
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date
Initial Developer first distributes or otherwise makes the Original Software
available to a third party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted:
(1)�for code that You delete from the Original Software, or (2)�for
infringements caused by: (i)�the modification of the Original Software, or
(ii)�the combination of the Original Software with other software or devices.
2.2. Contributor Grant.
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, each Contributor hereby grants You a
world-wide, royalty-free, non-exclusive license:
(a) under intellectual property rights (other than patent or trademark)
Licensable by Contributor to use, reproduce, modify, display, perform,
sublicense and distribute the Modifications created by such Contributor (or
portions thereof), either on an unmodified basis, with other Modifications, as
Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made
by that Contributor (or portions thereof); and (2)�the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
-(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the
date Contributor first distributes or otherwise makes the Modifications
available to a third party.
-(d) Notwithstanding Section�2.2(b) above, no patent license is granted:
(1)�for any code that Contributor has deleted from the Contributor Version;
(2)�for infringements caused by: (i)�third party modifications of Contributor
Version, or (ii)�the combination of Modifications made by that Contributor with
other software (except as part of the Contributor Version) or other devices; or
(3)�under Patent Claims infringed by Covered Software in the absence of
Modifications made by that Contributor.
+(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made
by that Contributor (or portions thereof); and (2)�the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the
date Contributor first distributes or otherwise makes the Modifications
available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted:
(1)�for any code that Contributor has deleted from the Contributor Version;
(2)�for infringements caused by: (i)�third party modifications of Contributor
Version, or (ii)�the combination of Modifications made by that Contributor with
other software (except as part of the Contributor Version) or other devices; or
(3)�under Patent Claims infringed by Covered Software in the absence of
Modifications made by that Contributor.
3. Distribution Obligations.
@@ -82,7 +82,7 @@ Sun Microsystems, Inc. is the initial license steward and may
publish revised an
You may always continue to use, distribute or otherwise make the Covered
Software available under the terms of the version of the License under which
You originally received the Covered Software. If the Initial Developer includes
a notice in the Original Software prohibiting it from being distributed or
otherwise made available under any subsequent version of the License, You must
distribute and make the Covered Software available under the terms of the
version of the License under which [...]
4.3. Modified Versions.
-When You are an Initial Developer and You want to create a new license for
Your Original Software, You may create and use a modified version of this
License if You: (a)�rename the license and remove any references to the name of
the license steward (except to note that the license differs from this
License); and (b)�otherwise make it clear that the license contains terms which
differ from this License.
+When You are an Initial Developer and You want to create a new license for
Your Original Software, You may create and use a modified version of this
License if You: (a)�rename the license and remove any references to the name of
the license steward (except to note that the license differs from this
License); and (b)�otherwise make it clear that the license contains terms which
differ from this License.
5. DISCLAIMER OF WARRANTY.
@@ -92,9 +92,9 @@ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS
BASIS, WITHOUT WARRA
6.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure such
breach within 30 days of becoming aware of the breach. Provisions which, by
their nature, must remain in effect beyond the termination of this License
shall survive.
-6.2. If You assert a patent infringement claim (excluding declaratory judgment
actions) against Initial Developer or a Contributor (the Initial Developer or
Contributor against whom You assert such claim is referred to as Participant)
alleging that the Participant Software (meaning the Contributor Version where
the Participant is a Contributor or the Original Software where the Participant
is the Initial Developer) directly or indirectly infringes any patent, then any
and all rights gran [...]
+6.2. If You assert a patent infringement claim (excluding declaratory judgment
actions) against Initial Developer or a Contributor (the Initial Developer or
Contributor against whom You assert such claim is referred to as Participant)
alleging that the Participant Software (meaning the Contributor Version where
the Participant is a Contributor or the Original Software where the Participant
is the Initial Developer) directly or indirectly infringes any patent, then any
and all rights gran [...]
-6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user
licenses that have been validly granted by You or any distributor hereunder
prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user
licenses that have been validly granted by You or any distributor hereunder
prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
7. LIMITATION OF LIABILITY.
@@ -102,7 +102,7 @@ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER
TORT (INCLUDING NEGLIG
8. U.S. GOVERNMENT END USERS.
-The Covered Software is a commercial item, as that term is defined in
48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as
that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer
software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995).
Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
(June 1995), all U.S. Government End Users acquire Covered Software with only
those rights set forth herein. T [...]
+The Covered Software is a commercial item, as that term is defined in
48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as
that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer
software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995).
Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
(June 1995), all U.S. Government End Users acquire Covered Software with only
those rights set forth herein. T [...]
9. MISCELLANEOUS.
diff --git
a/dolphinscheduler-dist/release-docs/licenses/LICENSE-transaction-api.txt
b/dolphinscheduler-dist/release-docs/licenses/LICENSE-transaction-api.txt
index 1154e0a..55ce20a 100644
--- a/dolphinscheduler-dist/release-docs/licenses/LICENSE-transaction-api.txt
+++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-transaction-api.txt
@@ -32,7 +32,7 @@ C. Any new file that is contributed or otherwise made
available under the terms
1.12. Source Code means (a) the common form of computer software code in which
modifications are made and (b) associated documentation included in or with
such code.
-1.13. You (or Your) means an individual or a legal entity exercising rights
under, and complying with all of the terms of, this License. For legal
entities, You includes any entity which controls, is controlled by, or is under
common control with You. For purposes of this definition, control means (a)�the
power, direct or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b)�ownership of more than fifty percent
(50%) of the outstanding sh [...]
+1.13. You (or Your) means an individual or a legal entity exercising rights
under, and complying with all of the terms of, this License. For legal
entities, You includes any entity which controls, is controlled by, or is under
common control with You. For purposes of this definition, control means (a)�the
power, direct or indirect, to cause the direction or management of such entity,
whether by contract or otherwise, or (b)�ownership of more than fifty percent
(50%) of the outstanding sh [...]
2. License Grants.
@@ -40,15 +40,15 @@ C. Any new file that is contributed or otherwise made
available under the terms
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, the Initial Developer hereby grants You a
world-wide, royalty-free, non-exclusive license:
(a) under intellectual property rights (other than patent or trademark)
Licensable by Initial Developer, to use, reproduce, modify, display, perform,
sublicense and distribute the Original Software (or portions thereof), with or
without Modifications, and/or as part of a Larger Work; and
(b) under Patent Claims infringed by the making, using or selling of Original
Software, to make, have made, use, practice, sell, and offer for sale, and/or
otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date
Initial Developer first distributes or otherwise makes the Original Software
available to a third party under the terms of this License.
-(d) Notwithstanding Section�2.1(b) above, no patent license is granted:
(1)�for code that You delete from the Original Software, or (2)�for
infringements caused by: (i)�the modification of the Original Software, or
(ii)�the combination of the Original Software with other software or devices.
+(c) The licenses granted in Sections�2.1(a) and (b) are effective on the date
Initial Developer first distributes or otherwise makes the Original Software
available to a third party under the terms of this License.
+(d) Notwithstanding Section�2.1(b) above, no patent license is granted:
(1)�for code that You delete from the Original Software, or (2)�for
infringements caused by: (i)�the modification of the Original Software, or
(ii)�the combination of the Original Software with other software or devices.
2.2. Contributor Grant.
Conditioned upon Your compliance with Section 3.1 below and subject to third
party intellectual property claims, each Contributor hereby grants You a
world-wide, royalty-free, non-exclusive license:
(a) under intellectual property rights (other than patent or trademark)
Licensable by Contributor to use, reproduce, modify, display, perform,
sublicense and distribute the Modifications created by such Contributor (or
portions thereof), either on an unmodified basis, with other Modifications, as
Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made
by that Contributor (or portions thereof); and (2)�the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
-(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the
date Contributor first distributes or otherwise makes the Modifications
available to a third party.
-(d) Notwithstanding Section�2.2(b) above, no patent license is granted:
(1)�for any code that Contributor has deleted from the Contributor Version;
(2)�for infringements caused by: (i)�third party modifications of Contributor
Version, or (ii)�the combination of Modifications made by that Contributor with
other software (except as part of the Contributor Version) or other devices; or
(3)�under Patent Claims infringed by Covered Software in the absence of
Modifications made by that Contributor.
+(b) under Patent Claims infringed by the making, using, or selling of
Modifications made by that Contributor either alone and/or in combination with
its Contributor Version (or portions of such combination), to make, use, sell,
offer for sale, have made, and/or otherwise dispose of: (1)�Modifications made
by that Contributor (or portions thereof); and (2)�the combination of
Modifications made by that Contributor with its Contributor Version (or
portions of such combination).
+(c) The licenses granted in Sections�2.2(a) and 2.2(b) are effective on the
date Contributor first distributes or otherwise makes the Modifications
available to a third party.
+(d) Notwithstanding Section�2.2(b) above, no patent license is granted:
(1)�for any code that Contributor has deleted from the Contributor Version;
(2)�for infringements caused by: (i)�third party modifications of Contributor
Version, or (ii)�the combination of Modifications made by that Contributor with
other software (except as part of the Contributor Version) or other devices; or
(3)�under Patent Claims infringed by Covered Software in the absence of
Modifications made by that Contributor.
3. Distribution Obligations.
@@ -82,7 +82,7 @@ Sun Microsystems, Inc. is the initial license steward and may
publish revised an
You may always continue to use, distribute or otherwise make the Covered
Software available under the terms of the version of the License under which
You originally received the Covered Software. If the Initial Developer includes
a notice in the Original Software prohibiting it from being distributed or
otherwise made available under any subsequent version of the License, You must
distribute and make the Covered Software available under the terms of the
version of the License under which [...]
4.3. Modified Versions.
-When You are an Initial Developer and You want to create a new license for
Your Original Software, You may create and use a modified version of this
License if You: (a)�rename the license and remove any references to the name of
the license steward (except to note that the license differs from this
License); and (b)�otherwise make it clear that the license contains terms which
differ from this License.
+When You are an Initial Developer and You want to create a new license for
Your Original Software, You may create and use a modified version of this
License if You: (a)�rename the license and remove any references to the name of
the license steward (except to note that the license differs from this
License); and (b)�otherwise make it clear that the license contains terms which
differ from this License.
5. DISCLAIMER OF WARRANTY.
@@ -92,9 +92,9 @@ COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS
BASIS, WITHOUT WARRA
6.1. This License and the rights granted hereunder will terminate
automatically if You fail to comply with terms herein and fail to cure such
breach within 30 days of becoming aware of the breach. Provisions which, by
their nature, must remain in effect beyond the termination of this License
shall survive.
-6.2. If You assert a patent infringement claim (excluding declaratory judgment
actions) against Initial Developer or a Contributor (the Initial Developer or
Contributor against whom You assert such claim is referred to as Participant)
alleging that the Participant Software (meaning the Contributor Version where
the Participant is a Contributor or the Original Software where the Participant
is the Initial Developer) directly or indirectly infringes any patent, then any
and all rights gran [...]
+6.2. If You assert a patent infringement claim (excluding declaratory judgment
actions) against Initial Developer or a Contributor (the Initial Developer or
Contributor against whom You assert such claim is referred to as Participant)
alleging that the Participant Software (meaning the Contributor Version where
the Participant is a Contributor or the Original Software where the Participant
is the Initial Developer) directly or indirectly infringes any patent, then any
and all rights gran [...]
-6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user
licenses that have been validly granted by You or any distributor hereunder
prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
+6.3. In the event of termination under Sections�6.1 or 6.2 above, all end user
licenses that have been validly granted by You or any distributor hereunder
prior to termination (excluding licenses granted to You by any distributor)
shall survive termination.
7. LIMITATION OF LIABILITY.
@@ -102,7 +102,7 @@ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER
TORT (INCLUDING NEGLIG
8. U.S. GOVERNMENT END USERS.
-The Covered Software is a commercial item, as that term is defined in
48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as
that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer
software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995).
Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
(June 1995), all U.S. Government End Users acquire Covered Software with only
those rights set forth herein. T [...]
+The Covered Software is a commercial item, as that term is defined in
48�C.F.R.�2.101 (Oct. 1995), consisting of commercial computer software (as
that term is defined at 48 C.F.R. �252.227-7014(a)(1)) and commercial computer
software documentation as such terms are used in 48�C.F.R.�12.212 (Sept. 1995).
Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
(June 1995), all U.S. Government End Users acquire Covered Software with only
those rights set forth herein. T [...]
9. MISCELLANEOUS.
diff --git
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java
index 0b3d901..c915800 100644
---
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java
+++
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteAckCommand.java
@@ -1 +1,131 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.remote.command;
import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
import java.io.Serializable;
import java.util.Date;
/**
* execute task
request command
*/
public class TaskExecuteAckCommand implements Serializable {
/**
* taskInstanceId
*/
private int taskInstanceId;
/**
* startTime
*/
private Date startTime;
/**
* host
*/
private String host;
/**
* status
*/
private int status;
/**
* logPath
*/
private String logPath;
/**
* executePath
*/
private String executePath;
public Date getStartTime() {
return startTime;
}
public void setStartTime(Date startTime) {
this.startTime = startTime;
}
public String getHost() {
return host;
}
public void setHost(String host) {
this.host = host;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getTaskInstanceId() {
return taskInstanceId;
}
public void setTaskInstanceId(int taskInstan
ceId) {
this.taskInstanceId = taskInstanceId;
}
public String getLogPath() {
return logPath;
}
public void setLogPath(String logPath) {
this.logPath = logPath;
}
public String getExecutePath() {
return executePath;
}
public void setExecutePath(String executePath) {
this.executePath = executePath;
}
/**
* package request command
*
* @return command
*/
public Command convert2Command(){
Command command = new Command();
command.setType(CommandType.TASK_EXECUTE_ACK);
byte[] body = FastJsonSerializer.serialize(this);
command.setBody(body);
return command;
}
@Override
public String toString() {
return "TaskExecuteAckCommand{" +
"taskInstanceId=" + taskInstanceId +
", startTime=" + startTime +
", host='" + host + '\'' +
", status=" + status +
"
, logPath='" + logPath + '\'' +
", executePath='" + executePath + '\'' +
'}';
}
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.remote.command;
+
+import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * execute task request command
+ */
+public class TaskExecuteAckCommand implements Serializable {
+
+ /**
+ * taskInstanceId
+ */
+ private int taskInstanceId;
+
+ /**
+ * startTime
+ */
+ private Date startTime;
+
+ /**
+ * host
+ */
+ private String host;
+
+ /**
+ * status
+ */
+ private int status;
+
+ /**
+ * logPath
+ */
+ private String logPath;
+
+ /**
+ * executePath
+ */
+ private String executePath;
+
+ public Date getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(Date startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public int getTaskInstanceId() {
+ return taskInstanceId;
+ }
+
+ public void setTaskInstanceId(int taskInstanceId) {
+ this.taskInstanceId = taskInstanceId;
+ }
+
+ public String getLogPath() {
+ return logPath;
+ }
+
+ public void setLogPath(String logPath) {
+ this.logPath = logPath;
+ }
+
+ public String getExecutePath() {
+ return executePath;
+ }
+
+ public void setExecutePath(String executePath) {
+ this.executePath = executePath;
+ }
+
+ /**
+ * package request command
+ *
+ * @return command
+ */
+ public Command convert2Command(){
+ Command command = new Command();
+ command.setType(CommandType.TASK_EXECUTE_ACK);
+ byte[] body = FastJsonSerializer.serialize(this);
+ command.setBody(body);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "TaskExecuteAckCommand{" +
+ "taskInstanceId=" + taskInstanceId +
+ ", startTime=" + startTime +
+ ", host='" + host + '\'' +
+ ", status=" + status +
+ ", logPath='" + logPath + '\'' +
+ ", executePath='" + executePath + '\'' +
+ '}';
+ }
+}
diff --git
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java
index 637724f..774eef8 100644
---
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java
+++
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteRequestCommand.java
@@ -1 +1,67 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.remote.command;
import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
import java.io.Serializable;
/**
* execute task request command
*/
pub
lic class TaskExecuteRequestCommand implements Serializable {
/**
* task execution context
*/
private String taskExecutionContext;
public String getTaskExecutionContext() {
return taskExecutionContext;
}
public void setTaskExecutionContext(String taskExecutionContext) {
this.taskExecutionContext = taskExecutionContext;
}
public TaskExecuteRequestCommand() {
}
public TaskExecuteRequestCommand(String taskExecutionContext) {
this.taskExecutionContext = taskExecutionContext;
}
/**
* package request command
*
* @return command
*/
public Command convert2Command(){
Command command = new Command();
command.setType(CommandType.TASK_EXECUTE_REQUEST);
byte[] body = FastJsonSerializer.serialize(this);
command.setBody(body);
return command;
}
@Override
public String toString() {
return "TaskExecuteRequestCommand{" +
"taskExecutionContext='" + taskExecutionContext + '\'' +
'}';
}
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.remote.command;
+
+import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
+
+import java.io.Serializable;
+
+/**
+ * execute task request command
+ */
+public class TaskExecuteRequestCommand implements Serializable {
+
+ /**
+ * task execution context
+ */
+ private String taskExecutionContext;
+
+ public String getTaskExecutionContext() {
+ return taskExecutionContext;
+ }
+
+ public void setTaskExecutionContext(String taskExecutionContext) {
+ this.taskExecutionContext = taskExecutionContext;
+ }
+
+ public TaskExecuteRequestCommand() {
+ }
+
+ public TaskExecuteRequestCommand(String taskExecutionContext) {
+ this.taskExecutionContext = taskExecutionContext;
+ }
+
+ /**
+ * package request command
+ *
+ * @return command
+ */
+ public Command convert2Command(){
+ Command command = new Command();
+ command.setType(CommandType.TASK_EXECUTE_REQUEST);
+ byte[] body = FastJsonSerializer.serialize(this);
+ command.setBody(body);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "TaskExecuteRequestCommand{" +
+ "taskExecutionContext='" + taskExecutionContext + '\'' +
+ '}';
+ }
+}
diff --git
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java
index deb6f5d..7311c37 100644
---
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java
+++
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskExecuteResponseCommand.java
@@ -1 +1,127 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.remote.command;
import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
import java.io.Serializable;
import java.util.Date;
/**
* execute task
response command
*/
public class TaskExecuteResponseCommand implements Serializable {
public TaskExecuteResponseCommand() {
}
public TaskExecuteResponseCommand(int taskInstanceId) {
this.taskInstanceId = taskInstanceId;
}
/**
* task instance id
*/
private int taskInstanceId;
/**
* status
*/
private int status;
/**
* end time
*/
private Date endTime;
/**
* processId
*/
private int processId;
/**
* appIds
*/
private String appIds;
public int getTaskInstanceId() {
return taskInstanceId;
}
public void setTaskInstanceId(int taskInstanceId) {
this.taskInstanceId = taskInstanceId;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
t
his.endTime = endTime;
}
public int getProcessId() {
return processId;
}
public void setProcessId(int processId) {
this.processId = processId;
}
public String getAppIds() {
return appIds;
}
public void setAppIds(String appIds) {
this.appIds = appIds;
}
/**
* package response command
* @return command
*/
public Command convert2Command(){
Command command = new Command();
command.setType(CommandType.TASK_EXECUTE_RESPONSE);
byte[] body = FastJsonSerializer.serialize(this);
command.setBody(body);
return command;
}
@Override
public String toString() {
return "TaskExecuteResponseCommand{" +
"taskInstanceId=" + taskInstanceId +
", status=" + status +
", endTime=" + endTime +
", processId=" + processId +
", appIds='" + appIds + '\'' +
'}';
}
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.remote.command;
+
+import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * execute task response command
+ */
+public class TaskExecuteResponseCommand implements Serializable {
+
+
+ public TaskExecuteResponseCommand() {
+ }
+
+ public TaskExecuteResponseCommand(int taskInstanceId) {
+ this.taskInstanceId = taskInstanceId;
+ }
+
+ /**
+ * task instance id
+ */
+ private int taskInstanceId;
+
+ /**
+ * status
+ */
+ private int status;
+
+
+ /**
+ * end time
+ */
+ private Date endTime;
+
+
+ /**
+ * processId
+ */
+ private int processId;
+
+ /**
+ * appIds
+ */
+ private String appIds;
+
+
+ public int getTaskInstanceId() {
+ return taskInstanceId;
+ }
+
+ public void setTaskInstanceId(int taskInstanceId) {
+ this.taskInstanceId = taskInstanceId;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
+ public int getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(int processId) {
+ this.processId = processId;
+ }
+
+ public String getAppIds() {
+ return appIds;
+ }
+
+ public void setAppIds(String appIds) {
+ this.appIds = appIds;
+ }
+
+ /**
+ * package response command
+ * @return command
+ */
+ public Command convert2Command(){
+ Command command = new Command();
+ command.setType(CommandType.TASK_EXECUTE_RESPONSE);
+ byte[] body = FastJsonSerializer.serialize(this);
+ command.setBody(body);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "TaskExecuteResponseCommand{" +
+ "taskInstanceId=" + taskInstanceId +
+ ", status=" + status +
+ ", endTime=" + endTime +
+ ", processId=" + processId +
+ ", appIds='" + appIds + '\'' +
+ '}';
+ }
+}
diff --git
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
index b8e02dd..af1b785 100644
---
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
+++
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
@@ -1 +1,61 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.remote.command;
import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
import java.io.Serializable;
/**
* kill task request command
*/
public
class TaskKillRequestCommand implements Serializable {
/**
* task id
*/
private int taskInstanceId;
public int getTaskInstanceId() {
return taskInstanceId;
}
public void setTaskInstanceId(int taskInstanceId) {
this.taskInstanceId = taskInstanceId;
}
/**
* package request command
*
* @return command
*/
public Command convert2Command(){
Command command = new Command();
command.setType(CommandType.TASK_KILL_REQUEST);
byte[] body = FastJsonSerializer.serialize(this);
command.setBody(body);
return command;
}
@Override
public String toString() {
return "TaskKillRequestCommand{" +
"taskInstanceId=" + taskInstanceId +
'}';
}
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.remote.command;
+
+import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
+
+import java.io.Serializable;
+
+/**
+ * kill task request command
+ */
+public class TaskKillRequestCommand implements Serializable {
+
+ /**
+ * task id
+ */
+ private int taskInstanceId;
+
+
+ public int getTaskInstanceId() {
+ return taskInstanceId;
+ }
+
+ public void setTaskInstanceId(int taskInstanceId) {
+ this.taskInstanceId = taskInstanceId;
+ }
+
+ /**
+ * package request command
+ *
+ * @return command
+ */
+ public Command convert2Command(){
+ Command command = new Command();
+ command.setType(CommandType.TASK_KILL_REQUEST);
+ byte[] body = FastJsonSerializer.serialize(this);
+ command.setBody(body);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "TaskKillRequestCommand{" +
+ "taskInstanceId=" + taskInstanceId +
+ '}';
+ }
+}
diff --git
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
index 2ca2330..d677fe1 100644
---
a/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
+++
b/dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
@@ -1 +1,120 @@
-/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.remote.command;
import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
/**
* kill task response command
*/
public class TaskKillResponseCommand implements Serializable {
/**
* taskInstanceId
*/
private int taskInstanceId;
/**
* host
*/
private String host;
/**
* status
*/
private int status;
/**
* processId
*/
private int processId;
/**
* other resource manager appId , for example : YARN etc
*/
protected List<String> appIds;
public int getTaskInstanceId() {
return taskInstanceId;
}
public void setTaskInstanceId(int taskInstanceId) {
this.taskInstanceId = taskInstanceId;
}
public String getHost() {
return host;
}
public void setHost(String host) {
this.host = host;
}
public int getStatus() {
return status;
}
public void setStatus(int status) {
this.status = status;
}
public int getProcessId() {
return processId;
}
public void setPr
ocessId(int processId) {
this.processId = processId;
}
public List<String> getAppIds() {
return appIds;
}
public void setAppIds(List<String> appIds) {
this.appIds = appIds;
}
/**
* package request command
*
* @return command
*/
public Command convert2Command(){
Command command = new Command();
command.setType(CommandType.TASK_KILL_RESPONSE);
byte[] body = FastJsonSerializer.serialize(this);
command.setBody(body);
return command;
}
@Override
public String toString() {
return "TaskKillResponseCommand{" +
"taskInstanceId=" + taskInstanceId +
", host='" + host + '\'' +
", status=" + status +
", processId=" + processId +
", appIds=" + appIds +
'}';
}
}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.remote.command;
+
+import org.apache.dolphinscheduler.remote.utils.FastJsonSerializer;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * kill task response command
+ */
+public class TaskKillResponseCommand implements Serializable {
+
+ /**
+ * taskInstanceId
+ */
+ private int taskInstanceId;
+
+ /**
+ * host
+ */
+ private String host;
+
+ /**
+ * status
+ */
+ private int status;
+
+
+ /**
+ * processId
+ */
+ private int processId;
+
+ /**
+ * other resource manager appId , for example : YARN etc
+ */
+ protected List<String> appIds;
+
+
+ public int getTaskInstanceId() {
+ return taskInstanceId;
+ }
+
+ public void setTaskInstanceId(int taskInstanceId) {
+ this.taskInstanceId = taskInstanceId;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public int getStatus() {
+ return status;
+ }
+
+ public void setStatus(int status) {
+ this.status = status;
+ }
+
+ public int getProcessId() {
+ return processId;
+ }
+
+ public void setProcessId(int processId) {
+ this.processId = processId;
+ }
+
+ public List<String> getAppIds() {
+ return appIds;
+ }
+
+ public void setAppIds(List<String> appIds) {
+ this.appIds = appIds;
+ }
+
+ /**
+ * package request command
+ *
+ * @return command
+ */
+ public Command convert2Command(){
+ Command command = new Command();
+ command.setType(CommandType.TASK_KILL_RESPONSE);
+ byte[] body = FastJsonSerializer.serialize(this);
+ command.setBody(body);
+ return command;
+ }
+
+ @Override
+ public String toString() {
+ return "TaskKillResponseCommand{" +
+ "taskInstanceId=" + taskInstanceId +
+ ", host='" + host + '\'' +
+ ", status=" + status +
+ ", processId=" + processId +
+ ", appIds=" + appIds +
+ '}';
+ }
+}
diff --git a/dolphinscheduler-server/pom.xml b/dolphinscheduler-server/pom.xml
index 1ed83f0..ca87ffb 100644
--- a/dolphinscheduler-server/pom.xml
+++ b/dolphinscheduler-server/pom.xml
@@ -65,6 +65,22 @@
</exclusions>
</dependency>
+ <!--springboot-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+
<groupId>org.springframework.boot</groupId>
+
<artifactId>spring-boot-starter-tomcat</artifactId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-to-slf4j</artifactId>
+
<groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
<artifactId>dolphinscheduler-service</artifactId>
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
index 18882a2..975558d 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/MasterServer.java
@@ -93,7 +93,7 @@ public class MasterServer {
*/
public static void main(String[] args) {
Thread.currentThread().setName(Constants.THREAD_NAME_MASTER_SERVER);
- new
SpringApplicationBuilder(MasterServer.class).web(WebApplicationType.NONE).run(args);
+ new SpringApplicationBuilder(MasterServer.class).run(args);
}
/**
diff --git
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
index 6895de3..449ee4f 100644
---
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
+++
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
@@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.remote.NettyRemotingServer;
import org.apache.dolphinscheduler.remote.command.CommandType;
import org.apache.dolphinscheduler.remote.config.NettyServerConfig;
+import org.apache.dolphinscheduler.server.master.MasterServer;
import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;
import org.apache.dolphinscheduler.server.worker.processor.DBTaskAckProcessor;
import
org.apache.dolphinscheduler.server.worker.processor.DBTaskResponseProcessor;
@@ -35,13 +36,16 @@ import
org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
import javax.annotation.PostConstruct;
/**
* worker server
*/
-@ComponentScan("org.apache.dolphinscheduler")
+@ComponentScan(value = "org.apache.dolphinscheduler", excludeFilters = {
+ @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes =
{MasterServer.class})
+})
public class WorkerServer {
/**
@@ -84,7 +88,7 @@ public class WorkerServer {
*/
public static void main(String[] args) {
Thread.currentThread().setName(Constants.THREAD_NAME_WORKER_SERVER);
- new
SpringApplicationBuilder(WorkerServer.class).web(WebApplicationType.NONE).run(args);
+ new SpringApplicationBuilder(WorkerServer.class).run(args);
}
diff --git a/dolphinscheduler-server/src/main/resources/logback-master.xml
b/dolphinscheduler-server/src/main/resources/logback-master.xml
index 6606ddc..79a58d9 100644
--- a/dolphinscheduler-server/src/main/resources/logback-master.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-master.xml
@@ -63,6 +63,7 @@
<fileNamePattern>${log.base}/dolphinscheduler-master.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
<maxHistory>168</maxHistory>
<maxFileSize>200MB</maxFileSize>
+ <totalSizeCap>4GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>
diff --git a/dolphinscheduler-server/src/main/resources/logback-worker.xml
b/dolphinscheduler-server/src/main/resources/logback-worker.xml
index 35b8242..dbb21a9 100644
--- a/dolphinscheduler-server/src/main/resources/logback-worker.xml
+++ b/dolphinscheduler-server/src/main/resources/logback-worker.xml
@@ -63,6 +63,7 @@
<fileNamePattern>${log.base}/dolphinscheduler-worker.%d{yyyy-MM-dd_HH}.%i.log</fileNamePattern>
<maxHistory>168</maxHistory>
<maxFileSize>200MB</maxFileSize>
+ <totalSizeCap>4GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>
diff --git a/dolphinscheduler-server/src/main/resources/master.properties
b/dolphinscheduler-server/src/main/resources/master.properties
index db963e0..65ff925 100644
--- a/dolphinscheduler-server/src/main/resources/master.properties
+++ b/dolphinscheduler-server/src/main/resources/master.properties
@@ -15,6 +15,14 @@
# limitations under the License.
#
+# master server metrics port
+server.port=12340
+
+# application name
+spring.application.name=ds-master
+management.endpoints.web.exposure.include=*
+management.metrics.tags.application=${spring.application.name}
+
# master execute thread num
#master.exec.threads=100
diff --git a/dolphinscheduler-server/src/main/resources/worker.properties
b/dolphinscheduler-server/src/main/resources/worker.properties
index ba9d72f..447ffc6 100644
--- a/dolphinscheduler-server/src/main/resources/worker.properties
+++ b/dolphinscheduler-server/src/main/resources/worker.properties
@@ -15,6 +15,14 @@
# limitations under the License.
#
+# master server metrics port
+server.port=12341
+
+# application name
+spring.application.name=ds-worker
+management.endpoints.web.exposure.include=*
+management.metrics.tags.application=${spring.application.name}
+
# worker execute thread num
#worker.exec.threads=100
diff --git
a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/DefaultEnsembleProviderTest.java
b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/DefaultEnsembleProviderTest.java
index cdec9d0..30f4d1b 100644
---
a/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/DefaultEnsembleProviderTest.java
+++
b/dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/zk/DefaultEnsembleProviderTest.java
@@ -1,65 +1,65 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.dolphinscheduler.service.zk;
-
-import org.apache.curator.ensemble.EnsembleProvider;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import java.io.IOException;
-
-import static org.junit.Assert.*;
-
-public class DefaultEnsembleProviderTest {
- private static final String DEFAULT_SERVER_LIST = "localhost:2181";
-
- @Test
- public void startAndClose() {
- EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
- try {
- ensembleProvider.start();
- } catch (Exception e) {
- Assert.fail("EnsembleProvider start error: " + e.getMessage());
- }
- try {
- ensembleProvider.close();
- } catch (IOException e) {
- Assert.fail("EnsembleProvider close error: " + e.getMessage());
- }
- }
-
- @Test
- public void getConnectionString() {
- EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
- Assert.assertEquals(DEFAULT_SERVER_LIST,
ensembleProvider.getConnectionString());
- }
-
- @Test
- public void setConnectionString() {
- EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
- ensembleProvider.setConnectionString("otherHost:2181");
- Assert.assertEquals(DEFAULT_SERVER_LIST,
ensembleProvider.getConnectionString());
- }
-
- @Test
- public void updateServerListEnabled() {
- EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
- Assert.assertFalse(ensembleProvider.updateServerListEnabled());
- }
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.service.zk;
+
+import org.apache.curator.ensemble.EnsembleProvider;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.junit.Assert.*;
+
+public class DefaultEnsembleProviderTest {
+ private static final String DEFAULT_SERVER_LIST = "localhost:2181";
+
+ @Test
+ public void startAndClose() {
+ EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
+ try {
+ ensembleProvider.start();
+ } catch (Exception e) {
+ Assert.fail("EnsembleProvider start error: " + e.getMessage());
+ }
+ try {
+ ensembleProvider.close();
+ } catch (IOException e) {
+ Assert.fail("EnsembleProvider close error: " + e.getMessage());
+ }
+ }
+
+ @Test
+ public void getConnectionString() {
+ EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
+ Assert.assertEquals(DEFAULT_SERVER_LIST,
ensembleProvider.getConnectionString());
+ }
+
+ @Test
+ public void setConnectionString() {
+ EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
+ ensembleProvider.setConnectionString("otherHost:2181");
+ Assert.assertEquals(DEFAULT_SERVER_LIST,
ensembleProvider.getConnectionString());
+ }
+
+ @Test
+ public void updateServerListEnabled() {
+ EnsembleProvider ensembleProvider = new
DefaultEnsembleProvider(DEFAULT_SERVER_LIST);
+ Assert.assertFalse(ensembleProvider.updateServerListEnabled());
+ }
}
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/images/favicon.ico
b/dolphinscheduler-ui/src/images/favicon.ico
old mode 100644
new mode 100755
index acf4cf7..6d8e93b
Binary files a/dolphinscheduler-ui/src/images/favicon.ico and
b/dolphinscheduler-ui/src/images/favicon.ico differ
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js
b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index b4236f3..25516ce 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -35,7 +35,7 @@ const router = new Router({
name: 'home',
component: resolve => require(['../pages/home/index'], resolve),
meta: {
- title: `${i18n.$t('Home')} - DolphinScheduler`
+ title: `${i18n.$t('Home')}`
}
},
{
@@ -513,7 +513,7 @@ router.beforeEach((to, from, next) => {
const $body = $('body')
$body.find('.tooltip.fade.top.in').remove()
if (to.meta.title) {
- document.title = `${to.meta.title} - DolphinScheduler`
+ document.title = `${to.meta.title}`
}
next()
})
diff --git a/dolphinscheduler-ui/src/js/conf/login/img/login-logo.svg
b/dolphinscheduler-ui/src/js/conf/login/img/login-logo.svg
index 6e50bd0..4a0890d 100755
--- a/dolphinscheduler-ui/src/js/conf/login/img/login-logo.svg
+++ b/dolphinscheduler-ui/src/js/conf/login/img/login-logo.svg
@@ -1,99 +1,72 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. -->
-<!-- <?xml version="1.0" encoding="utf-8"?> -->
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 180 46" style="enable-background:new 0 0 180 46;"
xml:space="preserve">
-<style type="text/css">
- .st0{fill:#85CDF0;}
- .st1{fill:#0097E0;}
- .st2{fill:#282828;}
-</style>
+ viewBox="0 0 960 560" enable-background="new 0 0 960 560"
xml:space="preserve">
<g>
- <path class="st0"
d="M29.9,25.6H14.5c-2.1,0-3.8,1.8-3.8,3.9c0,0.8,0.2,1.6,0.7,2.2c0.3-0.1,0.6-0.2,0.9-0.3l0,0l0,0
-
c1-0.4,2.1-1.2,2.8-1.8c0.2-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0.4-0.3c0.6-0.5,1.4-1.1,2.6-1.3c0.2,0,0.4,0,0.7,0
-
c1,0,1.9,0.3,2.5,0.9c0.2-0.1,0.4-0.2,0.5-0.3c0.3-0.1,0.5-0.3,0.7-0.4c0.2-0.1,0.5-0.2,0.8-0.2c0.6,0,1.2,0.3,1.5,0.9
-
c0.2,0.4,0.4,1.1-0.2,2.2c-0.1,0.2-0.3,0.4-0.4,0.7c-0.3,0.6-0.7,1.2-1.3,2h6.6c2.1,0,3.8-1.8,3.8-3.9C33.7,27.4,32,25.6,29.9,25.6
- z"/>
- <path class="st1"
d="M5.7,20.3h1c0.6,0,1-0.4,1-1c0-0.6-0.4-1-1-1h-1c-2.1,0-3.7-1.7-3.7-3.9c0-2.1,1.6-3.8,3.6-3.9v2.1l2.8-2.9
- l-2.8-3v1.7C2.6,8.6,0,11.2,0,14.4C0,17.7,2.5,20.3,5.7,20.3z"/>
- <path class="st1"
d="M38.4,18.6h-1c-0.6,0-1,0.4-1,1c0,0.6,0.4,1,1,1h1c2.1,0,3.7,1.7,3.7,3.9c0,2.1-1.6,3.8-3.6,3.9v-2.1L35.7,29
-
l2.8,3v-1.7c3-0.1,5.5-2.6,5.5-5.9C44.1,21.1,41.6,18.6,38.4,18.6z"/>
- <path class="st0"
d="M29.9,15.3H14.5c-2.1,0-3.8,1.8-3.8,3.9s1.7,3.9,3.8,3.9h15.4c2.1,0,3.8-1.8,3.8-3.9S32,15.3,29.9,15.3z"/>
- <path class="st0"
d="M29.9,5.1H14.5c-2.1,0-3.8,1.8-3.8,3.9v0c0,2.2,1.7,3.9,3.8,3.9h15.4c2.1,0,3.8-1.8,3.8-3.9v0
- C33.7,6.8,32,5.1,29.9,5.1z"/>
- <path class="st1"
d="M19.5,39c0.2,1.3-0.4,1-0.9,0.6c-0.3-0.2-1.2-0.7-1.7-1c0.8-0.4,1.5-0.9,2-1.3C19.2,37.8,19.4,38.4,19.5,39z
-
M18.4,31c-0.1,0-0.2,0.1-0.2,0.2s0.1,0.2,0.2,0.2s0.2-0.1,0.2-0.2S18.5,31,18.4,31z
M24.2,30.3c-0.8,1.3-1.8,3.3-4.6,5.9
-
c-0.6,0.6-1.9,1.5-3.2,2.1c-0.4,0.2-1,0.4-1.6,0.6c0.4-0.6,0.6-1.2,0.7-1.8l-0.3,0c-0.7,2.3-2.4,4.3-4.5,5c-1.3,0.4-1-0.3-0.8-0.9
-
c0.2-0.4,0.7-2.4,0.9-3.4l-0.4-0.1c0,0,0,0.2-0.1,0.4c-0.1,0.2-0.1,0.5-0.2,0.8c-1.2-0.4-2.4-1-3.3-2.1c-1.3-1.6-1.9-3.1-2.2-5.9
-
c-0.1-0.7-0.8-1.4-1.6-2.3c-1-1.1-1-2.7-0.4-2.9c0.4-0.1,2.5,0.9,3.2,1.4c0.8-0.6,2-1.6,2.4-1.3C8.5,26,8.6,27,7.9,28.5
-
c-1.5,3.1,0.6,4,1.1,4.1c0.9,0.2,2.3,0.3,3.7-0.3c1.3-0.5,2.9-1.8,3.4-2.2c0.7-0.5,1.4-1.2,2.5-1.4c1.3-0.2,2.3,0.2,2.8,1.1
- c0.6-0.2,1.4-0.8,2-1C23.9,28.5,25,28.9,24.2,30.3z
M18.8,31.4c0-0.3-0.2-0.6-0.5-0.6c-0.3,0-0.5,0.3-0.5,0.6s0.2,0.6,0.5,0.6
- C18.6,31.9,18.8,31.7,18.8,31.4z"/>
+ <polygon fill="#00A0E9" points="65.2,379.2 0,341.3 0,204.4 119.1,137
235,206.7 235,344.4 171.3,378.5 159.9,358 211,330.4
+ 211,219.9 118.2,164 23,218 23,327.9 76.7,359.1 "/>
+ <path fill="#00A0E9"
d="M100.2,213.1c1.9-12.6,30.6-32.4,49.8-1.7c22.4-2.7,27,21,22,26.3c17.7-6.1,50.3,32.3,10.3,52.3h-124
+ c-34.1-7-28-57.3,7.1-58.4C72.3,208.1,92.4,208.9,100.2,213.1z"/>
+ <polygon fill="#EEAF00" points="126.8,404.8 117.2,410.2 107.4,404.4
107.2,239.8 126.6,239.8 "/>
<g>
- <path class="st2"
d="M49,17.6h4.8c1.6,0,2.9,0.6,3.8,1.8c0.8,1.1,1.2,2.5,1.2,4.2c0,1.3-0.2,2.5-0.7,3.6c-0.8,1.9-2.3,2.8-4.3,2.8
- H49V17.6z
M53.5,28.6c0.5,0,1-0.1,1.3-0.2c0.6-0.2,1.1-0.6,1.5-1.3c0.3-0.5,0.5-1.1,0.7-1.9c0.1-0.5,0.1-0.9,0.1-1.3
-
c0-1.5-0.3-2.7-0.9-3.6c-0.6-0.8-1.5-1.3-2.8-1.3h-2.8v9.5H53.5z"/>
- <path class="st2"
d="M67.3,21.9c0.8,0.8,1.2,1.9,1.2,3.4c0,1.5-0.3,2.7-1,3.6c-0.7,1-1.7,1.4-3.2,1.4c-1.2,0-2.2-0.4-2.9-1.3
-
c-0.7-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.7,1.1-3.6c0.7-0.9,1.7-1.4,3-1.4C65.5,20.7,66.5,21.1,67.3,21.9z
M66.3,27.9
-
c0.4-0.8,0.5-1.6,0.5-2.5c0-0.8-0.1-1.5-0.4-2.1c-0.4-0.8-1.1-1.2-2.1-1.2c-0.9,0-1.5,0.4-1.9,1.1c-0.4,0.7-0.6,1.6-0.6,2.6
-
c0,1,0.2,1.8,0.6,2.4c0.4,0.6,1,1,1.9,1C65.3,29.1,66,28.7,66.3,27.9z"/>
- <path class="st2" d="M70.3,17.6h1.5V30h-1.5V17.6z"/>
- <path class="st2"
d="M73.8,21h1.4v1.2c0.3-0.4,0.6-0.7,1-1c0.5-0.3,1.1-0.5,1.8-0.5c1,0,1.8,0.4,2.5,1.2c0.7,0.8,1,1.9,1,3.4
-
c0,2-0.5,3.4-1.5,4.2c-0.6,0.5-1.4,0.8-2.2,0.8c-0.7,0-1.2-0.1-1.7-0.4c-0.3-0.2-0.6-0.5-0.9-0.9v4.6h-1.5V21z
M79.4,28.1
-
c0.5-0.6,0.7-1.5,0.7-2.7c0-0.7-0.1-1.3-0.3-1.9c-0.4-1-1.1-1.5-2.1-1.5c-1,0-1.7,0.5-2.1,1.6c-0.2,0.6-0.3,1.3-0.3,2.1
-
c0,0.7,0.1,1.3,0.3,1.8c0.4,0.9,1.1,1.4,2.1,1.4C78.4,29,78.9,28.7,79.4,28.1z"/>
- <path class="st2"
d="M83.3,17.6h1.5v4.6c0.3-0.5,0.7-0.8,0.9-1c0.5-0.3,1.1-0.5,1.8-0.5c1.3,0,2.1,0.5,2.6,1.4
-
c0.2,0.5,0.4,1.2,0.4,2.1V30h-1.5v-5.7c0-0.7-0.1-1.2-0.2-1.5c-0.3-0.5-0.8-0.7-1.5-0.7c-0.6,0-1.2,0.2-1.7,0.7
- c-0.5,0.4-0.7,1.3-0.7,2.5V30h-1.5V17.6z"/>
- <path class="st2" d="M92.6,17.6h1.5v1.7h-1.5V17.6z
M92.6,21h1.5v9h-1.5V21z"/>
- <path class="st2"
d="M96.4,21h1.4v1.3c0.4-0.5,0.9-0.9,1.3-1.1c0.5-0.2,1-0.3,1.5-0.3c1.2,0,2.1,0.4,2.5,1.3
-
c0.2,0.5,0.4,1.2,0.4,2.1V30H102v-5.7c0-0.6-0.1-1-0.2-1.3c-0.3-0.6-0.7-0.8-1.4-0.8c-0.3,0-0.6,0-0.9,0.1
-
c-0.4,0.1-0.8,0.4-1.1,0.7c-0.2,0.3-0.4,0.6-0.5,0.9c-0.1,0.3-0.1,0.8-0.1,1.4V30h-1.5V21z"/>
- <path class="st2"
d="M107,26c0,0.7,0.2,1.3,0.5,1.7c0.5,0.8,1.4,1.2,2.8,1.2c0.6,0,1.1-0.1,1.6-0.3c0.9-0.3,1.4-1,1.4-1.9
-
c0-0.7-0.2-1.2-0.6-1.4c-0.4-0.3-1-0.5-1.9-0.7l-1.6-0.4c-1-0.2-1.8-0.5-2.2-0.8c-0.7-0.5-1.1-1.3-1.1-2.3c0-1.1,0.4-2,1.1-2.7
-
c0.7-0.7,1.8-1.1,3.1-1.1c1.2,0,2.3,0.3,3.1,0.9c0.9,0.6,1.3,1.6,1.3,3h-1.5c-0.1-0.7-0.2-1.2-0.5-1.5c-0.5-0.6-1.3-1-2.4-1
-
c-0.9,0-1.6,0.2-2,0.6c-0.4,0.4-0.6,0.9-0.6,1.5c0,0.6,0.2,1.1,0.7,1.3c0.3,0.2,1,0.4,2.1,0.7l1.6,0.4c0.8,0.2,1.4,0.5,1.8,0.8
-
c0.7,0.6,1.1,1.4,1.1,2.5c0,1.4-0.5,2.4-1.4,2.9c-0.9,0.6-2,0.9-3.3,0.9c-1.5,0-2.6-0.4-3.4-1.2c-0.8-0.8-1.2-1.8-1.2-3.2H107z"/>
- <path class="st2"
d="M122.7,21.5c0.6,0.5,1,1.3,1.1,2.6h-1.4c-0.1-0.6-0.3-1-0.6-1.4c-0.3-0.4-0.8-0.6-1.5-0.6
-
c-0.9,0-1.6,0.5-2,1.4c-0.3,0.6-0.4,1.4-0.4,2.3c0,0.9,0.2,1.7,0.6,2.3c0.4,0.6,1,0.9,1.8,0.9c0.6,0,1.1-0.2,1.5-0.6
-
c0.4-0.4,0.6-0.9,0.7-1.6h1.4c-0.2,1.2-0.6,2.1-1.2,2.6c-0.7,0.6-1.5,0.8-2.5,0.8c-1.1,0-2.1-0.4-2.7-1.3c-0.7-0.9-1-1.9-1-3.2
-
c0-1.6,0.4-2.8,1.1-3.7c0.7-0.9,1.7-1.3,2.9-1.3C121.3,20.7,122.1,21,122.7,21.5z"/>
- <path class="st2"
d="M125.3,17.6h1.5v4.6c0.3-0.5,0.7-0.8,0.9-1c0.5-0.3,1.1-0.5,1.8-0.5c1.3,0,2.1,0.5,2.6,1.4
-
c0.2,0.5,0.4,1.2,0.4,2.1V30h-1.5v-5.7c0-0.7-0.1-1.2-0.2-1.5c-0.3-0.5-0.8-0.7-1.5-0.7c-0.6,0-1.2,0.2-1.7,0.7
- c-0.5,0.4-0.7,1.3-0.7,2.5V30h-1.5V17.6z"/>
- <path class="st2"
d="M140,21.2c0.6,0.3,1,0.7,1.3,1.2c0.3,0.5,0.5,1,0.6,1.6c0.1,0.4,0.1,1.1,0.1,2h-6.4c0,0.9,0.2,1.7,0.6,2.2
-
c0.4,0.6,1,0.8,1.8,0.8c0.8,0,1.4-0.3,1.8-0.8c0.3-0.3,0.4-0.7,0.5-1.1h1.5c0,0.3-0.2,0.7-0.4,1.1c-0.2,0.4-0.5,0.7-0.7,1
-
c-0.4,0.5-1,0.8-1.7,0.9c-0.4,0.1-0.8,0.1-1.2,0.1c-1.1,0-2-0.4-2.8-1.2c-0.8-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.6,1.1-3.5
- c0.8-0.9,1.8-1.4,3-1.4C138.9,20.8,139.5,20.9,140,21.2z
M140.6,24.8c-0.1-0.7-0.2-1.2-0.4-1.6c-0.4-0.7-1.1-1.1-2-1.1
-
c-0.7,0-1.2,0.3-1.7,0.8c-0.5,0.5-0.7,1.1-0.7,1.9H140.6z"/>
- <path class="st2"
d="M148.8,21.3c0.3,0.2,0.6,0.5,0.9,0.9v-4.6h1.4V30h-1.3v-1.3c-0.3,0.6-0.7,1-1.2,1.2c-0.5,0.2-1,0.4-1.6,0.4
-
c-1,0-1.8-0.4-2.5-1.3c-0.7-0.8-1.1-2-1.1-3.4c0-1.3,0.3-2.5,1-3.4c0.7-1,1.6-1.4,2.8-1.4C147.8,20.8,148.3,21,148.8,21.3z
-
M145.5,28.1c0.4,0.7,1,1,1.9,1c0.7,0,1.2-0.3,1.7-0.9c0.4-0.6,0.7-1.5,0.7-2.6c0-1.1-0.2-2-0.7-2.5c-0.5-0.5-1-0.8-1.7-0.8
-
c-0.7,0-1.3,0.3-1.8,0.9c-0.5,0.6-0.7,1.4-0.7,2.6C144.9,26.6,145.1,27.4,145.5,28.1z"/>
- <path class="st2"
d="M154.8,21v6c0,0.5,0.1,0.8,0.2,1.1c0.3,0.5,0.7,0.8,1.4,0.8c1,0,1.7-0.5,2-1.4c0.2-0.5,0.3-1.2,0.3-2.1V21
-
h1.5v9h-1.4l0-1.3c-0.2,0.3-0.4,0.6-0.7,0.9c-0.6,0.5-1.2,0.7-2,0.7c-1.2,0-2.1-0.4-2.5-1.3c-0.2-0.5-0.4-1.1-0.4-1.8V21H154.8z"
- />
- <path class="st2" d="M162.7,17.6h1.5V30h-1.5V17.6z"/>
- <path class="st2"
d="M171.8,21.2c0.6,0.3,1,0.7,1.3,1.2c0.3,0.5,0.5,1,0.6,1.6c0.1,0.4,0.1,1.1,0.1,2h-6.4c0,0.9,0.2,1.7,0.6,2.2
-
c0.4,0.6,1,0.8,1.8,0.8c0.8,0,1.4-0.3,1.8-0.8c0.3-0.3,0.4-0.7,0.5-1.1h1.5c0,0.3-0.2,0.7-0.4,1.1c-0.2,0.4-0.5,0.7-0.7,1
-
c-0.4,0.5-1,0.8-1.7,0.9c-0.4,0.1-0.8,0.1-1.2,0.1c-1.1,0-2-0.4-2.8-1.2c-0.8-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.6,1.1-3.5
-
c0.8-0.9,1.8-1.4,3-1.4C170.6,20.8,171.2,20.9,171.8,21.2z
M172.3,24.8c-0.1-0.7-0.2-1.2-0.4-1.6c-0.4-0.7-1.1-1.1-2-1.1
-
c-0.7,0-1.2,0.3-1.7,0.8c-0.5,0.5-0.7,1.1-0.7,1.9H172.3z"/>
- <path class="st2"
d="M175.7,21h1.4v1.6c0.1-0.3,0.4-0.7,0.8-1.1c0.4-0.4,1-0.7,1.5-0.7c0,0,0.1,0,0.1,0c0.1,0,0.2,0,0.3,0v1.6
-
c-0.1,0-0.2,0-0.2,0c-0.1,0-0.2,0-0.2,0c-0.7,0-1.3,0.2-1.7,0.7c-0.4,0.5-0.6,1.1-0.6,1.7V30h-1.5V21z"/>
+ <circle fill="#FFFFFF" cx="117" cy="244.4" r="14.7"/>
+ <path fill="#EEAF00"
d="M117,262.3c-9.8,0-17.9-8-17.9-17.9c0-9.8,8-17.9,17.9-17.9s17.9,8,17.9,17.9
+ C134.8,254.3,126.8,262.3,117,262.3z
M117,232.8c-6.4,0-11.6,5.2-11.6,11.6c0,6.4,5.2,11.7,11.6,11.7s11.6-5.2,11.6-11.6
+ C128.6,238.1,123.4,232.8,117,232.8z"/>
</g>
+ <polygon fill="#EEAF00" points="80.4,389.8 61.8,378.1 61.8,264.7
80.4,264.7 "/>
+ <polygon fill="#EEAF00" points="175.1,377.4 156.5,387.4 156.5,263.8
175.1,263.8 "/>
+ <g>
+ <circle fill="#FFFFFF" cx="165.7" cy="264.6" r="14.7"/>
+ <path fill="#EEAF00"
d="M165.7,282.4c-9.8,0-17.9-8-17.9-17.9c0-9.8,8-17.9,17.9-17.9c9.8,0,17.9,8,17.9,17.9
+ C183.6,274.4,175.5,282.4,165.7,282.4z
M165.7,253c-6.4,0-11.6,5.2-11.6,11.6s5.2,11.6,11.6,11.6s11.6-5.2,11.6-11.6
+ S172.1,253,165.7,253z"/>
+ </g>
+ <rect x="68.1" y="340.1" fill="none" width="102.1" height="90"/>
+ <g>
+ <circle fill="#FFFFFF" cx="71.2" cy="264.6" r="14.7"/>
+ <path fill="#EEAF00"
d="M71.2,282.4c-9.8,0-17.9-8-17.9-17.9c0-9.8,8-17.9,17.9-17.9s17.9,8,17.9,17.9S81,282.4,71.2,282.4z
+
M71.2,253c-6.4,0-11.6,5.2-11.6,11.6s5.2,11.6,11.6,11.6s11.6-5.2,11.6-11.6S77.6,253,71.2,253z"/>
+ </g>
+</g>
+<g enable-background="new ">
+ <path fill="#333333"
d="M271.1,333.8v-50.8c-1.3,0.5-2.5,1.1-3.9,1.6c-2.8-4-5.7-7.6-8.5-10.6c11.6-4.6,18.8-9.5,21.5-14.8h-20.5
+
v-11.2h7.1c-2.3-3.6-4.5-6.8-6.7-9.5c4.1-4,8.2-9.8,12.4-17.7h14.7c-1.3,2.8-2.6,5.5-3.9,8h31.9v11.3h-15.9
+
c-0.2,2.8-0.5,5.4-0.9,7.9h20.2v11.2h-17.7l16.2,10.8l-7.4,8.4h48.8v55.4h-15.3v-5h-56.8v5H271.1z
M269.3,247.9h14.4
+ c0.4-2.4,0.6-5,0.8-7.9h-8.3C274,243,271.7,245.6,269.3,247.9z
M279.8,278.4h26.2c-4.8-4.5-9.3-8.5-13.4-12
+ C289.7,270.8,285.4,274.8,279.8,278.4z
M343.2,290.3h-56.8v8h56.8V290.3z M286.4,316.8h56.8v-7.4h-56.8V316.8z
M320.4,229.3h45.5
+ v42.6h-45.5V229.3z M351.7,259.8v-18.5h-17.2v18.5H351.7z"/>
+ <path fill="#333333"
d="M377.4,243.7h8.9c-2-4.1-4.7-8.4-8.1-13l10.3-6.4c2.4,2.8,5.5,7.2,9.6,13.2l-10.3,6.2h12.8v-22.3H415v22.3
+
h12l-9.5-6.2c3.8-4.6,7-9.2,9.6-13.6l10.7,6.4c-2.5,4.3-5.7,8.8-9.5,13.3h6.6v11.6H415v8l3.9-5.2c4.7,2.5,9.2,5.1,13.5,7.5
+
c6.2-11.5,11.6-26.5,16.1-44.8l15.6,1.5c-1.5,5.9-3.1,11.5-4.8,16.9h28.5v13.9h-4.6c-1.6,20.1-5.9,36.7-12.8,49.6
+
c4.9,5.7,10.8,10.5,17.9,14.6c-2.7,3.1-6,8.2-9.9,15.2c-6.6-4.4-12.4-9.8-17.3-16.2c-6.3,7.4-13.5,13.3-21.8,17.9
+
c-3.1-4.4-6.5-8.5-10.2-12.3l-4,6.7c-4.6-2.6-9.5-5.3-14.9-8c-8.3,5.5-18.3,9.5-29.9,11.9c-1.4-4.2-3.4-8.9-6-14
+
c7.9-0.8,14.9-2.4,21-4.8c-5.2-2.3-10.8-4.7-16.6-7.1c2.6-3.8,4.9-7.5,7-11.3h-9.3v-11.6h15c1.3-3,2.3-6,3.2-9l6.2,0.6v-10.9
+
c-5.6,5.9-12.7,11.4-21.2,16.5c-1.6-5.1-3.4-9.6-5.4-13.7c7.6-2.9,14.4-6.9,20.5-11.9h-17V243.7z
M396.7,301.3l11.9,4.4
+ c3.4-3,6.2-6.4,8.4-10.4h-16.9L396.7,301.3z
M415,277.9h-5.8c-0.9,1.9-1.8,3.8-2.9,5.8h26.6v10.6c-3,6.2-6.7,11.7-11.1,16.5
+
l11.3,4.5l-2.3,3.7c8.4-4.4,15.6-10,21.5-17c-3.7-7.6-6.6-16.2-8.5-25.6c-1.3,2.4-2.7,4.7-4,6.9c-1.7-3-3.8-6.2-6.1-9.4l-3.4,5.1
+ c-4.7-3.2-9.8-6.4-15.3-9.7V277.9z
M453.2,256.3c1.5,12.7,4.2,23.2,8,31.7c4.5-10,7.2-21.6,8.1-35h-14.8
+ C454,254.2,453.6,255.3,453.2,256.3z"/>
+ <path fill="#333333"
d="M520,284.5c-0.1,5.9,0.4,11.7,1.4,17.6c-4.5,4.1-10.4,10.4-17.7,18.9l-8.1-11.1c1.9-2.2,2.9-5.4,3-9.7
+ v-30.1h-7.1v-14.8h21.5V292C514.6,290.4,516.9,287.9,520,284.5z
M506.8,222.6c5.3,6.8,9.9,13.4,13.8,19.6c-3.6,2.2-8.1,4.9-13.3,8
+ c-3.9-7.3-8.1-14.1-12.8-20.4L506.8,222.6z
M585,239.2h-47.1v41.3c0,23-3.4,41-10.1,54c-4.6-3.2-9.9-6.3-15.7-9.5
+
c7.7-10.3,11.5-24.7,11.5-43.1v-56.2h75.8v91.1c0,10.2-4.4,15.5-13.3,16c-3.6,0.3-8.9,0.5-16.1,0.5c-1.1-5.2-2.2-10.3-3.4-15.2
+ c5.1,0.4,9.3,0.5,12.5,0.5c4,0,5.9-1.9,5.9-5.7V239.2z
M540.3,265.6h14.1V259h-12.2v-10.7h12.2v-7.1h13.9v7.1h12.4V259h-12.4v6.6
+ h14.2v10.7h-42.3V265.6z
M542.5,319.1v-36.8h37.2v31.2H555v5.6H542.5z M567.1,293H555v9.8h12.1V293z"/>
+ <path fill="#333333"
d="M630.6,273.1c0.2,28.5-3.6,48.9-11.4,61.3c-4.2-4-8.3-7.6-12.4-10.7c6.5-12.1,9.5-29.6,9.2-52.7v-39.8h45.4
+
c-0.8-2.2-1.9-4.9-3.3-8l18.9-2.7c1.4,3.5,2.7,7.1,4.1,10.7h39.4v12.8h-89.9V273.1z
M709.6,287.4v12.3c-6.1,7-12.2,12.6-18.2,16.9
+
c8.4,1.6,18.4,2.6,30.1,3c-2.3,4.4-4.5,9-6.7,13.8c-16.8-2.1-30.3-4.9-40.5-8.5c-10.9,3.6-24.4,6.8-40.6,9.5
+
c-1.9-4.3-4.4-8.5-7.4-12.7c12.3-0.6,23.2-2.2,32.8-4.7c-6.3-4.6-12.1-10.3-17.3-17.2h-7.3v-12.3H709.6z
M633.1,251.1h12.4v-4.8
+
h14.6v4.8h28.3v-4.8H703v4.8h15.5v12.3H703V282h-57.4v-18.6h-12.4V251.1z
M674.9,311.4c6.9-3.2,12.8-7.1,17.7-11.7h-34.6
+ C662.8,304.5,668.5,308.5,674.9,311.4z
M688.4,270.4v-7h-28.3v7H688.4z"/>
+ <path fill="#333333"
d="M772.7,220.9H790v20.2h42.5V305h-16.9v-7.9H790v36.7h-17.3v-36.7h-25.6v8.2h-16.9v-64.3h42.5V220.9z
+ M747.1,281.4h25.6v-24.6h-25.6V281.4z
M815.7,256.8H790v24.6h25.6V256.8z"/>
+ <path fill="#333333"
d="M853.9,253.6l15.6,3.5c-3.3,18.1-7.5,34.8-12.8,50.3l-15.2-5.6C845.9,288,850,271.9,853.9,253.6z
+
M918.2,292.7c6.8,2.8,12.6,5,17.2,6.5c-0.5,3.6-1.5,8.4-2.9,14.5c-1.4,6.1-3.1,10-5,11.8c-1.9,1.8-4.4,3.1-7.3,4
+
c-2.9,0.9-6.4,1.3-10.5,1.3H891c-12.8,0-19.1-6.5-19.1-19.4v-65.6h16.9v60.4c0,6.5,3.4,9.8,10.1,9.8h5.8c3.4,0,6.1-0.6,8-1.7
+ c1.9-1.2,3.1-2.8,3.5-5.1C916.6,306.9,917.3,301.5,918.2,292.7z
M897,220.6c6.6,8.4,13.7,18.2,21.3,29.6l-15.2,9.3
+ c-6.5-11.6-12.9-21.9-19.3-30.9L897,220.6z
M939.2,255.5c6.1,12.5,11.4,25,16,37.5l-15.7,6.5c-4.3-12.4-9.4-25-15.4-37.8
+ L939.2,255.5z"/>
</g>
</svg>
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/logo.svg
b/dolphinscheduler-ui/src/js/module/components/nav/logo.svg
index 6a26786..332e623 100755
--- a/dolphinscheduler-ui/src/js/module/components/nav/logo.svg
+++ b/dolphinscheduler-ui/src/js/module/components/nav/logo.svg
@@ -1,99 +1,73 @@
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License. -->
-<!--<?xml version="1.0" encoding="utf-8"?>-->
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version:
6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd";>
<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px"
- viewBox="0 0 180 46" style="enable-background:new 0 0 180 46;"
xml:space="preserve">
-<style type="text/css">
- .st0{fill:#85CDF0;}
- .st1{fill:#0097E0;}
- .st2{fill:#FFFFFF;}
-</style>
+ viewBox="0 0 960 560" enable-background="new 0 0 960 560"
xml:space="preserve">
<g>
- <path class="st0"
d="M29.9,25.6H14.5c-2.1,0-3.8,1.8-3.8,3.9c0,0.8,0.2,1.6,0.7,2.2c0.3-0.1,0.6-0.2,0.9-0.3l0,0l0,0
-
c1-0.4,2.1-1.2,2.8-1.8c0.2-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0.4-0.3c0.6-0.5,1.4-1.1,2.6-1.3c0.2,0,0.4,0,0.7,0
-
c1,0,1.9,0.3,2.5,0.9c0.2-0.1,0.4-0.2,0.5-0.3c0.3-0.1,0.5-0.3,0.7-0.4s0.5-0.2,0.8-0.2c0.6,0,1.2,0.3,1.5,0.9
-
c0.2,0.4,0.4,1.1-0.2,2.2c-0.1,0.2-0.3,0.4-0.4,0.7c-0.3,0.6-0.7,1.2-1.3,2h6.6c2.1,0,3.8-1.8,3.8-3.9C33.7,27.4,32,25.6,29.9,25.6
- z"/>
- <path class="st1"
d="M5.7,20.3h1c0.6,0,1-0.4,1-1s-0.4-1-1-1h-1c-2.1,0-3.7-1.7-3.7-3.9c0-2.1,1.6-3.8,3.6-3.9v2.1l2.8-2.9l-2.8-3
- v1.7c-3,0.2-5.6,2.8-5.6,6C0,17.7,2.5,20.3,5.7,20.3z"/>
- <path class="st1"
d="M38.4,18.6h-1c-0.6,0-1,0.4-1,1s0.4,1,1,1h1c2.1,0,3.7,1.7,3.7,3.9c0,2.1-1.6,3.8-3.6,3.9v-2.1L35.7,29l2.8,3
- v-1.7c3-0.1,5.5-2.6,5.5-5.9C44.1,21.1,41.6,18.6,38.4,18.6z"/>
- <path class="st0"
d="M29.9,15.3H14.5c-2.1,0-3.8,1.8-3.8,3.9s1.7,3.9,3.8,3.9h15.4c2.1,0,3.8-1.8,3.8-3.9S32,15.3,29.9,15.3z"/>
- <path class="st0"
d="M29.9,5.1H14.5c-2.1,0-3.8,1.8-3.8,3.9l0,0c0,2.2,1.7,3.9,3.8,3.9h15.4c2.1,0,3.8-1.8,3.8-3.9l0,0
- C33.7,6.8,32,5.1,29.9,5.1z"/>
- <path class="st1"
d="M19.5,39c0.2,1.3-0.4,1-0.9,0.6c-0.3-0.2-1.2-0.7-1.7-1c0.8-0.4,1.5-0.9,2-1.3C19.2,37.8,19.4,38.4,19.5,39z
-
M18.4,31c-0.1,0-0.2,0.1-0.2,0.2s0.1,0.2,0.2,0.2s0.2-0.1,0.2-0.2S18.5,31,18.4,31z
M24.2,30.3c-0.8,1.3-1.8,3.3-4.6,5.9
-
c-0.6,0.6-1.9,1.5-3.2,2.1c-0.4,0.2-1,0.4-1.6,0.6c0.4-0.6,0.6-1.2,0.7-1.8h-0.3c-0.7,2.3-2.4,4.3-4.5,5c-1.3,0.4-1-0.3-0.8-0.9
-
c0.2-0.4,0.7-2.4,0.9-3.4l-0.4-0.1c0,0,0,0.2-0.1,0.4s-0.1,0.5-0.2,0.8c-1.2-0.4-2.4-1-3.3-2.1c-1.3-1.6-1.9-3.1-2.2-5.9
-
c-0.1-0.7-0.8-1.4-1.6-2.3c-1-1.1-1-2.7-0.4-2.9c0.4-0.1,2.5,0.9,3.2,1.4c0.8-0.6,2-1.6,2.4-1.3C8.5,26,8.6,27,7.9,28.5
-
c-1.5,3.1,0.6,4,1.1,4.1c0.9,0.2,2.3,0.3,3.7-0.3c1.3-0.5,2.9-1.8,3.4-2.2c0.7-0.5,1.4-1.2,2.5-1.4c1.3-0.2,2.3,0.2,2.8,1.1
- c0.6-0.2,1.4-0.8,2-1C23.9,28.5,25,28.9,24.2,30.3z
M18.8,31.4c0-0.3-0.2-0.6-0.5-0.6s-0.5,0.3-0.5,0.6S18,32,18.3,32
- C18.6,31.9,18.8,31.7,18.8,31.4z"/>
<g>
- <path class="st2"
d="M49,17.6h4.8c1.6,0,2.9,0.6,3.8,1.8c0.8,1.1,1.2,2.5,1.2,4.2c0,1.3-0.2,2.5-0.7,3.6c-0.8,1.9-2.3,2.8-4.3,2.8
- H49V17.6z
M53.5,28.6c0.5,0,1-0.1,1.3-0.2c0.6-0.2,1.1-0.6,1.5-1.3c0.3-0.5,0.5-1.1,0.7-1.9c0.1-0.5,0.1-0.9,0.1-1.3
-
c0-1.5-0.3-2.7-0.9-3.6c-0.6-0.8-1.5-1.3-2.8-1.3h-2.8v9.5L53.5,28.6L53.5,28.6z"/>
- <path class="st2"
d="M67.3,21.9c0.8,0.8,1.2,1.9,1.2,3.4s-0.3,2.7-1,3.6c-0.7,1-1.7,1.4-3.2,1.4c-1.2,0-2.2-0.4-2.9-1.3
-
c-0.7-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.7,1.1-3.6c0.7-0.9,1.7-1.4,3-1.4C65.5,20.7,66.5,21.1,67.3,21.9z
M66.3,27.9
-
c0.4-0.8,0.5-1.6,0.5-2.5c0-0.8-0.1-1.5-0.4-2.1c-0.4-0.8-1.1-1.2-2.1-1.2c-0.9,0-1.5,0.4-1.9,1.1s-0.6,1.6-0.6,2.6
-
s0.2,1.8,0.6,2.4c0.4,0.6,1,1,1.9,1C65.3,29.1,66,28.7,66.3,27.9z"/>
- <path class="st2" d="M70.3,17.6h1.5V30h-1.5V17.6z"/>
- <path class="st2"
d="M73.8,21h1.4v1.2c0.3-0.4,0.6-0.7,1-1c0.5-0.3,1.1-0.5,1.8-0.5c1,0,1.8,0.4,2.5,1.2c0.7,0.8,1,1.9,1,3.4
-
c0,2-0.5,3.4-1.5,4.2c-0.6,0.5-1.4,0.8-2.2,0.8c-0.7,0-1.2-0.1-1.7-0.4c-0.3-0.2-0.6-0.5-0.9-0.9v4.6h-1.5L73.8,21L73.8,21z
-
M79.4,28.1c0.5-0.6,0.7-1.5,0.7-2.7c0-0.7-0.1-1.3-0.3-1.9c-0.4-1-1.1-1.5-2.1-1.5s-1.7,0.5-2.1,1.6c-0.2,0.6-0.3,1.3-0.3,2.1
-
c0,0.7,0.1,1.3,0.3,1.8c0.4,0.9,1.1,1.4,2.1,1.4C78.4,29,78.9,28.7,79.4,28.1z"/>
- <path class="st2"
d="M83.3,17.6h1.5v4.6c0.3-0.5,0.7-0.8,0.9-1c0.5-0.3,1.1-0.5,1.8-0.5c1.3,0,2.1,0.5,2.6,1.4
-
c0.2,0.5,0.4,1.2,0.4,2.1V30H89v-5.7c0-0.7-0.1-1.2-0.2-1.5c-0.3-0.5-0.8-0.7-1.5-0.7c-0.6,0-1.2,0.2-1.7,0.7
- c-0.5,0.4-0.7,1.3-0.7,2.5V30h-1.5V17.6H83.3z"/>
- <path class="st2" d="M92.6,17.6h1.5v1.7h-1.5V17.6z
M92.6,21h1.5v9h-1.5V21z"/>
- <path class="st2"
d="M96.4,21h1.4v1.3c0.4-0.5,0.9-0.9,1.3-1.1c0.5-0.2,1-0.3,1.5-0.3c1.2,0,2.1,0.4,2.5,1.3
-
c0.2,0.5,0.4,1.2,0.4,2.1V30H102v-5.7c0-0.6-0.1-1-0.2-1.3c-0.3-0.6-0.7-0.8-1.4-0.8c-0.3,0-0.6,0-0.9,0.1
-
c-0.4,0.1-0.8,0.4-1.1,0.7c-0.2,0.3-0.4,0.6-0.5,0.9s-0.1,0.8-0.1,1.4V30h-1.5L96.4,21L96.4,21z"/>
- <path class="st2"
d="M107,26c0,0.7,0.2,1.3,0.5,1.7c0.5,0.8,1.4,1.2,2.8,1.2c0.6,0,1.1-0.1,1.6-0.3c0.9-0.3,1.4-1,1.4-1.9
-
c0-0.7-0.2-1.2-0.6-1.4c-0.4-0.3-1-0.5-1.9-0.7l-1.6-0.4c-1-0.2-1.8-0.5-2.2-0.8c-0.7-0.5-1.1-1.3-1.1-2.3c0-1.1,0.4-2,1.1-2.7
-
s1.8-1.1,3.1-1.1c1.2,0,2.3,0.3,3.1,0.9c0.9,0.6,1.3,1.6,1.3,3H113c-0.1-0.7-0.2-1.2-0.5-1.5c-0.5-0.6-1.3-1-2.4-1
-
c-0.9,0-1.6,0.2-2,0.6s-0.6,0.9-0.6,1.5s0.2,1.1,0.7,1.3c0.3,0.2,1,0.4,2.1,0.7l1.6,0.4c0.8,0.2,1.4,0.5,1.8,0.8
-
c0.7,0.6,1.1,1.4,1.1,2.5c0,1.4-0.5,2.4-1.4,2.9c-0.9,0.6-2,0.9-3.3,0.9c-1.5,0-2.6-0.4-3.4-1.2c-0.8-0.8-1.2-1.8-1.2-3.2h1.5V26z
+ <polygon fill="#00A0E9" points="65,383.4 0,345.6 0,209
119.1,141.7 235,211.3 235,348.7 171.2,382.8 159.9,362.3 211,334.8
+ 211,224.4 118.2,168.6 23,222.5 23,332.2 76.6,363.3
"/>
+ <path fill="#00A0E9"
d="M100,217.7c1.9-12.5,30.5-32.4,49.7-1.7c22.4-2.7,26.9,20.7,22,26c17.7-6.1,50.3,32,10.3,52H58.2
+
c-34.1-5-28-57,7.1-58.1C72.2,212.4,92.3,213.5,100,217.7z"/>
+ <polygon fill="#EEAF00" points="126.6,409 117,414.4 107.2,408.6
107,244.2 126.4,244.2 "/>
+ <g>
+ <circle fill="#FFFFFF" cx="116.8" cy="248.9" r="14.7"/>
+ <path fill="#EEAF00"
d="M116.8,266.7c-9.8,0-17.8-8-17.8-17.8c0-9.8,8-17.8,17.8-17.8s17.8,8,17.8,17.8
+ C134.6,258.7,126.6,266.7,116.8,266.7z
M116.8,237.3c-6.4,0-11.6,5.2-11.6,11.6c0,6.4,5.2,11.6,11.6,11.6
+
c6.4,0,11.6-5.2,11.6-11.6C128.4,242.5,123.2,237.3,116.8,237.3z"/>
+ </g>
+ <polygon fill="#EEAF00" points="80.3,394 61.7,382.4 61.7,269.1
80.3,269.1 "/>
+ <polygon fill="#EEAF00" points="174.8,381.7 156.2,391.6
156.2,268.3 174.8,268.3 "/>
+ <g>
+ <circle fill="#FFFFFF" cx="165.4" cy="269" r="14.7"/>
+ <path fill="#EEAF00"
d="M165.4,286.9c-9.8,0-17.8-8-17.8-17.8s8-17.8,17.8-17.8c9.8,0,17.8,8,17.8,17.8S175.2,286.9,165.4,286.9z
+
M165.4,257.4c-6.4,0-11.6,5.2-11.6,11.6s5.2,11.6,11.6,11.6c6.4,0,11.6-5.2,11.6-11.6S171.8,257.4,165.4,257.4z"/>
+ </g>
+ <rect x="68" y="344.4" fill="none" width="101.9" height="89.9"/>
+ <g>
+ <circle fill="#FFFFFF" cx="71.1" cy="269" r="14.7"/>
+ <path fill="#EEAF00"
d="M71.1,286.9c-9.8,0-17.8-8-17.8-17.8s8-17.8,17.8-17.8s17.8,8,17.8,17.8S80.9,286.9,71.1,286.9z
+
M71.1,257.4c-6.4,0-11.6,5.2-11.6,11.6s5.2,11.6,11.6,11.6c6.4,0,11.6-5.2,11.6-11.6S77.5,257.4,71.1,257.4z"/>
+ </g>
+ </g>
+ <g>
+ <path fill="#FFFFFF"
d="M274.1,338.3v-50.8c-1.3,0.5-2.5,1.1-3.9,1.6c-2.8-4-5.7-7.6-8.5-10.6c11.6-4.6,18.8-9.5,21.5-14.8h-20.5
+
v-11.2h7.1c-2.3-3.6-4.5-6.8-6.7-9.5c4.1-4,8.2-9.8,12.4-17.7h14.7c-1.3,2.8-2.6,5.5-3.9,8h31.9v11.3h-15.9
+
c-0.2,2.8-0.5,5.4-0.9,7.9h20.2v11.2h-17.7l16.2,10.8l-7.4,8.4h48.8v55.4h-15.3v-5h-56.8v5H274.1z
M272.3,252.5h14.4
+
c0.4-2.4,0.6-5,0.8-7.9h-8.3C277,247.6,274.7,250.2,272.3,252.5z
M282.8,282.9h26.2c-4.8-4.5-9.3-8.5-13.4-12
+ C292.7,275.4,288.4,279.4,282.8,282.9z
M346.2,294.9h-56.8v8h56.8V294.9z M289.4,321.4h56.8v-7.4h-56.8V321.4z
M323.4,233.8h45.5
+ v42.6h-45.5V233.8z
M354.7,264.4v-18.5h-17.2v18.5H354.7z"/>
+ <path fill="#FFFFFF"
d="M380.4,248.3h8.9c-2-4.1-4.7-8.4-8.1-13l10.3-6.4c2.4,2.8,5.5,7.2,9.6,13.2l-10.3,6.2h12.8V226H418v22.3
+
h12l-9.5-6.2c3.8-4.6,7-9.2,9.6-13.6l10.7,6.4c-2.5,4.3-5.7,8.8-9.5,13.3h6.6v11.6H418v8l3.9-5.2c4.7,2.5,9.2,5.1,13.5,7.5
+
c6.2-11.5,11.6-26.5,16.1-44.8l15.6,1.5c-1.5,5.9-3.1,11.5-4.8,16.9h28.5v13.9h-4.6c-1.6,20.1-5.9,36.7-12.8,49.6
+
c4.9,5.7,10.8,10.5,17.9,14.6c-2.7,3.1-6,8.2-9.9,15.2c-6.6-4.4-12.4-9.8-17.3-16.2c-6.3,7.4-13.5,13.3-21.8,17.9
+
c-3.1-4.4-6.5-8.5-10.2-12.3l-4,6.7c-4.6-2.6-9.5-5.3-14.9-8c-8.3,5.5-18.3,9.5-29.9,11.9c-1.4-4.2-3.4-8.9-6-14
+
c7.9-0.8,14.9-2.4,21-4.8c-5.2-2.3-10.8-4.7-16.6-7.1c2.6-3.8,4.9-7.5,7-11.3h-9.3v-11.6h15c1.3-3,2.3-6,3.2-9l6.2,0.6v-10.9
+
c-5.6,5.9-12.7,11.4-21.2,16.5c-1.6-5.1-3.4-9.6-5.4-13.7c7.6-2.9,14.4-6.9,20.5-11.9h-17V248.3z
M399.7,305.9l11.9,4.4
+ c3.4-3,6.2-6.4,8.4-10.4h-16.9L399.7,305.9z
M418,282.5h-5.8c-0.9,1.9-1.8,3.8-2.9,5.8h26.6v10.6c-3,6.2-6.7,11.7-11.1,16.5
+
l11.3,4.5l-2.3,3.7c8.4-4.4,15.6-10,21.5-17c-3.7-7.6-6.6-16.2-8.5-25.6c-1.3,2.4-2.7,4.7-4,6.9c-1.7-3-3.8-6.2-6.1-9.4l-3.4,5.1
+ c-4.7-3.2-9.8-6.4-15.3-9.7V282.5z
M456.2,260.9c1.5,12.7,4.2,23.2,8,31.7c4.5-10,7.2-21.6,8.1-35h-14.8
+ C457,258.8,456.6,259.8,456.2,260.9z"/>
+ <path fill="#FFFFFF"
d="M523,289.1c-0.1,5.9,0.4,11.7,1.4,17.6c-4.5,4.1-10.4,10.4-17.7,18.9l-8.1-11.1c1.9-2.2,2.9-5.4,3-9.7
+
v-30.1h-7.1v-14.8h21.5v36.7C517.6,295,519.9,292.4,523,289.1z
M509.8,227.2c5.3,6.8,9.9,13.4,13.8,19.6c-3.6,2.2-8.1,4.9-13.3,8
+ c-3.9-7.3-8.1-14.1-12.8-20.4L509.8,227.2z
M588,243.7h-47.1V285c0,23-3.4,41-10.1,54c-4.6-3.2-9.9-6.3-15.7-9.5
+
c7.7-10.3,11.5-24.7,11.5-43.1v-56.2h75.8v91.1c0,10.2-4.4,15.5-13.3,16c-3.6,0.3-8.9,0.5-16.1,0.5c-1.1-5.2-2.2-10.3-3.4-15.2
+ c5.1,0.4,9.3,0.5,12.5,0.5c4,0,5.9-1.9,5.9-5.7V243.7z
M543.3,270.2h14.1v-6.6h-12.2v-10.7h12.2v-7.1h13.9v7.1h12.4v10.7h-12.4
+ v6.6h14.2v10.7h-42.3V270.2z
M545.5,323.6v-36.8h37.2V318H558v5.6H545.5z M570.1,297.5H558v9.8h12.1V297.5z"/>
+ <path fill="#FFFFFF"
d="M633.6,277.7c0.2,28.5-3.6,48.9-11.4,61.3c-4.2-4-8.3-7.6-12.4-10.7c6.5-12.1,9.5-29.6,9.2-52.7v-39.8
+
h45.4c-0.8-2.2-1.9-4.9-3.3-8l18.9-2.7c1.4,3.5,2.7,7.1,4.1,10.7h39.4v12.8h-89.9V277.7z
M712.6,292v12.3
+
c-6.1,7-12.2,12.6-18.2,16.9c8.4,1.6,18.4,2.6,30.1,3c-2.3,4.4-4.5,9-6.7,13.8c-16.8-2.1-30.3-4.9-40.5-8.5
+
c-10.9,3.6-24.4,6.8-40.6,9.5c-1.9-4.3-4.4-8.5-7.4-12.7c12.3-0.6,23.2-2.2,32.8-4.7c-6.3-4.6-12.1-10.3-17.3-17.2h-7.3V292H712.6
+ z
M636.1,255.7h12.4v-4.8h14.6v4.8h28.3v-4.8H706v4.8h15.5V268H706v18.6h-57.4V268h-12.4V255.7z
M677.9,316
+
c6.9-3.2,12.8-7.1,17.7-11.7h-34.6C665.8,309.1,671.5,313,677.9,316z
M691.4,275v-7h-28.3v7H691.4z"/>
+ <path fill="#FFFFFF"
d="M775.7,225.5H793v20.2h42.5v63.9h-16.9v-7.9H793v36.7h-17.3v-36.7h-25.6v8.2h-16.9v-64.3h42.5V225.5z
+ M750.1,286h25.6v-24.6h-25.6V286z
M818.7,261.4H793V286h25.6V261.4z"/>
+ <path fill="#FFFFFF"
d="M856.9,258.2l15.6,3.5c-3.3,18.1-7.5,34.8-12.8,50.3l-15.2-5.6C848.9,292.6,853,276.5,856.9,258.2z
+
M921.2,297.3c6.8,2.8,12.6,5,17.2,6.5c-0.5,3.6-1.5,8.4-2.9,14.5c-1.4,6.1-3.1,10-5,11.8c-1.9,1.8-4.4,3.1-7.3,4
+
c-2.9,0.9-6.4,1.3-10.5,1.3H894c-12.8,0-19.1-6.5-19.1-19.4v-65.6h16.9v60.4c0,6.5,3.4,9.8,10.1,9.8h5.8c3.4,0,6.1-0.6,8-1.7
+
c1.9-1.2,3.1-2.8,3.5-5.1C919.6,311.5,920.3,306,921.2,297.3z
M900,225.2c6.6,8.4,13.7,18.2,21.3,29.6l-15.2,9.3
+ c-6.5-11.6-12.9-21.9-19.3-30.9L900,225.2z
M942.2,260c6.1,12.5,11.4,25,16,37.5l-15.7,6.5c-4.3-12.4-9.4-25-15.4-37.8L942.2,260z
"/>
- <path class="st2"
d="M122.7,21.5c0.6,0.5,1,1.3,1.1,2.6h-1.4c-0.1-0.6-0.3-1-0.6-1.4c-0.3-0.4-0.8-0.6-1.5-0.6
-
c-0.9,0-1.6,0.5-2,1.4c-0.3,0.6-0.4,1.4-0.4,2.3s0.2,1.7,0.6,2.3c0.4,0.6,1,0.9,1.8,0.9c0.6,0,1.1-0.2,1.5-0.6s0.6-0.9,0.7-1.6
-
h1.4c-0.2,1.2-0.6,2.1-1.2,2.6c-0.7,0.6-1.5,0.8-2.5,0.8c-1.1,0-2.1-0.4-2.7-1.3c-0.7-0.9-1-1.9-1-3.2c0-1.6,0.4-2.8,1.1-3.7
-
c0.7-0.9,1.7-1.3,2.9-1.3C121.3,20.7,122.1,21,122.7,21.5z"/>
- <path class="st2"
d="M125.3,17.6h1.5v4.6c0.3-0.5,0.7-0.8,0.9-1c0.5-0.3,1.1-0.5,1.8-0.5c1.3,0,2.1,0.5,2.6,1.4
-
c0.2,0.5,0.4,1.2,0.4,2.1V30H131v-5.7c0-0.7-0.1-1.2-0.2-1.5c-0.3-0.5-0.8-0.7-1.5-0.7c-0.6,0-1.2,0.2-1.7,0.7
- c-0.5,0.4-0.7,1.3-0.7,2.5V30h-1.5V17.6H125.3z"/>
- <path class="st2"
d="M140,21.2c0.6,0.3,1,0.7,1.3,1.2s0.5,1,0.6,1.6c0.1,0.4,0.1,1.1,0.1,2h-6.4c0,0.9,0.2,1.7,0.6,2.2
-
c0.4,0.6,1,0.8,1.8,0.8s1.4-0.3,1.8-0.8c0.3-0.3,0.4-0.7,0.5-1.1h1.5c0,0.3-0.2,0.7-0.4,1.1s-0.5,0.7-0.7,1
-
c-0.4,0.5-1,0.8-1.7,0.9c-0.4,0.1-0.8,0.1-1.2,0.1c-1.1,0-2-0.4-2.8-1.2c-0.8-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.6,1.1-3.5
- c0.8-0.9,1.8-1.4,3-1.4C138.9,20.8,139.5,20.9,140,21.2z
M140.6,24.8c-0.1-0.7-0.2-1.2-0.4-1.6c-0.4-0.7-1.1-1.1-2-1.1
-
c-0.7,0-1.2,0.3-1.7,0.8s-0.7,1.1-0.7,1.9C135.8,24.8,140.6,24.8,140.6,24.8z"/>
- <path class="st2"
d="M148.8,21.3c0.3,0.2,0.6,0.5,0.9,0.9v-4.6h1.4V30h-1.3v-1.3c-0.3,0.6-0.7,1-1.2,1.2s-1,0.4-1.6,0.4
-
c-1,0-1.8-0.4-2.5-1.3c-0.7-0.8-1.1-2-1.1-3.4c0-1.3,0.3-2.5,1-3.4c0.7-1,1.6-1.4,2.8-1.4C147.8,20.8,148.3,21,148.8,21.3z
-
M145.5,28.1c0.4,0.7,1,1,1.9,1c0.7,0,1.2-0.3,1.7-0.9c0.4-0.6,0.7-1.5,0.7-2.6s-0.2-2-0.7-2.5s-1-0.8-1.7-0.8s-1.3,0.3-1.8,0.9
- s-0.7,1.4-0.7,2.6C144.9,26.6,145.1,27.4,145.5,28.1z"/>
- <path class="st2"
d="M154.8,21v6c0,0.5,0.1,0.8,0.2,1.1c0.3,0.5,0.7,0.8,1.4,0.8c1,0,1.7-0.5,2-1.4c0.2-0.5,0.3-1.2,0.3-2.1V21
-
h1.5v9h-1.4v-1.3c-0.2,0.3-0.4,0.6-0.7,0.9c-0.6,0.5-1.2,0.7-2,0.7c-1.2,0-2.1-0.4-2.5-1.3c-0.2-0.5-0.4-1.1-0.4-1.8V21H154.8z"/>
- <path class="st2" d="M162.7,17.6h1.5V30h-1.5V17.6z"/>
- <path class="st2"
d="M171.8,21.2c0.6,0.3,1,0.7,1.3,1.2s0.5,1,0.6,1.6c0.1,0.4,0.1,1.1,0.1,2h-6.4c0,0.9,0.2,1.7,0.6,2.2
-
c0.4,0.6,1,0.8,1.8,0.8s1.4-0.3,1.8-0.8c0.3-0.3,0.4-0.7,0.5-1.1h1.5c0,0.3-0.2,0.7-0.4,1.1s-0.5,0.7-0.7,1
-
c-0.4,0.5-1,0.8-1.7,0.9c-0.4,0.1-0.8,0.1-1.2,0.1c-1.1,0-2-0.4-2.8-1.2c-0.8-0.8-1.1-2-1.1-3.4c0-1.5,0.4-2.6,1.1-3.5
-
c0.8-0.9,1.8-1.4,3-1.4C170.6,20.8,171.2,20.9,171.8,21.2z
M172.3,24.8c-0.1-0.7-0.2-1.2-0.4-1.6c-0.4-0.7-1.1-1.1-2-1.1
-
c-0.7,0-1.2,0.3-1.7,0.8s-0.7,1.1-0.7,1.9C167.5,24.8,172.3,24.8,172.3,24.8z"/>
- <path class="st2"
d="M175.7,21h1.4v1.6c0.1-0.3,0.4-0.7,0.8-1.1c0.4-0.4,1-0.7,1.5-0.7h0.1c0.1,0,0.2,0,0.3,0v1.6
-
c-0.1,0-0.2,0-0.2,0c-0.1,0-0.2,0-0.2,0c-0.7,0-1.3,0.2-1.7,0.7s-0.6,1.1-0.6,1.7V30h-1.5L175.7,21L175.7,21z"/>
</g>
</g>
</svg>
diff --git a/dolphinscheduler-ui/src/view/login/index.html
b/dolphinscheduler-ui/src/view/login/index.html
index cd1243f..dab5c47 100644
--- a/dolphinscheduler-ui/src/view/login/index.html
+++ b/dolphinscheduler-ui/src/view/login/index.html
@@ -31,8 +31,8 @@
<meta name="theme-color" content="#4a8dee">
<meta name="msapplication-navbutton-color" content="#4a8dee">
<meta name="viewport"
content="width=device-width,user-scalable=no,initial-scale=1,maximum-scale=1,minimum-scale=1">
-
- <title>Login - DolphinScheduler</title>
+
+ <title>登陆 - 智数调度中心</title>
</head>
<body>
<div id="app"></div>
diff --git a/pom.xml b/pom.xml
index 31968fb..47fdf95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,7 @@
<commons.collections4.version>4.1</commons.collections4.version>
<guava.version>20.0</guava.version>
<postgresql.version>42.1.4</postgresql.version>
- <hive.jdbc.version>2.1.0</hive.jdbc.version>
+ <hive.jdbc.version>1.1.0</hive.jdbc.version>
<commons.io.version>2.4</commons.io.version>
<oshi.core.version>3.5.0</oshi.core.version>
<clickhouse.jdbc.version>0.1.52</clickhouse.jdbc.version>
@@ -119,6 +119,7 @@
<swagger.version>1.9.3</swagger.version>
<springfox.version>2.9.2</springfox.version>
<skywalking.version>8.4.0</skywalking.version>
+ <micrometer.version>1.1.4</micrometer.version>
</properties>
<dependencyManagement>
@@ -170,6 +171,18 @@
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ <version>${micrometer.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
@@ -351,7 +364,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
diff --git a/script/dolphinscheduler-daemon.sh
b/script/dolphinscheduler-daemon.sh
index b6a6dba..fa50613 100755
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -73,13 +73,13 @@ elif [ "$command" = "master-server" ]; then
HEAP_INITIAL_SIZE=4g
HEAP_MAX_SIZE=4g
HEAP_NEW_GENERATION__SIZE=2g
- LOG_FILE="-Dlogging.config=classpath:logback-master.xml
-Ddruid.mysql.usePingMethod=false"
+ LOG_FILE="-Dlogging.config=classpath:logback-master.xml
-Ddruid.mysql.usePingMethod=false
-Dspring.config.location=${DOLPHINSCHEDULER_CONF_DIR}/master.properties"
CLASS=org.apache.dolphinscheduler.server.master.MasterServer
elif [ "$command" = "worker-server" ]; then
HEAP_INITIAL_SIZE=2g
HEAP_MAX_SIZE=2g
HEAP_NEW_GENERATION__SIZE=1g
- LOG_FILE="-Dlogging.config=classpath:logback-worker.xml
-Ddruid.mysql.usePingMethod=false"
+ LOG_FILE="-Dlogging.config=classpath:logback-worker.xml
-Ddruid.mysql.usePingMethod=false
-Dspring.config.location=${DOLPHINSCHEDULER_CONF_DIR}/worker.properties"
CLASS=org.apache.dolphinscheduler.server.worker.WorkerServer
elif [ "$command" = "alert-server" ]; then
HEAP_INITIAL_SIZE=1g
