Skip to content

Commit 364e7bc

Browse files
author
luxl
committed
Merge dev into DSIP-95
2 parents 585fc36 + acc3ac9 commit 364e7bc

55 files changed

Lines changed: 49 additions & 3100 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deploy/docker/docker-compose.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ version: "3.8"
1818

1919
services:
2020
dolphinscheduler-postgresql:
21-
image: bitnami/postgresql:15.2.0
21+
image: bitnamilegacy/postgresql:15.2.0-debian-11-r9
22+
2223
ports:
2324
- "5432:5432"
2425
profiles: ["all", "schema"]
@@ -37,7 +38,7 @@ services:
3738
- dolphinscheduler
3839

3940
dolphinscheduler-zookeeper:
40-
image: bitnami/zookeeper:3.7.1
41+
image: bitnamilegacy/zookeeper:3.7.1-debian-11-r99
4142
profiles: ["all"]
4243
environment:
4344
ALLOW_ANONYMOUS_LOGIN: "yes"

‎deploy/docker/docker-stack.yml‎

Lines changed: 0 additions & 132 deletions
This file was deleted.

‎docs/docs/en/guide/start/docker.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,25 @@ There are three ways to start DolphinScheduler with Docker
1111
Need to install [Docker](https://docs.docker.com/engine/install/) 1.13.1+ and [Docker Compose](https://docs.docker.com/compose/) 1.28.0+
1212
before starting DolphinScheduler with Docker
1313

14+
## Download Plugins Dependencies
15+
16+
Starting from version 3.3.0, the binary package no longer provides plugin dependencies, and users need to download them by themselves. The plugin dependency package download address: [Plugin Dependency Package](https://repo.maven.apache.org/maven2/org/apache/dolphinscheduler)
17+
You can also execute the following command to install plugin dependencies:
18+
19+
```shell
20+
bash ./bin/install-plugins.sh 3.3.0
21+
```
22+
23+
Usually, you do not need all connector plugins, you can specify the plugins you need by configuring `conf/plugins_config`. For example, if you only need the `dolphinscheduler-task-shell` plugin, you can modify the configuration file as follows:
24+
25+
```
26+
--task-plugins--
27+
dolphinscheduler-task-shell
28+
--end--
29+
```
30+
31+
> **_Note:_** The plugin dependency package is usually not included in the binary package. If you encounter a `ClassNotFoundException` error when starting the service, please refer to the documentation of the relevant plugin type to check if the plugin dependency package is missing. For example, `dolphinscheduler-datasource-mysql` does not include `mysql-connector-java.jar`.
32+
1433
## Start Server
1534

1635
### Using standalone-server Docker Image

‎docs/docs/zh/guide/start/docker.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,25 @@
1010

1111
需要安装 [Docker](https://docs.docker.com/engine/install/) 1.13.1 以上版本，以及 [Docker Compose](https://docs.docker.com/compose/) 1.28.0 以上版本。
1212

13+
## 下载插件依赖
14+
15+
从 3.3.0 版本开始，二进制包不再提供插件依赖，需要用户自行下载。插件依赖包下载地址：[插件依赖包](https://repo.maven.apache.org/maven2/org/apache/dolphinscheduler)
16+
你也可以执行以下命令来安装插件依赖:
17+
18+
```shell
19+
bash ./bin/install-plugins.sh 3.3.0
20+
```
21+
22+
通常你并不需要所有的连接器插件，可以通过配置 `conf/plugins_config` 来指定你所需要的插件，例如，你只需要 `dolphinscheduler-task-shell` 插件，那么您可以修改配置文件如下：
23+
24+
```
25+
--task-plugins--
26+
dolphinscheduler-task-shell
27+
--end--
28+
```
29+
30+
> **_注意:_** 插件依赖包通常不包含在二进制包中，如果你在启动服务时遇到 `ClassNotFoundException` 错误，请参考相关插件类型的文档检查是否缺少插件依赖包，例如 `dolphinscheduler-datasource-mysql` 中不包含 `mysql-connector-java.jar`
31+
1332
## 启动服务
1433

1534
### 使用 standalone-server 镜像

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/constants/AuditLogConstants.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@ private AuditLogConstants() {
4141
public static final String ALIAS = "alias";
4242
public static final String FILE_NAME = "fileName";
4343
public static final String FULL_NAME = "fullName";
44-
public static final String FUNC_NAME = "funcName";
4544

4645
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java‎

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -24,44 +24,27 @@
2424

2525
public class ApiFuncIdentificationConstant {
2626

27-
public static final String ACCESS_TOKEN_MANAGE = "security:token:view";
28-
public static final String ACCESS_TOKEN_VIEW = "security:token:view";
2927
public static final String ACCESS_TOKEN_CREATE = "security:token:create";
3028
public static final String ACCESS_TOKEN_UPDATE = "security:token:update";
3129
public static final String ACCESS_TOKEN_DELETE = "security:token:delete";
3230
public static final String ALERT_GROUP_VIEW = "security:alert-group:view";
3331
public static final String ALERT_GROUP_CREATE = "security:alert-group:create";
3432
public static final String ALERT_GROUP_UPDATE = "security:alert-group:update";
3533
public static final String ALERT_GROUP_DELETE = "security:alert-group:delete";
36-
public static final String TENANT_MANAGER = "security:tenant:view";
3734
public static final String TENANT_CREATE = "security:tenant:create";
3835
public static final String TENANT_UPDATE = "security:tenant:update";
3936
public static final String TENANT_DELETE = "security:tenant:delete";
4037
public static final String ALERT_INSTANCE_CREATE = "security:alert-plugin:create";
4138
public static final String ALERT_PLUGIN_UPDATE = "security:alert-plugin:update";
4239
public static final String ALERT_PLUGIN_DELETE = "security:alert-plugin:delete";
4340
public static final String WORKER_GROUP_CREATE = "security:worker-group:create";
44-
public static final String WORKER_GROUP_EDIT = "security:worker-group:update";
4541
public static final String WORKER_GROUP_DELETE = "security:worker-group:delete";
46-
public static final String YARN_QUEUE_MANAGE = "security:queue:view";
4742
public static final String YARN_QUEUE_CREATE = "security:queue:create";
4843
public static final String YARN_QUEUE_UPDATE = "security:queue:update";
4944
public static final String ENVIRONMENT_CREATE = "security:environment:create";
5045
public static final String ENVIRONMENT_UPDATE = "security:environment:update";
5146
public static final String ENVIRONMENT_DELETE = "security:environment:delete";
52-
public static final String ENVIRONMENT_MANAGER = "security:environment:view";
53-
public static final String CALENDAR_CREATE = "security:calendar:create";
54-
public static final String CALENDAR_EDIT = "security:calendar:update";
55-
public static final String CALENDAR_DELETE = "security:calendar:delete";
56-
public static final String CARDS_CREATE = "security:cards:create";
57-
public static final String CARDS_EDIT = "security:cards:update";
58-
public static final String CARDS_EDIT_VALUE = "security:cards:value";
59-
public static final String CARDS_CARDS_DELETE = "security:cards:delete";
60-
public static final String ALARM_GROUP_MANAGE = "security:alert-group:view";
6147
public static final String ALARM_INSTANCE_MANAGE = "security:alert-plugin:view";
62-
public static final String WORKER_GROUP_MANAGE = "security:worker-group:view";
63-
public static final String CALENDAR_MANAGE = "security:calendar:view";
64-
public static final String CARDS_MANAGER = "security:cards:view";
6548
public static final String USER_MANAGER = "security:user:view";
6649

6750
public static final String PROJECT = "project:view";
@@ -70,80 +53,47 @@ public class ApiFuncIdentificationConstant {
7053
public static final String PROJECT_DELETE = "project:delete";
7154
public static final String WORKFLOW_DEFINITION = "project:definition:list";
7255
public static final String WORKFLOW_CREATE = "project:definition:create";
73-
public static final String WORKFLOW_IMPORT = "project:definition:import";
7456
public static final String WORKFLOW_UPDATE = "project:definition:update";
75-
public static final String WORKFLOW_START = "project:executors:start";
76-
public static final String TIMING = "project:schedules:timing";
7757
public static final String WORKFLOW_ONLINE_OFFLINE = "project:definition:release";
78-
public static final String WORKFLOW_COPY = "project:definition:copy";
79-
public static final String CRON_MANAGE = "project:schedules:corn";
80-
public static final String WORKFLOW_DELETE = "project:definition:delete";
8158
public static final String WORKFLOW_TREE_VIEW = "project:definition:view-tree";
82-
public static final String WORKFLOW_EXPORT = "project:definition:export";
8359
public static final String WORKFLOW_BATCH_COPY = "project:definition:batch-copy";
84-
public static final String WORKFLOW_DEFINITION_EXPORT = "project:definition:batch-export";
85-
public static final String WORKFLOW_DEFINITION_BATCH_DELETE = "project:definition:batch-delete";
8660
public static final String WORKFLOW_SWITCH_TO_THIS_VERSION = "project:definition:version:switch";
8761
public static final String WORKFLOW_DEFINITION_DELETE = "project:definition:version:delete";
88-
public static final String WORKFLOW_SAVE = "project:definition:verify-name";
8962
public static final String WORKFLOW_INSTANCE = "project:process-instance:list";
9063
public static final String RERUN = "project:executors:execute";
9164
public static final String FAILED_TO_RETRY = "project:executors:retry";
9265
public static final String STOP = "project:executors:stop";
9366
public static final String RECOVERY_SUSPEND = "project:executors:recover";
9467
public static final String PAUSE = "project:executors:pause";
9568
public static final String INSTANCE_DELETE = "project:process-instance:delete";
96-
public static final String INSTANCE_BATCH_DELETE = "project:process-instance:batch-delete";
9769
public static final String FORCED_SUCCESS = "project:task-instance:force-success";
9870
public static final String VIEW_LOG = "project:log:detail";
9971
public static final String DOWNLOAD_LOG = "project:log:download-log";
10072
public static final String PROJECT_OVERVIEW = "project:overview:view";
101-
public static final String WORKFLOW_RELATION = "project:lineages:view";
102-
public static final String WORKFLOW_DEFINITION_VIEW = "project:definition:view";
103-
public static final String WORKFLOW_INSTANCE_VIEW = "project:process-instance:view";
10473
public static final String TASK_INSTANCE = "project:task-instance:view";
10574
public static final String INSTANCE_UPDATE = "project:process-instance:update";
10675
public static final String VERSION_LIST = "project:version:list";
10776
public static final String TASK_DEFINITION = "project:task-definition:view";
108-
public static final String TASK_DEFINITION_CREATE = "project:task-definition:create";
109-
public static final String TASK_DEFINITION_UPDATE = "project:task-definition:edit";
11077
public static final String TASK_DEFINITION_MOVE = "project:task-definition:move";
11178
public static final String TASK_VERSION_VIEW = "project:task-definition:version";
11279
public static final String TASK_DEFINITION_DELETE = "project:task-definition:delete";
113-
public static final String VERSION_DELETE = "project:version:delete";
11480

11581
public static final String DATASOURCE = "datasource:view";
11682
public static final String DATASOURCE_CREATE_DATASOURCE = "datasource:create";
11783
public static final String DATASOURCE_UPDATE = "datasource:update";
11884
public static final String DATASOURCE_DELETE = "datasource:delete";
119-
public static final String DATASOURCE_LIST = "datasource:list";
120-
public static final String DATASOURCE_PARAM_VIEW = "datasource:param-view";
121-
122-
public static final String FILE_VIEW = "resources:file:view";
123-
public static final String FOLDER_ONLINE_CREATE = "resources:file:create";
124-
public static final String FILE_ONLINE_CREATE = "resources:file:online-create";
125-
public static final String FILE_UPLOAD = "resources:file:upload";
126-
public static final String FILE_UPDATE = "resources:file:update-content";
127-
public static final String FILE_RENAME = "resources:file:rename";
128-
public static final String FILE_DOWNLOAD = "resources:file:download";
129-
public static final String FILE_DELETE = "resources:file:delete";
13085

13186
public static final String TASK_GROUP_VIEW = "resources:task-group:view";
13287
public static final String TASK_GROUP_CREATE = "resources:task-group:create";
13388
public static final String TASK_GROUP_CLOSE = "resources:task-group:close";
13489
public static final String TASK_GROUP_EDIT = "resources:task-group:update";
135-
public static final String TASK_GROUP_VIEW_QUEUE = "resources:task-group:queue-view";
13690

137-
public static final String TASK_GROUP_QUEUE = "resources:task-group-queue:view";
13891
public static final String TASK_GROUP_QUEUE_PRIORITY = "resources:task-group-queue:priority";
13992
public static final String TASK_GROUP_QUEUE_START = "resources:task-group-queue:start";
14093

14194
public static final String MONITOR_MASTER_VIEW = "monitor:masters:view";
142-
public static final String MONITOR_WORKER_VIEW = "monitor:workers:view";
14395
public static final String MONITOR_DATABASES_VIEW = "monitor:databases:view";
14496

145-
public static final String MONITOR_STATISTICS_VIEW = "monitor:statistics:view";
146-
14797
public final static Map<ExecuteType, String> map = new HashMap<ExecuteType, String>();
14898

14999
static {

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
@Data
2828
public class GanttDto {
2929

30-
/**
31-
* height
32-
*/
33-
private int height;
34-
3530
/**
3631
* tasks list
3732
*/
@@ -52,18 +47,4 @@ public GanttDto() {
5247
taskStatus.put("success", "success");
5348
}
5449

55-
public GanttDto(int height, List<Task> tasks, List<Long> taskNames) {
56-
this();
57-
this.height = height;
58-
this.tasks = tasks;
59-
this.taskNames = taskNames;
60-
}
61-
62-
public GanttDto(int height, List<Task> tasks, List<Long> taskNames, Map<String, String> taskStatus) {
63-
this.height = height;
64-
this.tasks = tasks;
65-
this.taskNames = taskNames;
66-
this.taskStatus = taskStatus;
67-
}
68-
6950
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/taskRelation/TaskRelationFilterRequest.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,6 @@ public class TaskRelationFilterRequest extends PageQueryDto {
4444
@Schema(example = "1234567890123")
4545
private long postTaskCode;
4646

47-
public TaskRelationFilterRequest(long workflowCode, long preTaskCode, long postTaskCode) {
48-
this.workflowCode = workflowCode;
49-
this.preTaskCode = preTaskCode;
50-
this.postTaskCode = postTaskCode;
51-
}
52-
5347
public TaskRelationFilterRequest(long preTaskCode, long postTaskCode) {
5448
this.preTaskCode = preTaskCode;
5549
this.postTaskCode = postTaskCode;

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/Instance.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ public class Instance {
6868

6969
private long subflowCode;
7070

71-
public Instance() {
72-
}
73-
7471
public Instance(int id, String name, long code, String type) {
7572
this.id = id;
7673
this.name = name;

0 commit comments

Comments
 (0)