From e8b985101208b335f68398811e3524220089545a Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Wed, 21 Apr 2021 15:04:06 +0800
Subject: [PATCH 01/22] =?UTF-8?q?checkPoint=E5=AE=9E=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98,=E5=92=8C=E4=BB=BB=E5=8A=A1=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=80=E8=87=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assembly/conf/streamx.sql             | 333 +++++++++---------
 1 file changed, 168 insertions(+), 165 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
index 7783d83254..ae6bd6497b 100644
--- a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
+++ b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
@@ -7,16 +7,16 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_app_backup`;
 CREATE TABLE `t_app_backup` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(20) DEFAULT NULL,
-  `SQL_ID` bigint(20) DEFAULT NULL,
-  `CONFIG_ID` bigint(20) DEFAULT NULL,
-  `VERSION` int(10) DEFAULT NULL,
-  `PATH` varchar(255) DEFAULT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(20) DEFAULT NULL,
+`SQL_ID` bigint(20) DEFAULT NULL,
+`CONFIG_ID` bigint(20) DEFAULT NULL,
+`VERSION` int(10) DEFAULT NULL,
+`PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`CREATE_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_app_backup
@@ -29,15 +29,15 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flame_graph`;
 CREATE TABLE `t_flame_graph` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(20) DEFAULT NULL,
