Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement-214][Service packages] Upgrade Dinky to v0.7.2, DolphinScheduler to v3.1.4 #215

Merged
merged 1 commit into from
Mar 15, 2023
Merged

[Improvement-214][Service packages] Upgrade Dinky to v0.7.2, DolphinScheduler to v3.1.4 #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions datasophon-api/src/main/resources/meta/DDP-1.0.0/DINKY/service_ddl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "DINKY",
"label": "Dinky",
"description": "流处理极速开发框架,流批一体&湖仓一体的云原生平台,一站式计算平台",
"version": "0.7.0",
"version": "0.7.2",
"sortNum": 19,
"dependencies":[],
"packageName": "dlink-0.7.0.tar.gz",
"decompressPackageName": "dlink-release-0.7.0",
"packageName": "dlink-0.7.2.tar.gz",
"decompressPackageName": "dlink-release-0.7.2",
"roles": [
{
"name": "Dinky",
Expand All @@ -19,7 +19,8 @@
"timeout": "60",
"program": "auto.sh",
"args": [
"startWithJmx"
"startWithJmx",
"1.14"
]
},
"stopRunner": {
Expand All @@ -40,7 +41,8 @@
"timeout": "60",
"program": "auto.sh",
"args": [
"restart"
"restart",
"1.14"
]
},
"externalLink": {
Expand Down
6 changes: 3 additions & 3 deletions datasophon-api/src/main/resources/meta/DDP-1.0.0/DS/service_ddl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "DS",
"label": "DolphinScheduler",
"description": "分布式易扩展的可视化工作流任务调度平台",
"version": "3.1.1",
"version": "3.1.4",
"sortNum": 14,
"dependencies":["ZOOKEEPER"],
"packageName": "dolphinscheduler-3.1.1.tar.gz",
"decompressPackageName": "dolphinscheduler-3.1.1",
"packageName": "dolphinscheduler-3.1.4.tar.gz",
"decompressPackageName": "dolphinscheduler-3.1.4",
"roles": [
{
"name": "ApiServer",
Expand Down
42 changes: 15 additions & 27 deletions datasophon-api/src/main/resources/sql/datasophon.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
/*
Navicat MySQL Data Transfer
* 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.
*/

Source Server : localhost
Source Server Type : MySQL
Source Server Version : 50722
Source Host : localhost:3306
Source Schema : datasophon

Target Server Type : MySQL
Target Server Version : 50722
File Encoding : 65001

Date: 12/02/2023 21:01:22
*/

SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
Expand Down Expand Up @@ -1090,22 +1094,6 @@ CREATE TABLE `t_ddh_session` (
INSERT INTO `t_ddh_session` VALUES ('3f229c41-84ee-4a09-a0b9-76e95f0577dc', 2, '192.168.75.12', '2022-09-07 11:52:12');
INSERT INTO `t_ddh_session` VALUES ('d25dd005-ceb6-4414-bfdf-9279a23c2ba6', 1, '192.168.75.12', '2023-02-12 20:34: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.
*/

-- ----------------------------
-- Table structure for t_ddh_user_info
Expand Down
7 changes: 7 additions & 0 deletions datasophon-worker/src/main/resources/templates/dinky.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ spring:
mvc:
pathmatch:
matching-strategy: ant_path_matcher
format:
date: yyyy-MM-dd HH:mm:ss
#json格式化全局配置
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss

main:
allow-circular-references: true

Expand Down