0.4.0-SNAPSHOT

dlink-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-admin/src/main/java/com/dlink/service/impl/StudioServiceImpl.java

@@ -28,10 +28,13 @@ import com.dlink.session.SessionInfo;
 import com.dlink.session.SessionPool;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -44,6 +47,8 @@ import java.util.Map;
 @Service
 public class StudioServiceImpl implements StudioService {
 
+    private static final Logger logger = LoggerFactory.getLogger(StudioServiceImpl.class);
+
     @Autowired
     private ClusterService clusterService;
     @Autowired
@@ -147,7 +152,12 @@ public class StudioServiceImpl implements StudioService {
     public List<JsonNode> listJobs(Integer clusterId) {
         Cluster cluster = clusterService.getById(clusterId);
         Asserts.checkNotNull(cluster,"该集群不存在");
-        return FlinkAPI.build(cluster.getJobManagerHost()).listJobs();
+        try{
+            return FlinkAPI.build(cluster.getJobManagerHost()).listJobs();
+        } catch (Exception e) {
+            logger.info("查询作业时集群不存在");
+        }
+        return new ArrayList<>();
     }
 
     @Override

dlink-admin/src/main/resources/mapper/SavepointsMapper.xml

@@ -9,6 +9,9 @@
         dlink_savepoints a
         <where>
             1=1
+            <if test='param.taskId!=null'>
+                and a.task_id = #{param.taskId}
+            </if>
             <if test='param.name!=null and param.name!=""'>
                 and a.name like "%${param.name}%"
             </if>

dlink-app/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-assembly/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-client/dlink-client-1.11/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>dlink-client</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>dlink-client-1.11</artifactId>

dlink-client/dlink-client-1.11/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-client/dlink-client-1.12/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>dlink-client</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>dlink-client-1.12</artifactId>

dlink-client/dlink-client-1.12/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-client/dlink-client-1.13/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>dlink-client</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>dlink-client-1.13</artifactId>

dlink-client/dlink-client-1.13/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-client/dlink-client-1.14/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>dlink-client</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>dlink-client-1.14</artifactId>

dlink-client/dlink-client-1.14/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-client</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

dlink-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-connectors/dlink-connector-jdbc-1.12/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-connectors/dlink-connector-jdbc-1.13/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-connectors</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-connectors/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

dlink-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

dlink-core/src/main/java/com/dlink/job/JobManager.java

@@ -29,6 +29,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.flink.runtime.jobgraph.JobGraph;
 import org.apache.flink.table.api.StatementSet;
 import org.apache.flink.table.api.TableResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -42,6 +44,8 @@ import java.util.List;
  **/
 public class JobManager extends RunTime {
 
+    private static final Logger logger = LoggerFactory.getLogger(JobManager.class);
+
     private JobHandler handler;
     private String sessionId;
     private Integer maxRowNum = 100;
@@ -375,7 +379,12 @@ public class JobManager extends RunTime {
             Gateway.build(config.getGatewayConfig()).savepointJob();
             return true;
         } else {
-            return FlinkAPI.build(config.getAddress()).stop(jobId);
+            try{
+                return FlinkAPI.build(config.getAddress()).stop(jobId);
+            }catch (Exception e){
+                logger.info("停止作业时集群不存在");
+            }
+            return false;
         }
     }
 

dlink-executor/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-extends/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>dlink</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>dlink-extends</artifactId>

dlink-extends/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-function/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/dlink-metadata-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-metadata</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/dlink-metadata-clickhouse/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-metadata</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/dlink-metadata-mysql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-metadata</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/dlink-metadata-oracle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-metadata</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/dlink-metadata-postgresql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink-metadata</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-metadata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dlink</artifactId>
         <groupId>com.dlink</groupId>
-        <version>0.3.2</version>
+        <version>0.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dlink-web/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>dlink</artifactId>
     <groupId>com.dlink</groupId>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>

dlink-web/src/components/Studio/StudioConsole/StudioProcess/index.tsx

@@ -44,7 +44,6 @@ const StudioProcess = (props: any) => {
       overlay={
         <Menu onClick={({key}) => savepoint(key, item)}>
           <Menu.Item key="trigger">Trigger</Menu.Item>
-          <Menu.Item key="dispose">Dispose</Menu.Item>
           <Menu.Item key="stop">Stop</Menu.Item>
           <Menu.Item key="cancel">Cancel</Menu.Item>
         </Menu>

dlink-web/src/components/Studio/StudioLeftTool/StudioCluster/index.tsx

 import {
   message, Button, Table, Empty, Divider,
-  Tooltip
+  Tooltip,Drawer
 } from "antd";
+import ProDescriptions from '@ant-design/pro-descriptions';
 import {StateType} from "@/pages/FlinkSqlStudio/model";
 import {connect} from "umi";
 import {useState} from "react";
@@ -14,19 +15,158 @@ import React from "react";
 import {showCluster} from "../../StudioEvent/DDL";
 import {handleAddOrUpdate} from "@/components/Common/crud";
 import ClusterForm from "@/pages/Cluster/components/ClusterForm";
+import {SavePointTableListItem} from "@/components/Studio/StudioRightTool/StudioSavePoint/data";
 
 const StudioCluster = (props: any) => {
 
   const {cluster, dispatch} = props;
   const [createModalVisible, handleCreateModalVisible] = useState<boolean>(false);
+  const [row, setRow] = useState<{}>();
 
   const getColumns = () => {
-    let columns: any = [{
+    return [{
       title: "集群名",
       dataIndex: "alias",
       key: "alias",
       sorter: true,
-    }, {
+      render: (dom, entity) => {
+        return <a onClick={() => setRow(entity)}>{dom}</a>;
+      },
+    }];
+  };
+
+  const getAllColumns = () => {
+    return [{
+      title: "集群名",
+      dataIndex: "alias",
+      key: "alias",
+    },{
+      title: '名称',
+      dataIndex: 'name',
+    },
+      {
+        title: '集群ID',
+        dataIndex: 'id',
+      },
+      {
+        title: '类型',
+        sorter: true,
+        dataIndex: 'type',
+        filters: [
+          {
+            text: 'Yarn Session',
+            value: 'yarn-session',
+          },
+          {
+            text: 'Standalone',
+            value: 'standalone',
+          },
+          {
+            text: 'Yarn Per-Job',
+            value: 'yarn-per-job',
+          },
+          {
+            text: 'Yarn Application',
+            value: 'yarn-application',
+          },
+        ],
+        filterMultiple: false,
+        valueEnum: {
+          'yarn-session': {text: 'Yarn Session'},
+          'standalone': {text: 'Standalone'},
+          'yarn-per-job': {text: 'Yarn Per-Job'},
+          'yarn-application': {text: 'Yarn Application'},
+        },
+      },
+      {
+        title: 'JobManager HA 地址',
+        sorter: true,
+        dataIndex: 'hosts',
+        valueType: 'textarea',
+      },
+      {
+        title: '当前 JobManager 地址',
+        sorter: true,
+        dataIndex: 'jobManagerHost',
+      },{
+        title: '版本',
+        sorter: true,
+        dataIndex: 'version',
+      },
+      {
+        title: '状态',
+        dataIndex: 'status',
+        filters: [
+          {
+            text: '正常',
+            value: 1,
+          },
+          {
+            text: '异常',
+            value: 0,
+          },
+        ],
+        filterMultiple: false,
+        valueEnum: {
+          1: {text: '正常', status: 'Success'},
+          0: {text: '异常', status: 'Error'},
+        },
+      },
+      {
+        title: '注释',
+        sorter: true,
+        valueType: 'textarea',
+        dataIndex: 'note',
+      },
+      {
+        title: '是否启用',
+        dataIndex: 'enabled',
+        filters: [
+          {
+            text: '已启用',
+            value: 1,
+          },
+          {
+            text: '已禁用',
+            value: 0,
+          },
+        ],
+        filterMultiple: false,
+        valueEnum: {
+          true: {text: '已启用', status: 'Success'},
+          false: {text: '已禁用', status: 'Error'},
+        },
+      },
+      {
+        title: '注册方式',
+        dataIndex: 'autoRegisters',
+        filters: [
+          {
+            text: '自动',
+            value: 1,
+          },
+          {
+            text: '手动',
+            value: 0,
+          },
+        ],
+        filterMultiple: false,
+        valueEnum: {
+          true: {text: '自动', status: 'Success'},
+          false: {text: '手动', status: 'Error'},
+        },
+      },
+      {
+        title: '创建时间',
+        dataIndex: 'createTime',
+        valueType: 'dateTime',
+      },
+      {
+        title: '最近更新时间',
+        dataIndex: 'updateTime',
+        valueType: 'dateTime',
+      },
+      {
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
@@ -46,7 +186,6 @@ const StudioCluster = (props: any) => {
         </a>
       ],
     },];
-    return columns;
   };
 
   const onRefreshCluster = () => {
@@ -91,6 +230,28 @@ const StudioCluster = (props: any) => {
         }}
         modalVisible={createModalVisible}
       />
+      <Drawer
+        width={600}
+        visible={!!row}
+        onClose={() => {
+          setRow(undefined);
+        }}
+        closable={false}
+      >
+        {row?.name && (
+          <ProDescriptions
+            column={2}
+            title={row?.name}
+            request={async () => ({
+            data: row || {},
+          })}
+            params={{
+            id: row?.name,
+          }}
+            columns={getAllColumns()}
+            />
+            )}
+      </Drawer>
     </>
   );
 };

dlink-web/src/components/Studio/StudioRightTool/StudioSavePoint/index.tsx

 import React, {useRef, useState} from "react";
 import {DownOutlined, HeartOutlined, PlusOutlined, UserOutlined} from '@ant-design/icons';
 import {ActionType, ProColumns} from "@ant-design/pro-table";
-import {Drawer} from 'antd';
-import {PageContainer} from '@ant-design/pro-layout';
+import {Drawer,Table} from 'antd';
 import ProTable from '@ant-design/pro-table';
 import ProDescriptions from '@ant-design/pro-descriptions';
 import {queryData} from "@/components/Common/crud";
@@ -74,7 +73,7 @@ const StudioSavePoint: React.FC<{}> = (props: any) => {
       <ProTable<SavePointTableListItem>
         actionRef={actionRef}
         rowKey="id"
-        request={(params, sorter, filter) => queryData(url, {taskId:current.taskId,...params, sorter, filter})}
+        request={(params, sorter, filter) => queryData(url, {taskId:current.key,...params, sorter, filter})}
         columns={columns}
         search={false}
         />

dlink-web/src/components/Studio/StudioRightTool/StudioSetting/index.tsx

@@ -178,11 +178,11 @@ const StudioSetting = (props: any) => {
         label="SavePoint策略" className={styles.form_item} name="savePointStrategy"
         tooltip='指定 SavePoint策略，默认为禁用'
       >
-        <Select defaultValue="0">
-          <Option value="0">禁用</Option>
-          <Option value="1">最近一次</Option>
-          <Option value="2">最早一次</Option>
-          <Option value="3">自定义</Option>
+        <Select defaultValue={0}>
+          <Option value={0}>禁用</Option>
+          <Option value={1}>最近一次</Option>
+          <Option value={2}>最早一次</Option>
+          <Option value={3}>自定义</Option>
         </Select>
       </Form.Item>
       {current.task.savePointStrategy == 3 ?

dlink-web/src/locales/zh-CN/pages.ts

@@ -29,7 +29,7 @@ export default {
   'pages.welcome.link': '欢迎加入',
   'pages.welcome.star': '欢迎 Star ',
   'pages.welcome.advancedLayout': 'Github',
-  'pages.welcome.alertMessage': '实时计算平台 Dlink & Apache Flink 即将发布，目前为体验版，版本号为 0.3.2。',
+  'pages.welcome.alertMessage': '实时计算平台 Dlink & Apache Flink 即将发布，目前为体验版，版本号为 0.4.0。',
   'pages.admin.subPage.title': ' 这个页面只有 admin 权限才能查看',
   'pages.admin.subPage.alertMessage': 'umi ui 现已发布，欢迎使用 npm run ui 启动体验。',
   'pages.searchTable.createForm.newRule': '新建规则',

dlink-web/src/pages/Welcome.tsx

@@ -20,7 +20,7 @@ export default (): React.ReactNode => {
         <Alert
           message={intl.formatMessage({
             id: 'pages.welcome.alertMessage',
-            defaultMessage: '实时计算平台 Dlink & Apache Flink 即将发布，目前为体验版，版本号为 0.3.2。',
+            defaultMessage: '实时计算平台 Dlink & Apache Flink 即将发布，目前为体验版，版本号为 0.4.0。',
           })}
           type="success"
           showIcon
@@ -408,6 +408,9 @@ export default (): React.ReactNode => {
                 <li>
                   <Link>新增 yarn-perjob 和 yarn-application 的启动时多样化集群配置生效</Link>
                 </li>
+                <li>
+                  <Link>优化项目结构与打包结构</Link>
+                </li>
               </ul>
             </Paragraph>
           </Timeline.Item>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.dlink</groupId>
     <artifactId>dlink</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.2</version>
+    <version>0.4.0-SNAPSHOT</version>
 
     <modules>
         <module>dlink-common</module>