-  `PROFILER` varchar(255) DEFAULT NULL,
-  `TIMELINE` datetime DEFAULT NULL,
-  `CONTENT` varchar(2000) DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE,
-  KEY `INX_TIME` (`TIMELINE`) USING BTREE,
-  KEY `INX_APPID` (`APP_ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(20) DEFAULT NULL,
+`PROFILER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`TIMELINE` datetime DEFAULT NULL,
+`CONTENT` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE,
+KEY `INX_TIME` (`TIMELINE`) USING BTREE,
+KEY `INX_APPID` (`APP_ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flame_graph
@@ -50,48 +50,47 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_app`;
 CREATE TABLE `t_flink_app` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `JOB_TYPE` int(1) DEFAULT NULL,
-  `EXECUTION_MODE` int(10) DEFAULT NULL,
-  `PROJECT_ID` varchar(64) DEFAULT NULL,
-  `JOB_NAME` varchar(255) DEFAULT NULL,
-  `MODULE` varchar(255) DEFAULT NULL,
-  `JAR` varchar(255) DEFAULT NULL,
-  `MAIN_CLASS` varchar(255) DEFAULT NULL,
-  `ARGS` varchar(255) DEFAULT NULL,
-  `OPTIONS` text,
-  `USER_ID` int(25) DEFAULT NULL,
-  `APP_ID` varchar(255) DEFAULT NULL,
-  `APP_TYPE` int(1) DEFAULT NULL,
-  `DURATION` bigint(20) DEFAULT NULL,
-  `JOB_ID` varchar(64) DEFAULT NULL,
-  `STATE` varchar(50) DEFAULT NULL,
-  `DYNAMIC_OPTIONS` text,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `RESOLVE_ORDER` smallint(1) DEFAULT NULL,
-  `FLAME_GRAPH` tinyint(1) DEFAULT '0',
-  `JM_MEMORY` int(10) DEFAULT NULL,
-  `TM_MEMORY` int(255) DEFAULT NULL,
-  `TOTAL_TASK` int(10) DEFAULT NULL,
-  `TOTAL_TM` int(10) DEFAULT NULL,
-  `TOTAL_SLOT` int(10) DEFAULT NULL,
-  `AVAILABLE_SLOT` int(10) DEFAULT NULL,
-  `OPTION_STATE` int(11) DEFAULT NULL,
-  `TRACKING` int(1) DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  `DEPLOY` int(1) DEFAULT '0',
-  `START_TIME` datetime DEFAULT NULL,
-  `END_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE,
-  KEY `INX_STATE` (`STATE`) USING BTREE,
-  KEY `INX_TRACK` (`TRACKING`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1383720958407139331 DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`JOB_TYPE` int(1) DEFAULT NULL,
+`EXECUTION_MODE` int(10) DEFAULT NULL,
+`PROJECT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`JOB_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`MODULE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`JAR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`MAIN_CLASS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`ARGS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`USER_ID` int(25) DEFAULT NULL,
+`APP_ID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`APP_TYPE` int(1) DEFAULT NULL,
+`DURATION` bigint(20) DEFAULT NULL,
+`JOB_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`STATE` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`DYNAMIC_OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`RESOLVE_ORDER` smallint(1) DEFAULT NULL,
+`FLAME_GRAPH` tinyint(1) DEFAULT '0',
+`JM_MEMORY` int(10) DEFAULT NULL,
+`TM_MEMORY` int(255) DEFAULT NULL,
+`TOTAL_TASK` int(10) DEFAULT NULL,
+`TOTAL_TM` int(10) DEFAULT NULL,
+`TOTAL_SLOT` int(10) DEFAULT NULL,
+`AVAILABLE_SLOT` int(10) DEFAULT NULL,
+`OPTION_STATE` int(11) DEFAULT NULL,
+`TRACKING` int(1) DEFAULT NULL,
+`CREATE_TIME` datetime DEFAULT NULL,
+`DEPLOY` int(1) DEFAULT '0',
+`START_TIME` datetime DEFAULT NULL,
+`END_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE,
+KEY `INX_STATE` (`STATE`) USING BTREE,
+KEY `INX_TRACK` (`TRACKING`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_app
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_flink_app` VALUES (1383720958407139330, 2, 4, NULL, 'Flink Sql', NULL, NULL, NULL, '', '{\"jobmanager.memory.process.size\":\"1024mb\",\"taskmanager.memory.process.size\":\"1024mb\",\"parallelism.default\":1,\"taskmanager.numberOfTaskSlots\":1}', 1, 'application_1608425563635_146822', 1, 6609957, 'fee72e948e804b8e2aeec20db6a19183', '7', '', 'Flink Sql', 0, 0, 1024, 1024, 1, 1, 1, 0, 0, 1, '2021-04-18 17:55:59', 3, '2021-04-18 18:31:56', NULL);
 COMMIT;
 
 -- ----------------------------
@@ -99,20 +98,21 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_config`;
 CREATE TABLE `t_flink_config` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(20) NOT NULL,
-  `FORMAT` tinyint(1) NOT NULL DEFAULT '0',
-  `VERSION` int(10) NOT NULL,
-  `LATEST` tinyint(1) NOT NULL DEFAULT '0',
-  `CONTENT` text NOT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1383318218421993474 DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(20) NOT NULL,
+`FORMAT` tinyint(1) NOT NULL DEFAULT '0',
+`VERSION` int(10) NOT NULL,
+`LATEST` tinyint(1) NOT NULL DEFAULT '0',
+`CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+`CREATE_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=1384151176129277955 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_config
 -- ----------------------------
 BEGIN;
+INSERT INTO `t_flink_config` VALUES (1384151176129277954, 1384093607717126145, 0, 1, 0, 'eNq1VU1v1EgQvfMrWhqkzEixnQ8iIZ8WIW5oOcBhEVpFPXZ5xnG729vdE/BqDlkgSwLKh5BACLEcVgtIoOyIywoEaP8Mntn8C8p2e+yEiRaByMEZV9V79bq6qhywkEfuKUJ8SJhIY+A6fyMkkSIBqVOXtH5QAC7pa50o13G80KYJ9fpgC9lzMGwNPK2cICcqn5YvPGVJYEAVWIv24pJTszue4EHYs/s6ZkUiQk6HXIPklCFxwkKP6lBwO6Yhd01ESiU/4uQ0hhOdvwxgMPVqqqKYctoDafNB3AV5KbiCtstMaOWSRROWUEkZAxaq2PYhoAOmXbJknGuiW1HEEAuZVuSEFAe2Vfgr1LY+0OSYaW09tmJALVg5mOET6yAR5uOpb9QeEQTWDDKsuQdKHbE2j/klGgOJFbwuZGTPSFA7T1BQZvK/QFepbFaSwn4C/9eV66in7p5aLx7My1vEJQv2GfRiF3tRIrD/VBkMnHYZNruWAygMRWuuU+aS5QX8K2yx8DHkwk/nzl+5eHX10o/nLxRmHcYgBtpElqED7Oqwx8GfUl6nSBhTGbnH+BcNqEUmd/8Zb/yW7e9OXo3QoDRCyugu9SLgSNYiOJPfNpIiUU5BXT5XDbdqTiYKw0kieK+R8ruY9eO/f2QHjyav32VP77Xn6rmYmydzQchApUpDnL8ZzFzHUJmmJCtLZ5bOnl1ArsP7W9nobc0xfrI9frA1P36ykf31Ivt9ExMZLFUp91wSUKYgf6+w7Ro8X2fvVESPRtn+8+z9RrY/yt7fHB88M3Qh9yTkuygve34tpFXyGc2z8H8+PbyzZ/Ctqh6Tx7cPN3cmH/7O9m7+t3Hre6zIKpdVXJJlLumYkFJEBCkKyrZ3Jih59914d9stQPZskN1l+KN81hPWaoyE7YcSq46FxTM5Ok4crx+hrQxUdB3+Nw5v6s4O1m9y8HDyIK+/BNQkNR5HorSe2VKmz4LwBviWD4ymCG0ir7UbvmFAQzaQYOUUQy44dLLN18sf37zM9kZlLbAQJfDngr8BrpYC1dgqSf4JWDaW0k1WqtltZqlQuG8sY1cWfh+t6fyagCboM+dUQAu3H+6ZU6T8b764jHIOWMlu3iEY0y5+DAXzh5SnncbuweoBxQ3XI612l2qvP5xaOp8AYEy7bQ==', '2021-04-19 22:25:31');
 COMMIT;
 
 -- ----------------------------
@@ -120,14 +120,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_effective`;
 CREATE TABLE `t_flink_effective` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(20) NOT NULL,
-  `TARGET_TYPE` int(1) NOT NULL COMMENT '1) config 2) flink sql',
-  `TARGET_ID` bigint(20) NOT NULL COMMENT 'configId or sqlId',
-  `CREATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE,
-  UNIQUE KEY `UN_INX` (`APP_ID`,`TARGET_TYPE`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(20) NOT NULL,
+`TARGET_TYPE` int(1) NOT NULL COMMENT '1) config 2) flink sql',
+`TARGET_ID` bigint(20) NOT NULL COMMENT 'configId or sqlId',
+`CREATE_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE,
+UNIQUE KEY `UN_INX` (`APP_ID`,`TARGET_TYPE`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_effective
@@ -140,14 +140,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_log`;
 CREATE TABLE `t_flink_log` (
-  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(20) DEFAULT NULL,
-  `YARN_APP_ID` varchar(50) DEFAULT NULL,
-  `SUCCESS` tinyint(1) DEFAULT NULL,
-  `EXCEPTION` text,
-  `START_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(20) DEFAULT NULL,
+`YARN_APP_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`SUCCESS` tinyint(1) DEFAULT NULL,
+`EXCEPTION` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`START_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_log
@@ -160,21 +160,21 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_project`;
 CREATE TABLE `t_flink_project` (
-  `ID` bigint(64) NOT NULL AUTO_INCREMENT,
-  `NAME` varchar(255) DEFAULT NULL,
-  `URL` varchar(1000) DEFAULT NULL,
-  `BRANCHES` varchar(1000) DEFAULT NULL,
-  `USERNAME` varchar(255) DEFAULT NULL,
-  `PASSWORD` varchar(255) DEFAULT NULL,
-  `POM` varchar(255) DEFAULT NULL,
-  `TYPE` int(1) DEFAULT NULL,
-  `REPOSITORY` int(1) DEFAULT NULL,
-  `DATE` datetime DEFAULT NULL,
-  `LASTBUILD` datetime DEFAULT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  `BUILDSTATE` int(1) DEFAULT '-1',
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4;
+`ID` bigint(64) NOT NULL AUTO_INCREMENT,
+`NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`URL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`BRANCHES` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`USERNAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`PASSWORD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`POM` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`TYPE` int(1) DEFAULT NULL,
+`REPOSITORY` int(1) DEFAULT NULL,
+`DATE` datetime DEFAULT NULL,
+`LASTBUILD` datetime DEFAULT NULL,
+`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`BUILDSTATE` int(1) DEFAULT '-1',
+                                   PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_project
@@ -188,12 +188,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_savepoint`;
 CREATE TABLE `t_flink_savepoint` (
-  `ID` bigint(50) NOT NULL AUTO_INCREMENT,
-  `APP_ID` bigint(50) NOT NULL,
-  `LASTEST` tinyint(4) NOT NULL,
-  `SAVE_POINT` varchar(255) DEFAULT NULL,
-  `CREATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
+`ID` bigint(50) NOT NULL AUTO_INCREMENT,
+`APP_ID` bigint(50) NOT NULL,
+`TYPE` int(1) DEFAULT NULL,
+`PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+`LATEST` tinyint(4) NOT NULL,
+`TRIGGER_TIME` datetime DEFAULT NULL,
+`CREATE_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
@@ -207,15 +209,15 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_sql`;
 CREATE TABLE `t_flink_sql` (
-  `ID` bigint(20) NOT NULL,
-  `APP_ID` bigint(20) DEFAULT NULL,
-  `SQL` text,
-  `DEPENDENCY` text,
-  `VERSION` int(20) DEFAULT NULL,
-  `CANDIDATE` int(1) NOT NULL DEFAULT '0',
-  `CREATE_TIME` datetime DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`ID` bigint(20) NOT NULL,
+`APP_ID` bigint(20) DEFAULT NULL,
+`SQL` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`DEPENDENCY` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`VERSION` int(20) DEFAULT NULL,
+`Candidate` int(1) NOT NULL DEFAULT '0',
+`CREATE_TIME` datetime DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_sql
@@ -228,13 +230,13 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_tutorial`;
 CREATE TABLE `t_flink_tutorial` (
-  `ID` int(11) NOT NULL AUTO_INCREMENT,
-  `TYPE` int(11) DEFAULT NULL,
-  `NAME` varchar(255) DEFAULT NULL,
-  `CONTENT` text,
-  `CREATE_TIME` date DEFAULT NULL,
-  PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4;
+`ID` int(11) NOT NULL AUTO_INCREMENT,
+`TYPE` int(11) DEFAULT NULL,
+`NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+`CREATE_TIME` date DEFAULT NULL,
+PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_flink_tutorial
@@ -248,16 +250,16 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_menu`;
 CREATE TABLE `t_menu` (
-  `MENU_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单/按钮ID',
-  `PARENT_ID` bigint(20) NOT NULL COMMENT '上级菜单ID',
-  `MENU_NAME` varchar(50) NOT NULL COMMENT '菜单/按钮名称',
-  `PATH` varchar(255) DEFAULT NULL COMMENT '对应路由path',
-  `COMPONENT` varchar(255) DEFAULT NULL COMMENT '对应路由组件component',
-  `PERMS` varchar(50) DEFAULT NULL COMMENT '权限标识',
-  `ICON` varchar(50) DEFAULT NULL COMMENT '图标',
-  `TYPE` char(2) NOT NULL COMMENT '类型 0菜单 1按钮',
-  `DISPLAY` char(2) NOT NULL DEFAULT '1' COMMENT '菜单是否显示',
-  `ORDER_NUM` double(20,0) DEFAULT NULL COMMENT '排序',
+`MENU_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单/按钮ID',
+`PARENT_ID` bigint(20) NOT NULL COMMENT '上级菜单ID',
+`MENU_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单/按钮名称',
+`PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由path',
+`COMPONENT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由组件component',
+`PERMS` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '权限标识',
+`ICON` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图标',
+`TYPE` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型 0菜单 1按钮',
+`DISPLAY` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '菜单是否显示',
+`ORDER_NUM` double(20,0) DEFAULT NULL COMMENT '排序',
   `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
   `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (`MENU_ID`) USING BTREE
@@ -315,13 +317,13 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_role`;
 CREATE TABLE `t_role` (
-  `ROLE_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
-  `ROLE_NAME` varchar(50) NOT NULL COMMENT '角色名称',
-  `REMARK` varchar(100) DEFAULT NULL COMMENT '角色描述',
-  `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
-  `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
-  `ROLE_CODE` varchar(255) DEFAULT NULL COMMENT '角色标识',
-  PRIMARY KEY (`ROLE_ID`) USING BTREE
+`ROLE_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+`ROLE_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '角色名称',
+`REMARK` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色描述',
+`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
+`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
+`ROLE_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色标识',
+PRIMARY KEY (`ROLE_ID`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=143 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
@@ -337,8 +339,8 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_role_menu`;
 CREATE TABLE `t_role_menu` (
-  `ROLE_ID` bigint(20) NOT NULL,
-  `MENU_ID` bigint(20) NOT NULL
+`ROLE_ID` bigint(20) NOT NULL,
+`MENU_ID` bigint(20) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
@@ -411,19 +413,20 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_setting`;
 CREATE TABLE `t_setting` (
-  `KEY` varchar(50) NOT NULL,
-  `VALUE` varchar(255) DEFAULT NULL,
-  `TITLE` varchar(255) DEFAULT NULL,
-  `DESCRIPTION` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`KEY`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+`KEY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+`VALUE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`TITLE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+PRIMARY KEY (`KEY`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_setting
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_setting` VALUES ('env.flink.home', NULL, 'Flink Home', 'Flink Home');
+INSERT INTO `t_setting` VALUES ('env.flink.home', '/usr/local/flink-1.12.0', 'Flink Home', 'Flink Home');
 INSERT INTO `t_setting` VALUES ('maven.central.repository', '', 'Maven Central Repository', 'Maven 私服地址');
+INSERT INTO `t_setting` VALUES ('streamx.console.checkpoint.threshold', '12', 'Checkpoints Keep Threshold', 'CheckPoint默认保存多少个');
 INSERT INTO `t_setting` VALUES ('streamx.console.webapp.address', 'http://test-hadoop-2:10000', 'StreamX Webapp address', 'StreamX Console Web 应用程序 HTTP 端口');
 INSERT INTO `t_setting` VALUES ('streamx.console.workspace', '/streamx/workspace', 'StreamX Console Workspace', 'StreamX Console 的工作空间,用于存放项目源码,编译后的项目等');
 COMMIT;
@@ -433,31 +436,31 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_user`;
 CREATE TABLE `t_user` (
-  `USER_ID` bigint(10) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-  `USERNAME` varchar(255) DEFAULT NULL COMMENT '登录用户名',
-  `NICK_NAME` varchar(50) NOT NULL COMMENT '昵称',
-  `SALT` varchar(255) DEFAULT NULL COMMENT '密码加盐',
-  `PASSWORD` varchar(128) NOT NULL COMMENT '密码',
-  `DEPT_ID` bigint(20) DEFAULT NULL COMMENT '部门ID',
-  `EMAIL` varchar(128) DEFAULT NULL COMMENT '邮箱',
-  `MOBILE` varchar(20) DEFAULT NULL COMMENT '联系电话',
-  `STATUS` char(1) NOT NULL COMMENT '状态 0锁定 1有效',
-  `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
-  `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
-  `LAST_LOGIN_TIME` datetime DEFAULT NULL COMMENT '最近访问时间',
-  `SEX` char(1) DEFAULT NULL COMMENT '性别 0男 1女 2保密',
-  `DESCRIPTION` varchar(100) DEFAULT NULL COMMENT '描述',
-  `AVATAR` varchar(100) DEFAULT NULL COMMENT '用户头像',
-  `USER_TYPE` char(1) NOT NULL DEFAULT '2' COMMENT '用户类型 1内部用户 2外部用户',
-  PRIMARY KEY (`USER_ID`) USING BTREE,
-  UNIQUE KEY `UN_USERNAME` (`NICK_NAME`) USING BTREE
+`USER_ID` bigint(10) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+`USERNAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '登录用户名',
+`NICK_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '昵称',
+`SALT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '密码加盐',
+`PASSWORD` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
+`DEPT_ID` bigint(20) DEFAULT NULL COMMENT '部门ID',
+`EMAIL` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '邮箱',
+`MOBILE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
+`STATUS` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '状态 0锁定 1有效',
+`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
+`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
+`LAST_LOGIN_TIME` datetime DEFAULT NULL COMMENT '最近访问时间',
+`SEX` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '性别 0男 1女 2保密',
+`DESCRIPTION` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
+`AVATAR` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户头像',
+`USER_TYPE` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '2' COMMENT '用户类型 1内部用户 2外部用户',
+PRIMARY KEY (`USER_ID`) USING BTREE,
+UNIQUE KEY `UN_USERNAME` (`NICK_NAME`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of t_user
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_user` VALUES (1, 'admin', '', 'ats6sdxdqf8vsqjtz0utj461wr', '829b009a6b9cc8ea486a4abbc38e56529f3c6f4c9c6fcd3604b41b1d6eca1a57', 1, 'benjobs@qq.com', '18500193260', '1', '2017-12-27 15:47:19', '2019-08-09 15:42:57', '2021-04-18 09:57:19', '0', 'author。', 'ubnKSIfAJTxIgXOKlciN.png', '1');
+INSERT INTO `t_user` VALUES (1, 'admin', '', 'ats6sdxdqf8vsqjtz0utj461wr', '829b009a6b9cc8ea486a4abbc38e56529f3c6f4c9c6fcd3604b41b1d6eca1a57', 1, 'benjobs@qq.com', '18500193260', '1', '2017-12-27 15:47:19', '2019-08-09 15:42:57', '2021-04-20 19:03:34', '0', 'author。', 'ubnKSIfAJTxIgXOKlciN.png', '1');
 COMMIT;
 
 -- ----------------------------
@@ -465,8 +468,8 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_user_role`;
 CREATE TABLE `t_user_role` (
-  `USER_ID` bigint(20) DEFAULT NULL COMMENT '用户ID',
-  `ROLE_ID` bigint(20) DEFAULT NULL COMMENT '角色ID'
+`USER_ID` bigint(20) DEFAULT NULL COMMENT '用户ID',
+`ROLE_ID` bigint(20) DEFAULT NULL COMMENT '角色ID'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------

From c73560b7c4b677494682ecb43e0f38e227edc762 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Wed, 21 Apr 2021 15:05:52 +0800
Subject: [PATCH 02/22] =?UTF-8?q?checkPoint=E5=AE=9E=E6=97=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98,=E5=92=8C=E4=BB=BB=E5=8A=A1=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=80=E8=87=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx-console-service/src/assembly/conf/streamx.sql  | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
index ae6bd6497b..82ab71cd4d 100644
--- a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
+++ b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
@@ -108,13 +108,6 @@ CREATE TABLE `t_flink_config` (
 PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=1384151176129277955 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
--- ----------------------------
--- Records of t_flink_config
--- ----------------------------
-BEGIN;
-INSERT INTO `t_flink_config` VALUES (1384151176129277954, 1384093607717126145, 0, 1, 0, 'eNq1VU1v1EgQvfMrWhqkzEixnQ8iIZ8WIW5oOcBhEVpFPXZ5xnG729vdE/BqDlkgSwLKh5BACLEcVgtIoOyIywoEaP8Mntn8C8p2e+yEiRaByMEZV9V79bq6qhywkEfuKUJ8SJhIY+A6fyMkkSIBqVOXtH5QAC7pa50o13G80KYJ9fpgC9lzMGwNPK2cICcqn5YvPGVJYEAVWIv24pJTszue4EHYs/s6ZkUiQk6HXIPklCFxwkKP6lBwO6Yhd01ESiU/4uQ0hhOdvwxgMPVqqqKYctoDafNB3AV5KbiCtstMaOWSRROWUEkZAxaq2PYhoAOmXbJknGuiW1HEEAuZVuSEFAe2Vfgr1LY+0OSYaW09tmJALVg5mOET6yAR5uOpb9QeEQTWDDKsuQdKHbE2j/klGgOJFbwuZGTPSFA7T1BQZvK/QFepbFaSwn4C/9eV66in7p5aLx7My1vEJQv2GfRiF3tRIrD/VBkMnHYZNruWAygMRWuuU+aS5QX8K2yx8DHkwk/nzl+5eHX10o/nLxRmHcYgBtpElqED7Oqwx8GfUl6nSBhTGbnH+BcNqEUmd/8Zb/yW7e9OXo3QoDRCyugu9SLgSNYiOJPfNpIiUU5BXT5XDbdqTiYKw0kieK+R8ruY9eO/f2QHjyav32VP77Xn6rmYmydzQchApUpDnL8ZzFzHUJmmJCtLZ5bOnl1ArsP7W9nobc0xfrI9frA1P36ykf31Ivt9ExMZLFUp91wSUKYgf6+w7Ro8X2fvVESPRtn+8+z9RrY/yt7fHB88M3Qh9yTkuygve34tpFXyGc2z8H8+PbyzZ/Ctqh6Tx7cPN3cmH/7O9m7+t3Hre6zIKpdVXJJlLumYkFJEBCkKyrZ3Jih59914d9stQPZskN1l+KN81hPWaoyE7YcSq46FxTM5Ok4crx+hrQxUdB3+Nw5v6s4O1m9y8HDyIK+/BNQkNR5HorSe2VKmz4LwBviWD4ymCG0ir7UbvmFAQzaQYOUUQy44dLLN18sf37zM9kZlLbAQJfDngr8BrpYC1dgqSf4JWDaW0k1WqtltZqlQuG8sY1cWfh+t6fyagCboM+dUQAu3H+6ZU6T8b764jHIOWMlu3iEY0y5+DAXzh5SnncbuweoBxQ3XI612l2qvP5xaOp8AYEy7bQ==', '2021-04-19 22:25:31');
-COMMIT;
-
 -- ----------------------------
 -- Table structure for t_flink_effective
 -- ----------------------------

From 9385b46750e824bc65ee3323959a8cb060a2fe43 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Wed, 21 Apr 2021 16:17:04 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E6=AF=8F=E4=B8=AA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=8B=AC=E7=AB=8B=E7=9A=84checkPoint?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../console/core/entity/Application.java      |  6 ++++++
 .../console/core/entity/SavePoint.java        |  2 ++
 .../console/core/service/SettingService.java  |  3 ---
 .../service/impl/SavePointServiceImpl.java    |  5 +++--
 .../core/service/impl/SettingServiceImpl.java |  5 -----
 .../console/core/task/FlinkTrackingTask.java  |  1 +
 .../mapper/core/ApplicationMapper.xml         |  1 +
 .../src/views/flink/app/Add.vue               | 14 +++++++++++++
 .../src/views/flink/app/EditStreamX.vue       | 20 +++++++++++++++----
 .../src/views/flink/setting/View.vue          |  1 -
 10 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
index 7652d9925c..d4550f1671 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
@@ -92,6 +92,11 @@ public class Application implements Serializable {
 
     private Integer optionState;
 
+    /**
+     * checkPoint 保留的最大条数
+     */
+    private Integer cpThreshold;
+
     private String args;
     /**
      * 应用程序模块
@@ -104,6 +109,7 @@ public class Application implements Serializable {
     private String dynamicOptions;
     private Integer appType;
     private Boolean flameGraph;
+
     /**
      * 是否需要跟踪监控状态
      */
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SavePoint.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SavePoint.java
index e382e99766..2e8c0e4154 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SavePoint.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SavePoint.java
@@ -52,4 +52,6 @@ public class SavePoint {
     private Date triggerTime;
 
     private Date createTime;
+
+    private transient Integer cpThreshold;
 }
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
index f5ddc9a741..ed8cd7c82b 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
@@ -33,7 +33,6 @@ public interface SettingService extends IService<Setting> {
     String KEY_STREAMX_ADDRESS = "streamx.console.webapp.address";
     String KEY_STREAMX_WORKSPACE = "streamx.console.workspace";
     String KEY_ENV_FLINK_HOME = "env.flink.home";
-    String KEY_CHECKPOINT_THRESHOLD = "streamx.console.checkpoint.threshold";
 
     /**
      * @param key
@@ -57,6 +56,4 @@ public interface SettingService extends IService<Setting> {
 
     boolean checkWorkspace();
 
-    Integer getCheckpointThreshold();
-
 }
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SavePointServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SavePointServiceImpl.java
index 8e5325dba6..85a74d3870 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SavePointServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SavePointServiceImpl.java
@@ -34,6 +34,7 @@
 import com.streamxhub.streamx.console.base.utils.SortUtil;
 import com.streamxhub.streamx.console.core.dao.SavePointMapper;
 import com.streamxhub.streamx.console.core.entity.SavePoint;
+import com.streamxhub.streamx.console.core.service.ApplicationService;
 import com.streamxhub.streamx.console.core.service.SavePointService;
 import com.streamxhub.streamx.console.core.service.SettingService;
 import lombok.extern.slf4j.Slf4j;
@@ -55,7 +56,7 @@ public class SavePointServiceImpl extends ServiceImpl<SavePointMapper, SavePoint
 
 
     @Autowired
-    private SettingService settingService;
+    private ApplicationService settingService;
 
     @Override
     public void obsolete(Long appId) {
@@ -70,8 +71,8 @@ public boolean save(SavePoint entity) {
     }
 
     private void expire(SavePoint entity) {
-        Integer threshold = settingService.getCheckpointThreshold();
         LambdaQueryWrapper<SavePoint> queryWrapper = new QueryWrapper<SavePoint>().lambda();
+        Integer threshold = entity.getCpThreshold();
         queryWrapper.select(SavePoint::getTriggerTime)
                 .eq(SavePoint::getAppId, entity.getAppId())
                 .orderByDesc(SavePoint::getTriggerTime)
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
index b82c83daec..d30c1d2db8 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
@@ -105,9 +105,4 @@ public String getMavenRepository() {
         return settings.get(SettingService.KEY_MAVEN_REPOSITORY).getValue();
     }
 
-    @Override
-    public Integer getCheckpointThreshold() {
-        String threshold = settings.get(SettingService.KEY_CHECKPOINT_THRESHOLD).getValue();
-        return Integer.parseInt(threshold);
-    }
 }
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
index 88c5c804a0..64f204c884 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
@@ -320,6 +320,7 @@ private void handleCheckPoints(Application application) throws IOException {
                     savePoint.setTriggerTime(new Date(checkPoint.getTriggerTimestamp()));
                     savePoint.setCreateTime(new Date());
                     savePoint.setPath(checkPoint.getPath());
+                    savePoint.setCpThreshold(application.getCpThreshold());
                     savePointService.save(savePoint);
                     checkPointMap.put(application.getJobId(), checkPoint.getId());
                 }
diff --git a/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml b/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
index 942b2108d8..90935823d0 100644
--- a/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
+++ b/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
@@ -32,6 +32,7 @@
         <result column="JM_MEMORY" jdbcType="INTEGER" property="jmMemory"/>
         <result column="TM_MEMORY" jdbcType="INTEGER" property="tmMemory"/>
         <result column="OPTION_STATE" jdbcType="INTEGER" property="optionState"/>
+        <result column="CP_THRESHOLD" jdbcType="INTEGER" property="cpThreshold"/>
         <result column="DESCRIPTION" jdbcType="VARCHAR" property="description"/>
         <result column="CREATE_TIME" jdbcType="DATE" property="createTime"/>
     </resultMap>
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
index cdf0b3da25..e37327cfa8 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
@@ -330,6 +330,17 @@
           v-decorator="['slot']" />
       </a-form-item>
 
+      <a-form-item
+        label="CheckPoint Threshold"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-input-number
+          :min="1"
+          :step="1"
+          placeholder="Checkpoints keep Max size"
+          v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
+      </a-form-item>
+
       <a-form-item
         label="Run Options"
         :label-col="{lg: {span: 5}, sm: {span: 7}}"
@@ -803,6 +814,7 @@ export default {
       })
       this.form.getFieldDecorator('resolveOrder', { initialValue: 0 })
       this.form.getFieldDecorator('executionMode', { initialValue: 4 })
+      this.form.getFieldDecorator('cpThreshold', { initialValue: 10 })
     },
 
     handleJobType(value) {
@@ -1127,6 +1139,7 @@ export default {
         options: JSON.stringify(options),
         dynamicOptions: values.dynamicOptions,
         resolveOrder: values.resolveOrder,
+        cpThreshold: values.cpThreshold,
         description: values.description
       }
       if (this.appType === 1) {
@@ -1184,6 +1197,7 @@ export default {
         options: JSON.stringify(options),
         dynamicOptions: values.dynamicOptions || null,
         resolveOrder: values.resolveOrder,
+        cpThreshold: values.cpThreshold,
         description: values.description || null
       }
       this.handleCreateApp(params)
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
index 42f052d72c..65714612e0 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
@@ -417,6 +417,17 @@
           v-decorator="['slot']" />
       </a-form-item>
 
+      <a-form-item
+        label="CheckPoint Threshold"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-input-number
+          :min="1"
+          :step="1"
+          placeholder="Checkpoints keep Max size"
+          v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
+      </a-form-item>
+
       <a-form-item
         label="Configuration"
         :label-col="{lg: {span: 5}, sm: {span: 7}}"
@@ -862,11 +873,11 @@ export default {
         { name: 'child-first', order: 1 }
       ],
       executionMode: [
+        { mode: 'application', value: 4, disabled: false },
+        { mode: 'pre-job', value: 2, disabled: false },
         { mode: 'local', value: 0, disabled: true },
         { mode: 'remote', value: 1, disabled: true },
-        { mode: 'pre-job', value: 2, disabled: false },
         { mode: 'yarn-session', value: 3, disabled: true },
-        { mode: 'application', value: 4, disabled: false },
         { mode: 'kubernetes', value: 5, disabled: true }
       ],
       runMaxTagCount: 1,
@@ -1344,6 +1355,7 @@ export default {
         dynamicOptions: values.dynamicOptions,
         resolveOrder: values.resolveOrder,
         executionMode: values.executionMode,
+        cpThreshold: values.cpThreshold,
         description: values.description
       }
       this.handleUpdateApp(params)
@@ -1380,6 +1392,7 @@ export default {
         options: JSON.stringify(options),
         dynamicOptions: values.dynamicOptions || null,
         resolveOrder: values.resolveOrder,
+        cpThreshold: values.cpThreshold,
         executionMode: values.executionMode,
         description: values.description || null
       }
@@ -1540,8 +1553,7 @@ export default {
           'dynamicOptions': this.app.dynamicOptions,
           'resolveOrder': this.app.resolveOrder,
           'executionMode': this.app.executionMode,
-          'slot': this.defaultOptions.slot,
-          'parallelism': this.defaultOptions.parallelism
+          'cpThreshold': this.app.cpThreshold
         })
         if (this.app.jobType === 2) {
           this.flinkSql.sql = this.app.flinkSql || null
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
index f28a689df5..bd2238eb90 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
@@ -12,7 +12,6 @@
             <svg-icon class="avatar" name="maven" size="large" slot="avatar" v-if="item.key.match(/(.*)maven(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="http" size="large" slot="avatar" v-if="item.key.match(/(.*)address(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="flink" size="large" slot="avatar" v-if="item.key.match(/env.flink(.*)/g)"></svg-icon>
-            <svg-icon class="avatar" name="threshold" size="large" slot="avatar" v-if="item.key.match(/(.*)checkpoint.threshold$/g)"></svg-icon>
             <span slot="title">
               {{ item.title }}
             </span>

From fe13380fa3a9f906187072d582e5f8f5c3f289b3 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Wed, 21 Apr 2021 18:58:35 +0800
Subject: [PATCH 04/22] Fault Alarm support!

---
 .../src/components/SvgIcon/index.vue          |   8 +-
 .../streamx-console-webapp/src/core/icons.js  |   6 +-
 .../src/views/flink/app/Add.vue               | 131 +++++++++++++++++-
 .../src/views/flink/app/AddEdit.js            |  11 ++
 .../src/views/flink/app/EditStreamX.vue       |  26 ++--
 5 files changed, 160 insertions(+), 22 deletions(-)

diff --git a/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue b/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
index 4ebeb908af..e20e565c8f 100644
--- a/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
+++ b/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
@@ -12,15 +12,19 @@
     <deploy v-if="name==='deploy'"></deploy>
     <stream v-if="name==='stream'"></stream>
     <format v-if="name==='format'"></format>
+    <dingding v-if="name==='dingding'"></dingding>
+    <mail v-if="name==='mail'"></mail>
+    <sms v-if="name==='sms'"></sms>
+    <wechat v-if="name==='wechat'"></wechat>
   </span>
 </template>
 
 <script>
-import {analyse,deploy, flink, flinksql, fql, http, maven, spark, stream, workspace, threshold ,format} from '@/core/icons'
+import {analyse,deploy, flink, flinksql, fql, http, maven, spark, stream, workspace, threshold ,format,dingding,mail,sms,wechat } from '@/core/icons'
 
 export default {
   name: 'SvgIcon',
-  components: {analyse,flink, flinksql, fql, spark, maven, workspace, http, deploy, stream, threshold ,format},
+  components: {analyse,flink, flinksql, fql, spark, maven, workspace, http, deploy, stream, threshold ,format,dingding,mail,sms,wechat},
   props: {
     name: {
       type: String,
diff --git a/streamx-console/streamx-console-webapp/src/core/icons.js b/streamx-console/streamx-console-webapp/src/core/icons.js
index 631cd942f6..4a8eac8ae5 100644
--- a/streamx-console/streamx-console-webapp/src/core/icons.js
+++ b/streamx-console/streamx-console-webapp/src/core/icons.js
@@ -18,5 +18,9 @@ import deploy from '@/assets/icons/deploy.svg?inline'
 import stream from '@/assets/icons/stream.svg?inline'
 import threshold from '@/assets/icons/threshold.svg?inline'
 import format from '@/assets/icons/format.svg?inline'
+import dingding from '@/assets/icons/dingding.svg?inline'
+import mail from '@/assets/icons/mail.svg?inline'
+import sms from '@/assets/icons/sms.svg?inline'
+import wechat from '@/assets/icons/wechat.svg?inline'
 
-export { analyse,flink,flinksql,fql,spark,maven,workspace,http,deploy,stream,threshold,format }
+export { analyse,flink,flinksql,fql,spark,maven,workspace,http,deploy,stream,threshold,format,dingding,mail,sms,wechat }
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
index e37327cfa8..633e300a52 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
@@ -41,9 +41,16 @@
               successful
             </span>
           </p>
+          <a-icon
+            class='format-sql'
+            type='align-left'
+            title='Format SQL'
+            @click.native='handleFormatSql'/>
+
           <a-icon
             class="big-screen"
             type="fullscreen"
+            title="Full Screen"
             two-tone-color="#4a9ff5"
             @click="handleBigScreenOpen()" />
         </a-form-item>
@@ -341,6 +348,99 @@
           v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
       </a-form-item>
 
+      <a-form-item
+        label="Fault Alarm"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-switch
+          checked-children="ON"
+          un-checked-children="OFF"
+          default-checked
+          @change="handleAlert"
+          v-decorator="[ 'alert',{rules: [{ required: true }]}]" />
+      </a-form-item>
+
+      <!--告警方式-->
+      <template v-if="alert">
+        <a-form-item
+          label="Alert Type"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-select
+            placeholder="Alert Type"
+            mode="multiple"
+            @change="handleAlertType"
+            v-decorator="[ 'alertType', {rules: [{ required: true, message: 'Alert Type is required' }] }]">
+            <a-select-option
+              v-for="(o,index) in alertTypes"
+              :key="`alertType_${index}`"
+              :value="o.value">
+              <svg-icon role="img" v-if="o.value === 1" name="dingding"/>
+              <svg-icon role="img" v-if="o.value === 2" name="wechat"/>
+              <svg-icon role="img" v-if="o.value === 3" name="sms"/>
+              <svg-icon role="img" v-if="o.value === 4" name="mail"/>
+              {{o.name}}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(1)>-1"
+          label="DingTask Url"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-input
+            type="text"
+            placeholder="Please enter DingTask Url"
+            v-decorator="[ 'alertDingURL', {rules: [{ required: true, message: 'DingTask Url is required' }]} ]" />
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(1)>-1"
+          label="DingTask User"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-input
+            type="text"
+            placeholder="Please enter DingTask receive user"
+            v-decorator="[ 'alertDingUser', {rules: [{ required: true, message: 'DingTask receive user is required' }]} ]" />
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(3)>-1"
+          label="SMS"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-input
+            type="text"
+            placeholder="Please enter mobile number"
+            v-decorator="[ 'alertSms', {rules: [{ required: true, message: 'mobile number is required' }]} ]" />
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(3)>-1"
+          label="SMS Template"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-textarea
+            rows="4"
+            placeholder="Please enter sms template"
+            v-decorator="['alertSmsTemplate', {rules: [{ required: true, message: 'SMS Template is required' }]} ]" />
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(4)>-1"
+          label="Email"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-input
+            type="text"
+            placeholder="Please enter email"
+            v-decorator="[ 'alertEmail', {rules: [{ required: true, message: 'email is required' }]} ]" />
+        </a-form-item>
+
+      </template>
+
       <a-form-item
         label="Run Options"
         :label-col="{lg: {span: 5}, sm: {span: 7}}"
@@ -625,7 +725,12 @@
           </ellipsis>
         </span>
         <a-button
-          key="submit"
+          type="primary"
+          title='Format SQL'
+          @click="handleFormatSql">
+          <a-icon type='align-left'/>
+        </a-button>
+        <a-button
           type="primary"
           @click="handleBigScreenOk">
           Apply
@@ -658,6 +763,7 @@ import {
   bigScreenOpen,
   bigScreenOk,
   bigScreenClose,
+  formatSql,
   applyPom,
   updateDependency
 } from './AddEdit'
@@ -694,6 +800,14 @@ export default {
       switchDefaultValue: true,
       config: null,
       isSetConfig: false,
+      alert: true,
+      alertTypes: [
+        {name: 'Ding Ding Task', value: 1},
+        {name: 'Wechat', value: 2},
+        {name: 'SMS', value: 3},
+        {name: 'E-mail', value: 4},
+      ],
+      alertType: [],
       configOverride: null,
       configSource: [],
       configItems: [],
@@ -867,6 +981,17 @@ export default {
       this.totalItems = item
     },
 
+    handleAlert() {
+      this.alert = !this.alert
+      if (!this.alert) {
+        this.alertType = []
+      }
+    },
+
+    handleAlertType(item) {
+      this.alertType = item
+    },
+
     handleJobName(confFile) {
       name({
         config: confFile
@@ -956,6 +1081,10 @@ export default {
       updateDependency(this)
     },
 
+    handleFormatSql() {
+      formatSql(this)
+    },
+
     handleBigScreenOpen() {
       bigScreenOpen(this)
     },
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/AddEdit.js b/streamx-console/streamx-console-webapp/src/views/flink/app/AddEdit.js
index 36f115979d..e4f5509891 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/AddEdit.js
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/AddEdit.js
@@ -20,6 +20,7 @@
  */
 import monaco from '@/views/flink/app/Monaco.xml'
 import { verify } from '@/api/flinksql'
+import { format } from 'sql-formatter'
 
 const globalOption = {
   theme: 'vs', //vs, hc-black, or vs-dark
@@ -191,6 +192,16 @@ export function bigScreenOpen(vue) {
   })
 }
 
+export function formatSql(vue) {
+  const sql = vue.controller.flinkSql.value
+  const foramtSql = format(sql)
+  if (vue.controller.visiable.bigScreen) {
+    vue.controller.editor.bigScreen.getModel().setValue(foramtSql)
+  } else {
+    vue.controller.editor.flinkSql.getModel().setValue(foramtSql)
+  }
+}
+
 export function bigScreenOk(vue,callback) {
   const controller = vue.controller
   verifySQL(vue, (success) => {
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
index 65714612e0..4713278d4e 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
@@ -87,10 +87,10 @@
           </p>
 
           <a-icon
-            class='format-sql'
-            type='align-left'
-            title='Format SQL'
-            @click.native='handleFormatSql()'/>
+            class="format-sql"
+            type="align-left"
+            title="Format SQL"
+            @click.native="handleFormatSql"/>
 
           <a-icon
             class="big-screen"
@@ -729,14 +729,12 @@
           </ellipsis>
         </span>
         <a-button
-          key="submit"
           type="primary"
           title='Format SQL'
-          @click="handleFormatSql()">
+          @click="handleFormatSql">
           <a-icon type='align-left'/>
         </a-button>
         <a-button
-          key="submit"
           type="primary"
           @click="handleBigScreenOk">
           Apply
@@ -805,13 +803,11 @@
       <template
         slot="footer">
         <a-button
-          key="back"
           @click="handleCompareCancel">
           Close
         </a-button>
         <a-button
-          key="submit"
-          type="primary"
+          type="compare"
           @click="handleCompareOk">
           Compare
         </a-button>
@@ -840,7 +836,6 @@ import Mergely from './Mergely'
 import Different from './Different'
 import configOptions from './Option'
 import SvgIcon from '@/components/SvgIcon'
-import { format } from 'sql-formatter'
 
 const Base64 = require('js-base64').Base64
 import {
@@ -850,6 +845,7 @@ import {
   bigScreenOk,
   bigScreenClose,
   applyPom,
+  formatSql,
   updateDependency
 } from './AddEdit'
 
@@ -1093,13 +1089,7 @@ export default {
     },
 
     handleFormatSql() {
-      const sql = this.controller.flinkSql.value
-      const foramtSql = format(sql)
-      if (this.controller.visiable.bigScreen) {
-        this.controller.editor.bigScreen.getModel().setValue(foramtSql)
-      } else {
-        this.controller.editor.flinkSql.getModel().setValue(foramtSql)
-      }
+      formatSql(this)
     },
 
     handleBigScreenOpen() {

From 7066cf245f51d851f892c5ca46e292b0cd0ff619 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Wed, 21 Apr 2021 19:19:55 +0800
Subject: [PATCH 05/22] Fault Alarm Support!

---
 .../streamx-console-webapp/src/assets/icons/dingding.svg         | 1 +
 streamx-console/streamx-console-webapp/src/assets/icons/mail.svg | 1 +
 streamx-console/streamx-console-webapp/src/assets/icons/sms.svg  | 1 +
 .../streamx-console-webapp/src/assets/icons/wechat.svg           | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/dingding.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/mail.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/sms.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/wechat.svg

diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/dingding.svg b/streamx-console/streamx-console-webapp/src/assets/icons/dingding.svg
new file mode 100644
index 0000000000..329ae587f8
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/dingding.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618998709273" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1776" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M118.052571 36.278857a53.00419 53.00419 0 0 0-7.460571 20.528762l-0.536381 9.606095C108.105143 138.971429 146.285714 253.17181 179.053714 289.792l1.219048 1.26781-3.754667 3.023238c-8.728381 7.801905-13.945905 19.163429-14.628571 34.328381l0.048762 5.851428c0.341333 5.753905 1.560381 11.117714 3.315809 16.335238l1.024 2.681905 1.121524 5.315048c16.432762 70.509714 70.217143 144.237714 125.025524 167.497142l1.365333 0.48762-1.852952 4.827428c-5.36381 16.62781-1.121524 36.425143 9.849905 54.759619 4.437333 7.41181 9.898667 14.726095 16.188952 22.040381 8.43581 9.801143 16.725333 17.846857 22.674286 23.064381 68.559238 62.268952 127.75619 79.481905 172.519619 66.267429l5.558857-1.852953 3.608381-1.511619 14.628571-4.632381 16.676572-5.071238-18.236953 76.312381-0.828952 4.876191a36.571429 36.571429 0 0 0 36.376381 40.228571l47.104-0.048762-40.374857 160.426667c-9.752381 38.716952 40.667429 62.854095 64.658285 30.963809l228.205715-302.713904 2.876952-4.388572a36.571429 36.571429 0 0 0-32.036571-54.223238H786.529524l12.04419-19.651048 30.378667-50.761142 18.870857-32.426667 18.090667-31.98781c13.165714-23.747048 23.893333-44.178286 31.597714-60.708571l1.26781-3.023238c6.095238-12.873143 10.678857-24.429714 12.873142-34.03581 16.091429-67.535238-29.013333-107.715048-130.291809-148.041143l-11.50781-4.486095c-27.355429-10.48381-137.313524-48.079238-171.495619-60.269714l-5.217523-1.852952A3745.401905 3745.401905 0 0 1 464.213333 138.337524l-39.302095-16.237714c-37.059048-15.408762-74.947048-31.597714-112.737524-48.030477L214.308571 30.915048l-32.475428-14.628572L176.030476 14.140952C151.454476 7.704381 129.609143 17.359238 118.052571 36.278857z m379.708953 588.946286l-7.070476 3.120762 1.755428-0.975238c-5.266286 1.560381-13.750857 1.609143-26.282666-2.048-18.919619-5.510095-41.252571-18.18819-66.998858-39.984762l-13.165714-11.702857a180.321524 180.321524 0 0 1-8.143238-8.192l-1.999238-2.243048 11.068952-1.755429 37.839238-5.412571 121.514667-15.945143c8.825905-1.121524 16.481524-2.048 22.918095-2.779428 45.494857-5.36381 41.691429-72.655238-4.144762-72.899048l-63.731809 0.487619H449.877333l-34.864762-0.390095c-43.690667-0.633905-75.434667-1.999238-88.84419-4.096l-4.486095-1.121524c-24.576-8.289524-60.65981-52.906667-77.433905-98.694095l5.997714 1.560381c23.990857 6.144 60.611048 14.482286 107.715048 24.722285l86.064762 18.334477 109.763047 22.625523c45.543619 9.264762 62.366476-57.197714 17.944381-70.802285L516.437333 339.870476l-61.927619-19.797333a6675.504762 6675.504762 0 0 1-59.830857-19.651048l-64.999619-22.332952c-54.613333-19.407238-94.598095-35.401143-96.060952-37.010286l-3.218286-4.047238c-15.36-21.601524-35.791238-79.140571-43.934476-126.829714l-1.852953-12.385524 41.545143 18.480762c56.612571 25.014857 114.590476 50.029714 170.666667 73.386667l39.789714 16.432761 40.667429 16.432762c19.797333 7.850667 38.619429 15.213714 56.466286 22.040381l34.32838 12.775619c25.84381 9.45981 134.339048 46.518857 169.935239 59.63581l5.753904 2.145524c76.409905 29.257143 100.985905 49.590857 96.694857 67.535238-0.487619 2.096762-1.755429 5.705143-3.754666 10.483809l-6.192762 14.092191-6.582857 13.360762c-7.41181 14.628571-17.408 33.158095-29.354667 54.272l-14.238476 24.966095a4031.829333 4031.829333 0 0 1-44.227048 74.459428l-15.847619 25.84381-2.194285 2.438095a38.278095 38.278095 0 0 0-3.072 4.632381l-24.771048 43.105524-2.145524 4.388571a36.571429 36.571429 0 0 0 33.840762 50.371048h46.031238l-75.190857 99.766857 7.704381-30.573714 0.877714-4.632381a36.571429 36.571429 0 0 0-36.327619-40.862476l-47.689143-0.048762 21.845334-91.038476a36.571429 36.571429 0 0 0-44.080762-44.129524c-28.91581 6.972952-61.293714 16.091429-97.328762 27.696762z" fill="#3664FF" p-id="1777"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/mail.svg b/streamx-console/streamx-console-webapp/src/assets/icons/mail.svg
new file mode 100644
index 0000000000..b2213a76dd
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/mail.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618998650897" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1348" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M960 128H64a64 64 0 0 0-64 64v640a64 64 0 0 0 64 64h896a64 64 0 0 0 64-64V192a64 64 0 0 0-64-64z m-64 128v26.88L512 502.336 128 282.88V256zM128 768V430.272l352.256 201.28a64 64 0 0 0 63.488 0L896 430.272V768z" fill="#1890ff" p-id="1349"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/sms.svg b/streamx-console/streamx-console-webapp/src/assets/icons/sms.svg
new file mode 100644
index 0000000000..642aa5aaf2
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/sms.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618998692496" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1492" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 64C229.2 64 0 250.2 0 480c0 99.2 42.8 190 114 261.4C89 842.2 5.4 932 4.4 933c-4.4 4.6-5.6 11.4-3 17.4 2.6 6 8.2 9.6 14.6 9.6 132.6 0 232-63.6 281.2-102.8 65.4 24.6 138 38.8 214.8 38.8 282.8 0 512-186.2 512-416S794.8 64 512 64zM256.4 608H232c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16h24.6c12 0 20.8-7 20.8-13.2 0-2.6-1.6-5.4-4.2-7.6l-43.8-37.6c-17-14.4-26.6-35-26.6-56.2 0-42.6 38-77.2 84.8-77.2H312c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-24.6c-12 0-20.8 7-20.8 13.2 0 2.6 1.6 5.4 4.2 7.6l43.8 37.6c17 14.4 26.6 35 26.6 56.2 0.2 42.6-38 77.2-84.8 77.2z m383.6-16c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16v-136.4l-49.6 111.6c-5.8 11.8-22.8 11.8-28.6 0L448 455.6V592c0 8.8-7.2 16-16 16h-32c-8.8 0-16-7.2-16-16V384c0-17.6 14.4-32 32-32h32c12.2 0 23.2 6.8 28.6 17.6l35.4 70.8 35.4-70.8c5.4-10.8 16.6-17.6 28.6-17.6h32c17.6 0 32 14.4 32 32v208z m96.6 16H712c-8.8 0-16-7.2-16-16v-32c0-8.8 7.2-16 16-16h24.6c12 0 20.8-7 20.8-13.2 0-2.6-1.6-5.4-4.2-7.6l-43.8-37.6c-17-14.4-26.6-35-26.6-56.2 0-42.6 38-77.2 84.8-77.2H792c8.8 0 16 7.2 16 16v32c0 8.8-7.2 16-16 16h-24.6c-12 0-20.8 7-20.8 13.2 0 2.6 1.6 5.4 4.2 7.6l43.8 37.6c17 14.4 26.6 35 26.6 56.2 0.2 42.6-37.8 77.2-84.6 77.2z" fill="#2c2c2c" p-id="1493"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/wechat.svg b/streamx-console/streamx-console-webapp/src/assets/icons/wechat.svg
new file mode 100644
index 0000000000..2a2b5d2135
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/wechat.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1618998703919" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1636" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M384.042667 625.109333a30.421333 30.421333 0 0 1-14.08 3.456 31.146667 31.146667 0 0 1-27.306667-16.469333l-2.048-4.650667L255.189333 414.293333a17.066667 17.066667 0 0 1-1.493333-6.826666c0-8.874667 6.997333-16.085333 15.616-16.085334 3.541333 0 6.784 1.194667 9.386667 3.2l100.821333 73.941334a45.653333 45.653333 0 0 0 41.685333 4.949333L895.36 256C810.368 152.789333 670.421333 85.333333 512 85.333333 252.8 85.333333 42.666667 265.728 42.666667 488.32c0 121.429333 63.232 230.741333 162.133333 304.64a32.512 32.512 0 0 1 11.52 36.522667l-21.162667 81.28c-0.981333 3.84-2.517333 7.808-2.517333 11.776 0 8.917333 6.997333 16.128 15.658667 16.128 3.413333 0 6.144-1.28 9.045333-2.986667l102.741333-61.141333c7.722667-4.608 15.914667-7.424 24.917334-7.424 4.778667 0 9.429333 0.725333 13.781333 2.133333a540.16 540.16 0 0 0 153.216 22.101333c259.2 0 469.333333-180.48 469.333333-403.029333 0-67.413333-19.370667-130.901333-53.461333-186.752L387.456 623.061333l-3.413333 2.048z" fill="#09BB07" p-id="1637"></path></svg>
\ No newline at end of file

From 808078e6224fd706d882f5fc06be6881f544e6b7 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 13:25:53 +0800
Subject: [PATCH 06/22] Fault Alert support!

---
 .../streamx-console-service/pom.xml           |  13 +-
 .../console/core/entity/Application.java      |   4 +-
 .../console/core/entity/SenderEmail.java      |  33 ++
 .../console/core/service/AlertService.java    |  38 ++
 .../console/core/service/SettingService.java  |   2 +
 .../core/service/impl/AlertServiceImpl.java   | 134 +++++++
 .../service/impl/ApplicationServiceImpl.java  |   1 +
 .../core/service/impl/SettingServiceImpl.java |   6 +
 .../console/core/task/FlinkTrackingTask.java  |   6 +
 .../src/main/resources/email.html             | 361 ++++++++++++++++++
 .../src/views/flink/app/Add.vue               |  93 +++--
 .../src/views/flink/app/EditStreamX.vue       |   4 +-
 12 files changed, 638 insertions(+), 57 deletions(-)
 create mode 100644 streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
 create mode 100644 streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/AlertService.java
 create mode 100644 streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
 create mode 100644 streamx-console/streamx-console-service/src/main/resources/email.html

diff --git a/streamx-console/streamx-console-service/pom.xml b/streamx-console/streamx-console-service/pom.xml
index 84db1e02fd..c3b9465f42 100644
--- a/streamx-console/streamx-console-service/pom.xml
+++ b/streamx-console/streamx-console-service/pom.xml
@@ -195,11 +195,16 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- ip2region -->
         <dependency>
-            <groupId>org.lionsoul</groupId>
-            <artifactId>ip2region</artifactId>
-            <version>1.7.2</version>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.30</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-email</artifactId>
+            <version>1.5</version>
         </dependency>
 
         <!-- jwt -->
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
index d4550f1671..14115bdcda 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Application.java
@@ -97,6 +97,9 @@ public class Application implements Serializable {
      */
     private Integer cpThreshold;
 
+    //失败告警的通知邮箱
+    private String alertEmail;
+
     private String args;
     /**
      * 应用程序模块
@@ -133,7 +136,6 @@ public class Application implements Serializable {
     @TableField("TOTAL_TM")
     private Integer totalTM;
 
-
     private Integer totalSlot;
     private Integer availableSlot;
     private Integer jmMemory;
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
new file mode 100644
index 0000000000..c6944d6aba
--- /dev/null
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 The StreamX Project
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.streamxhub.streamx.console.core.entity;
+
+import lombok.Data;
+
+@Data
+public class SenderEmail {
+
+    private String smtpHost;
+    private Integer smtpPort;
+    private String email;
+    private String password;
+
+}
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/AlertService.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/AlertService.java
new file mode 100644
index 0000000000..931ce8569f
--- /dev/null
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/AlertService.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019 The StreamX Project
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.streamxhub.streamx.console.core.service;
+
+import com.streamxhub.streamx.console.core.entity.Application;
+import com.streamxhub.streamx.console.core.enums.FlinkAppState;
+
+/**
+ * @author benjobs
+ */
+public interface AlertService {
+
+    /**
+     * alert
+     *
+     * @param application
+     */
+    void alert(Application application, FlinkAppState appState);
+
+}
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
index ed8cd7c82b..6178c15bc5 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
@@ -22,6 +22,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.streamxhub.streamx.console.base.domain.RestResponse;
+import com.streamxhub.streamx.console.core.entity.SenderEmail;
 import com.streamxhub.streamx.console.core.entity.Setting;
 
 /**
@@ -56,4 +57,5 @@ public interface SettingService extends IService<Setting> {
 
     boolean checkWorkspace();
 
+    SenderEmail getSenderEmail();
 }
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
new file mode 100644
index 0000000000..0722f8de01
--- /dev/null
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (c) 2019 The StreamX Project
+ * <p>
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.streamxhub.streamx.console.core.service.impl;
+
+import com.streamxhub.streamx.common.util.DateUtils;
+import com.streamxhub.streamx.common.util.HadoopUtils;
+import com.streamxhub.streamx.common.util.Utils;
+import com.streamxhub.streamx.console.core.entity.Application;
+import com.streamxhub.streamx.console.core.entity.SenderEmail;
+import com.streamxhub.streamx.console.core.enums.FlinkAppState;
+import com.streamxhub.streamx.console.core.service.AlertService;
+import com.streamxhub.streamx.console.core.service.SettingService;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.mail.HtmlEmail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+/**
+ * @author benjobs
+ */
+@Slf4j
+@Service
+public class AlertServiceImpl implements AlertService {
+
+    private Template template;
+
+    @Autowired
+    private SettingService settingService;
+
+    private SenderEmail senderEmail;
+
+    @PostConstruct
+    public void initConfig() throws Exception {
+        Configuration configuration = new Configuration(Configuration.VERSION_2_3_28);
+        String template = "email.html";
+        Enumeration<URL> urls = ClassLoader.getSystemResources(template);
+        if (urls != null) {
+            if (!urls.hasMoreElements()) {
+                urls = Thread.currentThread().getContextClassLoader().getResources(template);
+            }
+        }
+        if (urls != null) {
+            while (urls.hasMoreElements()) {
+                URL url = urls.nextElement();
+                if (url.getPath().contains(".jar")) {
+                    configuration.setClassLoaderForTemplateLoading(Thread.currentThread().getContextClassLoader(), "");
+                } else {
+                    File file = new File(url.getPath());
+                    configuration.setDirectoryForTemplateLoading(file.getParentFile());
+                }
+                configuration.setDefaultEncoding("UTF-8");
+                this.template = configuration.getTemplate(template);
+                break;
+            }
+        } else {
+            log.error("email.html not found!");
+            throw new ExceptionInInitializerError("email.html not found!");
+        }
+        this.senderEmail = settingService.getSenderEmail();
+        assert this.senderEmail != null;
+    }
+
+    @Override
+    public void alert(Application application, FlinkAppState appState) {
+        //发送邮件
+        if (Utils.notEmpty(application.getAlertEmail())) {
+            try {
+                HtmlEmail htmlEmail = new HtmlEmail();
+                htmlEmail.setCharset("UTF-8");
+                htmlEmail.setHostName(this.senderEmail.getSmtpHost());
+                htmlEmail.setSslSmtpPort(this.senderEmail.getSmtpPort().toString());
+                htmlEmail.setAuthentication(this.senderEmail.getEmail(), this.senderEmail.getPassword());
+                htmlEmail.setFrom(this.senderEmail.getEmail());
+                htmlEmail.setSubject("StreamX Alert: [ " + application.getJobName() + " ] is " + appState.name());
+                String html = getHtmlMessage(application, appState);
+                htmlEmail.setHtmlMsg(html);
+                htmlEmail.addTo(application.getAlertEmail().split(","));
+                htmlEmail.send();
+            } catch (Exception e) {
+                e.printStackTrace(System.err);
+            }
+        }
+    }
+
+    private String getHtmlMessage(Application application, FlinkAppState appState) throws Exception {
+        String content = "Job [" + application.getJobName() + "] is " + appState.name() + "\n" +
+                "Start Time:" + DateUtils.format(application.getStartTime(),DateUtils.fullFormat(),TimeZone.getDefault()) + "\n" +
+                "End Time:" + DateUtils.format(application.getEndTime(),DateUtils.fullFormat(),TimeZone.getDefault()) + "\n" +
+                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration())  + "\n" +
+                "please check it, Thank you for using StreamX\n\n\n" +
+                "Best Wishes!!";
+
+        Map<String, String> root = new HashMap<>();
+        root.put("title", "Notify :" + application.getJobName().concat(" is ").concat(appState.name()));
+        root.put("message", content);
+        String format = "%s/proxy/%s/";
+        String url = String.format(format, HadoopUtils.rmHttpAddress(false), application.getAppId());
+        root.put("link", url);
+
+        StringWriter writer = new StringWriter();
+        template.process(root, writer);
+        return writer.toString();
+    }
+
+}
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/ApplicationServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/ApplicationServiceImpl.java
index 1cee6e640e..3f185eb00f 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/ApplicationServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/ApplicationServiceImpl.java
@@ -423,6 +423,7 @@ public boolean update(Application appParam) {
             application.setDescription(appParam.getDescription());
             application.setResolveOrder(appParam.getResolveOrder());
             application.setExecutionMode(appParam.getExecutionMode());
+            application.setAlertEmail(appParam.getAlertEmail());
             // Flink Sql job...
             if (application.isFlinkSqlJob()) {
                 updateFlinkSqlJob(application, appParam);
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
index d30c1d2db8..32bdca0a5c 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
@@ -24,6 +24,7 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.streamxhub.streamx.common.util.Utils;
 import com.streamxhub.streamx.console.core.dao.SettingMapper;
+import com.streamxhub.streamx.console.core.entity.SenderEmail;
 import com.streamxhub.streamx.console.core.entity.Setting;
 import com.streamxhub.streamx.console.core.service.SettingService;
 import lombok.extern.slf4j.Slf4j;
@@ -90,6 +91,11 @@ public boolean checkWorkspace() {
         return file.canRead() && file.canWrite();
     }
 
+    @Override
+    public SenderEmail getSenderEmail() {
+        return null;
+    }
+
     @Override
     public String getStreamXWorkspace() {
         return settings.get(SettingService.KEY_STREAMX_WORKSPACE).getValue();
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
index 64f204c884..4101612aaf 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
@@ -31,6 +31,7 @@
 import com.streamxhub.streamx.console.core.metrics.flink.JobsOverview;
 import com.streamxhub.streamx.console.core.metrics.flink.Overview;
 import com.streamxhub.streamx.console.core.metrics.yarn.AppInfo;
+import com.streamxhub.streamx.console.core.service.AlertService;
 import com.streamxhub.streamx.console.core.service.ApplicationService;
 import com.streamxhub.streamx.console.core.service.SavePointService;
 import lombok.extern.slf4j.Slf4j;
@@ -106,6 +107,9 @@ public class FlinkTrackingTask {
     @Autowired
     private SavePointService savePointService;
 
+    @Autowired
+    private AlertService alertService;
+
     private static ApplicationService applicationService;
 
     private static final Map<String, Long> checkPointMap = new ConcurrentHashMap<>();
@@ -207,6 +211,7 @@ private void tracking() {
                             if (StopFrom.NONE.equals(stopFrom)) {
                                 savePointService.obsolete(application.getId());
                                 application.setState(FlinkAppState.LOST.getValue());
+                                alertService.alert(application,FlinkAppState.LOST);
                             } else {
                                 application.setState(FlinkAppState.CANCELED.getValue());
                             }
@@ -412,6 +417,7 @@ private void handleNotRunState(Application application,
                 application.setState(FlinkAppState.FAILED.getValue());
                 //持久化application并且移除跟踪监控
                 persistentAndClean(application);
+                alertService.alert(application,FlinkAppState.FAILED);
                 break;
             case RESTARTING:
                 log.info("flinkTrackingTask getFromFlinkRestApi, job state {},add to starting", currentState.name());
diff --git a/streamx-console/streamx-console-service/src/main/resources/email.html b/streamx-console/streamx-console-service/src/main/resources/email.html
new file mode 100644
index 0000000000..5e6e3c9fe1
--- /dev/null
+++ b/streamx-console/streamx-console-service/src/main/resources/email.html
@@ -0,0 +1,361 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta content="telephone=no" name="format-detection" />
+    <title></title>
+    <style type="text/css" data-premailer="ignore">
+        @import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,500,600,700);
+    </style>
+    <style data-premailer="ignore">
+        @media screen and (max-width: 600px) {
+            u+.body {
+                width: 100vw !important;
+            }
+        }
+        a[x-apple-data-detectors] {
+            color: inherit !important;
+            text-decoration: none !important;
+            font-size: inherit !important;
+            font-family: inherit !important;
+            font-weight: inherit !important;
+            line-height: inherit !important;
+        }
+    </style>
+    <!--[if mso]>
+    <style type="text/css">
+        body, table, td {
+            font-family: Arial, Helvetica, sans-serif !important;
+        }
+
+        img {
+            -ms-interpolation-mode: bicubic;
+        }
+
+        .box {
+            border-color: #eee !important;
+        }
+    </style>
+    <![endif]-->
+
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            background-color: #f5f7fb;
+            font-size: 15px;
+            line-height: 160%;
+            mso-line-height-rule: exactly;
+            color: #444444;
+            width: 100%;
+        }
+
+        body {
+            font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;
+        }
+
+        img {
+            border: 0 none;
+            line-height: 100%;
+            outline: none;
+            text-decoration: none;
+            vertical-align: baseline;
+            font-size: 0;
+        }
+
+        a:hover {
+            text-decoration: underline;
+        }
+
+        .btn:hover {
+            text-decoration: none;
+        }
+
+        .btn.bg-bordered:hover {
+            background-color: #f9fbfe !important;
+        }
+
+        a.bg-blue:hover {
+            background-color: #4abf8a !important;
+        }
+
+        a.bg-azure:hover {
+            background-color: #37a3f1 !important;
+        }
+
+        a.bg-indigo:hover {
+            background-color: #596ac9 !important;
+        }
+
+        a.bg-purple:hover {
+            background-color: #9d50e8 !important;
+        }
+
+        a.bg-pink:hover {
+            background-color: #f55f91 !important;
+        }
+
+        a.bg-red:hover {
+            background-color: #c01e1d !important;
+        }
+
+        a.bg-orange:hover {
+            background-color: #fd8e35 !important;
+        }
+
+        a.bg-yellow:hover {
+            background-color: #e3b90d !important;
+        }
+
+        a.bg-lime:hover {
+            background-color: #73cb2d !important;
+        }
+
+        a.bg-green:hover {
+            background-color: #56ab00 !important;
+        }
+
+        a.bg-teal:hover {
+            background-color: #28beae !important;
+        }
+
+        a.bg-cyan:hover {
+            background-color: #1596aa !important;
+        }
+
+        a.bg-gray:hover {
+            background-color: #95a9b0 !important;
+        }
+
+        a.bg-secondary:hover {
+            background-color: #37a3f1 !important;
+        }
+
+        .img-hover:hover img {
+            opacity: .64;
+        }
+
+        @media only screen and (max-width: 560px) {
+            body {
+                font-size: 14px !important;
+            }
+
+            .content {
+                padding: 24px !important;
+            }
+
+            .content-image-text {
+                padding: 24px !important;
+            }
+
+            .content-image {
+                height: 100px !important;
+            }
+
+            .content-image-text {
+                padding-top: 96px !important;
+            }
+
+            h1 {
+                font-size: 24px !important;
+            }
+
+            .h1 {
+                font-size: 24px !important;
+            }
+
+            h2 {
+                font-size: 20px !important;
+            }
+
+            .h2 {
+                font-size: 20px !important;
+            }
+
+            h3 {
+                font-size: 18px !important;
+            }
+
+            .h3 {
+                font-size: 18px !important;
+            }
+
+            .col {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .col-spacer {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .col-spacer-xs {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .col-spacer-sm {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .col-hr {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .row {
+                display: table !important;
+                width: 100% !important;
+            }
+
+            .col-hr {
+                border: 0 !important;
+                height: 24px !important;
+                width: auto !important;
+                background: transparent !important;
+            }
+
+            .col-spacer {
+                width: 100% !important;
+                height: 24px !important;
+            }
+
+            .col-spacer-sm {
+                height: 16px !important;
+            }
+
+            .col-spacer-xs {
+                height: 8px !important;
+            }
+
+            .chart-cell-spacer {
+                width: 4px !important;
+            }
+
+            .text-mobile-center {
+                text-align: center !important;
+            }
+
+            .d-mobile-none {
+                display: none !important;
+            }
+        }
+    </style>
+</head>
+
+<body class="bg-body" style="font-size: 15px; margin: 0; padding: 0; line-height: 160%; mso-line-height-rule: exactly; color: #444444; width: 100%; font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;" bgcolor="#f5f7fb">
+<center>
+    <table class="main bg-body" width="100%" cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%;" bgcolor="#f5f7fb">
+        <tr>
+            <td align="center" valign="top" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                <!--[if (gte mso 9)|(IE)]>
+                <table border="0" cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td align="center" valign="top" width="640">
+                <![endif]-->
+                <span class="preheader" style="font-size: 0; padding: 0; display: none; max-height: 0; mso-hide: all; line-height: 0; color: transparent; height: 0; max-width: 0; opacity: 0; overflow: hidden; visibility: hidden; width: 0;">This is preheader text. Some clients will show this text as a preview.</span>
+                <table class="wrap" cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%; max-width: 640px; text-align: left;">
+                    <tr>
+                        <td class="p-sm" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; padding: 8px;">
+                            <div class="main-content">
+                                <table class="box" cellpadding="0" cellspacing="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%; border-radius: 3px; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05); border: 1px solid #f0f0f0;" bgcolor="#ffffff">
+                                    <tr>
+                                        <td style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                                            <table cellpadding="0" cellspacing="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%;">
+                                                <tr>
+                                                    <td class="content pb-0" align="center" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; padding: 40px 48px 0;">
+                                                        <table class="icon icon-lg bg-blue-lightest " cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; padding: 0; border-collapse: separate; width: 72px; border-radius: 50%; line-height: 100%; font-weight: 300; height: 72px; font-size: 48px; text-align: center;" bgcolor="#edf2fa">
+                                                            <tr>
+                                                                <td valign="middle" align="center" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                                                                    <img src="http://www.streamxhub.com/assets/logo/logo.png"
+                                                                         class=" va-middle" width="60" height="60" alt="message-square" style="line-height: 100%; border: 0 none; outline: none; text-decoration: none; vertical-align: middle; font-size: 0; display: block; width: 60px; height: 60px;" />
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <h1 class="text-center m-0 mt-md" style="font-weight: 300; font-size: 28px; line-height: 130%; margin: 16px 0 0;" align="center">${title}</h1>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td class="content" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; padding: 40px 48px;">
+                                                        <p style="margin: 0 0 1em;">Dear StreamX User:</p>
+                                                        <table class="my-xl" cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%; margin-top: 48px; margin-bottom: 48px;">
+                                                            <tr>
+                                                                <td class="w-1p va-top pr-md" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; width: 1%; padding-right: 16px;" valign="top">
+                                                                    <span class="avatar " width="48" height="48" alt="" style="line-height: 100%; border: 0 none; outline: none; text-decoration: none; vertical-align: baseline; font-size: 50px; border-radius: 50%; -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);">
+                                                                        👤
+                                                                    </span>
+                                                                </td>
+                                                                <td style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                                                                    <div class="quote" style="background-color: #fafafa; border-radius: 3px; display: inline-block; padding: 8px 12px;">
+                                                                        ${message}
+                                                                    </div>
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                        <table class="row" cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%; table-layout: fixed;">
+                                                            <tr>
+                                                                <td class="col" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;" valign="top">
+                                                                    <table cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%;">
+                                                                        <tr>
+                                                                            <td align="center" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                                                                                <table cellpadding="0" cellspacing="0" border="0" class="bg-blue rounded" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: separate; width: 100%; color: #ffffff; border-radius: 3px;" bgcolor="#467fcf">
+                                                                                    <tr>
+                                                                                        <td align="center" valign="top" class="lh-1" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; line-height: 100%;">
+                                                                                            <a href="${link}" class="btn bg-blue border-blue" style="color: #ffffff; padding: 12px 32px; border: 1px solid #4abf8a; text-decoration: none; white-space: nowrap; font-weight: 600; font-size: 16px; border-radius: 3px; line-height: 100%; display: block; -webkit-transition: .3s background-color; transition: .3s background-color; background-color: #3eaf7c;">
+                                                                                                <span class="btn-span" style="color: #ffffff; font-size: 16px; text-decoration: none; white-space: nowrap; font-weight: 600; line-height: 100%;">Details</span>
+                                                                                            </a>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                </table>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </table>
+                                                                </td>
+                                                                <td class="col-spacer" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; width: 24px;" valign="top"></td>
+                                                                <td class="col" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;" valign="top">
+                                                                    <table cellspacing="0" cellpadding="0" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: collapse; width: 100%;">
+                                                                        <tr>
+                                                                            <td align="center" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
+                                                                                <table cellpadding="0" cellspacing="0" border="0" class="bg-secondary rounded" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; border-collapse: separate; width: 100%; color: #ffffff; border-radius: 3px;" bgcolor="#f5f7f8">
+                                                                                    <tr>
+                                                                                        <td align="center" valign="top" class="lh-1" style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif; line-height: 100%;">
+                                                                                            <a href="https://github.com/streamxhub/streamx" class="btn bg-secondary border-secondary" style="color: #9eb0b7; padding: 12px 32px; border: 1px solid #f5f7f8; text-decoration: none; white-space: nowrap; font-weight: 600; font-size: 16px; border-radius: 3px; line-height: 100%; display: block; -webkit-transition: .3s background-color; transition: .3s background-color; background-color: #467fcf;">
+                                                                                                <span class="btn-span" style="color: #ffffff; font-size: 16px; text-decoration: none; white-space: nowrap; font-weight: 600; line-height: 100%;">GitHub</span>
+                                                                                            </a>
+                                                                                        </td>
+                                                                                    </tr>
+                                                                                </table>
+                                                                            </td>
+                                                                        </tr>
+                                                                    </table>
+                                                                </td>
+                                                            </tr>
+                                                        </table>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </table>
+                            </div>
+
+                        </td>
+                    </tr>
+                </table>
+                <!--[if (gte mso 9)|(IE)]>
+                </td>
+                </tr>
+                </table>
+                <![endif]-->
+            </td>
+        </tr>
+    </table>
+</center>
+</body>
+
+</html>
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
index 633e300a52..fe7eab078d 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/Add.vue
@@ -42,10 +42,10 @@
             </span>
           </p>
           <a-icon
-            class='format-sql'
-            type='align-left'
-            title='Format SQL'
-            @click.native='handleFormatSql'/>
+            class="format-sql"
+            type="align-left"
+            title="Format SQL"
+            @click.native="handleFormatSql"/>
 
           <a-icon
             class="big-screen"
@@ -348,22 +348,11 @@
           v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
       </a-form-item>
 
-      <a-form-item
-        label="Fault Alarm"
-        :label-col="{lg: {span: 5}, sm: {span: 7}}"
-        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
-        <a-switch
-          checked-children="ON"
-          un-checked-children="OFF"
-          default-checked
-          @change="handleAlert"
-          v-decorator="[ 'alert',{rules: [{ required: true }]}]" />
-      </a-form-item>
-
       <!--告警方式-->
-      <template v-if="alert">
+      <template>
         <a-form-item
-          label="Alert Type"
+          v-if="1===2"
+          label="Fault Alert Type"
           :label-col="{lg: {span: 5}, sm: {span: 7}}"
           :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
           <a-select
@@ -374,40 +363,31 @@
             <a-select-option
               v-for="(o,index) in alertTypes"
               :key="`alertType_${index}`"
+              :disabled="o.disabled"
               :value="o.value">
-              <svg-icon role="img" v-if="o.value === 1" name="dingding"/>
-              <svg-icon role="img" v-if="o.value === 2" name="wechat"/>
-              <svg-icon role="img" v-if="o.value === 3" name="sms"/>
-              <svg-icon role="img" v-if="o.value === 4" name="mail"/>
-              {{o.name}}
+              <svg-icon role="img" v-if="o.value === 1" name="mail"/>
+              <svg-icon role="img" v-if="o.value === 2" name="sms"/>
+              <svg-icon role="img" v-if="o.value === 3" name="dingding"/>
+              <svg-icon role="img" v-if="o.value === 4" name="wechat"/>
+              {{ o.name }}
             </a-select-option>
           </a-select>
         </a-form-item>
 
         <a-form-item
-          v-if="alertType.indexOf(1)>-1"
-          label="DingTask Url"
-          :label-col="{lg: {span: 5}, sm: {span: 7}}"
-          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
-          <a-input
-            type="text"
-            placeholder="Please enter DingTask Url"
-            v-decorator="[ 'alertDingURL', {rules: [{ required: true, message: 'DingTask Url is required' }]} ]" />
-        </a-form-item>
-
-        <a-form-item
-          v-if="alertType.indexOf(1)>-1"
-          label="DingTask User"
+          label="Fault Alert Email"
           :label-col="{lg: {span: 5}, sm: {span: 7}}"
           :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
           <a-input
             type="text"
-            placeholder="Please enter DingTask receive user"
-            v-decorator="[ 'alertDingUser', {rules: [{ required: true, message: 'DingTask receive user is required' }]} ]" />
+            placeholder="Please enter email,separate multiple emails with comma(,)"
+            v-decorator="[ 'alertEmail', {rules: [{ required: true, message: 'email is required' }]} ]">
+            <svg-icon name="mail" slot="prefix"/>
+          </a-input>
         </a-form-item>
 
         <a-form-item
-          v-if="alertType.indexOf(3)>-1"
+          v-if="alertType.indexOf(2)>-1"
           label="SMS"
           :label-col="{lg: {span: 5}, sm: {span: 7}}"
           :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
@@ -418,7 +398,7 @@
         </a-form-item>
 
         <a-form-item
-          v-if="alertType.indexOf(3)>-1"
+          v-if="alertType.indexOf(2)>-1"
           label="SMS Template"
           :label-col="{lg: {span: 5}, sm: {span: 7}}"
           :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
@@ -429,14 +409,25 @@
         </a-form-item>
 
         <a-form-item
-          v-if="alertType.indexOf(4)>-1"
-          label="Email"
+          v-if="alertType.indexOf(3)>-1"
+          label="DingTask Url"
           :label-col="{lg: {span: 5}, sm: {span: 7}}"
           :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
           <a-input
             type="text"
-            placeholder="Please enter email"
-            v-decorator="[ 'alertEmail', {rules: [{ required: true, message: 'email is required' }]} ]" />
+            placeholder="Please enter DingTask Url"
+            v-decorator="[ 'alertDingURL', {rules: [{ required: true, message: 'DingTask Url is required' }]} ]" />
+        </a-form-item>
+
+        <a-form-item
+          v-if="alertType.indexOf(3)>-1"
+          label="DingTask User"
+          :label-col="{lg: {span: 5}, sm: {span: 7}}"
+          :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+          <a-input
+            type="text"
+            placeholder="Please enter DingTask receive user"
+            v-decorator="[ 'alertDingUser', {rules: [{ required: true, message: 'DingTask receive user is required' }]} ]" />
         </a-form-item>
 
       </template>
@@ -726,9 +717,9 @@
         </span>
         <a-button
           type="primary"
-          title='Format SQL'
+          title="Format SQL"
           @click="handleFormatSql">
-          <a-icon type='align-left'/>
+          <a-icon type="align-left"/>
         </a-button>
         <a-button
           type="primary"
@@ -802,10 +793,10 @@ export default {
       isSetConfig: false,
       alert: true,
       alertTypes: [
-        {name: 'Ding Ding Task', value: 1},
-        {name: 'Wechat', value: 2},
-        {name: 'SMS', value: 3},
-        {name: 'E-mail', value: 4},
+        {name: 'E-mail', value: 1, disabled: false},
+        {name: 'SMS', value: 2,disabled: true},
+        {name: 'Ding Ding Task', value: 3,disabled: true},
+        {name: 'Wechat', value: 4,disabled: true},
       ],
       alertType: [],
       configOverride: null,
@@ -1269,6 +1260,7 @@ export default {
         dynamicOptions: values.dynamicOptions,
         resolveOrder: values.resolveOrder,
         cpThreshold: values.cpThreshold,
+        alertEmail: values.alertEmail,
         description: values.description
       }
       if (this.appType === 1) {
@@ -1327,6 +1319,7 @@ export default {
         dynamicOptions: values.dynamicOptions || null,
         resolveOrder: values.resolveOrder,
         cpThreshold: values.cpThreshold,
+        alertEmail: values.alertEmail,
         description: values.description || null
       }
       this.handleCreateApp(params)
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
index 4713278d4e..dcce9a61e4 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
@@ -730,9 +730,9 @@
         </span>
         <a-button
           type="primary"
-          title='Format SQL'
+          title="Format SQL"
           @click="handleFormatSql">
-          <a-icon type='align-left'/>
+          <a-icon type="align-left"/>
         </a-button>
         <a-button
           type="primary"

From 486ce4a5a19ea966a8b5fd8239d813bec3343254 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 13:39:59 +0800
Subject: [PATCH 07/22] Fault Alert Support!

---
 .../console/core/service/SettingService.java  |  6 +++
 .../core/service/impl/AlertServiceImpl.java   | 45 ++++++++++---------
 .../core/service/impl/SettingServiceImpl.java | 14 ++++++
 .../console/core/task/FlinkTrackingTask.java  |  1 +
 4 files changed, 45 insertions(+), 21 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
index 6178c15bc5..47626cdf21 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
@@ -33,6 +33,12 @@ public interface SettingService extends IService<Setting> {
     String KEY_MAVEN_REPOSITORY = "maven.central.repository";
     String KEY_STREAMX_ADDRESS = "streamx.console.webapp.address";
     String KEY_STREAMX_WORKSPACE = "streamx.console.workspace";
+
+    String KEY_ALERT_EMAIL_HOST = "alert.email.host";
+    String KEY_ALERT_EMAIL_PORT = "alert.email.port";
+    String KEY_ALERT_EMAIL_ADDRESS = "alert.email.address";
+    String KEY_ALERT_EMAIL_PASSWORD = "alert.email.password";
+
     String KEY_ENV_FLINK_HOME = "env.flink.home";
 
     /**
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index 0722f8de01..eeaf2d2cd0 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -85,37 +85,40 @@ public void initConfig() throws Exception {
             log.error("email.html not found!");
             throw new ExceptionInInitializerError("email.html not found!");
         }
-        this.senderEmail = settingService.getSenderEmail();
-        assert this.senderEmail != null;
     }
 
     @Override
     public void alert(Application application, FlinkAppState appState) {
-        //发送邮件
-        if (Utils.notEmpty(application.getAlertEmail())) {
-            try {
-                HtmlEmail htmlEmail = new HtmlEmail();
-                htmlEmail.setCharset("UTF-8");
-                htmlEmail.setHostName(this.senderEmail.getSmtpHost());
-                htmlEmail.setSslSmtpPort(this.senderEmail.getSmtpPort().toString());
-                htmlEmail.setAuthentication(this.senderEmail.getEmail(), this.senderEmail.getPassword());
-                htmlEmail.setFrom(this.senderEmail.getEmail());
-                htmlEmail.setSubject("StreamX Alert: [ " + application.getJobName() + " ] is " + appState.name());
-                String html = getHtmlMessage(application, appState);
-                htmlEmail.setHtmlMsg(html);
-                htmlEmail.addTo(application.getAlertEmail().split(","));
-                htmlEmail.send();
-            } catch (Exception e) {
-                e.printStackTrace(System.err);
+        if (this.senderEmail == null) {
+            this.senderEmail = settingService.getSenderEmail();
+        }
+        if (this.senderEmail != null) {
+            //发送邮件
+            if (Utils.notEmpty(application.getAlertEmail())) {
+                try {
+                    HtmlEmail htmlEmail = new HtmlEmail();
+                    htmlEmail.setCharset("UTF-8");
+                    htmlEmail.setHostName(this.senderEmail.getSmtpHost());
+                    htmlEmail.setSslSmtpPort(this.senderEmail.getSmtpPort().toString());
+                    htmlEmail.setAuthentication(this.senderEmail.getEmail(), this.senderEmail.getPassword());
+                    htmlEmail.setFrom(this.senderEmail.getEmail());
+                    htmlEmail.setSubject("StreamX Alert: [ " + application.getJobName() + " ] is " + appState.name());
+                    String html = getHtmlMessage(application, appState);
+                    htmlEmail.setHtmlMsg(html);
+                    htmlEmail.addTo(application.getAlertEmail().split(","));
+                    htmlEmail.send();
+                } catch (Exception e) {
+                    e.printStackTrace(System.err);
+                }
             }
         }
     }
 
     private String getHtmlMessage(Application application, FlinkAppState appState) throws Exception {
         String content = "Job [" + application.getJobName() + "] is " + appState.name() + "\n" +
-                "Start Time:" + DateUtils.format(application.getStartTime(),DateUtils.fullFormat(),TimeZone.getDefault()) + "\n" +
-                "End Time:" + DateUtils.format(application.getEndTime(),DateUtils.fullFormat(),TimeZone.getDefault()) + "\n" +
-                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration())  + "\n" +
+                "Start Time:" + DateUtils.format(application.getStartTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "\n" +
+                "End Time:" + DateUtils.format(application.getEndTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "\n" +
+                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration()) + "\n" +
                 "please check it, Thank you for using StreamX\n\n\n" +
                 "Best Wishes!!";
 
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
index 32bdca0a5c..8f8a2a4acb 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
@@ -93,6 +93,20 @@ public boolean checkWorkspace() {
 
     @Override
     public SenderEmail getSenderEmail() {
+        try {
+            String host = settings.get(SettingService.KEY_ALERT_EMAIL_HOST).getValue();
+            String port = settings.get(SettingService.KEY_ALERT_EMAIL_PORT).getValue();
+            String address = settings.get(SettingService.KEY_ALERT_EMAIL_ADDRESS).getValue();
+            String password = settings.get(SettingService.KEY_ALERT_EMAIL_PASSWORD).getValue();
+            SenderEmail senderEmail = new SenderEmail();
+            senderEmail.setSmtpHost(host);
+            senderEmail.setSmtpPort(Integer.parseInt(port));
+            senderEmail.setSmtpHost(address);
+            senderEmail.setPassword(password);
+            return senderEmail;
+        } catch (Exception e) {
+            log.warn("Fault Alert Email is not set.");
+        }
         return null;
     }
 
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
index 4101612aaf..5c95ce2728 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
@@ -403,6 +403,7 @@ private void handleNotRunState(Application application,
                 if (StopFrom.NONE.equals(stopFrom)) {
                     log.info("flinkTrackingTask getFromFlinkRestApi, job cancel is not form streamX,savePoint obsoleted!");
                     savePointService.obsolete(application.getId());
+                    alertService.alert(application,FlinkAppState.CANCELED);
                 }
                 //清理stopFrom
                 stopFromCache.invalidate(application.getId());

From e819cb9fa36e802ee9de95203b1f8b955afd7db8 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 13:55:30 +0800
Subject: [PATCH 08/22] Fault Alert Support.

---
 .../streamxhub/streamx/console/core/entity/SenderEmail.java  | 1 +
 .../streamx/console/core/service/SettingService.java         | 1 +
 .../streamx/console/core/service/impl/AlertServiceImpl.java  | 5 ++++-
 .../console/core/service/impl/SettingServiceImpl.java        | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
index c6944d6aba..34ce8c1c76 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/SenderEmail.java
@@ -29,5 +29,6 @@ public class SenderEmail {
     private Integer smtpPort;
     private String email;
     private String password;
+    private boolean ssl;
 
 }
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
index 47626cdf21..53a7c3559a 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/SettingService.java
@@ -38,6 +38,7 @@ public interface SettingService extends IService<Setting> {
     String KEY_ALERT_EMAIL_PORT = "alert.email.port";
     String KEY_ALERT_EMAIL_ADDRESS = "alert.email.address";
     String KEY_ALERT_EMAIL_PASSWORD = "alert.email.password";
+    String KEY_ALERT_EMAIL_SSL = "alert.email.ssl";
 
     String KEY_ENV_FLINK_HOME = "env.flink.home";
 
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index eeaf2d2cd0..7a0004f48a 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -99,9 +99,12 @@ public void alert(Application application, FlinkAppState appState) {
                     HtmlEmail htmlEmail = new HtmlEmail();
                     htmlEmail.setCharset("UTF-8");
                     htmlEmail.setHostName(this.senderEmail.getSmtpHost());
-                    htmlEmail.setSslSmtpPort(this.senderEmail.getSmtpPort().toString());
                     htmlEmail.setAuthentication(this.senderEmail.getEmail(), this.senderEmail.getPassword());
                     htmlEmail.setFrom(this.senderEmail.getEmail());
+                    if (this.senderEmail.isSsl()) {
+                        htmlEmail.setSSLOnConnect(true);
+                        htmlEmail.setSslSmtpPort(this.senderEmail.getSmtpPort().toString());
+                    }
                     htmlEmail.setSubject("StreamX Alert: [ " + application.getJobName() + " ] is " + appState.name());
                     String html = getHtmlMessage(application, appState);
                     htmlEmail.setHtmlMsg(html);
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
index 8f8a2a4acb..fab71fa789 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
@@ -98,11 +98,14 @@ public SenderEmail getSenderEmail() {
             String port = settings.get(SettingService.KEY_ALERT_EMAIL_PORT).getValue();
             String address = settings.get(SettingService.KEY_ALERT_EMAIL_ADDRESS).getValue();
             String password = settings.get(SettingService.KEY_ALERT_EMAIL_PASSWORD).getValue();
+            String ssl = settings.get(SettingService.KEY_ALERT_EMAIL_SSL).getValue();
+
             SenderEmail senderEmail = new SenderEmail();
             senderEmail.setSmtpHost(host);
             senderEmail.setSmtpPort(Integer.parseInt(port));
             senderEmail.setSmtpHost(address);
             senderEmail.setPassword(password);
+            senderEmail.setSsl(Boolean.parseBoolean(ssl));
             return senderEmail;
         } catch (Exception e) {
             log.warn("Fault Alert Email is not set.");

From 23d79f116a86f85c9a45fd30c20e69200fb4c0c1 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 13:58:33 +0800
Subject: [PATCH 09/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/core/ApplicationMapper.xml         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml b/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
index 90935823d0..f05f52c69a 100644
--- a/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
+++ b/streamx-console/streamx-console-service/src/main/resources/mapper/core/ApplicationMapper.xml
@@ -33,6 +33,7 @@
         <result column="TM_MEMORY" jdbcType="INTEGER" property="tmMemory"/>
         <result column="OPTION_STATE" jdbcType="INTEGER" property="optionState"/>
         <result column="CP_THRESHOLD" jdbcType="INTEGER" property="cpThreshold"/>
+        <result column="ALERT_EMAIL" jdbcType="VARCHAR" property="alertEmail"/>
         <result column="DESCRIPTION" jdbcType="VARCHAR" property="description"/>
         <result column="CREATE_TIME" jdbcType="DATE" property="createTime"/>
     </resultMap>

From b6a6cca00a4580b8f53bb0726d5919df62a4e573 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 14:06:30 +0800
Subject: [PATCH 10/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 streamx-console/streamx-console-service/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/streamx-console/streamx-console-service/pom.xml b/streamx-console/streamx-console-service/pom.xml
index c3b9465f42..ee27dcc47b 100644
--- a/streamx-console/streamx-console-service/pom.xml
+++ b/streamx-console/streamx-console-service/pom.xml
@@ -195,6 +195,13 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!-- ip2region -->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+            <version>1.7.2</version>
+        </dependency>
+
         <dependency>
             <groupId>org.freemarker</groupId>
             <artifactId>freemarker</artifactId>

From 29903fa793911e7dd415b07da03af4faf9ea48ff Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 14:30:45 +0800
Subject: [PATCH 11/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx/console/core/service/impl/SettingServiceImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
index fab71fa789..350dedac71 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/SettingServiceImpl.java
@@ -96,14 +96,14 @@ public SenderEmail getSenderEmail() {
         try {
             String host = settings.get(SettingService.KEY_ALERT_EMAIL_HOST).getValue();
             String port = settings.get(SettingService.KEY_ALERT_EMAIL_PORT).getValue();
-            String address = settings.get(SettingService.KEY_ALERT_EMAIL_ADDRESS).getValue();
+            String email = settings.get(SettingService.KEY_ALERT_EMAIL_ADDRESS).getValue();
             String password = settings.get(SettingService.KEY_ALERT_EMAIL_PASSWORD).getValue();
             String ssl = settings.get(SettingService.KEY_ALERT_EMAIL_SSL).getValue();
 
             SenderEmail senderEmail = new SenderEmail();
             senderEmail.setSmtpHost(host);
             senderEmail.setSmtpPort(Integer.parseInt(port));
-            senderEmail.setSmtpHost(address);
+            senderEmail.setEmail(email);
             senderEmail.setPassword(password);
             senderEmail.setSsl(Boolean.parseBoolean(ssl));
             return senderEmail;

From 06eeadec5acc71f188e687a128a53b3017a0cae3 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 15:08:28 +0800
Subject: [PATCH 12/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../console/core/service/impl/AlertServiceImpl.java    | 10 +++++-----
 .../src/main/resources/email.html                      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index 7a0004f48a..eea2c7b5e0 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -118,11 +118,11 @@ public void alert(Application application, FlinkAppState appState) {
     }
 
     private String getHtmlMessage(Application application, FlinkAppState appState) throws Exception {
-        String content = "Job [" + application.getJobName() + "] is " + appState.name() + "\n" +
-                "Start Time:" + DateUtils.format(application.getStartTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "\n" +
-                "End Time:" + DateUtils.format(application.getEndTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "\n" +
-                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration()) + "\n" +
-                "please check it, Thank you for using StreamX\n\n\n" +
+        String content = "Job [" + application.getJobName() + "] is " + appState.name() + "<br>" +
+                "Start Time: " + DateUtils.format(application.getStartTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "<br>" +
+                "End Time: " + DateUtils.format(application.getEndTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "<br>" +
+                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration()) + "<br><br>" +
+                "please check it,Thank you for using StreamX<br><br>" +
                 "Best Wishes!!";
 
         Map<String, String> root = new HashMap<>();
diff --git a/streamx-console/streamx-console-service/src/main/resources/email.html b/streamx-console/streamx-console-service/src/main/resources/email.html
index 5e6e3c9fe1..3cba0666fe 100644
--- a/streamx-console/streamx-console-service/src/main/resources/email.html
+++ b/streamx-console/streamx-console-service/src/main/resources/email.html
@@ -291,7 +291,7 @@ <h1 class="text-center m-0 mt-md" style="font-weight: 300; font-size: 28px; line
                                                                     </span>
                                                                 </td>
                                                                 <td style="font-family: Open Sans, -apple-system, BlinkMacSystemFont, Roboto, Helvetica Neue, Helvetica, Arial, sans-serif;">
-                                                                    <div class="quote" style="background-color: #fafafa; border-radius: 3px; display: inline-block; padding: 8px 12px;">
+                                                                    <div class="quote" style="background-color: #fafafa; border-radius: 3px; padding: 8px 12px;">
                                                                         ${message}
                                                                     </div>
                                                                 </td>

From b598583b5f28ef3a5073b6664753e371b27a156f Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 15:18:26 +0800
Subject: [PATCH 13/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx/console/core/service/impl/AlertServiceImpl.java      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index eea2c7b5e0..2fdaf270ef 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -89,6 +89,7 @@ public void initConfig() throws Exception {
 
     @Override
     public void alert(Application application, FlinkAppState appState) {
+        log.info("Email Alert:{} is {}", application.getJobName(), appState.name());
         if (this.senderEmail == null) {
             this.senderEmail = settingService.getSenderEmail();
         }

From 5467a86aad73fc9b16a44eca37c24c2ce2186368 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 15:20:11 +0800
Subject: [PATCH 14/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx/console/core/service/impl/AlertServiceImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index 2fdaf270ef..a56e66e464 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -112,7 +112,7 @@ public void alert(Application application, FlinkAppState appState) {
                     htmlEmail.addTo(application.getAlertEmail().split(","));
                     htmlEmail.send();
                 } catch (Exception e) {
-                    e.printStackTrace(System.err);
+                   e.printStackTrace();
                 }
             }
         }

From 194d741e7478e0abcb8e0b0968d0c65b5375b0d0 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 15:42:55 +0800
Subject: [PATCH 15/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../console/core/task/FlinkTrackingTask.java    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
index 5c95ce2728..fd12d9e8f1 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/task/FlinkTrackingTask.java
@@ -211,7 +211,7 @@ private void tracking() {
                             if (StopFrom.NONE.equals(stopFrom)) {
                                 savePointService.obsolete(application.getId());
                                 application.setState(FlinkAppState.LOST.getValue());
-                                alertService.alert(application,FlinkAppState.LOST);
+                                alertService.alert(application, FlinkAppState.LOST);
                             } else {
                                 application.setState(FlinkAppState.CANCELED.getValue());
                             }
@@ -224,6 +224,11 @@ private void tracking() {
                         cleanOptioning(optionState, key);
                         application.setEndTime(new Date());
                         this.persistentAndClean(application);
+
+                        FlinkAppState appState = FlinkAppState.of(application.getState());
+                        if (appState.equals(FlinkAppState.FAILED) || appState.equals(FlinkAppState.LOST)) {
+                            alertService.alert(application, FlinkAppState.of(application.getState()));
+                        }
                     }
                 }
             }
@@ -403,7 +408,7 @@ private void handleNotRunState(Application application,
                 if (StopFrom.NONE.equals(stopFrom)) {
                     log.info("flinkTrackingTask getFromFlinkRestApi, job cancel is not form streamX,savePoint obsoleted!");
                     savePointService.obsolete(application.getId());
-                    alertService.alert(application,FlinkAppState.CANCELED);
+                    alertService.alert(application, FlinkAppState.CANCELED);
                 }
                 //清理stopFrom
                 stopFromCache.invalidate(application.getId());
@@ -418,7 +423,7 @@ private void handleNotRunState(Application application,
                 application.setState(FlinkAppState.FAILED.getValue());
                 //持久化application并且移除跟踪监控
                 persistentAndClean(application);
-                alertService.alert(application,FlinkAppState.FAILED);
+                alertService.alert(application, FlinkAppState.FAILED);
                 break;
             case RESTARTING:
                 log.info("flinkTrackingTask getFromFlinkRestApi, job state {},add to starting", currentState.name());
@@ -437,7 +442,7 @@ private void handleNotRunState(Application application,
      * @param stopFrom
      */
     private void getFromYarnRestApi(Application application, StopFrom stopFrom) throws Exception {
-        log.debug("flinkTrackingTask getFromYarnRestApi starting...");
+        log.info("flinkTrackingTask getFromYarnRestApi starting...");
         OptionState optionState = optioning.get(application.getId());
 
         /**
@@ -480,6 +485,10 @@ private void getFromYarnRestApi(Application application, StopFrom stopFrom) thro
                     //能运行到这一步,说明到YARN REST api中成功查询到信息
                     cleanOptioning(optionState, application.getId());
                     this.persistentAndClean(application);
+
+                    if (flinkAppState.equals(FlinkAppState.FAILED) || flinkAppState.equals(FlinkAppState.LOST)) {
+                        alertService.alert(application, flinkAppState);
+                    }
                 } catch (Exception e) {
                     log.error("flinkTrackingTask getFromYarnRestApi error:{}", e);
                     throw e;

From 1a3f65b75563df2a39074dfeccdcc1b2416e6961 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 15:53:00 +0800
Subject: [PATCH 16/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx/console/core/service/impl/AlertServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
index a56e66e464..464ee53e73 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/service/impl/AlertServiceImpl.java
@@ -112,7 +112,7 @@ public void alert(Application application, FlinkAppState appState) {
                     htmlEmail.addTo(application.getAlertEmail().split(","));
                     htmlEmail.send();
                 } catch (Exception e) {
-                   e.printStackTrace();
+                    e.printStackTrace();
                 }
             }
         }
@@ -122,7 +122,7 @@ private String getHtmlMessage(Application application, FlinkAppState appState) t
         String content = "Job [" + application.getJobName() + "] is " + appState.name() + "<br>" +
                 "Start Time: " + DateUtils.format(application.getStartTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "<br>" +
                 "End Time: " + DateUtils.format(application.getEndTime(), DateUtils.fullFormat(), TimeZone.getDefault()) + "<br>" +
-                "Duration: " + DateUtils.toRichTimeDuration(application.getDuration()) + "<br><br>" +
+                "Duration: " + DateUtils.toRichTimeDuration(application.getEndTime().getTime() - application.getStartTime().getTime()) + "<br><br>" +
                 "please check it,Thank you for using StreamX<br><br>" +
                 "Best Wishes!!";
 

From f545a0cc36890414407c670e19ae64fd4b592adf Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 17:30:36 +0800
Subject: [PATCH 17/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/SvgIcon/index.vue                      | 8 ++++++--
 streamx-console/streamx-console-webapp/src/core/icons.js  | 6 +++++-
 .../src/views/flink/setting/View.vue                      | 5 +++++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue b/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
index e20e565c8f..824b3b74b5 100644
--- a/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
+++ b/streamx-console/streamx-console-webapp/src/components/SvgIcon/index.vue
@@ -16,15 +16,19 @@
     <mail v-if="name==='mail'"></mail>
     <sms v-if="name==='sms'"></sms>
     <wechat v-if="name==='wechat'"></wechat>
+    <host v-if="name==='host'"></host>
+    <keys v-if="name==='keys'"></keys>
+    <port v-if="name==='port'"></port>
+    <ssl v-if="name==='ssl'"></ssl>
   </span>
 </template>
 
 <script>
-import {analyse,deploy, flink, flinksql, fql, http, maven, spark, stream, workspace, threshold ,format,dingding,mail,sms,wechat } from '@/core/icons'
+import {analyse,deploy, flink, flinksql, fql, http, maven, spark, stream, workspace, threshold ,format,dingding,mail,sms,wechat,host,keys,port,ssl } from '@/core/icons'
 
 export default {
   name: 'SvgIcon',
-  components: {analyse,flink, flinksql, fql, spark, maven, workspace, http, deploy, stream, threshold ,format,dingding,mail,sms,wechat},
+  components: {analyse,flink, flinksql, fql, spark, maven, workspace, http, deploy, stream, threshold ,format,dingding,mail,sms,wechat,host,keys,port,ssl},
   props: {
     name: {
       type: String,
diff --git a/streamx-console/streamx-console-webapp/src/core/icons.js b/streamx-console/streamx-console-webapp/src/core/icons.js
index 4a8eac8ae5..b8f09b67b2 100644
--- a/streamx-console/streamx-console-webapp/src/core/icons.js
+++ b/streamx-console/streamx-console-webapp/src/core/icons.js
@@ -22,5 +22,9 @@ import dingding from '@/assets/icons/dingding.svg?inline'
 import mail from '@/assets/icons/mail.svg?inline'
 import sms from '@/assets/icons/sms.svg?inline'
 import wechat from '@/assets/icons/wechat.svg?inline'
+import host from '@/assets/icons/host.svg?inline'
+import keys from '@/assets/icons/keys.svg?inline'
+import port from '@/assets/icons/port.svg?inline'
+import ssl from '@/assets/icons/ssl.svg?inline'
 
-export { analyse,flink,flinksql,fql,spark,maven,workspace,http,deploy,stream,threshold,format,dingding,mail,sms,wechat }
+export { analyse,flink,flinksql,fql,spark,maven,workspace,http,deploy,stream,threshold,format,dingding,mail,sms,wechat,host,keys,port,ssl }
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
index bd2238eb90..7437981bca 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
@@ -12,6 +12,11 @@
             <svg-icon class="avatar" name="maven" size="large" slot="avatar" v-if="item.key.match(/(.*)maven(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="http" size="large" slot="avatar" v-if="item.key.match(/(.*)address(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="flink" size="large" slot="avatar" v-if="item.key.match(/env.flink(.*)/g)"></svg-icon>
+            <svg-icon class="avatar" name="host" size="large" slot="avatar" v-if="item.key==='alert.email.host'"></svg-icon>
+            <svg-icon class="avatar" name="port" size="large" slot="avatar" v-if="item.key==='alert.email.port'"></svg-icon>
+            <svg-icon class="avatar" name="mail" size="large" slot="avatar" v-if="item.key==='alert.email.address'"></svg-icon>
+            <svg-icon class="avatar" name="keys" size="large" slot="avatar" v-if="item.key==='alert.email.password'"></svg-icon>
+            <svg-icon class="avatar" name="ssl" size="large" slot="avatar" v-if="item.key==='alert.email.ssl'"></svg-icon>
             <span slot="title">
               {{ item.title }}
             </span>

From be9f2d6496bc497114ab28d3c27b39184d54c9ca Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 17:30:51 +0800
Subject: [PATCH 18/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 streamx-console/streamx-console-webapp/src/assets/icons/host.svg | 1 +
 streamx-console/streamx-console-webapp/src/assets/icons/keys.svg | 1 +
 streamx-console/streamx-console-webapp/src/assets/icons/port.svg | 1 +
 streamx-console/streamx-console-webapp/src/assets/icons/ssl.svg  | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/host.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/keys.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/port.svg
 create mode 100644 streamx-console/streamx-console-webapp/src/assets/icons/ssl.svg

diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/host.svg b/streamx-console/streamx-console-webapp/src/assets/icons/host.svg
new file mode 100644
index 0000000000..18ee0a2726
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/host.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083515543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1672" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M981.333333 165.12A122.453333 122.453333 0 0 0 858.88 42.666667H165.12A122.453333 122.453333 0 0 0 42.666667 165.12v122.453333a121.813333 121.813333 0 0 0 31.36 81.493334A121.813333 121.813333 0 0 0 42.666667 450.773333v122.453334a121.813333 121.813333 0 0 0 31.36 81.706666A121.813333 121.813333 0 0 0 42.666667 736.426667v122.453333A122.453333 122.453333 0 0 0 165.12 981.333333h693.76A122.453333 122.453333 0 0 0 981.333333 858.88v-122.453333a121.813333 121.813333 0 0 0-31.36-81.706667A121.813333 121.813333 0 0 0 981.333333 573.226667v-122.453334a121.813333 121.813333 0 0 0-31.36-81.706666A121.813333 121.813333 0 0 0 981.333333 287.573333zM124.373333 185.6A61.226667 61.226667 0 0 1 185.6 124.373333h652.8a61.226667 61.226667 0 0 1 61.226667 61.226667v81.706667a61.226667 61.226667 0 0 1-61.226667 61.226666H185.6a61.226667 61.226667 0 0 1-61.226667-61.226666z m775.253334 367.146667a61.226667 61.226667 0 0 1-61.226667 61.226666H185.6a61.226667 61.226667 0 0 1-61.226667-61.226666v-81.493334a61.226667 61.226667 0 0 1 61.226667-61.226666h652.8a61.226667 61.226667 0 0 1 61.226667 61.226666z m0 285.653333a61.226667 61.226667 0 0 1-61.226667 61.226667H185.6a61.226667 61.226667 0 0 1-61.226667-61.226667v-81.493333a61.226667 61.226667 0 0 1 61.226667-61.226667h652.8a61.226667 61.226667 0 0 1 61.226667 61.226667z" p-id="1673"></path><path d="M348.8 267.093333H512a40.746667 40.746667 0 1 0 0-81.493333h-163.2a40.746667 40.746667 0 1 0 0 81.706667z" p-id="1674"></path><path d="M216.106667 226.346667m-40.746667 0a40.746667 40.746667 0 1 0 81.493333 0 40.746667 40.746667 0 1 0-81.493333 0Z" p-id="1675"></path><path d="M348.8 471.253333h-132.693333a40.746667 40.746667 0 0 0 0 81.706667h132.693333a40.746667 40.746667 0 0 0 0-81.706667zM613.973333 471.253333h-132.48a40.746667 40.746667 0 0 0 0 81.706667h132.693334a40.746667 40.746667 0 0 0 0-81.706667zM512 756.906667h-163.2a40.746667 40.746667 0 0 0 0 81.706666H512a40.746667 40.746667 0 0 0 0-81.706666z" p-id="1676"></path><path d="M216.106667 797.653333m-40.746667 0a40.746667 40.746667 0 1 0 81.493333 0 40.746667 40.746667 0 1 0-81.493333 0Z" p-id="1677"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/keys.svg b/streamx-console/streamx-console-webapp/src/assets/icons/keys.svg
new file mode 100644
index 0000000000..2f9f1508ad
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/keys.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083508780" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1530" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M881.472 196.096A249.6 249.6 0 0 0 480.256 480l-309.568 309.376 5.76 111.744 111.744 5.76 44.8-44.8s-58.752-58.752-39.168-78.336 78.208 39.04 78.336 39.168l39.168-39.168s-58.752-58.816-39.168-78.336 78.272 39.04 78.272 39.04l-3.264 3.264 42.432-42.432c-0.192-0.32-58.368-58.88-39.168-78.08s78.336 39.168 78.336 39.168l-14.336 14.016 83.2-83.2a249.6 249.6 0 0 0 283.776-401.216z m-117.44 235.008a83.2 83.2 0 1 1 0-117.504 83.2 83.2 0 0 1 0 117.504z" fill="#13227a" p-id="1531"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/port.svg b/streamx-console/streamx-console-webapp/src/assets/icons/port.svg
new file mode 100644
index 0000000000..fde1134377
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/port.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083490738" class="icon" viewBox="0 0 1204 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7013" xmlns:xlink="http://www.w3.org/1999/xlink" width="235.15625" height="200"><defs><style type="text/css"></style></defs><path d="M298.345412 186.307765v91.678117H92.641882v648.734118h1019.422118V277.985882h-212.329412V203.354353h-160.707764V93.967059H466.582588v92.340706H298.345412z m694.031059-0.963765H1204.705882v834.017882H0V185.344h205.703529V93.605647h168.176942V1.264941h457.788235v109.44753h160.707765v74.631529z" fill="#666666" p-id="7014"></path><path d="M277.985882 463.329882h92.641883v277.985883H277.985882zM463.329882 463.329882H555.971765v277.985883H463.329882zM648.673882 463.329882h92.641883v277.985883h-92.641883zM834.017882 463.329882h92.641883v277.985883h-92.641883z" fill="#666666" p-id="7015"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/ssl.svg b/streamx-console/streamx-console-webapp/src/assets/icons/ssl.svg
new file mode 100644
index 0000000000..49f1c2657c
--- /dev/null
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/ssl.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083522059" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1818" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024l-10.808889-4.209778C153.941333 884.849778 113.777778 708.456296 113.777778 587.510519V125.610667l30.985481 1.024c241.398519 8.305778 344.177778-101.262222 345.125926-102.324148L512.037926 0l22.072889 24.310519c0.796444 0.910222 98.228148 102.779259 319.374222 102.779259h0.037926c8.419556 0 16.990815-0.113778 25.713778-0.455111L910.222222 125.610667v461.899852c0 120.945778-40.163556 297.339259-387.413333 432.279703L512 1024zM173.700741 187.354074v400.156445c0 65.042963 0.037926 236.73363 338.299259 371.825777 338.299259-135.092148 338.299259-306.782815 338.299259-371.825777V187.354074c-187.354074-0.720593-295.10163-67.735704-338.299259-102.362074-43.235556 34.588444-150.983111 101.56563-338.299259 102.362074z" fill="#d81e06" p-id="1819"></path><path d="M791.74163 606.814815h-134.674963V377.325037h48.886518v189.477926h85.788445V606.814815z m-196.645926-13.349926c-15.587556 11.567407-37.774222 17.332148-66.484148 17.332148-26.282667 0-47.786667-4.209778-64.625778-12.705185v-49.038222a96.218074 96.218074 0 0 0 62.994963 22.945185c13.312 0 23.36237-2.313481 30.075259-6.902519 6.712889-4.589037 10.05037-10.467556 10.05037-17.673481 0-6.219852-2.654815-12.09837-8.00237-17.635556-5.30963-5.537185-19.418074-13.046519-42.211556-22.528-35.84-15.208296-53.778963-37.319111-53.778963-66.37037 0-21.31437 8.154074-37.925926 24.386371-49.720889 16.232296-11.794963 37.774222-17.673481 64.512-17.673481 22.452148 0 41.263407 2.88237 56.433778 8.722962v45.928297c-15.397926-10.467556-33.412741-15.701333-54.082371-15.701334-12.022519 0-21.655704 2.199704-28.899555 6.599112-7.168 4.399407-10.808889 10.277926-10.808889 17.711407 0 5.916444 2.503111 11.377778 7.433481 16.346074 4.968296 5.006222 17.142519 11.719111 36.560593 20.214519 22.831407 9.784889 38.532741 20.100741 47.066074 30.985481 8.533333 10.846815 12.818963 23.779556 12.818963 38.798222 0 22.034963-7.774815 38.836148-23.438222 50.36563z m-182.499556 0c-15.587556 11.567407-37.774222 17.332148-66.522074 17.332148-26.244741 0-47.824593-4.209778-64.587852-12.705185v-49.038222c18.469926 15.284148 39.442963 22.945185 62.957037 22.945185 13.349926 0 23.36237-2.313481 30.07526-6.902519 6.712889-4.589037 10.088296-10.467556 10.088296-17.673481 0-6.219852-2.692741-12.09837-8.002371-17.635556-5.347556-5.537185-19.418074-13.046519-42.249481-22.528-35.84-15.208296-53.778963-37.319111-53.778963-66.37037 0-21.31437 8.116148-37.925926 24.38637-49.720889 16.270222-11.794963 37.736296-17.673481 64.512-17.673481 22.414222 0 41.225481 2.88237 56.433778 8.722962v45.928297c-15.397926-10.467556-33.412741-15.701333-54.044444-15.701334-12.060444 0-21.69363 2.199704-28.899556 6.599112-7.205926 4.399407-10.808889 10.277926-10.808889 17.711407 0 5.916444 2.465185 11.377778 7.395556 16.346074 4.93037 5.006222 17.142519 11.719111 36.598518 20.214519 22.831407 9.784889 38.494815 20.100741 47.028148 30.985481a60.681481 60.681481 0 0 1 12.818963 38.798222c0 22.034963-7.812741 38.836148-23.400296 50.36563zM986.074074 265.481481a2396.16 2396.16 0 0 1-474.074074 47.748741A2396.16 2396.16 0 0 1 37.925926 265.481481c39.025778 105.66163 58.55763 187.847111 58.55763 246.518519 0 58.671407-19.531852 140.856889-58.55763 246.518519 209.464889-36.522667 367.502222-54.765037 474.074074-54.765038 106.571852 0 264.609185 18.24237 474.074074 54.765038-51.124148-106.989037-76.648296-189.174519-76.648296-246.518519 0-57.344 25.524148-139.529481 76.648296-246.518519z" fill="#d81e06" p-id="1820"></path></svg>
\ No newline at end of file

From bcdf06ed80232d86e6331aa42780f260af28e572 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 17:43:27 +0800
Subject: [PATCH 19/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx-console-webapp/src/assets/icons/host.svg           | 2 +-
 .../streamx-console-webapp/src/assets/icons/port.svg           | 2 +-
 .../streamx-console-webapp/src/views/flink/setting/View.less   | 3 +++
 .../streamx-console-webapp/src/views/flink/setting/View.vue    | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/host.svg b/streamx-console/streamx-console-webapp/src/assets/icons/host.svg
index 18ee0a2726..e196beed3a 100644
--- a/streamx-console/streamx-console-webapp/src/assets/icons/host.svg
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/host.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083515543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1672" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M981.333333 165.12A122.453333 122.453333 0 0 0 858.88 42.666667H165.12A122.453333 122.453333 0 0 0 42.666667 165.12v122.453333a121.813333 121.813333 0 0 0 31.36 81.493334A121.813333 121.813333 0 0 0 42.666667 450.773333v122.453334a121.813333 121.813333 0 0 0 31.36 81.706666A121.813333 121.813333 0 0 0 42.666667 736.426667v122.453333A122.453333 122.453333 0 0 0 165.12 981.333333h693.76A122.453333 122.453333 0 0 0 981.333333 858.88v-122.453333a121.813333 121.813333 0 0 0-31.36-81.706667A121.813333 121.813333 0 0 0 981.333333 573.226667v-122.453334a121.813333 121.813333 0 0 0-31.36-81.706666A121.813333 121.813333 0 0 0 981.333333 287.573333zM124.373333 185.6A61.226667 61.226667 0 0 1 185.6 124.373333h652.8a61.226667 61.226667 0 0 1 61.226667 61.226667v81.706667a61.226667 61.226667 0 0 1-61.226667 61.226666H185.6a61.226667 61.226667 0 0 1-61.226667-61.226666z m775.253334 367.146667a61.226667 61.226667 0 0 1-61.226667 61.226666H185.6a61.226667 61.226667 0 0 1-61.226667-61.226666v-81.493334a61.226667 61.226667 0 0 1 61.226667-61.226666h652.8a61.226667 61.226667 0 0 1 61.226667 61.226666z m0 285.653333a61.226667 61.226667 0 0 1-61.226667 61.226667H185.6a61.226667 61.226667 0 0 1-61.226667-61.226667v-81.493333a61.226667 61.226667 0 0 1 61.226667-61.226667h652.8a61.226667 61.226667 0 0 1 61.226667 61.226667z" p-id="1673"></path><path d="M348.8 267.093333H512a40.746667 40.746667 0 1 0 0-81.493333h-163.2a40.746667 40.746667 0 1 0 0 81.706667z" p-id="1674"></path><path d="M216.106667 226.346667m-40.746667 0a40.746667 40.746667 0 1 0 81.493333 0 40.746667 40.746667 0 1 0-81.493333 0Z" p-id="1675"></path><path d="M348.8 471.253333h-132.693333a40.746667 40.746667 0 0 0 0 81.706667h132.693333a40.746667 40.746667 0 0 0 0-81.706667zM613.973333 471.253333h-132.48a40.746667 40.746667 0 0 0 0 81.706667h132.693334a40.746667 40.746667 0 0 0 0-81.706667zM512 756.906667h-163.2a40.746667 40.746667 0 0 0 0 81.706666H512a40.746667 40.746667 0 0 0 0-81.706666z" p-id="1676"></path><path d="M216.106667 797.653333m-40.746667 0a40.746667 40.746667 0 1 0 81.493333 0 40.746667 40.746667 0 1 0-81.493333 0Z" p-id="1677"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619084097907" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7645" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M0 0h1024v1024H0z" fill="#FFFFFF" p-id="7646"></path><path d="M947.2 716.8H76.8a25.6 25.6 0 0 0-25.6 25.6v153.6a25.6 25.6 0 0 0 25.6 25.6h870.4a25.6 25.6 0 0 0 25.6-25.6v-153.6a25.6 25.6 0 0 0-25.6-25.6zM204.8 870.4H102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4zM947.2 102.4H76.8a25.6 25.6 0 0 0-25.6 25.6v153.6a25.6 25.6 0 0 0 25.6 25.6h870.4a25.6 25.6 0 0 0 25.6-25.6V128a25.6 25.6 0 0 0-25.6-25.6zM204.8 256H102.4V153.6h102.4z m153.6 0h-102.4V153.6h102.4z m153.6 0h-102.4V153.6h102.4z m435.2 153.6H76.8a25.6 25.6 0 0 0-25.6 25.6v153.6a25.6 25.6 0 0 0 25.6 25.6h870.4a25.6 25.6 0 0 0 25.6-25.6v-153.6a25.6 25.6 0 0 0-25.6-25.6zM204.8 563.2H102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4z" fill="#188CFF" p-id="7647"></path><path d="M947.2 716.8H76.8a25.6 25.6 0 0 0-25.6 25.6v153.6a25.6 25.6 0 0 0 25.6 25.6h870.4a25.6 25.6 0 0 0 25.6-25.6v-153.6a25.6 25.6 0 0 0-25.6-25.6zM204.8 870.4H102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4z m153.6 0h-102.4v-102.4h102.4zM947.2 102.4H76.8a25.6 25.6 0 0 0-25.6 25.6v153.6a25.6 25.6 0 0 0 25.6 25.6h870.4a25.6 25.6 0 0 0 25.6-25.6V128a25.6 25.6 0 0 0-25.6-25.6zM204.8 256H102.4V153.6h102.4z m153.6 0h-102.4V153.6h102.4z m153.6 0h-102.4V153.6h102.4z" fill="#99C7F5" p-id="7648"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/assets/icons/port.svg b/streamx-console/streamx-console-webapp/src/assets/icons/port.svg
index fde1134377..938a3785ec 100644
--- a/streamx-console/streamx-console-webapp/src/assets/icons/port.svg
+++ b/streamx-console/streamx-console-webapp/src/assets/icons/port.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619083490738" class="icon" viewBox="0 0 1204 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7013" xmlns:xlink="http://www.w3.org/1999/xlink" width="235.15625" height="200"><defs><style type="text/css"></style></defs><path d="M298.345412 186.307765v91.678117H92.641882v648.734118h1019.422118V277.985882h-212.329412V203.354353h-160.707764V93.967059H466.582588v92.340706H298.345412z m694.031059-0.963765H1204.705882v834.017882H0V185.344h205.703529V93.605647h168.176942V1.264941h457.788235v109.44753h160.707765v74.631529z" fill="#666666" p-id="7014"></path><path d="M277.985882 463.329882h92.641883v277.985883H277.985882zM463.329882 463.329882H555.971765v277.985883H463.329882zM648.673882 463.329882h92.641883v277.985883h-92.641883zM834.017882 463.329882h92.641883v277.985883h-92.641883z" fill="#666666" p-id="7015"></path></svg>
\ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1619084088051" class="icon" viewBox="0 0 1202 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7503" xmlns:xlink="http://www.w3.org/1999/xlink" width="234.765625" height="200"><defs><style type="text/css"></style></defs><path d="M133.565217 0h934.956522a133.565217 133.565217 0 0 1 133.565218 133.565217v756.869566a133.565217 133.565217 0 0 1-133.565218 133.565217H133.565217a133.565217 133.565217 0 0 1-133.565217-133.565217V133.565217a133.565217 133.565217 0 0 1 133.565217-133.565217z m0 89.043478a44.521739 44.521739 0 0 0-44.521739 44.521739v756.869566a44.521739 44.521739 0 0 0 44.521739 44.521739h934.956522a44.521739 44.521739 0 0 0 44.521739-44.521739V133.565217a44.521739 44.521739 0 0 0-44.521739-44.521739H133.565217z m747.965218 311.652174H1001.73913v445.217391H200.347826V400.695652h115.756522v-111.304348h124.660869V178.086957h320.556522v111.304347h120.208696v111.304348zM289.391304 489.73913v267.130435h623.304348V489.73913h-120.208695v-111.304347h-120.208696v-111.304348h-142.469565v111.304348h-124.66087v111.304347H289.391304z m66.782609 89.043479a44.521739 44.521739 0 1 1 89.043478 0v89.043478a44.521739 44.521739 0 1 1-89.043478 0v-89.043478z m133.565217 0a44.521739 44.521739 0 1 1 89.043479 0v89.043478a44.521739 44.521739 0 1 1-89.043479 0v-89.043478z m133.565218 0a44.521739 44.521739 0 1 1 89.043478 0v89.043478a44.521739 44.521739 0 1 1-89.043478 0v-89.043478z m133.565217 0a44.521739 44.521739 0 1 1 89.043478 0v89.043478a44.521739 44.521739 0 1 1-89.043478 0v-89.043478z" fill="#2D60FF" p-id="7504"></path></svg>
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.less b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.less
index 05906ba1d3..a5740d9317 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.less
+++ b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.less
@@ -37,6 +37,9 @@
     border-radius: 50%;
     background-color: #ebebeb;
     border: 6px solid #ebebeb;
+    svg {
+      padding:8px;
+    }
   }
 
 }
\ No newline at end of file
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
index 7437981bca..f11576f6e2 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/setting/View.vue
@@ -10,7 +10,7 @@
           <a-list-item-meta style="width: 50%">
             <svg-icon class="avatar" name="workspace" size="large" slot="avatar" v-if="item.key.match(/(.*)workspace(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="maven" size="large" slot="avatar" v-if="item.key.match(/(.*)maven(.*)/g)"></svg-icon>
-            <svg-icon class="avatar" name="http" size="large" slot="avatar" v-if="item.key.match(/(.*)address(.*)/g)"></svg-icon>
+            <svg-icon class="avatar" name="http" size="large" slot="avatar" v-if="item.key.match(/(.*)webapp.address(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="flink" size="large" slot="avatar" v-if="item.key.match(/env.flink(.*)/g)"></svg-icon>
             <svg-icon class="avatar" name="host" size="large" slot="avatar" v-if="item.key==='alert.email.host'"></svg-icon>
             <svg-icon class="avatar" name="port" size="large" slot="avatar" v-if="item.key==='alert.email.port'"></svg-icon>

From 16566d5048c6fd26a3cf5ec2bb38413cf6f78e7c Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 17:47:06 +0800
Subject: [PATCH 20/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../streamx/console/core/controller/SettingController.java   | 5 ++++-
 .../com/streamxhub/streamx/console/core/entity/Setting.java  | 4 ++++
 .../src/main/resources/mapper/core/SettingMapper.xml         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/controller/SettingController.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/controller/SettingController.java
index 30b0016f1d..2c31f07059 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/controller/SettingController.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/controller/SettingController.java
@@ -20,6 +20,8 @@
  */
 package com.streamxhub.streamx.console.core.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.streamxhub.streamx.console.base.controller.BaseController;
 import com.streamxhub.streamx.console.base.domain.RestResponse;
 import com.streamxhub.streamx.console.core.entity.Setting;
@@ -49,7 +51,8 @@ public class SettingController extends BaseController {
     @PostMapping("all")
     @RequiresPermissions("setting:view")
     public RestResponse all() {
-        List<Setting> setting = settingService.list();
+        LambdaQueryWrapper<Setting> query = new QueryWrapper<Setting>().lambda().orderByAsc(Setting::getNum);
+        List<Setting> setting = settingService.list(query);
         return RestResponse.create().data(setting);
     }
 
diff --git a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Setting.java b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Setting.java
index dd27aefe4e..0e59383c51 100644
--- a/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Setting.java
+++ b/streamx-console/streamx-console-service/src/main/java/com/streamxhub/streamx/console/core/entity/Setting.java
@@ -35,6 +35,10 @@
 @TableName("t_setting")
 @Slf4j
 public class Setting implements Serializable {
+
+    @TableField("`NUM`")
+    private Integer num;
+
     @TableField("`TITLE`")
     private String title;
 
diff --git a/streamx-console/streamx-console-service/src/main/resources/mapper/core/SettingMapper.xml b/streamx-console/streamx-console-service/src/main/resources/mapper/core/SettingMapper.xml
index e0a1cb663c..e18a161bb5 100644
--- a/streamx-console/streamx-console-service/src/main/resources/mapper/core/SettingMapper.xml
+++ b/streamx-console/streamx-console-service/src/main/resources/mapper/core/SettingMapper.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.streamxhub.streamx.console.core.dao.SettingMapper">
     <resultMap id="BaseResultMap" type="com.streamxhub.streamx.console.core.entity.Setting">
+        <result column="NUM" jdbcType="INTEGER" property="num"/>
         <result column="TITLE" jdbcType="VARCHAR" property="title"/>
         <result column="KEY" jdbcType="VARCHAR" property="key"/>
         <result column="VALUE" jdbcType="VARCHAR" property="value"/>

From 2328657d53e470f82e0811bf214b58992d942cd8 Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 18:02:00 +0800
Subject: [PATCH 21/22] alertEmail support

---
 .../src/views/flink/app/EditFlink.vue         | 29 +++++++++++++++++--
 .../src/views/flink/app/EditStreamX.vue       | 17 ++++++++++-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/EditFlink.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/EditFlink.vue
index 3a4aab8fdf..308d9872e5 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/EditFlink.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/EditFlink.vue
@@ -126,6 +126,29 @@
           v-decorator="['slot']" />
       </a-form-item>
 
+      <a-form-item
+        label="CheckPoint Threshold"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-input-number
+          :min="1"
+          :step="1"
+          placeholder="Checkpoints keep Max size"
+          v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
+      </a-form-item>
+
+      <a-form-item
+        label="Fault Alert Email"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-input
+          type="text"
+          placeholder="Please enter email,separate multiple emails with comma(,)"
+          v-decorator="[ 'alertEmail', {rules: [{ required: true, message: 'email is required' }]} ]">
+          <svg-icon name="mail" slot="prefix"/>
+        </a-input>
+      </a-form-item>
+
       <a-form-item
         label="Run Options"
         :label-col="{lg: {span: 5}, sm: {span: 7}}"
@@ -562,6 +585,8 @@ export default {
               args: values.args,
               options: JSON.stringify(options),
               dynamicOptions: values.dynamicOptions,
+              cpThreshold: values.cpThreshold,
+              alertEmail: values.alertEmail,
               description: values.description
             }
             this.handleUpdateApp(params)
@@ -627,8 +652,8 @@ export default {
           'dynamicOptions': this.app.dynamicOptions,
           'resolveOrder': this.app.resolveOrder,
           'executionMode': this.app.executionMode,
-          'slot': this.defaultOptions.slot,
-          'parallelism': this.defaultOptions.parallelism
+          'cpThreshold': this.app.cpThreshold,
+          'alertEmail': this.app.alertEmail
         })
       })
 
diff --git a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
index dcce9a61e4..42721844d6 100644
--- a/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
+++ b/streamx-console/streamx-console-webapp/src/views/flink/app/EditStreamX.vue
@@ -428,6 +428,18 @@
           v-decorator="['cpThreshold', {rules: [{ required: true, message: 'CheckPoint Threshold is required'}]}]" />
       </a-form-item>
 
+      <a-form-item
+        label="Fault Alert Email"
+        :label-col="{lg: {span: 5}, sm: {span: 7}}"
+        :wrapper-col="{lg: {span: 16}, sm: {span: 17} }">
+        <a-input
+          type="text"
+          placeholder="Please enter email,separate multiple emails with comma(,)"
+          v-decorator="[ 'alertEmail', {rules: [{ required: true, message: 'email is required' }]} ]">
+          <svg-icon name="mail" slot="prefix"/>
+        </a-input>
+      </a-form-item>
+
       <a-form-item
         label="Configuration"
         :label-col="{lg: {span: 5}, sm: {span: 7}}"
@@ -1346,6 +1358,7 @@ export default {
         resolveOrder: values.resolveOrder,
         executionMode: values.executionMode,
         cpThreshold: values.cpThreshold,
+        alertEmail: values.alertEmail,
         description: values.description
       }
       this.handleUpdateApp(params)
@@ -1383,6 +1396,7 @@ export default {
         dynamicOptions: values.dynamicOptions || null,
         resolveOrder: values.resolveOrder,
         cpThreshold: values.cpThreshold,
+        alertEmail: values.alertEmail,
         executionMode: values.executionMode,
         description: values.description || null
       }
@@ -1543,7 +1557,8 @@ export default {
           'dynamicOptions': this.app.dynamicOptions,
           'resolveOrder': this.app.resolveOrder,
           'executionMode': this.app.executionMode,
-          'cpThreshold': this.app.cpThreshold
+          'cpThreshold': this.app.cpThreshold,
+          'alertEmail': this.app.alertEmail
         })
         if (this.app.jobType === 2) {
           this.flinkSql.sql = this.app.flinkSql || null

From 8190df18f6b7d47c2c1b6e29945fe89d4b46748b Mon Sep 17 00:00:00 2001
From: benjobs <benjobs@qq.com>
Date: Thu, 22 Apr 2021 18:09:40 +0800
Subject: [PATCH 22/22] =?UTF-8?q?checkPoint=E6=96=B0=E5=A2=9E=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=9C=80=E5=A4=A7=E6=9D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assembly/conf/streamx.sql             | 376 +++++++++---------
 1 file changed, 194 insertions(+), 182 deletions(-)

diff --git a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
index 82ab71cd4d..c8dba139a2 100644
--- a/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
+++ b/streamx-console/streamx-console-service/src/assembly/conf/streamx.sql
@@ -1,4 +1,3 @@
-
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
@@ -7,15 +6,15 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_app_backup`;
 CREATE TABLE `t_app_backup` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(20) DEFAULT NULL,
-`SQL_ID` bigint(20) DEFAULT NULL,
-`CONFIG_ID` bigint(20) DEFAULT NULL,
-`VERSION` int(10) DEFAULT NULL,
-`PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`CREATE_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(20) DEFAULT NULL,
+  `SQL_ID` bigint(20) DEFAULT NULL,
+  `CONFIG_ID` bigint(20) DEFAULT NULL,
+  `VERSION` int(10) DEFAULT NULL,
+  `PATH` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -29,14 +28,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flame_graph`;
 CREATE TABLE `t_flame_graph` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(20) DEFAULT NULL,
-`PROFILER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`TIMELINE` datetime DEFAULT NULL,
-`CONTENT` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE,
-KEY `INX_TIME` (`TIMELINE`) USING BTREE,
-KEY `INX_APPID` (`APP_ID`) USING BTREE
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(20) DEFAULT NULL,
+  `PROFILER` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `TIMELINE` datetime DEFAULT NULL,
+  `CONTENT` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `INX_TIME` (`TIMELINE`) USING BTREE,
+  KEY `INX_APPID` (`APP_ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -50,41 +49,43 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_app`;
 CREATE TABLE `t_flink_app` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`JOB_TYPE` int(1) DEFAULT NULL,
-`EXECUTION_MODE` int(10) DEFAULT NULL,
-`PROJECT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`JOB_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`MODULE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`JAR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`MAIN_CLASS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`ARGS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`USER_ID` int(25) DEFAULT NULL,
-`APP_ID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`APP_TYPE` int(1) DEFAULT NULL,
-`DURATION` bigint(20) DEFAULT NULL,
-`JOB_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`STATE` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`DYNAMIC_OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`RESOLVE_ORDER` smallint(1) DEFAULT NULL,
-`FLAME_GRAPH` tinyint(1) DEFAULT '0',
-`JM_MEMORY` int(10) DEFAULT NULL,
-`TM_MEMORY` int(255) DEFAULT NULL,
-`TOTAL_TASK` int(10) DEFAULT NULL,
-`TOTAL_TM` int(10) DEFAULT NULL,
-`TOTAL_SLOT` int(10) DEFAULT NULL,
-`AVAILABLE_SLOT` int(10) DEFAULT NULL,
-`OPTION_STATE` int(11) DEFAULT NULL,
-`TRACKING` int(1) DEFAULT NULL,
-`CREATE_TIME` datetime DEFAULT NULL,
-`DEPLOY` int(1) DEFAULT '0',
-`START_TIME` datetime DEFAULT NULL,
-`END_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE,
-KEY `INX_STATE` (`STATE`) USING BTREE,
-KEY `INX_TRACK` (`TRACKING`) USING BTREE
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `JOB_TYPE` int(1) DEFAULT NULL,
+  `EXECUTION_MODE` int(10) DEFAULT NULL,
+  `PROJECT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `JOB_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `MODULE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `JAR` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `MAIN_CLASS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ARGS` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `USER_ID` int(25) DEFAULT NULL,
+  `APP_ID` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `APP_TYPE` int(1) DEFAULT NULL,
+  `DURATION` bigint(20) DEFAULT NULL,
+  `JOB_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `STATE` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `DYNAMIC_OPTIONS` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `ALERT_EMAIL` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `RESOLVE_ORDER` smallint(1) DEFAULT NULL,
+  `FLAME_GRAPH` tinyint(1) DEFAULT '0',
+  `CP_THRESHOLD` int(10) DEFAULT NULL,
+  `JM_MEMORY` int(10) DEFAULT NULL,
+  `TM_MEMORY` int(255) DEFAULT NULL,
+  `TOTAL_TASK` int(10) DEFAULT NULL,
+  `TOTAL_TM` int(10) DEFAULT NULL,
+  `TOTAL_SLOT` int(10) DEFAULT NULL,
+  `AVAILABLE_SLOT` int(10) DEFAULT NULL,
+  `OPTION_STATE` int(11) DEFAULT NULL,
+  `TRACKING` int(1) DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  `DEPLOY` int(1) DEFAULT '0',
+  `START_TIME` datetime DEFAULT NULL,
+  `END_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE,
+  KEY `INX_STATE` (`STATE`) USING BTREE,
+  KEY `INX_TRACK` (`TRACKING`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -98,28 +99,34 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_config`;
 CREATE TABLE `t_flink_config` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(20) NOT NULL,
-`FORMAT` tinyint(1) NOT NULL DEFAULT '0',
-`VERSION` int(10) NOT NULL,
-`LATEST` tinyint(1) NOT NULL DEFAULT '0',
-`CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-`CREATE_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=1384151176129277955 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(20) NOT NULL,
+  `FORMAT` tinyint(1) NOT NULL DEFAULT '0',
+  `VERSION` int(10) NOT NULL,
+  `LATEST` tinyint(1) NOT NULL DEFAULT '0',
+  `CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
+
+-- ----------------------------
+-- Records of t_flink_config
+-- ----------------------------
+BEGIN;
+COMMIT;
 
 -- ----------------------------
 -- Table structure for t_flink_effective
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_effective`;
 CREATE TABLE `t_flink_effective` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(20) NOT NULL,
-`TARGET_TYPE` int(1) NOT NULL COMMENT '1) config 2) flink sql',
-`TARGET_ID` bigint(20) NOT NULL COMMENT 'configId or sqlId',
-`CREATE_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE,
-UNIQUE KEY `UN_INX` (`APP_ID`,`TARGET_TYPE`) USING BTREE
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(20) NOT NULL,
+  `TARGET_TYPE` int(1) NOT NULL COMMENT '1) config 2) flink sql',
+  `TARGET_ID` bigint(20) NOT NULL COMMENT 'configId or sqlId',
+  `CREATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE,
+  UNIQUE KEY `UN_INX` (`APP_ID`,`TARGET_TYPE`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -133,13 +140,13 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_log`;
 CREATE TABLE `t_flink_log` (
-`ID` bigint(20) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(20) DEFAULT NULL,
-`YARN_APP_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`SUCCESS` tinyint(1) DEFAULT NULL,
-`EXCEPTION` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`START_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
+  `ID` bigint(20) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(20) DEFAULT NULL,
+  `YARN_APP_ID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `SUCCESS` tinyint(1) DEFAULT NULL,
+  `EXCEPTION` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `START_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -153,20 +160,20 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_project`;
 CREATE TABLE `t_flink_project` (
-`ID` bigint(64) NOT NULL AUTO_INCREMENT,
-`NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`URL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`BRANCHES` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`USERNAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`PASSWORD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`POM` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`TYPE` int(1) DEFAULT NULL,
-`REPOSITORY` int(1) DEFAULT NULL,
-`DATE` datetime DEFAULT NULL,
-`LASTBUILD` datetime DEFAULT NULL,
-`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`BUILDSTATE` int(1) DEFAULT '-1',
-                                   PRIMARY KEY (`ID`) USING BTREE
+  `ID` bigint(64) NOT NULL AUTO_INCREMENT,
+  `NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `URL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `BRANCHES` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `USERNAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `PASSWORD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `POM` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `TYPE` int(1) DEFAULT NULL,
+  `REPOSITORY` int(1) DEFAULT NULL,
+  `DATE` datetime DEFAULT NULL,
+  `LASTBUILD` datetime DEFAULT NULL,
+  `DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `BUILDSTATE` int(1) DEFAULT '-1',
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -181,14 +188,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_savepoint`;
 CREATE TABLE `t_flink_savepoint` (
-`ID` bigint(50) NOT NULL AUTO_INCREMENT,
-`APP_ID` bigint(50) NOT NULL,
-`TYPE` int(1) DEFAULT NULL,
-`PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
-`LATEST` tinyint(4) NOT NULL,
-`TRIGGER_TIME` datetime DEFAULT NULL,
-`CREATE_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
+  `ID` bigint(50) NOT NULL AUTO_INCREMENT,
+  `APP_ID` bigint(50) NOT NULL,
+  `TYPE` int(1) DEFAULT NULL,
+  `PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
+  `LATEST` tinyint(4) NOT NULL,
+  `TRIGGER_TIME` datetime DEFAULT NULL,
+  `CREATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
@@ -202,14 +209,14 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_sql`;
 CREATE TABLE `t_flink_sql` (
-`ID` bigint(20) NOT NULL,
-`APP_ID` bigint(20) DEFAULT NULL,
-`SQL` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`DEPENDENCY` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`VERSION` int(20) DEFAULT NULL,
-`Candidate` int(1) NOT NULL DEFAULT '0',
-`CREATE_TIME` datetime DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
+  `ID` bigint(20) NOT NULL,
+  `APP_ID` bigint(20) DEFAULT NULL,
+  `SQL` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `DEPENDENCY` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `VERSION` int(20) DEFAULT NULL,
+  `Candidate` int(1) NOT NULL DEFAULT '0',
+  `CREATE_TIME` datetime DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -223,12 +230,12 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_flink_tutorial`;
 CREATE TABLE `t_flink_tutorial` (
-`ID` int(11) NOT NULL AUTO_INCREMENT,
-`TYPE` int(11) DEFAULT NULL,
-`NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
-`CREATE_TIME` date DEFAULT NULL,
-PRIMARY KEY (`ID`) USING BTREE
+  `ID` int(11) NOT NULL AUTO_INCREMENT,
+  `TYPE` int(11) DEFAULT NULL,
+  `NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `CONTENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci,
+  `CREATE_TIME` date DEFAULT NULL,
+  PRIMARY KEY (`ID`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
@@ -243,20 +250,20 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_menu`;
 CREATE TABLE `t_menu` (
-`MENU_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单/按钮ID',
-`PARENT_ID` bigint(20) NOT NULL COMMENT '上级菜单ID',
-`MENU_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单/按钮名称',
-`PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由path',
-`COMPONENT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由组件component',
-`PERMS` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '权限标识',
-`ICON` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图标',
-`TYPE` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型 0菜单 1按钮',
-`DISPLAY` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '菜单是否显示',
-`ORDER_NUM` double(20,0) DEFAULT NULL COMMENT '排序',
+  `MENU_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '菜单/按钮ID',
+  `PARENT_ID` bigint(20) NOT NULL COMMENT '上级菜单ID',
+  `MENU_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '菜单/按钮名称',
+  `PATH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由path',
+  `COMPONENT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '对应路由组件component',
+  `PERMS` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '权限标识',
+  `ICON` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '图标',
+  `TYPE` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '类型 0菜单 1按钮',
+  `DISPLAY` char(2) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '1' COMMENT '菜单是否显示',
+  `ORDER_NUM` double(20,0) DEFAULT NULL COMMENT '排序',
   `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
   `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
   PRIMARY KEY (`MENU_ID`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=210 DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB AUTO_INCREMENT=211 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of t_menu
@@ -310,20 +317,20 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_role`;
 CREATE TABLE `t_role` (
-`ROLE_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
-`ROLE_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '角色名称',
-`REMARK` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色描述',
-`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
-`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
-`ROLE_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色标识',
-PRIMARY KEY (`ROLE_ID`) USING BTREE
+  `ROLE_ID` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '角色ID',
+  `ROLE_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '角色名称',
+  `REMARK` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色描述',
+  `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
+  `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
+  `ROLE_CODE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '角色标识',
+  PRIMARY KEY (`ROLE_ID`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=143 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of t_role
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_role` VALUES (1, 'admin', 'admin', '2017-12-27 16:23:11', '2021-04-11 23:59:52', 'admin');
+INSERT INTO `t_role` VALUES (1, 'admin', 'admin', '2017-12-27 16:23:11', '2021-04-22 09:35:44', 'admin');
 INSERT INTO `t_role` VALUES (142, 'developer', '普通开发者', '2021-04-11 19:02:56', '2021-04-12 00:00:14', NULL);
 COMMIT;
 
@@ -332,14 +339,32 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_role_menu`;
 CREATE TABLE `t_role_menu` (
-`ROLE_ID` bigint(20) NOT NULL,
-`MENU_ID` bigint(20) NOT NULL
+  `ROLE_ID` bigint(20) NOT NULL,
+  `MENU_ID` bigint(20) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of t_role_menu
 -- ----------------------------
 BEGIN;
+INSERT INTO `t_role_menu` VALUES (142, 197);
+INSERT INTO `t_role_menu` VALUES (142, 198);
+INSERT INTO `t_role_menu` VALUES (142, 199);
+INSERT INTO `t_role_menu` VALUES (142, 200);
+INSERT INTO `t_role_menu` VALUES (142, 185);
+INSERT INTO `t_role_menu` VALUES (142, 201);
+INSERT INTO `t_role_menu` VALUES (142, 202);
+INSERT INTO `t_role_menu` VALUES (142, 203);
+INSERT INTO `t_role_menu` VALUES (142, 205);
+INSERT INTO `t_role_menu` VALUES (142, 206);
+INSERT INTO `t_role_menu` VALUES (142, 204);
+INSERT INTO `t_role_menu` VALUES (142, 188);
+INSERT INTO `t_role_menu` VALUES (142, 191);
+INSERT INTO `t_role_menu` VALUES (142, 192);
+INSERT INTO `t_role_menu` VALUES (142, 193);
+INSERT INTO `t_role_menu` VALUES (142, 194);
+INSERT INTO `t_role_menu` VALUES (142, 183);
+INSERT INTO `t_role_menu` VALUES (142, 209);
 INSERT INTO `t_role_menu` VALUES (1, 1);
 INSERT INTO `t_role_menu` VALUES (1, 3);
 INSERT INTO `t_role_menu` VALUES (1, 11);
@@ -381,24 +406,6 @@ INSERT INTO `t_role_menu` VALUES (1, 206);
 INSERT INTO `t_role_menu` VALUES (1, 207);
 INSERT INTO `t_role_menu` VALUES (1, 208);
 INSERT INTO `t_role_menu` VALUES (1, 209);
-INSERT INTO `t_role_menu` VALUES (142, 197);
-INSERT INTO `t_role_menu` VALUES (142, 198);
-INSERT INTO `t_role_menu` VALUES (142, 199);
-INSERT INTO `t_role_menu` VALUES (142, 200);
-INSERT INTO `t_role_menu` VALUES (142, 185);
-INSERT INTO `t_role_menu` VALUES (142, 201);
-INSERT INTO `t_role_menu` VALUES (142, 202);
-INSERT INTO `t_role_menu` VALUES (142, 203);
-INSERT INTO `t_role_menu` VALUES (142, 205);
-INSERT INTO `t_role_menu` VALUES (142, 206);
-INSERT INTO `t_role_menu` VALUES (142, 204);
-INSERT INTO `t_role_menu` VALUES (142, 188);
-INSERT INTO `t_role_menu` VALUES (142, 191);
-INSERT INTO `t_role_menu` VALUES (142, 192);
-INSERT INTO `t_role_menu` VALUES (142, 193);
-INSERT INTO `t_role_menu` VALUES (142, 194);
-INSERT INTO `t_role_menu` VALUES (142, 183);
-INSERT INTO `t_role_menu` VALUES (142, 209);
 COMMIT;
 
 -- ----------------------------
@@ -406,22 +413,27 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_setting`;
 CREATE TABLE `t_setting` (
-`KEY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
-`VALUE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`TITLE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-`DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-PRIMARY KEY (`KEY`) USING BTREE
+  `NUM` int(10) DEFAULT NULL,
+  `KEY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `VALUE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `TITLE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `DESCRIPTION` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+  PRIMARY KEY (`KEY`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 
 -- ----------------------------
 -- Records of t_setting
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_setting` VALUES ('env.flink.home', '/usr/local/flink-1.12.0', 'Flink Home', 'Flink Home');
-INSERT INTO `t_setting` VALUES ('maven.central.repository', '', 'Maven Central Repository', 'Maven 私服地址');
-INSERT INTO `t_setting` VALUES ('streamx.console.checkpoint.threshold', '12', 'Checkpoints Keep Threshold', 'CheckPoint默认保存多少个');
-INSERT INTO `t_setting` VALUES ('streamx.console.webapp.address', 'http://test-hadoop-2:10000', 'StreamX Webapp address', 'StreamX Console Web 应用程序 HTTP 端口');
-INSERT INTO `t_setting` VALUES ('streamx.console.workspace', '/streamx/workspace', 'StreamX Console Workspace', 'StreamX Console 的工作空间,用于存放项目源码,编译后的项目等');
+INSERT INTO `t_setting` VALUES (7, 'alert.email.address', NULL, 'Alert  Email Sender', '用来发送告警邮箱的mail');
+INSERT INTO `t_setting` VALUES (5, 'alert.email.host', NULL, 'Alert Email Smtp Host', '告警邮箱Smtp Host');
+INSERT INTO `t_setting` VALUES (8, 'alert.email.password', NULL, 'Alert Email Password', '发送告警的邮箱的密码');
+INSERT INTO `t_setting` VALUES (6, 'alert.email.port', NULL, 'Alert Email Smtp Port', '告警邮箱的Smtp Port');
+INSERT INTO `t_setting` VALUES (9, 'alert.email.ssl', NULL, 'Alert Email Is SSL', '发送告警的邮箱是否开启SSL');
+INSERT INTO `t_setting` VALUES (1, 'env.flink.home', '/usr/local/flink-1.12.0', 'Flink Home', 'Flink Home');
+INSERT INTO `t_setting` VALUES (2, 'maven.central.repository', '', 'Maven Central Repository', 'Maven 私服地址');
+INSERT INTO `t_setting` VALUES (4, 'streamx.console.webapp.address', 'http://test-hadoop-2:10000', 'StreamX Webapp address', 'StreamX Console Web 应用程序 HTTP 端口');
+INSERT INTO `t_setting` VALUES (3, 'streamx.console.workspace', '/streamx/workspace', 'StreamX Console Workspace', 'StreamX Console 的工作空间,用于存放项目源码,编译后的项目等');
 COMMIT;
 
 -- ----------------------------
@@ -429,31 +441,31 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_user`;
 CREATE TABLE `t_user` (
-`USER_ID` bigint(10) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
-`USERNAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '登录用户名',
-`NICK_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '昵称',
-`SALT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '密码加盐',
-`PASSWORD` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
-`DEPT_ID` bigint(20) DEFAULT NULL COMMENT '部门ID',
-`EMAIL` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '邮箱',
-`MOBILE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
-`STATUS` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '状态 0锁定 1有效',
-`CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
-`MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
-`LAST_LOGIN_TIME` datetime DEFAULT NULL COMMENT '最近访问时间',
-`SEX` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '性别 0男 1女 2保密',
-`DESCRIPTION` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
-`AVATAR` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户头像',
-`USER_TYPE` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '2' COMMENT '用户类型 1内部用户 2外部用户',
-PRIMARY KEY (`USER_ID`) USING BTREE,
-UNIQUE KEY `UN_USERNAME` (`NICK_NAME`) USING BTREE
+  `USER_ID` bigint(10) NOT NULL AUTO_INCREMENT COMMENT '用户ID',
+  `USERNAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '登录用户名',
+  `NICK_NAME` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '昵称',
+  `SALT` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '密码加盐',
+  `PASSWORD` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码',
+  `DEPT_ID` bigint(20) DEFAULT NULL COMMENT '部门ID',
+  `EMAIL` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '邮箱',
+  `MOBILE` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
+  `STATUS` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '状态 0锁定 1有效',
+  `CREATE_TIME` datetime NOT NULL COMMENT '创建时间',
+  `MODIFY_TIME` datetime DEFAULT NULL COMMENT '修改时间',
+  `LAST_LOGIN_TIME` datetime DEFAULT NULL COMMENT '最近访问时间',
+  `SEX` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '性别 0男 1女 2保密',
+  `DESCRIPTION` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
+  `AVATAR` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '用户头像',
+  `USER_TYPE` char(1) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '2' COMMENT '用户类型 1内部用户 2外部用户',
+  PRIMARY KEY (`USER_ID`) USING BTREE,
+  UNIQUE KEY `UN_USERNAME` (`NICK_NAME`) USING BTREE
 ) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8;
 
 -- ----------------------------
 -- Records of t_user
 -- ----------------------------
 BEGIN;
-INSERT INTO `t_user` VALUES (1, 'admin', '', 'ats6sdxdqf8vsqjtz0utj461wr', '829b009a6b9cc8ea486a4abbc38e56529f3c6f4c9c6fcd3604b41b1d6eca1a57', 1, 'benjobs@qq.com', '18500193260', '1', '2017-12-27 15:47:19', '2019-08-09 15:42:57', '2021-04-20 19:03:34', '0', 'author。', 'ubnKSIfAJTxIgXOKlciN.png', '1');
+INSERT INTO `t_user` VALUES (1, 'admin', '', 'ats6sdxdqf8vsqjtz0utj461wr', '829b009a6b9cc8ea486a4abbc38e56529f3c6f4c9c6fcd3604b41b1d6eca1a57', 1, 'benjobs@qq.com', '18500193260', '1', '2017-12-27 15:47:19', '2019-08-09 15:42:57', '2021-04-22 09:37:13', '0', 'author。', 'ubnKSIfAJTxIgXOKlciN.png', '1');
 COMMIT;
 
 -- ----------------------------
@@ -461,8 +473,8 @@ COMMIT;
 -- ----------------------------
 DROP TABLE IF EXISTS `t_user_role`;
 CREATE TABLE `t_user_role` (
-`USER_ID` bigint(20) DEFAULT NULL COMMENT '用户ID',
-`ROLE_ID` bigint(20) DEFAULT NULL COMMENT '角色ID'
+  `USER_ID` bigint(20) DEFAULT NULL COMMENT '用户ID',
+  `ROLE_ID` bigint(20) DEFAULT NULL COMMENT '角色ID'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 -- ----------------------------