ui升级及优化

zhp8341 · Jan 20, 2022 · 62f1a55 · 62f1a55
1 parent bf6df85
commit 62f1a55
Show file tree

Hide file tree

Showing 159 changed files with 94 additions and 19,905 deletions.
diff --git a/README.md b/README.md
@@ -18,8 +18,7 @@ https://xie.infoq.cn/article/1af0cb75be056fea788e6c86b
   **主要功能**:包含任务配置、启/停任务、告警、日志等功能，支持sql语法提示，格式化、sql语句校验。 
 
   **目的**:减少开发、降低成本 完全实现sql化 流计算任务。 😂
-
-   由于前端UI是本人自己写的，不够专业，样式有点丑 请多多包含！！！
+
 
    该项目获得 [Flink Forward Asia Hackathon (2021) 季军 ](https://mp.weixin.qq.com/s/J2OkX_D34ktfwSfhwdmXYQ)
 
@@ -216,19 +215,12 @@ https://nightlies.apache.org/flink/flink-docs-release-1.13/zh/docs/connectors/ta
 ##  七、RoadMap
 
 
-1、 支持除官方以外的连接器  如：阿里云的sls
-
-2、 任务告警自动拉起 (完成)
-
-3、 支持Application模式
-
-4、 完善文档 （持续过程）
+1、支持多版本flink
 
-5、 支持sql预校验，编写sql的时候语法提示等友好的用户体验(完成)
+2、 完善文档 （持续过程）
 
-6、 checkpoint支持rocksDB (完成)
+3、UI
 
-7、 支持jar模式提交任务 (完成)
 
 
 

diff --git a/deployer/pom.xml b/deployer/pom.xml
@@ -10,7 +10,6 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.streaming.platform.web</groupId>
     <artifactId>deployer</artifactId>
     <version>${flink_streaming_version}</version>
 

diff --git a/deployer/src/main/bin/docker-deploy.sh b/deployer/src/main/bin/docker-deploy.sh
@@ -6,7 +6,7 @@ ACTION=$1
 
 ##变量设置##
 env=docker
-project="/data/projects/flink-streaming-platform-web/lib/flink-streaming-web-1.3.0.RELEASE.jar"
+project="/data/projects/flink-streaming-platform-web/lib/flink-streaming-web-1.4.0.RELEASE.jar"
 
 
 ##JAVA_OPTS设置

diff --git a/deployer/src/main/conf/application.properties b/deployer/src/main/conf/application.properties
@@ -1,20 +1,20 @@
-# Nacos config
-nacos.core.auth.enabled=true
-nacos.config.bootstrap.enable=true
-nacos.config.server-addr=172.16.167.37:8848
-nacos.config.group=DEFAULT_GROUP
-nacos.config.data-id=flink-web.properties
-nacos.config.namespace=dev
-nacos.config.username=nacos
-nacos.config.password=nacos
-nacos.config.type=properties
-nacos.config.max-retry=10
-nacos.config.auto-refresh=true
-nacos.config.config-retry-time=2333
-nacos.config.config-long-poll-timeout=46000
+# 如果公司内部使用了nacos 可以将有些配置放到nacos 如果没有请不要填写相关配置
+#nacos.core.auth.enabled=true
+#nacos.config.bootstrap.enable=true
+#nacos.config.server-addr=172.16.167.37:8848
+#nacos.config.group=DEFAULT_GROUP
+#nacos.config.data-id=flink-web.properties
+#nacos.config.namespace=dev
+#nacos.config.username=nacos
+#nacos.config.password=nacos
+#nacos.config.type=properties
+#nacos.config.max-retry=10
+#nacos.config.auto-refresh=true
+#nacos.config.config-retry-time=2333
+#nacos.config.config-long-poll-timeout=46000
 
 ####jdbc信息
 server.port=9084
-spring.datasource.url=jdbc:mysql://db-master-fink-web-001.ch:3306/flink_web?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username=xiaowu
-spring.datasource.password=xiaowu_8rt4BYy5T
+spring.datasource.url=jdbc:mysql://localhost:3306/flink_web?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=root
diff --git a/docs/idea-run.md b/docs/idea-run.md
@@ -18,7 +18,7 @@
 
 6、将 flink-streaming-core/target/flink-streaming-core.jar 移动到 刚创建的lib 中
 
-7、将 flink-streaming-core.jar 改名为 flink-streaming-core-1.3.0.RELEASE.jar
+7、将 flink-streaming-core.jar 改名为 flink-streaming-core-1.4.0.RELEASE.jar
 
 8、flink-streaming-web 模块是REST服务模块，运行启动类是：com.flink.streaming.web.StartApplication
 
@@ -38,9 +38,9 @@
 
 2、command 类似于，下面这个命令是 平台生成的 使用 yarn 提交 批任务
 
-/Users/gump/dreamware/flink-1.13.1/bin/flink run -yjm 1024m -ytm 1024m -p 1 -yqu default  -ynm flink@my_batch_job  -yd -m yarn-cluster  -c com.flink.streaming.core.JobApplication /Users/gump/study/source/github/flink-streaming-platform-web/lib/flink-streaming-core-1.3.0.RELEASE.jar -sql /Users/gump/study/source/github/flink-streaming-platform-web/sql/job_sql_3.sql  -type 2 
+/Users/gump/dreamware/flink-1.13.1/bin/flink run -yjm 1024m -ytm 1024m -p 1 -yqu default  -ynm flink@my_batch_job  -yd -m yarn-cluster  -c com.flink.streaming.core.JobApplication /Users/gump/study/source/github/flink-streaming-platform-web/lib/flink-streaming-core-1.4.0.RELEASE.jar -sql /Users/gump/study/source/github/flink-streaming-platform-web/sql/job_sql_3.sql  -type 2 
 
-3、大家可以去分析这个命令，其实就是要知道 Flink 的客户端在哪个目录 ，提交的jar 就是导入到lib下的 flink-streaming-core-1.3.0.RELEASE.jar 
+3、大家可以去分析这个命令，其实就是要知道 Flink 的客户端在哪个目录 ，提交的jar 就是导入到lib下的 flink-streaming-core-1.4.0.RELEASE.jar 
 
 4、yarn 的url 貌似只是 日志那里有使用
 

diff --git a/docs/img.md b/docs/img.md
@@ -24,24 +24,9 @@
 
 
 
- ![图片](http://img.ccblog.cn/flink/0.png)
- ![图片](http://img.ccblog.cn/flink/1-1.png)
- ![图片](http://img.ccblog.cn/flink/1.png)
- ![图片](http://img.ccblog.cn/flink/2.png)
- ![图片](http://img.ccblog.cn/flink/3-1.png)
- ![图片](http://img.ccblog.cn/flink/3.png)
- ![图片](http://img.ccblog.cn/flink/4.png)
- ![图片](http://img.ccblog.cn/flink/5.png)
- ![图片](http://img.ccblog.cn/flink/6.png)
- ![图片](http://img.ccblog.cn/flink/7.png)
- ![图片](http://img.ccblog.cn/flink/9.png)
- ![图片](http://img.ccblog.cn/flink/10.png)
- ![图片](http://img.ccblog.cn/flink/12.png)
- ![图片](http://img.ccblog.cn/flink/13.png)
- ![图片](http://img.ccblog.cn/flink/1-0.png)
- ![图片](http://img.ccblog.cn/flink/1-2.png)
- ![图片](http://img.ccblog.cn/flink/1-3.png)
- ![图片](http://img.ccblog.cn/flink/1-4.png)
- ![图片](http://img.ccblog.cn/flink/1-5.png)
- ![图片](http://img.ccblog.cn/flink/1-6.png)
- ![图片](http://img.ccblog.cn/flink/1-7.png)
+ ![图片](img_preview/1.png)
+ ![图片](img_preview/2.png)
+ ![图片](img_preview/6.png)
+ ![图片](img_preview/3.png)
+ ![图片](img_preview/4.png)
+ ![图片](img_preview/5.png)
diff --git a/docs/img_preview/1.png b/docs/img_preview/1.png
diff --git a/docs/img_preview/2.png b/docs/img_preview/2.png
diff --git a/docs/img_preview/3.png b/docs/img_preview/3.png
diff --git a/docs/img_preview/4.png b/docs/img_preview/4.png
diff --git a/docs/img_preview/5.png b/docs/img_preview/5.png
diff --git a/docs/img_preview/6.png b/docs/img_preview/6.png
diff --git a/docs/tristan-deploy-use/Dockerfile b/docs/tristan-deploy-use/Dockerfile
@@ -4,4 +4,4 @@ RUN rm -rf /app/flink-streaming-platform-web.tar.gz
 WORKDIR /app/flink-streaming-platform-web/lib
 VOLUME /app/flink-streaming-platform-web/conf
 VOLUME /app/flink-streaming-platform-web/logs
-ENTRYPOINT ["java", "-jar", "flink-streaming-web-1.3.0.RELEASE.jar"]
+ENTRYPOINT ["java", "-jar", "flink-streaming-web-1.4.0.RELEASE.jar"]
diff --git a/flink-streaming-commom/src/main/java/com/flink/streaming/common/constant/SystemConstant.java b/flink-streaming-commom/src/main/java/com/flink/streaming/common/constant/SystemConstant.java
@@ -23,7 +23,7 @@ public class SystemConstant {
     public static final int DEFAULT_PATTERN_FLAGS = Pattern.CASE_INSENSITIVE | Pattern.DOTALL;
 
 
-    public final static String JARVERSION = "lib/flink-streaming-core-1.3.0.RELEASE.jar";
+    public final static String JARVERSION = "lib/flink-streaming-core-1.4.0.RELEASE.jar";
 
 
     public static final String QUERY_JOBID_KEY_WORD = "job-submitted-success:";

diff --git a/flink-streaming-web-front/src/router/index.js b/flink-streaming-web-front/src/router/index.js
@@ -70,16 +70,28 @@ export const constantRoutes = [
     component: () => import('@/views/error-page/401'),
     hidden: true
   },
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: '/dashboard',
+  //   children: [
+  //     {
+  //       path: 'dashboard',
+  //       component: () => import('@/views/dashboard/index'),
+  //       name: 'Dashboard',
+  //       meta: { title: 'dashboard', icon: 'dashboard', affix: true }
+  //     }
+  //   ]
+  // },
   {
     path: '/',
     component: Layout,
-    redirect: '/dashboard',
+    redirect: '/flink/task-manage/index',
     children: [
       {
-        path: 'dashboard',
-        component: () => import('@/views/dashboard/index'),
-        name: 'Dashboard',
-        meta: { title: 'dashboard', icon: 'dashboard', affix: true }
+        path: 'index',
+        name: 'FlinkTaskManage',
+        component: () => import('@/views/flink/task-manage/index'),
       }
     ]
   },

diff --git a/flink-streaming-web-front/src/router/modules/flink.js b/flink-streaming-web-front/src/router/modules/flink.js
@@ -197,5 +197,17 @@ export const flinkRouter = [
         meta: { title: '系统设置', icon: 'el-icon-setting' }
       }
     ]
+  },
+  {
+    path: '/flink/system-contact',
+    component: Layout,
+    children: [
+      {
+        path: 'index',
+        name: 'Contact',
+        component: () => import('@/views/flink/system-contact'),
+        meta: { title: '联系方式', icon: 'el-icon-tickets' }
+      }
+    ]
   }
 ]
diff --git a/flink-streaming-web-front/src/views/flink/system-contact/index.vue b/flink-streaming-web-front/src/views/flink/system-contact/index.vue
@@ -0,0 +1,18 @@
+<template>
+  <div v-loading="loading" class="tab-container" size="mini">
+
+    <el-form ref="form" :model="form" label-width="180px">
+      <el-form-item inline="true">
+        <span slot="label">作者：朱慧培 </span>
+      </el-form-item>
+      <el-form-item inline="true">
+        <span slot="label">源码： <a href="https://github.com/zhp8341/flink-streaming-platform-web" target="_blank">点击查看源码</a> </span>
+      </el-form-item>
+      <el-form-item inline="true">
+        <span slot="label">钉钉群：34315096 </span>
+        <img src="https://flink-sql.oss-cn-hangzhou.aliyuncs.com/dd2.png" style="width: 800px; height: 1028px;">
+      </el-form-item>
+
+    </el-form>
+  </div>
+</template>
diff --git a/flink-streaming-web-front/src/views/flink/task-manage/index.vue b/flink-streaming-web-front/src/views/flink/task-manage/index.vue
@@ -96,7 +96,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="editor" :show-overflow-tooltip="true" label="提交人员" min-width="70" width="100" align="center" />
-        <el-table-column :show-overflow-tooltip="true" label="版本信息" min-width="80" align="center">
+        <el-table-column :show-overflow-tooltip="true" label="版本信息" min-width="70" align="center">
           <template slot-scope="scope">
             <router-link :to="{name:'HistoryTask', params:{flag:'tasklist', context:queryContent(), jobConfigId:scope.row.id}}">
               <el-link type="info" class="fl-version-text"><span class="fl-version-span">[{{ scope.row.version }}]</span>{{ scope.row.jobDesc }}</el-link>
@@ -108,7 +108,7 @@
             <el-link v-if="scope.row.alarmStrs">{{ scope.row.alarmStrs }}</el-link><!-- 辅助 -->
           </template>
         </el-table-column>
-        <el-table-column prop="savepoint" label="保存状态" width="115" fixed="right">
+        <el-table-column prop="savepoint" label="保存状态(savepoint)" width="135px" fixed="right">
           <template slot-scope="scope">
             <el-link v-if="scope.row.jobTypeEnum==='SQL_STREAMING'" type="primary" icon="el-icon-sell" @click.native="doRecoverSavePoint(scope.row)">恢复</el-link>
             <el-link v-if="scope.row.jobTypeEnum==='SQL_STREAMING'" type="success" icon="el-icon-sold-out" @click.native="savePoint(scope.row)">备份</el-link>

diff --git a/flink-streaming-web/pom.xml b/flink-streaming-web/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>com.streaming.platform.web</groupId>
     <artifactId>flink-streaming-web</artifactId>
-    <version>1.3.0.RELEASE</version>
+    <version>1.4.0.RELEASE</version>
 
 	<properties>
 		<nacos.config.version>0.2.7</nacos.config.version>

diff --git a/...k-streaming-web/src/main/java/com/flink/streaming/web/controller/web/AlartController.java b/...k-streaming-web/src/main/java/com/flink/streaming/web/controller/web/AlartController.java