From 3162cccd43808cfe2ec7b69faad9f5636decf0af Mon Sep 17 00:00:00 2001 From: khadgarmage Date: Tue, 15 Oct 2019 19:48:28 +0800 Subject: [PATCH] license check (#1016) --- .github/workflows/ci.yml | 15 + .../api/utils/ZooKeeperState.java | 26 +- .../api/utils/ZookeeperMonitor.java | 16 + .../api/controller/MonitorControllerTest.java | 16 + .../api/utils/ZookeeperMonitorUtilsTest.java | 16 + .../common/enums/ZKNodeType.java | 16 + .../common/utils/IpUtilsTest.java | 16 + .../org/apache/dolphinscheduler/dao/App.java | 16 + .../dao/utils/DagHelperTest.java | 17 + .../rpc/LogViewServiceGrpc.java | 28 +- .../server/worker/EnvFileTest.java | 16 + .../server/zk/ZKWorkerClientTest.java | 16 + dolphinscheduler-ui/src/combo/1.0.0/3rd.css | 16 + dolphinscheduler-ui/src/combo/1.0.0/local.js | 16 + dolphinscheduler-ui/src/font/demo.css | 16 + dolphinscheduler-ui/src/font/demo_index.html | 508 +++++++++--------- dolphinscheduler-ui/src/font/iconfont.css | 16 + dolphinscheduler-ui/src/font/iconfont.js | 16 + dolphinscheduler-ui/src/js/conf/home/App.vue | 16 + .../js/conf/home/pages/dag/_source/dag.scss | 16 + .../js/conf/home/pages/dag/_source/dag.vue | 16 + .../_source/formModel/_source/selectInput.vue | 16 + .../formModel/_source/timeoutAlarm.vue | 16 + .../formModel/_source/workerGroups.vue | 16 + .../dag/_source/formModel/formModel.scss | 16 + .../pages/dag/_source/formModel/formModel.vue | 16 + .../home/pages/dag/_source/formModel/log.vue | 16 + .../formModel/tasks/_source/commcon.js | 16 + .../formModel/tasks/_source/datasource.vue | 16 + .../tasks/_source/dependItemList.vue | 16 + .../formModel/tasks/_source/listBox.vue | 16 + .../formModel/tasks/_source/localParams.vue | 16 + .../formModel/tasks/_source/resources.vue | 16 + .../formModel/tasks/_source/sqlType.vue | 16 + .../formModel/tasks/_source/statementList.vue | 16 + .../_source/formModel/tasks/_source/udfs.vue | 16 + .../dag/_source/formModel/tasks/dependent.vue | 16 + .../dag/_source/formModel/tasks/flink.vue | 16 + .../pages/dag/_source/formModel/tasks/mr.vue | 16 + .../dag/_source/formModel/tasks/procedure.vue | 16 + .../dag/_source/formModel/tasks/python.vue | 16 + .../dag/_source/formModel/tasks/shell.vue | 16 + .../dag/_source/formModel/tasks/spark.vue | 16 + .../pages/dag/_source/formModel/tasks/sql.vue | 16 + .../_source/formModel/tasks/sub_process.vue | 16 + .../pages/dag/_source/jumpAffirm/index.js | 16 + .../dag/_source/jumpAffirm/jumpAffirm.vue | 16 + .../pages/dag/_source/startingParam/index.vue | 16 + .../dag/_source/udp/_source/selectTenant.vue | 16 + .../conf/home/pages/dag/_source/udp/udp.vue | 16 + .../home/pages/dag/_source/variable/index.vue | 16 + .../dag/_source/variable/variablesView.vue | 16 + .../conf/home/pages/dag/definitionDetails.vue | 16 + .../src/js/conf/home/pages/dag/index.vue | 16 + .../conf/home/pages/dag/instanceDetails.vue | 16 + .../js/conf/home/pages/datasource/index.vue | 16 + .../pages/list/_source/createDataSource.vue | 16 + .../datasource/pages/list/_source/list.vue | 16 + .../pages/datasource/pages/list/index.vue | 16 + .../src/js/conf/home/pages/home/index.vue | 16 + .../src/js/conf/home/pages/monitor/index.vue | 16 + .../monitor/pages/servers/_source/gauge.vue | 16 + .../pages/servers/_source/gaugeOption.js | 16 + .../pages/servers/_source/zookeeperList.vue | 16 + .../pages/monitor/pages/servers/alert.vue | 16 + .../pages/monitor/pages/servers/apiserver.vue | 16 + .../pages/monitor/pages/servers/master.vue | 16 + .../pages/monitor/pages/servers/mysql.vue | 16 + .../pages/monitor/pages/servers/rpcserver.vue | 16 + .../pages/monitor/pages/servers/servers.scss | 16 + .../monitor/pages/servers/statistics.vue | 16 + .../pages/monitor/pages/servers/worker.vue | 16 + .../pages/monitor/pages/servers/zookeeper.vue | 16 + .../src/js/conf/home/pages/projects/index.vue | 16 + .../_source/instanceConditions/index.vue | 16 + .../taskRecordList/_source/conditions.vue | 16 + .../_source/taskRecordList/_source/list.vue | 16 + .../pages/_source/taskRecordList/index.vue | 16 + .../pages/projects/pages/definition/index.vue | 16 + .../pages/definition/pages/create/index.vue | 16 + .../pages/definition/pages/details/index.vue | 16 + .../definition/pages/list/_source/email.vue | 16 + .../definition/pages/list/_source/list.vue | 16 + .../definition/pages/list/_source/start.vue | 16 + .../definition/pages/list/_source/timing.vue | 16 + .../pages/definition/pages/list/index.vue | 16 + .../definition/pages/tree/_source/tree.js | 16 + .../pages/definition/pages/tree/index.vue | 16 + .../pages/definition/timing/_source/list.vue | 16 + .../pages/definition/timing/index.vue | 16 + .../pages/historyTaskRecord/index.vue | 16 + .../pages/index/_source/commandStateCount.vue | 16 + .../pages/index/_source/defineUserCount.vue | 16 + .../pages/index/_source/processStateCount.vue | 16 + .../pages/index/_source/queueCount.vue | 16 + .../pages/index/_source/taskCtatusCount.vue | 16 + .../home/pages/projects/pages/index/index.vue | 16 + .../pages/projects/pages/instance/index.vue | 16 + .../pages/instance/pages/details/index.vue | 16 + .../instance/pages/gantt/_source/gantt.js | 16 + .../pages/instance/pages/gantt/index.vue | 16 + .../instance/pages/list/_source/list.vue | 16 + .../pages/instance/pages/list/index.vue | 16 + .../pages/list/_source/createProject.vue | 16 + .../projects/pages/list/_source/list.vue | 16 + .../home/pages/projects/pages/list/index.vue | 16 + .../pages/taskInstance/_source/list.vue | 16 + .../pages/projects/pages/taskRecord/index.vue | 16 + .../pages/projects/pages/timing/index.vue | 16 + .../src/js/conf/home/pages/resource/index.vue | 16 + .../home/pages/resource/pages/file/index.vue | 16 + .../pages/file/pages/create/index.vue | 16 + .../file/pages/details/_source/noType.vue | 16 + .../pages/file/pages/details/index.vue | 16 + .../resource/pages/file/pages/edit/index.vue | 16 + .../pages/file/pages/list/_source/list.vue | 16 + .../pages/file/pages/list/_source/rename.vue | 16 + .../resource/pages/file/pages/list/index.vue | 16 + .../home/pages/resource/pages/udf/index.vue | 16 + .../udf/pages/function/_source/createUdf.vue | 16 + .../pages/udf/pages/function/_source/list.vue | 16 + .../pages/udf/pages/function/index.vue | 16 + .../pages/udf/pages/resource/_source/list.vue | 16 + .../udf/pages/resource/_source/rename.vue | 16 + .../pages/udf/pages/resource/index.vue | 16 + .../src/js/conf/home/pages/security/index.vue | 16 + .../pages/queue/_source/createQueue.vue | 16 + .../security/pages/queue/_source/list.vue | 16 + .../home/pages/security/pages/queue/index.vue | 16 + .../pages/tenement/_source/createTenement.vue | 16 + .../security/pages/tenement/_source/list.vue | 16 + .../pages/security/pages/tenement/index.vue | 16 + .../home/pages/security/pages/token/index.vue | 16 + .../pages/users/_source/createUser.vue | 16 + .../security/pages/users/_source/list.vue | 16 + .../home/pages/security/pages/users/index.vue | 16 + .../warningGroups/_source/createWarning.vue | 16 + .../pages/warningGroups/_source/list.vue | 16 + .../security/pages/warningGroups/index.vue | 16 + .../workerGroups/_source/createWorker.vue | 16 + .../pages/workerGroups/_source/list.vue | 16 + .../security/pages/workerGroups/index.vue | 16 + .../src/js/conf/home/pages/user/index.vue | 16 + .../pages/user/pages/account/_source/info.vue | 16 + .../home/pages/user/pages/account/index.vue | 16 + .../user/pages/password/_source/info.vue | 16 + .../home/pages/user/pages/password/index.vue | 16 + .../user/pages/token/_source/createToken.vue | 16 + .../pages/user/pages/token/_source/list.vue | 16 + .../home/pages/user/pages/token/index.vue | 16 + dolphinscheduler-ui/src/js/conf/login/App.vue | 16 + .../components/conditions/conditions.vue | 16 + .../fileUpdate/definitionUpdate.vue | 16 + .../components/fileUpdate/fileUpdate.vue | 16 + .../components/fileUpdate/udfUpdate.vue | 16 + .../js/module/components/layout/layout.vue | 16 + .../module/components/listBoxF/listBoxF.vue | 16 + .../listConstruction/listConstruction.vue | 16 + .../src/js/module/components/nav/nav.vue | 16 + .../js/module/components/noData/noData.vue | 16 + .../src/js/module/components/popup/popup.vue | 16 + .../module/components/priority/priority.vue | 16 + .../components/progressBar/progressBar.vue | 16 + .../secondaryMenu/secondaryMenu.vue | 16 + .../src/js/module/components/spin/spin.vue | 16 + .../components/tooltipsJSON/tooltipsJSON.vue | 16 + .../module/components/transfer/transfer.vue | 16 + .../src/js/module/util/clickoutside.js | 16 + .../src/js/module/util/index.js | 16 + .../gitbook-plugin-livereload/plugin.js | 16 + .../view/docs/zh_CN/_book/gitbook/gitbook.js | 16 + .../view/docs/zh_CN/_book/gitbook/theme.js | 16 + dolphinscheduler-ui/src/view/home/index.html | 18 + dolphinscheduler-ui/src/view/login/index.html | 18 + pom.xml | 55 ++ 175 files changed, 3101 insertions(+), 256 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000000..0ce451d8e3 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,15 @@ +name: CI + +on: [push, pull_request] + +jobs: + License-check: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: check + run: mvn -B apache-rat:check diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java index 66fde70f9a..c7ec39ebf1 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZooKeeperState.java @@ -1,3 +1,19 @@ +/* + * 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.api.utils; import org.apache.commons.lang3.StringUtils; @@ -9,7 +25,7 @@ import java.io.IOException; import java.util.Scanner; /** - * zookeeper状态监控:4字口诀 + * zookeeper状态监控:4字口诀 * */ public class ZooKeeperState { @@ -77,7 +93,7 @@ public class ZooKeeperState { } scannerForWchs.close(); } - + String consText = cmd("cons"); if (StringUtils.isNotBlank(consText)) { Scanner scannerForCons = new Scanner(consText); @@ -205,7 +221,7 @@ public class ZooKeeperState { + ", watches=" + watches + ", connections=" + connections + "]"; } - - - + + + } diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java index 4b8623ea8b..1ccd77e201 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitor.java @@ -1,3 +1,19 @@ +/* + * 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.api.utils; import org.apache.dolphinscheduler.common.enums.ZKNodeType; diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java index 941c4ce638..4c449d63d9 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/MonitorControllerTest.java @@ -1,3 +1,19 @@ +/* + * 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.api.controller; import org.apache.dolphinscheduler.api.enums.Status; diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java index f6facce97d..d04fea34c7 100644 --- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java +++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/ZookeeperMonitorUtilsTest.java @@ -1,3 +1,19 @@ +/* + * 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.api.utils; import org.apache.dolphinscheduler.common.model.MasterServer; diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java index 36a3d86a80..8982c2a838 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java @@ -1,3 +1,19 @@ +/* + * 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.enums; /** diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java index 6f5f72631d..e65bcd219b 100644 --- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java +++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/IpUtilsTest.java @@ -1,3 +1,19 @@ +/* + * 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.utils; import org.junit.Assert; diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java index c39cc2439a..bec7e16743 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/App.java @@ -1,3 +1,19 @@ +/* + * 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.dao; import org.springframework.boot.SpringApplication; diff --git a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java index b85cfb5b6f..d94657c1aa 100644 --- a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java +++ b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/DagHelperTest.java @@ -1,3 +1,20 @@ +/* + * 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.dao.utils; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java b/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java index 4ea4646118..ddab9bd830 100644 --- a/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java +++ b/dolphinscheduler-rpc/src/main/java/org/apache/dolphinscheduler/rpc/LogViewServiceGrpc.java @@ -1,3 +1,19 @@ +/* + * 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.rpc; import static io.grpc.MethodDescriptor.generateFullMethodName; @@ -32,7 +48,7 @@ public final class LogViewServiceGrpc { // Static method descriptors that strictly reflect the proto. @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getRollViewLogMethod()} instead. + @java.lang.Deprecated // Use {@link #getRollViewLogMethod()} instead. public static final io.grpc.MethodDescriptor METHOD_ROLL_VIEW_LOG = getRollViewLogMethod(); @@ -46,7 +62,7 @@ public final class LogViewServiceGrpc { if ((getRollViewLogMethod = LogViewServiceGrpc.getRollViewLogMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getRollViewLogMethod = LogViewServiceGrpc.getRollViewLogMethod) == null) { - LogViewServiceGrpc.getRollViewLogMethod = getRollViewLogMethod = + LogViewServiceGrpc.getRollViewLogMethod = getRollViewLogMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( @@ -64,7 +80,7 @@ public final class LogViewServiceGrpc { return getRollViewLogMethod; } @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getViewLogMethod()} instead. + @java.lang.Deprecated // Use {@link #getViewLogMethod()} instead. public static final io.grpc.MethodDescriptor METHOD_VIEW_LOG = getViewLogMethod(); @@ -78,7 +94,7 @@ public final class LogViewServiceGrpc { if ((getViewLogMethod = LogViewServiceGrpc.getViewLogMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getViewLogMethod = LogViewServiceGrpc.getViewLogMethod) == null) { - LogViewServiceGrpc.getViewLogMethod = getViewLogMethod = + LogViewServiceGrpc.getViewLogMethod = getViewLogMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( @@ -96,7 +112,7 @@ public final class LogViewServiceGrpc { return getViewLogMethod; } @io.grpc.ExperimentalApi("https://github.com/grpc/grpc-java/issues/1901") - @java.lang.Deprecated // Use {@link #getGetLogBytesMethod()} instead. + @java.lang.Deprecated // Use {@link #getGetLogBytesMethod()} instead. public static final io.grpc.MethodDescriptor METHOD_GET_LOG_BYTES = getGetLogBytesMethod(); @@ -110,7 +126,7 @@ public final class LogViewServiceGrpc { if ((getGetLogBytesMethod = LogViewServiceGrpc.getGetLogBytesMethod) == null) { synchronized (LogViewServiceGrpc.class) { if ((getGetLogBytesMethod = LogViewServiceGrpc.getGetLogBytesMethod) == null) { - LogViewServiceGrpc.getGetLogBytesMethod = getGetLogBytesMethod = + LogViewServiceGrpc.getGetLogBytesMethod = getGetLogBytesMethod = io.grpc.MethodDescriptor.newBuilder() .setType(io.grpc.MethodDescriptor.MethodType.UNARY) .setFullMethodName(generateFullMethodName( diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java index 3556ee4502..d6dc34a67a 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java @@ -1,3 +1,19 @@ +/* + * 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.server.worker; import org.apache.commons.lang.StringUtils; diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java index caac3bdb14..55a2a4a3a3 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/zk/ZKWorkerClientTest.java @@ -1,3 +1,19 @@ +/* + * 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.server.zk; import org.junit.Assert; diff --git a/dolphinscheduler-ui/src/combo/1.0.0/3rd.css b/dolphinscheduler-ui/src/combo/1.0.0/3rd.css index 658a682e97..31ad26482d 100644 --- a/dolphinscheduler-ui/src/combo/1.0.0/3rd.css +++ b/dolphinscheduler-ui/src/combo/1.0.0/3rd.css @@ -1,3 +1,19 @@ +/* + * 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. + */ .hljs{display:block;overflow-x:auto;padding:0.5em;background:white;color:black}.hljs-comment,.hljs-quote,.hljs-variable{color:#008000}.hljs-keyword,.hljs-selector-tag,.hljs-built_in,.hljs-name,.hljs-tag{color:#00f}.hljs-string,.hljs-title,.hljs-section,.hljs-attribute,.hljs-literal,.hljs-template-tag,.hljs-template-variable,.hljs-type,.hljs-addition{color:#a31515}.hljs-deletion,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-meta{color:#2b91af}.hljs-doctag{color:#808080}.hljs-attr{color:#f00}.hljs-symbol,.hljs-bullet,.hljs-link{color:#00b0e8}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:bold} .jtk-node{position:absolute}.jtk-group{position:absolute;overflow:visible}[jtk-group-content]{position:relative}.katavorio-clone-drag{pointer-events:none}.jtk-surface{overflow:hidden!important;position:relative;cursor:move;cursor:-moz-grab;cursor:-webkit-grab;touch-action:none}.jtk-surface-panning{cursor:-moz-grabbing;cursor:-webkit-grabbing;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jtk-surface-canvas{overflow:visible!important}.jtk-surface-droppable-node{touch-action:none}.jtk-surface-nopan{overflow:scroll!important;cursor:default}.jtk-surface-tile{border:none;outline:0;margin:0;-webkit-transition:opacity .3s ease .15s;-moz-transition:opacity .3s ease .15s;-o-transition:opacity .3s ease .15s;-ms-transition:opacity .3s ease .15s;transition:opacity .3s ease .15s}.jtk-lasso{border:2px solid #3177b8;background-color:#f5f5f5;opacity:.5;display:none;z-index:20000;position:absolute}.jtk-lasso-select-defeat *{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.jtk-lasso-mask{position:fixed;z-index:20000;display:none;opacity:.5;background-color:#07234e;top:0;bottom:0;left:0;right:0}.jtk-surface-selected-element{border:2px dashed #f76258!important}.jtk-surface-pan{background-color:Azure;opacity:.4;text-align:center;cursor:pointer;z-index:2;-webkit-transition:background-color .15s ease-in;-moz-transition:background-color .15s ease-in;-o-transition:background-color .15s ease-in;transition:background-color .15s ease-in}.jtk-surface-pan-bottom,.jtk-surface-pan-top{width:100%;height:20px}.jtk-surface-pan-bottom:hover,.jtk-surface-pan-left:hover,.jtk-surface-pan-right:hover,.jtk-surface-pan-top:hover{opacity:.6;background-color:#3177b8;color:#fff;font-weight:700}.jtk-surface-pan-left,.jtk-surface-pan-right{width:20px;height:100%;line-height:40}.jtk-surface-pan-active,.jtk-surface-pan-active:hover{background-color:#f76258}.jtk-miniview{overflow:hidden!important;width:125px;height:125px;position:relative;background-color:#b2c9cd;border:1px solid #e2e6cd;border-radius:4px;opacity:.8}.jtk-miniview-panner{border:5px dotted #f5f5f5;opacity:.4;background-color:#4f6f7e;cursor:move;cursor:-moz-grab;cursor:-webkit-grab}.jtk-miniview-panning{cursor:-moz-grabbing;cursor:-webkit-grabbing}.jtk-miniview-element{background-color:#607a86;position:absolute}.jtk-miniview-group-element{background:0 0;border:2px solid #607a86}.jtk-miniview-collapse{color:#f5f5f5;position:absolute;font-size:18px;top:-1px;right:3px;cursor:pointer;font-weight:700}.jtk-miniview-collapse:before{content:"\2012"}.jtk-miniview-collapsed{background-color:#449ea6;border-radius:4px;height:22px;margin-right:0;padding:4px;width:21px}.jtk-miniview-collapsed .jtk-miniview-element,.jtk-miniview-collapsed .jtk-miniview-panner{visibility:hidden}.jtk-miniview-collapsed .jtk-miniview-collapse:before{content:"+"}.jtk-miniview-collapse:hover{color:#e4f013}.jtk-dialog-underlay{left:0;right:0;top:0;bottom:0;position:fixed;z-index:100000;opacity:.8;background-color:#ccc;display:none}.jtk-dialog-overlay{position:fixed;z-index:100001;display:none;background-color:#fff;font-family:"Open Sans",sans-serif;padding:7px;box-shadow:0 0 5px gray;overflow:hidden}.jtk-dialog-overlay-x{max-height:0;transition:max-height .5s ease-in;-moz-transition:max-height .5s ease-in;-ms-transition:max-height .5s ease-in;-o-transition:max-height .5s ease-in;-webkit-transition:max-height .5s ease-in}.jtk-dialog-overlay-y{max-width:0;transition:max-width .5s ease-in;-moz-transition:max-width .5s ease-in;-ms-transition:max-width .5s ease-in;-o-transition:max-width .5s ease-in;-webkit-transition:max-width .5s ease-in}.jtk-dialog-overlay-top{top:20px}.jtk-dialog-overlay-bottom{bottom:20px}.jtk-dialog-overlay-left{left:20px}.jtk-dialog-overlay-right{right:20px}.jtk-dialog-overlay-x.jtk-dialog-overlay-visible{max-height:1000px}.jtk-dialog-overlay-y.jtk-dialog-overlay-visible{max-width:1000px}.jtk-dialog-buttons{text-align:right;margin-top:5px}.jtk-dialog-button{border:none;cursor:pointer;margin-right:5px;min-width:56px;background-color:#fff;outline:1px solid #ccc}.jtk-dialog-button:hover{color:#fff;background-color:#234b5e}.jtk-dialog-title{text-align:left;font-size:14px;margin-bottom:9px}.jtk-dialog-content{font-size:12px;text-align:left;min-width:250px;margin:0 14px}.jtk-dialog-content ul{width:100%;padding-left:0}.jtk-dialog-content label{cursor:pointer;font-weight:inherit}.jtk-dialog-overlay input,.jtk-dialog-overlay textarea{background-color:#fff;border:1px solid #ccc;color:#333;font-size:14px;font-style:normal;outline:0;padding:6px 4px;margin-right:6px}.jtk-dialog-overlay input:focus,.jtk-dialog-overlay textarea:focus{background-color:#cbeae1;border:1px solid #83b8a8;color:#333;font-size:14px;font-style:normal;outline:0}.jtk-draw-skeleton{position:absolute;left:0;right:0;top:0;bottom:0;outline:2px solid #84acb3;opacity:.8}.jtk-draw-handle{position:absolute;width:7px;height:7px;background-color:#84acb3}.jtk-draw-handle-tl{left:0;top:0;cursor:nw-resize}.jtk-draw-handle-tr{right:0;top:0;cursor:ne-resize}.jtk-draw-handle-bl{left:0;bottom:0;cursor:sw-resize}.jtk-draw-handle-br{bottom:0;right:0;cursor:se-resize}.jtk-draw-drag{display:none;position:absolute;left:50%;top:50%;margin-left:-10px;margin-top:-10px;width:20px;height:20px;background-color:#84acb3;cursor:move}.jtk-drag-select-defeat *{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none} .CodeMirror{font-family:monospace;height:300px;color:#000;direction:ltr}.CodeMirror-lines{padding:4px 0}.CodeMirror pre{padding:0 4px}.CodeMirror-gutter-filler,.CodeMirror-scrollbar-filler{background-color:#fff}.CodeMirror-gutters{border-right:1px solid #ddd;background-color:#f7f7f7;white-space:nowrap}.CodeMirror-linenumber{padding:0 3px 0 5px;min-width:20px;text-align:right;color:#999;white-space:nowrap}.CodeMirror-guttermarker{color:#000}.CodeMirror-guttermarker-subtle{color:#999}.CodeMirror-cursor{border-left:1px solid #000;border-right:none;width:0}.CodeMirror div.CodeMirror-secondarycursor{border-left:1px solid silver}.cm-fat-cursor .CodeMirror-cursor{width:auto;border:0!important;background:#7e7}.cm-fat-cursor div.CodeMirror-cursors{z-index:1}.cm-fat-cursor-mark{background-color:rgba(20,255,20,.5);-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite}.cm-animate-fat-cursor{width:auto;border:0;-webkit-animation:blink 1.06s steps(1) infinite;-moz-animation:blink 1.06s steps(1) infinite;animation:blink 1.06s steps(1) infinite;background-color:#7e7}@-moz-keyframes blink{50%{background-color:transparent}}@-webkit-keyframes blink{50%{background-color:transparent}}@keyframes blink{50%{background-color:transparent}}.cm-tab{display:inline-block;text-decoration:inherit}.CodeMirror-rulers{position:absolute;left:0;right:0;top:-50px;bottom:-20px;overflow:hidden}.CodeMirror-ruler{border-left:1px solid #ccc;top:0;bottom:0;position:absolute}.cm-s-default .cm-header{color:#00f}.cm-s-default .cm-quote{color:#090}.cm-negative{color:#d44}.cm-positive{color:#292}.cm-header,.cm-strong{font-weight:700}.cm-em{font-style:italic}.cm-link{text-decoration:underline}.cm-strikethrough{text-decoration:line-through}.cm-s-default .cm-keyword{color:#708}.cm-s-default .cm-atom{color:#219}.cm-s-default .cm-number{color:#164}.cm-s-default .cm-def{color:#00f}.cm-s-default .cm-variable-2{color:#05a}.cm-s-default .cm-type,.cm-s-default .cm-variable-3{color:#085}.cm-s-default .cm-comment{color:#a50}.cm-s-default .cm-string{color:#a11}.cm-s-default .cm-string-2{color:#f50}.cm-s-default .cm-meta{color:#555}.cm-s-default .cm-qualifier{color:#555}.cm-s-default .cm-builtin{color:#30a}.cm-s-default .cm-bracket{color:#997}.cm-s-default .cm-tag{color:#170}.cm-s-default .cm-attribute{color:#00c}.cm-s-default .cm-hr{color:#999}.cm-s-default .cm-link{color:#00c}.cm-s-default .cm-error{color:red}.cm-invalidchar{color:red}.CodeMirror-composing{border-bottom:2px solid}div.CodeMirror span.CodeMirror-matchingbracket{color:#0b0}div.CodeMirror span.CodeMirror-nonmatchingbracket{color:#a22}.CodeMirror-matchingtag{background:rgba(255,150,0,.3)}.CodeMirror-activeline-background{background:#e8f2ff}.CodeMirror{position:relative;overflow:hidden;background:#fff}.CodeMirror-scroll{overflow:scroll!important;margin-bottom:-30px;margin-right:-30px;padding-bottom:30px;height:100%;outline:0;position:relative}.CodeMirror-sizer{position:relative;border-right:30px solid transparent}.CodeMirror-gutter-filler,.CodeMirror-hscrollbar,.CodeMirror-scrollbar-filler,.CodeMirror-vscrollbar{position:absolute;z-index:6;display:none}.CodeMirror-vscrollbar{right:0;top:0;overflow-x:hidden;overflow-y:scroll}.CodeMirror-hscrollbar{bottom:0;left:0;overflow-y:hidden;overflow-x:scroll}.CodeMirror-scrollbar-filler{right:0;bottom:0}.CodeMirror-gutter-filler{left:0;bottom:0}.CodeMirror-gutters{position:absolute;left:0;top:0;min-height:100%;z-index:3}.CodeMirror-gutter{white-space:normal;height:100%;display:inline-block;vertical-align:top;margin-bottom:-30px}.CodeMirror-gutter-wrapper{position:absolute;z-index:4;background:0 0!important;border:none!important}.CodeMirror-gutter-background{position:absolute;top:0;bottom:0;z-index:4}.CodeMirror-gutter-elt{position:absolute;cursor:default;z-index:4}.CodeMirror-gutter-wrapper ::selection{background-color:transparent}.CodeMirror-gutter-wrapper ::-moz-selection{background-color:transparent}.CodeMirror-lines{cursor:text;min-height:1px}.CodeMirror pre{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;border-width:0;background:0 0;font-family:inherit;font-size:inherit;margin:0;white-space:pre;word-wrap:normal;line-height:inherit;color:inherit;z-index:2;position:relative;overflow:visible;-webkit-tap-highlight-color:transparent;-webkit-font-variant-ligatures:contextual;font-variant-ligatures:contextual}.CodeMirror-wrap pre{word-wrap:break-word;white-space:pre-wrap;word-break:normal}.CodeMirror-linebackground{position:absolute;left:0;right:0;top:0;bottom:0;z-index:0}.CodeMirror-linewidget{position:relative;z-index:2;padding:.1px}.CodeMirror-rtl pre{direction:rtl}.CodeMirror-code{outline:0}.CodeMirror-gutter,.CodeMirror-gutters,.CodeMirror-linenumber,.CodeMirror-scroll,.CodeMirror-sizer{-moz-box-sizing:content-box;box-sizing:content-box}.CodeMirror-measure{position:absolute;width:100%;height:0;overflow:hidden;visibility:hidden}.CodeMirror-cursor{position:absolute;pointer-events:none}.CodeMirror-measure pre{position:static}div.CodeMirror-cursors{visibility:hidden;position:relative;z-index:3}div.CodeMirror-dragcursors{visibility:visible}.CodeMirror-focused div.CodeMirror-cursors{visibility:visible}.CodeMirror-selected{background:#d9d9d9}.CodeMirror-focused .CodeMirror-selected{background:#d7d4f0}.CodeMirror-crosshair{cursor:crosshair}.CodeMirror-line::selection,.CodeMirror-line>span::selection,.CodeMirror-line>span>span::selection{background:#d7d4f0}.CodeMirror-line::-moz-selection,.CodeMirror-line>span::-moz-selection,.CodeMirror-line>span>span::-moz-selection{background:#d7d4f0}.cm-searching{background-color:#ffa;background-color:rgba(255,255,0,.4)}.cm-force-border{padding-right:.1px}@media print{.CodeMirror div.CodeMirror-cursors{visibility:hidden}}.cm-tab-wrap-hack:after{content:''}span.CodeMirror-selectedtext{background:0 0} diff --git a/dolphinscheduler-ui/src/combo/1.0.0/local.js b/dolphinscheduler-ui/src/combo/1.0.0/local.js index ec6f9abe6c..1d0d62ecd5 100644 --- a/dolphinscheduler-ui/src/combo/1.0.0/local.js +++ b/dolphinscheduler-ui/src/combo/1.0.0/local.js @@ -1 +1,17 @@ +/* + * 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. + */ Not found \ No newline at end of file diff --git a/dolphinscheduler-ui/src/font/demo.css b/dolphinscheduler-ui/src/font/demo.css index a67054a0a0..9abf38fc19 100644 --- a/dolphinscheduler-ui/src/font/demo.css +++ b/dolphinscheduler-ui/src/font/demo.css @@ -1,3 +1,19 @@ +/* + * 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. + */ /* Logo 字体 */ @font-face { font-family: "iconfont logo"; diff --git a/dolphinscheduler-ui/src/font/demo_index.html b/dolphinscheduler-ui/src/font/demo_index.html index 7b950b5eb3..4741c2236b 100644 --- a/dolphinscheduler-ui/src/font/demo_index.html +++ b/dolphinscheduler-ui/src/font/demo_index.html @@ -1,3 +1,21 @@ + + @@ -22,494 +40,494 @@
  • Font class
  • Symbol
  • - + 查看项目 - +
      - +
    • 编辑修改
      
    • - +
    • 失败
      
    • - +
    • 等待
      
    • - +
    • 刷新
      
    • - +
    • 启动
      
    • - +
    • gantt
      
    • - +
    • 工作流程图
      
    • - +
    • 成功已解决-
      
    • - +
    • 首页
      
    • - +
    • 复制
      
    • - +
    • 删除
      
    • - +
    • 系统操作日志
      
    • - +
    • 定位
      
    • - +
    • 运行中
      
    • - +
    • 设置 设定 配置 齿轮
      
    • - +
    • 指缘刷新9
      
    • - +
    • tip
      
    • - +
    • 单箭头直线
      
    • - +
    • 全屏
      
    • - +
    • 全屏
      
    • - +
    • 删除
      
    • - +
    • 用户
      
    • - +
    • 暂停
      
    • - +
    • 暂停
      
    • - +
    • 用户
      
    • - +
    • 文件夹
      
    • - +
    • 成功
      
    • - +
    • 安全
      
    • - +
    • 刷新
      
    • - +
    • 文档修改
      
    • - +
    • 下载
      
    • - +
    • IT监控
      
    • - +
    • 修改信息
      
    • - +
    • remove
      
    • - +
    • 排班管理
      
    • - +
    • 设置
      
    • - +
    • 添加
      
    • - +
    • 退出 #8f8f8f & 14px
      
    • - +
    • icon_禁止
      
    • - +
    • 1116加载中
      
    • - +
    • 
    • - +
    • 沙漏
      
    • - +
    • 停止
      
    • - +
    • 定时器
      
    • - +
    • 箭头
      
    • - +
    • 停止
      
    • - +
    • 运算-等于
      
    • - +
    • 编辑
      
    • - +
    • 项目管理
      
    • - +
    • 依赖关系
      
    • - +
    • 二级-下线记录
      
    • - +
    • 代码
      
    • - +
    • 文档下载
      
    • - +
    • 历史
      
    • - +
    • 放大
      
    • - +
    • 缩小
      
    • - +
    • 导航
      
    • - +
    • 时间管理
      
    • - +
    • 数据库
      
    • - +
    • 调度中心
      
    • - +
    • 鼠标指针
      
    • - +
    • 圆点
      
    • - +
    • 24-Tree-Structure
      
    • - +
    • 
    • - +
    • 暂停
      
    • - +
    • 用户
      
    • - +
    • 删除
      
    • - +
    • 关 闭
      
    • - +
    • 15.错误、关闭、失败
      
    • - +
    • 分页向左
      
    • - +
    • 分页向左
      
    • - +
    • 日志设置
      
    • - +
    • 刷新
      
    • - +
    • 暂停
      
    • - +
    • 时间分类
      
    • - +
    • 二级-下线记录
      
    • - +
    • 调度中心
      
    • - +
    • 树型
      
    • - +
    • LOGO-2
      
    • - +
    • 箭头
      
    • - +

    Unicode 引用

    @@ -559,7 +577,7 @@
      - +
    • @@ -568,7 +586,7 @@
      .icon-bianjixiugai
    • - +
    • @@ -577,7 +595,7 @@
      .icon-shibai
    • - +
    • @@ -586,7 +604,7 @@
      .icon-dengdai
    • - +
    • @@ -595,7 +613,7 @@
      .icon-shuaxin1
    • - +
    • @@ -604,7 +622,7 @@
      .icon-qidong
    • - +
    • @@ -613,7 +631,7 @@
      .icon-gantt
    • - +
    • @@ -622,7 +640,7 @@
      .icon-gongzuoliuchengtu
    • - +
    • @@ -631,7 +649,7 @@
      .icon-chenggongyijiejue
    • - +
    • @@ -640,7 +658,7 @@
      .icon-home
    • - +
    • @@ -649,7 +667,7 @@
      .icon-fuzhi
    • - +
    • @@ -658,7 +676,7 @@
      .icon-shanchu1
    • - +
    • @@ -667,7 +685,7 @@
      .icon-xitongcaozuorizhi
    • - +
    • @@ -676,7 +694,7 @@
      .icon-dingwei
    • - +
    • @@ -685,7 +703,7 @@
      .icon-yunxingzhong
    • - +
    • @@ -694,7 +712,7 @@
      .icon-shezhishedingpeizhichilun
    • - +
    • @@ -703,7 +721,7 @@
      .icon-zhiyuanshuaxin9
    • - +
    • @@ -712,7 +730,7 @@
      .icon-tishi2
    • - +
    • @@ -721,7 +739,7 @@
      .icon-one-line-arrow
    • - +
    • @@ -730,7 +748,7 @@
      .icon-quanping
    • - +
    • @@ -739,7 +757,7 @@
      .icon-quanping1
    • - +
    • @@ -748,7 +766,7 @@
      .icon-shanchu
    • - +
    • @@ -757,7 +775,7 @@
      .icon-yonghu
    • - +
    • @@ -766,7 +784,7 @@
      .icon-ai06
    • - +
    • @@ -775,7 +793,7 @@
      .icon-ai05
    • - +
    • @@ -784,7 +802,7 @@
      .icon-yonghu1
    • - +
    • @@ -793,7 +811,7 @@
      .icon-wenjianjia
    • - +
    • @@ -802,7 +820,7 @@
      .icon-chenggong
    • - +
    • @@ -811,7 +829,7 @@
      .icon-anquan
    • - +
    • @@ -820,7 +838,7 @@
      .icon-shuaxin
    • - +
    • @@ -829,7 +847,7 @@
      .icon-wendangxiugai
    • - +
    • @@ -838,7 +856,7 @@
      .icon-download
    • - +
    • @@ -847,7 +865,7 @@
      .icon-ITjiankong
    • - +
    • @@ -856,7 +874,7 @@
      .icon-icon-xiugai
    • - +
    • @@ -865,7 +883,7 @@
      .icon-remove
    • - +
    • @@ -874,7 +892,7 @@
      .icon-paibanguanli
    • - +
    • @@ -883,7 +901,7 @@
      .icon-shezhi-xue
    • - +
    • @@ -892,7 +910,7 @@
      .icon-tianjia-xue
    • - +
    • @@ -901,7 +919,7 @@
      .icon-tuichufffpx
    • - +
    • @@ -910,7 +928,7 @@
      .icon-icon_jinzhi
    • - +
    • @@ -919,7 +937,7 @@
      .icon-jiazaizhong
    • - +
    • @@ -928,7 +946,7 @@
      .icon-gou1
    • - +
    • @@ -937,7 +955,7 @@
      .icon-shalou
    • - +
    • @@ -946,7 +964,7 @@
      .icon-stop
    • - +
    • @@ -955,7 +973,7 @@
      .icon-timer
    • - +
    • @@ -964,7 +982,7 @@
      .icon-jiantou-copy
    • - +
    • @@ -973,7 +991,7 @@
      .icon-tingzhi
    • - +
    • @@ -982,7 +1000,7 @@
      .icon-yunsuan-dengyu
    • - +
    • @@ -991,7 +1009,7 @@
      .icon-bianji
    • - +
    • @@ -1000,7 +1018,7 @@
      .icon-xiangmuguanli
    • - +
    • @@ -1009,7 +1027,7 @@
      .icon-yilaiguanxi
    • - +
    • @@ -1018,7 +1036,7 @@
      .icon-erji-xiaxianjilu
    • - +
    • @@ -1027,7 +1045,7 @@
      .icon-daima
    • - +
    • @@ -1036,7 +1054,7 @@
      .icon-wendangxiazai1
    • - +
    • @@ -1045,7 +1063,7 @@
      .icon-lishi
    • - +
    • @@ -1054,7 +1072,7 @@
      .icon-fangda
    • - +
    • @@ -1063,7 +1081,7 @@
      .icon-suoxiao
    • - +
    • @@ -1072,7 +1090,7 @@
      .icon-daohang
    • - +
    • @@ -1081,7 +1099,7 @@
      .icon-shijianguanli
    • - +
    • @@ -1090,7 +1108,7 @@
      .icon-shujuku
    • - +
    • @@ -1099,7 +1117,7 @@
      .icon-tiaoduzhongxin
    • - +
    • @@ -1108,7 +1126,7 @@
      .icon-shubiaozhizhen
    • - +
    • @@ -1117,7 +1135,7 @@
      .icon-yuandian
    • - +
    • @@ -1126,7 +1144,7 @@
      .icon--Tree-Structure
    • - +
    • @@ -1135,7 +1153,7 @@
      .icon-xia
    • - +
    • @@ -1144,7 +1162,7 @@
      .icon-zanting
    • - +
    • @@ -1153,7 +1171,7 @@
      .icon-yonghu3
    • - +
    • @@ -1162,7 +1180,7 @@
      .icon-shanchu2
    • - +
    • @@ -1171,7 +1189,7 @@
      .icon-guanbi
    • - +
    • @@ -1180,7 +1198,7 @@
      .icon-cuowuguanbishibai
    • - +
    • @@ -1189,7 +1207,7 @@
      .icon-icon_paging_left
    • - +
    • @@ -1198,7 +1216,7 @@
      .icon-icon_paging_left-copy
    • - +
    • @@ -1207,7 +1225,7 @@
      .icon-rizhishezhi
    • - +
    • @@ -1216,7 +1234,7 @@
      .icon-icon-test
    • - +
    • @@ -1225,7 +1243,7 @@
      .icon-zanting1
    • - +
    • @@ -1234,7 +1252,7 @@
      .icon-shijianfenlei
    • - +
    • @@ -1243,7 +1261,7 @@
      .icon-erji-xiaxianjilu-copy
    • - +
    • @@ -1252,7 +1270,7 @@
      .icon-tiaoduzhongxin-copy
    • - +
    • @@ -1261,7 +1279,7 @@
      .icon-juxingkaobei
    • - +
    • @@ -1270,7 +1288,7 @@
      .icon-LOGO-
    • - +
    • @@ -1279,7 +1297,7 @@
      .icon-jiantou-copy-copy
    • - +

    font-class 引用

    @@ -1308,7 +1326,7 @@
      - +
    • 编辑修改
      #icon-bianjixiugai
    • - +
    • 失败
      #icon-shibai
    • - +
    • 等待
      #icon-dengdai
    • - +
    • 刷新
      #icon-shuaxin1
    • - +
    • 启动
      #icon-qidong
    • - +
    • gantt
      #icon-gantt
    • - +
    • 工作流程图
      #icon-gongzuoliuchengtu
    • - +
    • 成功已解决-
      #icon-chenggongyijiejue
    • - +
    • 首页
      #icon-home
    • - +
    • 复制
      #icon-fuzhi
    • - +
    • 删除
      #icon-shanchu1
    • - +
    • 系统操作日志
      #icon-xitongcaozuorizhi
    • - +
    • 定位
      #icon-dingwei
    • - +
    • 运行中
      #icon-yunxingzhong
    • - +
    • 设置 设定 配置 齿轮
      #icon-shezhishedingpeizhichilun
    • - +
    • 指缘刷新9
      #icon-zhiyuanshuaxin9
    • - +
    • tip
      #icon-tishi2
    • - +
    • 单箭头直线
      #icon-one-line-arrow
    • - +
    • 全屏
      #icon-quanping
    • - +
    • 全屏
      #icon-quanping1
    • - +
    • 删除
      #icon-shanchu
    • - +
    • 用户
      #icon-yonghu
    • - +
    • 暂停
      #icon-ai06
    • - +
    • 暂停
      #icon-ai05
    • - +
    • 用户
      #icon-yonghu1
    • - +
    • 文件夹
      #icon-wenjianjia
    • - +
    • 成功
      #icon-chenggong
    • - +
    • 安全
      #icon-anquan
    • - +
    • 刷新
      #icon-shuaxin
    • - +
    • 文档修改
      #icon-wendangxiugai
    • - +
    • 下载
      #icon-download
    • - +
    • IT监控
      #icon-ITjiankong
    • - +
    • 修改信息
      #icon-icon-xiugai
    • - +
    • remove
      #icon-remove
    • - +
    • 排班管理
      #icon-paibanguanli
    • - +
    • 设置
      #icon-shezhi-xue
    • - +
    • 添加
      #icon-tianjia-xue
    • - +
    • 退出 #8f8f8f & 14px
      #icon-tuichufffpx
    • - +
    • icon_禁止
      #icon-icon_jinzhi
    • - +
    • 1116加载中
      #icon-jiazaizhong
    • - +
    • #icon-gou1
    • - +
    • 沙漏
      #icon-shalou
    • - +
    • 停止
      #icon-stop
    • - +
    • 定时器
      #icon-timer
    • - +
    • 箭头
      #icon-jiantou-copy
    • - +
    • 停止
      #icon-tingzhi
    • - +
    • 运算-等于
      #icon-yunsuan-dengyu
    • - +
    • 编辑
      #icon-bianji
    • - +
    • 项目管理
      #icon-xiangmuguanli
    • - +
    • 依赖关系
      #icon-yilaiguanxi
    • - +
    • 二级-下线记录
      #icon-erji-xiaxianjilu
    • - +
    • 代码
      #icon-daima
    • - +
    • 文档下载
      #icon-wendangxiazai1
    • - +
    • 历史
      #icon-lishi
    • - +
    • 放大
      #icon-fangda
    • - +
    • 缩小
      #icon-suoxiao
    • - +
    • 导航
      #icon-daohang
    • - +
    • 时间管理
      #icon-shijianguanli
    • - +
    • 数据库
      #icon-shujuku
    • - +
    • 调度中心
      #icon-tiaoduzhongxin
    • - +
    • 鼠标指针
      #icon-shubiaozhizhen
    • - +
    • 圆点
      #icon-yuandian
    • - +
    • 24-Tree-Structure
      #icon--Tree-Structure
    • - +
    • #icon-xia
    • - +
    • 暂停
      #icon-zanting
    • - +
    • 用户
      #icon-yonghu3
    • - +
    • 删除
      #icon-shanchu2
    • - +
    • 关 闭
      #icon-guanbi
    • - +
    • 15.错误、关闭、失败
      #icon-cuowuguanbishibai
    • - +
    • 分页向左
      #icon-icon_paging_left
    • - +
    • 分页向左
      #icon-icon_paging_left-copy
    • - +
    • 日志设置
      #icon-rizhishezhi
    • - +
    • 刷新
      #icon-icon-test
    • - +
    • 暂停
      #icon-zanting1
    • - +
    • 时间分类
      #icon-shijianfenlei
    • - +
    • 二级-下线记录
      #icon-erji-xiaxianjilu-copy
    • - +
    • 调度中心
      #icon-tiaoduzhongxin-copy
    • - +
    • 树型
      #icon-juxingkaobei
    • - +
    • LOGO-2
      #icon-LOGO-
    • - +
    • 箭头
      #icon-jiantou-copy-copy
    • - +

    Symbol 引用

    diff --git a/dolphinscheduler-ui/src/font/iconfont.css b/dolphinscheduler-ui/src/font/iconfont.css index 77b5d0724d..0a7b84a393 100644 --- a/dolphinscheduler-ui/src/font/iconfont.css +++ b/dolphinscheduler-ui/src/font/iconfont.css @@ -1,3 +1,19 @@ +/* + * 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. + */ @font-face {font-family: "iconfont"; src: url('iconfont.eot?t=1554803141579'); /* IE9 */ src: url('iconfont.eot?t=1554803141579#iefix') format('embedded-opentype'), /* IE6-IE8 */ diff --git a/dolphinscheduler-ui/src/font/iconfont.js b/dolphinscheduler-ui/src/font/iconfont.js index 00ab236f61..14779bbc05 100644 --- a/dolphinscheduler-ui/src/font/iconfont.js +++ b/dolphinscheduler-ui/src/font/iconfont.js @@ -1 +1,17 @@ +/* + * 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. + */ !function(s){var c,h='',l=(c=document.getElementsByTagName("script"))[c.length-1].getAttribute("data-injectcss");if(l&&!s.__iconfont__svg__cssinject__){s.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(c){console&&console.log(c)}}!function(c){if(document.addEventListener)if(~["complete","loaded","interactive"].indexOf(document.readyState))setTimeout(c,0);else{var l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()};document.addEventListener("DOMContentLoaded",l,!1)}else document.attachEvent&&(h=c,a=s.document,i=!1,o=function(){i||(i=!0,h())},(t=function(){try{a.documentElement.doScroll("left")}catch(c){return void setTimeout(t,50)}o()})(),a.onreadystatechange=function(){"complete"==a.readyState&&(a.onreadystatechange=null,o())});var h,a,i,o,t}(function(){var c,l;(c=document.createElement("div")).innerHTML=h,h=null,(l=c.getElementsByTagName("svg")[0])&&(l.setAttribute("aria-hidden","true"),l.style.position="absolute",l.style.width=0,l.style.height=0,l.style.overflow="hidden",function(c,l){l.firstChild?function(c,l){l.parentNode.insertBefore(c,l)}(c,l.firstChild):l.appendChild(c)}(l,document.body))})}(window); \ No newline at end of file diff --git a/dolphinscheduler-ui/src/js/conf/home/App.vue b/dolphinscheduler-ui/src/js/conf/home/App.vue index 65969452e9..97110e580c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/App.vue +++ b/dolphinscheduler-ui/src/js/conf/home/App.vue @@ -1,3 +1,19 @@ +/* + * 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. + */