From 88fee9df9f0247fd34facf3944a77d667497b459 Mon Sep 17 00:00:00 2001
From: mozhenghua <baisui@qlangtech.com>
Date: Wed, 27 Mar 2024 14:24:19 +0800
Subject: [PATCH] modify incr channel wethear is null

---
 .idea/workspace.xml                           |  23 ++--
 src/base/base.manage-routing.module.ts        |  14 +++
 src/base/datax.worker.add.step0.component.ts  |  89 +++++++-------
 src/base/datax.worker.component.ts            |  14 ++-
 src/base/datax.worker.running.component.ts    |  27 ++--
 src/common/basic.form.component.ts            |   4 +-
 .../launch.waitting.process.component.ts      |   4 +-
 src/common/navigate.bar.component.ts          |   5 +
 src/common/plugins.component.ts               |   3 +
 src/common/tis.service.ts                     | 116 +++++++++++++++---
 src/datax/datax.index.component.ts            |  32 ++---
 src/runtime/app.module-jit.ts                 |  14 ++-
 src/runtime/incr.pod.logs.status.component.ts |   9 +-
 src/runtime/misc/RCDeployment.ts              |   3 +
 14 files changed, 246 insertions(+), 111 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 726b34b..9956d89 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,18 +8,17 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/base/base.manage-routing.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/base.manage-routing.module.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/base/datax.worker.add.step0.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.add.step0.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/base/datax.worker.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/base/datax.worker.running.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/datax.worker.running.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/error.detail.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/error.detail.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/error.list.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/error.list.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/base/flink.cluster.list.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/base/flink.cluster.list.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/init.system.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/init.system.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/common/basic.form.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/basic.form.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/common/launch.waitting.process.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/launch.waitting.process.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/common/navigate.bar.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/navigate.bar.component.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/common/plugins.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/plugins.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/common/tis.plugin.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/tis.plugin.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/common/tis.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/common/tis.service.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/incr.build.step0.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/incr.build.step0.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/incr.build.step4.running.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/incr.build.step4.running.component.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/runtime/root-welcome-component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/root-welcome-component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/datax/datax.index.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/datax/datax.index.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/runtime/app.module-jit.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/app.module-jit.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/runtime/incr.pod.logs.status.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/incr.pod.logs.status.component.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/runtime/misc/RCDeployment.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/runtime/misc/RCDeployment.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -208,7 +207,8 @@
       <workItem from="1708064889532" duration="6439000" />
       <workItem from="1708498515669" duration="28236000" />
       <workItem from="1709011380537" duration="53759000" />
-      <workItem from="1710341418442" duration="23403000" />
+      <workItem from="1710341418442" duration="55807000" />
+      <workItem from="1711444715700" duration="2582000" />
     </task>
     <servers />
   </component>
@@ -379,6 +379,11 @@
           <line>31</line>
           <option name="timeStamp" value="1" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="javascript">
+          <url>file://$PROJECT_DIR$/src/common/navigate.bar.component.ts</url>
+          <line>93</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
diff --git a/src/base/base.manage-routing.module.ts b/src/base/base.manage-routing.module.ts
index b115118..bce85a2 100644
--- a/src/base/base.manage-routing.module.ts
+++ b/src/base/base.manage-routing.module.ts
@@ -40,6 +40,7 @@ import {DataxWorkerAddStep0Component} from "./datax.worker.add.step0.component";
 import {K8SRCSpec} from "../common/k8s.replics.spec.component";
 import {FlinkClusterListComponent} from "./flink.cluster.list.component";
 import {DataxWorkerAddStep3Component} from "./datax.worker.add.step3.component";
+import {DataxWorkerRunningComponent} from "./datax.worker.running.component";
 
 const get_job_worker_meta = "get_job_worker_meta";
 const flinkClusterCfgTargetName = PowerjobCptType.FlinkCluster.toString();// "flink-cluster";
@@ -51,11 +52,15 @@ export const dataXWorkerCfg: { processMeta: ProcessMeta }
   = {
 
   processMeta: {
+    endType: 'powerjob',
     step1PluginType: {
       name: 'datax-worker',
       require: true,
       extraParam: "dataxName_" + PowerjobCptType.Server
     },
+    afterSuccessDelete: (cpt: DataxWorkerRunningComponent) => {
+      cpt.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: cpt.dto.processMeta}));
+    },
     successCreateNext: (step3: DataxWorkerAddStep3Component) => {
       DataxWorkerComponent.getJobWorkerMeta(step3, null, step3.dto.processMeta)
         .then((dataXWorkerStatus) => {
@@ -174,11 +179,15 @@ const FlinkSessionPageHeader = "添加Kubernetes Session执行器";
 export const flinkClusterCfg: { processMeta: ProcessMeta }
   = {
   processMeta: {
+    endType: 'flink',
     step1PluginType: {
       name: PowerjobCptType.FlinkCluster,
       require: true,
       extraParam: "dataxName_" + PowerjobCptType.FlinkCluster
     },
+    afterSuccessDelete: (cpt: DataxWorkerRunningComponent) => {
+      cpt.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: cpt.dto.processMeta}));
+    },
     breadcrumbGetter: (params) => {
       let crumb: Breadcrumb = flinkSessionDetail.processMeta.breadcrumbGetter(params);
       return {
@@ -273,6 +282,7 @@ const get_flink_session = 'get_flink_session';
 export const flinkSessionDetail: { processMeta: ProcessMeta }
   = {
   processMeta: {
+    endType: 'flink',
     step1PluginType: null,
     breadcrumbGetter: (params) => {
       return {
@@ -280,6 +290,10 @@ export const flinkSessionDetail: { processMeta: ProcessMeta }
         name: params[KEY_TARGET_NAME]
       }
     },
+    afterSuccessDelete: (cpt: DataxWorkerRunningComponent) => {
+      // cpt.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: cpt.dto.processMeta}));
+      cpt.router.navigate(["/base/flink-cluster-list"]);
+    },
     successCreateNext: (step3: DataxWorkerAddStep3Component) => {
       throw  new Error("shall not execute");
     },
diff --git a/src/base/datax.worker.add.step0.component.ts b/src/base/datax.worker.add.step0.component.ts
index 51af915..d6aba02 100644
--- a/src/base/datax.worker.add.step0.component.ts
+++ b/src/base/datax.worker.add.step0.component.ts
@@ -35,35 +35,40 @@ import {NzDrawerService} from "ng-zorro-antd/drawer";
 
 @Component({
   template: `
-    <nz-spin [nzSpinning]="this.formDisabled" nzSize="large">
-<!--      <nz-alert nzType="warning" nzMessage="告知" [nzDescription]="unableToUseK8SController"-->
-<!--                nzShowIcon></nz-alert>-->
-<!--      <ng-template #unableToUseK8SController>-->
-<!--        因架构调整，基于K8S执行的分布式DataX任务执行器，和Flink任务执行器需要做新的调整，会将Zookeeper组建依赖去掉，会在<strong>4.0.0版本</strong>中重新与大家见面-->
-<!--      </ng-template>-->
-
-      <nz-empty style="height: 500px"
-                nzNotFoundImage="https://gw.alipayobjects.com/zos/antfincdn/ZHrcdLPrvN/empty.svg"
-                [nzNotFoundFooter]="footerTpl"
-                [nzNotFoundContent]="contentTpl"
-      >
-        <ng-template #contentTpl>
-          <span>{{this.dto.processMeta.notCreateTips}}</span>
-        </ng-template>
-        <ng-template #footerTpl>
-
-          <nz-space class="btn-block">
-            <ng-container *ngFor="let btn of this.dto.processMeta.step1Buttons;let i =index">
-              <button *nzSpaceItem [disabled]="this.formDisabled" nz-button
-                      [nzType]="i<1 ? 'primary':'default'"
-                      (click)="btn.click(this)">{{btn.label}}</button>
-            </ng-container>
-          </nz-space>
-
-
-        </ng-template>
-      </nz-empty>
-    </nz-spin>
+      <nz-spin [nzSpinning]="this.formDisabled" nzSize="large">
+          <!--      <nz-alert nzType="warning" nzMessage="告知" [nzDescription]="unableToUseK8SController"-->
+          <!--                nzShowIcon></nz-alert>-->
+          <!--      <ng-template #unableToUseK8SController>-->
+          <!--        因架构调整，基于K8S执行的分布式DataX任务执行器，和Flink任务执行器需要做新的调整，会将Zookeeper组建依赖去掉，会在<strong>4.0.0版本</strong>中重新与大家见面-->
+          <!--      </ng-template>-->
+
+          <nz-empty style="height: 500px"
+                    [nzNotFoundImage]="notFoundImage"
+                    [nzNotFoundFooter]="footerTpl"
+                    [nzNotFoundContent]="contentTpl"
+          >
+              <ng-template #contentTpl>
+                  <span>{{this.dto.processMeta.notCreateTips}}</span>
+              </ng-template>
+              <ng-template #footerTpl>
+
+                  <nz-space class="btn-block">
+                      <ng-container *ngFor="let btn of this.dto.processMeta.step1Buttons;let i =index">
+                          <button *nzSpaceItem [disabled]="this.formDisabled" nz-button
+                                  [nzType]="i<1 ? 'primary':'default'"
+                                  (click)="btn.click(this)">{{btn.label}}</button>
+                      </ng-container>
+                  </nz-space>
+
+
+              </ng-template>
+              <ng-template #notFoundImage>
+                  <p style="margin: 20px">
+                      <span style="font-size: 8em" nz-icon [nzType]="dto.processMeta.endType" nzTheme="fill"></span>
+                  </p>
+              </ng-template>
+          </nz-empty>
+      </nz-spin>
   `
 })
 export class DataxWorkerAddStep0Component extends BasicFormComponent implements AfterViewInit, OnInit {
@@ -85,7 +90,17 @@ export class DataxWorkerAddStep0Component extends BasicFormComponent implements
     // let promise =    Promise.resolve();
     let success$ = new Subject<any>();
 
-    DataxWorkerAddStep0Component.getWorkDescs(dataXWorkerCfg.processMeta.targetName, true, module)
+    let opt: SavePluginEvent = null;
+
+    if (appendParams) {
+      let p = appendParams.find((param) => param.key === KEY_APPNAME);
+      if (p) {
+        opt = new SavePluginEvent();
+        opt.overwriteHttpHeaderOfAppName(p.val);
+      }
+    }
+
+    DataxWorkerAddStep0Component.getWorkDescs(dataXWorkerCfg.processMeta.targetName, true, module, opt)
       .then((dto) => {
         let rList = dto.workDesc;
         let desc = Array.from(rList.values());
@@ -96,15 +111,7 @@ export class DataxWorkerAddStep0Component extends BasicFormComponent implements
           appendParams: appendParams
         };
         // console.log([pluginDesc,pluginCategory]);
-        let opt = null;
-
-        if (appendParams) {
-          let p = appendParams.find((param) => param.key === KEY_APPNAME);
-          if (p) {
-            opt = new SavePluginEvent();
-            opt.overwriteHttpHeaderOfAppName(p.val);
-          }
-        }
+
         // console.log(dto);
         let containTplRewriterPlugin = dto.typedPluginCount[PowerjobCptType.JobTplAppOverwrite];
         let modelRef = PluginsComponent.openPluginDialog({
@@ -128,9 +135,9 @@ export class DataxWorkerAddStep0Component extends BasicFormComponent implements
     return success$.asObservable();
   }
 
-  public static getWorkDescs(targetName: string, addJobTplOverwritePlugin: boolean, module: BasicFormComponent): Promise<WorkerDTO> {
+  public static getWorkDescs(targetName: string, addJobTplOverwritePlugin: boolean, module: BasicFormComponent, e?: SavePluginEvent): Promise<WorkerDTO> {
     return module.httpPost('/coredefine/corenodemanage.ajax'
-      , `action=datax_action&emethod=worker_desc&targetName=${targetName}&addJobTplOverwritePlugin=${addJobTplOverwritePlugin}`)
+      , `action=datax_action&emethod=worker_desc&targetName=${targetName}&addJobTplOverwritePlugin=${addJobTplOverwritePlugin}`, e)
       .then((r) => {
         if (r.success) {
           let rList = PluginsComponent.wrapDescriptors(r.bizresult.pluginDesc);
diff --git a/src/base/datax.worker.component.ts b/src/base/datax.worker.component.ts
index 4904767..894b92a 100644
--- a/src/base/datax.worker.component.ts
+++ b/src/base/datax.worker.component.ts
@@ -139,8 +139,8 @@ export class DataxWorkerComponent extends AppFormComponent implements AfterViewI
 
     this.multiViewDAG = new MultiViewDAG(configFST, this._componentFactoryResolver, this.containerRef);
 
-    this.route.params.subscribe((params) => {
-      //console.log(params);
+    let next = (params) => {
+       console.log(params);
       DataxWorkerComponent.getJobWorkerMeta(this, params, this.processMeta).then((dataXWorkerStatus) => {
         if (dataXWorkerStatus.k8sReplicationControllerCreated) {
           this.multiViewDAG.loadComponent(DataxWorkerRunningComponent, dataXWorkerStatus);
@@ -152,7 +152,15 @@ export class DataxWorkerComponent extends AppFormComponent implements AfterViewI
 
         }
       })
-    });
+    };
+
+    // this.route.queryParams.subscribe((query) => {
+    //   // 当实例删除后为了页面刷新一下，加了一个update参数
+    //   if (query['update']) {
+    //     next.apply(this.route.params);
+    //   }
+    // });
+    this.route.params.subscribe(next);
 
 
     // this.httpPost('/coredefine/corenodemanage.ajax'
diff --git a/src/base/datax.worker.running.component.ts b/src/base/datax.worker.running.component.ts
index 6a193a7..cebf5aa 100644
--- a/src/base/datax.worker.running.component.ts
+++ b/src/base/datax.worker.running.component.ts
@@ -67,7 +67,7 @@ export const KEY_APPNAME = "appname";
       <nz-tabset nzSize="large" [(nzSelectedIndex)]="tabSelectIndex" [nzTabBarExtraContent]="extraTemplate"
                  #tabsetComponent>
         <ng-container *ngIf="dto.rcDeployment?.status">
-          <nz-tab nzTitle="基本" (nzSelect)="profileTabSelect()">
+          <nz-tab [nzTitle]="profileTitle" (nzSelect)="profileTabSelect()">
             <ng-template nz-tab>
               <div style="margin-top: 8px;"
                    *ngTemplateOutlet="promoteServerHost;context:{server_port_host:this.dto.payloads['server_port_host']}">
@@ -87,7 +87,7 @@ export const KEY_APPNAME = "appname";
               -->
             </ng-template>
           </nz-tab>
-          <nz-tab nzTitle="规格" (nzSelect)="envTabSelect()">
+          <nz-tab [nzTitle]="specificationTitle" (nzSelect)="envTabSelect()">
             <ng-template nz-tab>
               <rc-spec *ngFor="let rc of dto.rcDeployments" [rcDeployment]="rc"></rc-spec>
             </ng-template>
@@ -214,16 +214,23 @@ export const KEY_APPNAME = "appname";
 
           <ng-template #unableToUseK8SController>
 
-            可直接打开PowerJob控制台 &nbsp;<a target="_blank"
-                                              [href]="server_port_host"><i nz-icon nzType="link"
-                                                                           nzTheme="outline"></i>控制台</a>
+            可直接打开{{this.dto.processMeta.pageHeader}}控制台 &nbsp;<a target="_blank" [href]="server_port_host"><i nz-icon nzType="link"   nzTheme="outline"></i>控制台</a>
           </ng-template>
         </nz-alert>
 
       </ng-template>
+      <ng-template #profileTitle>
+        <span nz-icon [nzType]="dto.processMeta.endType" nzTheme="outline"></span>基本
+      </ng-template>
       <ng-template #cfgTitle>
         <span nz-icon nzType="file" nzTheme="outline"></span>配置
       </ng-template>
+      <ng-template #specificationTitle>
+        <span nz-icon nzType="ordered-list" nzTheme="outline"></span>规格
+      </ng-template>
+
+
+
       <ng-template #controller>
         <span nz-icon nzType="setting" nzTheme="outline"></span>操作
       </ng-template>
@@ -282,7 +289,7 @@ export class DataxWorkerRunningComponent extends AppFormComponent implements Aft
   workflows: PowerJobWorkflow[] = [];
 
 
-  constructor(tisService: TISService, route: ActivatedRoute, modalService: NzModalService, private router: Router, notification: NzNotificationService, public _zone: NgZone) {
+  constructor(tisService: TISService, route: ActivatedRoute, modalService: NzModalService, public router: Router, notification: NzNotificationService, public _zone: NgZone) {
     super(tisService, route, modalService, notification);
   }
 
@@ -423,17 +430,13 @@ export class DataxWorkerRunningComponent extends AppFormComponent implements Aft
 
   dataXWorkerDelete(cpt: ControlPanelComponent) {
 
-    // this.confirm(`是否确定要将${this.dto.processMeta.pageHeader}从K8S容器中删除`, () => {
-    //
-    // });
-
     this.jsonPost('/coredefine/corenodemanage.ajax?action=datax_action&emethod=remove_datax_worker&targetName=' + this.currentApp.name //this.dto.processMeta.targetName
       , {})
       .then((r) => {
-        // console.log("xxxxxxxx");
         cpt.enableComponent();
         if (r.success) {
-          this.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: this.dto.processMeta}));
+          this.dto.processMeta.afterSuccessDelete(this);
+         // this.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: this.dto.processMeta}));
         }
       });
 
diff --git a/src/common/basic.form.component.ts b/src/common/basic.form.component.ts
index 301c718..11ae730 100644
--- a/src/common/basic.form.component.ts
+++ b/src/common/basic.form.component.ts
@@ -163,11 +163,11 @@ export class BasicFormComponent {
   }
 
   // 发送http post请求
-  public httpPost(url: string, body: string): Promise<TisResponseResult> {
+  public httpPost(url: string, body: string, e?: SavePluginEvent): Promise<TisResponseResult> {
     this.formDisabled = true;
     NProgress.start();
     this.clearProcessResult();
-    return this.tisService.httpPost(url, body).then(this.webExecuteCallback).catch(this.handleError);
+    return this.tisService.httpPost(url, body, e).then(this.webExecuteCallback).catch(this.handleError);
     // return this.tisService._zone.runOutsideAngular(()=>{
     //
     // })
diff --git a/src/common/launch.waitting.process.component.ts b/src/common/launch.waitting.process.component.ts
index 1a8e42b..f2966be 100644
--- a/src/common/launch.waitting.process.component.ts
+++ b/src/common/launch.waitting.process.component.ts
@@ -47,10 +47,10 @@ export function openWaittingProcessComponent(drawerService: NzDrawerService, sub
         <nz-page-header-extra>
           <button nz-button nzType="primary" *ngIf="!this.errScalaLog && this.execStatus === 'error'"
                   (click)="reExecute()">
-            重新执行
+            <span nz-icon nzType="reload" nzTheme="outline"></span> 重新执行
           </button>
           <button nz-button (click)="closeDrawer()">
-            关闭
+             关闭
           </button>
         </nz-page-header-extra>
         <nz-page-header-content>
diff --git a/src/common/navigate.bar.component.ts b/src/common/navigate.bar.component.ts
index 76ee5fa..cd6dee4 100644
--- a/src/common/navigate.bar.component.ts
+++ b/src/common/navigate.bar.component.ts
@@ -128,7 +128,9 @@ import {expressionType} from "@angular/compiler/src/output/output_ast";
           </nz-select>
         </li>
       </ng-container>
+
       <li class="user-profile" nz-menu-item nzMatchRouter>
+
         <button nz-button nzType="link" (click)="openTisAbout()">关于</button>
         <button nz-button nz-dropdown [nzDropdownMenu]="user">
           <i nz-icon nzType="user" style="margin: 0px" nzTheme="outline"></i>{{userProfile?.name}}
@@ -154,6 +156,9 @@ import {expressionType} from "@angular/compiler/src/output/output_ast";
           </svg>
         </ng-template>
       </li>
+      <li class="user-profile" nz-menu-item nzMatchRouter>
+        <a href="https://github.com/datavane/tis" target="_blank"><span style="color: white;font-size: 1.2em" nz-icon nzType="github" nzTheme="outline"></span></a>
+      </li>
       <!--
                 <li nz-menu-item>
                     <a class="nav-link dropdown-toggle" href="#" id="navbarUsers" data-toggle="dropdown"
diff --git a/src/common/plugins.component.ts b/src/common/plugins.component.ts
index 6fd488e..cbf2d58 100644
--- a/src/common/plugins.component.ts
+++ b/src/common/plugins.component.ts
@@ -288,6 +288,7 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
 
   public static openPluginDialog(opts: OpenPluginDialogOptions, b: BasicFormComponent
     , pluginDesc: Descriptor, pluginTp: PluginType, title: string, onSuccess: (biz) => void): NzModalRef<any> {
+    //console.log("openPluginDialog  ");
     let modalRef = b.openDialog(PluginsComponent, {nzTitle: title});
     let addDb: PluginsComponent = modalRef.getContentComponent();
 
@@ -298,8 +299,10 @@ export class PluginsComponent extends AppFormComponent implements AfterContentIn
     addDb.disableNotebook = true;
 
     if (opts.shallLoadSavedItems) {
+      //console.log("shallLoadSavedItems  ");
       addDb.setPlugins([pluginTp], opts.opt);
     } else {
+      //console.log("not shallLoadSavedItems");
       addDb._heteroList = PluginsComponent.pluginDesc(pluginDesc, pluginTp);
       addDb.setPluginMeta([pluginTp])
     }
diff --git a/src/common/tis.service.ts b/src/common/tis.service.ts
index 7612040..445baf5 100644
--- a/src/common/tis.service.ts
+++ b/src/common/tis.service.ts
@@ -46,9 +46,24 @@ export const KEY_APPNAME = 'appname';
 export const KEY_APP_ID = 'appid';
 
 export enum SystemError {
-  FLINK_CLUSTER_LOSS_OF_CONTACT = 'FLINK_CLUSTER_LOSS_OF_CONTACT'
+  FLINK_INSTANCE_LOSS_OF_CONTACT = 'FLINK_INSTANCE_LOSS_OF_CONTACT',
+  FLINK_SESSION_CLUSTER_LOSS_OF_CONTACT = 'FLINK_SESSION_CLUSTER_LOSS_OF_CONTACT',
+  POWER_JOB_CLUSTER_LOSS_OF_CONTACT = 'POWER_JOB_CLUSTER_LOSS_OF_CONTACT'
 }
 
+// "errCode":{
+//   "code":"FLINK_SESSION_CLUSTER_LOSS_OF_CONTACT",
+//     "payload":{
+//     "targetName":"flink-cluster"
+//   }
+// },
+
+interface ErrorVal {
+  code: SystemError;
+  payload: [string: any]
+}
+
+
 // @ts-ignore
 @Injectable()
 export class TISService {
@@ -303,6 +318,7 @@ export class TISService {
         return result;
       }
       let logFileName: string[];
+      let errorVal: ErrorVal = null;
       let errCode: SystemError = null;
       let errContent = '<ul class="list-ul-msg">' + errs.map((r) => {
         if (typeof r === 'string') {
@@ -313,10 +329,12 @@ export class TISService {
           //   "message":"IllegalStateException: xxxxxxxxxxxxxxxxxxxxx"
           // }
           if (r.errCode) {
-            errCode = SystemError[r.errCode];
+            errorVal = r.errCode;
+            errCode = SystemError[errorVal.code];
             if (!errCode) {
               throw new Error("invalid errCode:" + r.errCode);
             }
+            errorVal.code = errCode;
           }
           logFileName = [r.logFileName];
           return `<li><a>详细</a> ${r.message}  </li>`
@@ -330,34 +348,72 @@ export class TISService {
         // console.log(errCode);
         let sysErrorRestoreStrategy: SysErrorRestoreStrategy = null;
         let mref: NzModalRef = null;
+        let okEventEmitter = new EventEmitter<any>();
         switch (errCode) {
-          case SystemError.FLINK_CLUSTER_LOSS_OF_CONTACT:
-            let okEventEmitter = new EventEmitter<any>();
+          case SystemError.FLINK_INSTANCE_LOSS_OF_CONTACT: {
+
             sysErrorRestoreStrategy = {
               title: "服务端Flink服务已经失联，是否要重新创建增量通道？",
               okText: "重新创建",
               cancelText: "等等再说",
-              onOKExec: okEventEmitter
+              onOKExec: okEventEmitter,
+              afterSuccessRestore: (errVal) => {
+                this.router.navigate(["/x", errVal.payload[KEY_APPNAME]], {relativeTo: this.route});
+              }
             }
-            okEventEmitter.subscribe((ist) => {
-              if (mref) {
-                let cfg = mref.getConfig();
-                cfg.nzOkLoading = true;
-                TISService.channelDelete(this)
-                  .then((r) => {
-                    // TODO 页面重定向
-                    this.router.navigate(["/x", this.currApp.appName], {relativeTo: this.route});
-                    mref.close();
-                  }).finally(() => {
-                  cfg.nzOkLoading = false;
+
+            break;
+          }
+          case SystemError.FLINK_SESSION_CLUSTER_LOSS_OF_CONTACT: {
+            sysErrorRestoreStrategy = {
+              title: "服务端Flink Session服务已经失联，是否要重新创建？",
+              okText: "重新创建",
+              cancelText: "等等再说",
+              onOKExec: okEventEmitter,
+              afterSuccessRestore: (errVal) => {
+                this.router.navigate(["/base/flink-cluster-list"], {relativeTo: this.route});
+              }
+            }
+            break;
+          }
+          case SystemError.POWER_JOB_CLUSTER_LOSS_OF_CONTACT: {
+            sysErrorRestoreStrategy = {
+              title: "PowerJob服务已经失联，是否要重新创建？",
+              okText: "重新创建",
+              cancelText: "等等再说",
+              onOKExec: okEventEmitter,
+              afterSuccessRestore: (errVal) => {
+                // https://stackoverflow.com/questions/40983055/how-to-reload-the-current-route-with-the-angular-2-router
+                this.router.navigateByUrl('/', {skipLocationChange: true})
+                  .then(() => {
+                  this.router.navigate(["/base/datax-worker"]);
                 });
               }
-
-            })
+            }
+            break;
+          }
           default:
+            throw new Error("invalid errorCode:" + errCode);
         }
-        //
-        //
+
+        okEventEmitter.subscribe((ist) => {
+          if (mref) {
+            let cfg = mref.getConfig();
+            cfg.nzOkLoading = true;
+            TISService.restoreExcpetion(this, errorVal)
+              .then((r) => {
+                sysErrorRestoreStrategy.afterSuccessRestore(errorVal);
+                // TODO 页面重定向
+                //  this.router.navigate(["/x", this.currApp.appName], {relativeTo: this.route});
+                mref.close();
+              }).finally(() => {
+              cfg.nzOkLoading = false;
+            });
+          }
+
+        });
+
+
         mref = this.modalService.error({
           nzWidth: 500,
           nzTitle: sysErrorRestoreStrategy.title,
@@ -397,6 +453,25 @@ export class TISService {
     });
   }
 
+  /**
+   * 恢复系统异常
+   * @param tisService
+   * @private
+   */
+  private static restoreExcpetion(tisService: TISService, errorVal: ErrorVal): Promise<TisResponseResult> {
+
+    let params = "event_submit_do_exception_restore=y&action=operation_log_action&errorCode=" + errorVal.code;
+    for (let key in errorVal.payload) {
+      params += ('&' + key + "=" + errorVal.payload[key]);
+    }
+
+    return tisService.httpPost('/runtime/addapp.ajax', params).then((r) => {
+      if (r.success) {
+        return r;
+      }
+    });
+  }
+
   protected handleError = (error: any): Promise<any> => {
     // console.log(error);
     if (error instanceof HttpErrorResponse) {
@@ -497,6 +572,7 @@ interface SysErrorRestoreStrategy {
   okText: string;
   cancelText: string;
   onOKExec: EventEmitter<any>;
+  afterSuccessRestore: (errVal: ErrorVal) => void
 };
 
 export class EventSourceSubject {
diff --git a/src/datax/datax.index.component.ts b/src/datax/datax.index.component.ts
index 09a1ac5..60abf59 100644
--- a/src/datax/datax.index.component.ts
+++ b/src/datax/datax.index.component.ts
@@ -33,32 +33,32 @@ import {NzModalService} from "ng-zorro-antd/modal";
               <ul nz-menu nzMode="inline">
                   <li nz-menu-item nzMatchRouter nzMatchRouterExact>
                       <a [routerLink]="['./']">
-                          <i class="fa fa-tachometer fa-2x" aria-hidden="true"></i>主控台</a>
+                        <span class="icon-large" nz-icon nzType="dashboard" nzTheme="outline"></span>主控台</a>
                   </li>
                   <li nz-menu-item nzMatchRouter nzMatchRouterExact>
                       <a routerLink="./notebook">
-                          <i class="fa fa-book fa-2x" aria-hidden="true"></i>Notebook</a>
+                        <span class="icon-large" nz-icon nzType="book" nzTheme="outline"></span>Notebook</a>
                   </li>
-<!--                  <li nz-menu-item nzMatchRouter>-->
-<!--                      <a routerLink="./config"><i class="fa fa-plug fa-2x" aria-hidden="true"></i>配置</a>-->
-<!--                  </li>-->
+                  <!--                  <li nz-menu-item nzMatchRouter>-->
+                  <!--                      <a routerLink="./config"><i class="fa fa-plug fa-2x" aria-hidden="true"></i>配置</a>-->
+                  <!--                  </li>-->
 
-                <li nz-menu-item nzMatchRouter>
-                  <a routerLink="./manage"><i class="fa fa-plug fa-2x" aria-hidden="true"></i>管理</a>
-                </li>
+                  <li nz-menu-item nzMatchRouter>
+                      <a routerLink="./manage"><span class="icon-large" nz-icon nzType="control" nzTheme="outline"></span>管理</a>
+                  </li>
 
                   <li nz-menu-item nzMatchRouter>
-                      <a routerLink="./app_build_history" ><i aria-hidden="true" class="fa fa-cog fa-2x"></i>批量构建</a>
+                      <a routerLink="./app_build_history"> <span class="icon-large" nz-icon nzType="batch-computing" nzTheme="fill"></span>批量构建</a>
                   </li>
                   <li nz-menu-item nzMatchRouter>
                       <a routerLink="./incr_build">
-                          <i aria-hidden="true" class="fa fa-truck fa-2x"></i>实时同步</a>
+                          <span class="icon-large" nz-icon nzType="stream-computing" nzTheme="outline"> </span> 实时同步</a>
                   </li>
-<!--                  <li nz-menu-item nzMatchRouter>-->
-<!--                      <a routerLink="./monitor"><i class="fa fa-bar-chart fa-2x" aria-hidden="true"></i>指标</a>-->
-<!--                  </li>-->
+                  <!--                  <li nz-menu-item nzMatchRouter>-->
+                  <!--                      <a routerLink="./monitor"><i class="fa fa-bar-chart fa-2x" aria-hidden="true"></i>指标</a>-->
+                  <!--                  </li>-->
                   <li nz-menu-item nzMatchRouter>
-                      <a routerLink="./operationlog"><i class="fa fa-pencil fa-2x" aria-hidden="true"></i>操作历史</a>
+                      <a routerLink="./operationlog"><span class="icon-large" nz-icon nzType="history" nzTheme="outline"></span>操作历史</a>
                   </li>
               </ul>
           </nz-sider>
@@ -72,6 +72,10 @@ import {NzModalService} from "ng-zorro-antd/modal";
 
   `,
   styles: [`
+    .icon-large {
+      font-size: 1.5em;
+      margin-right: 4px;
+    }
       a:link {
           color: black;
       }
diff --git a/src/runtime/app.module-jit.ts b/src/runtime/app.module-jit.ts
index 4755db1..7477d5a 100644
--- a/src/runtime/app.module-jit.ts
+++ b/src/runtime/app.module-jit.ts
@@ -106,7 +106,7 @@ export function markedOptionsFactory(): MarkedOptions {
   entryComponents: [],
   bootstrap: [AppComponent],
   // bootstrap: [CodemirrorComponent],
-  providers: [TISService,  NzIconService,NzMessageService
+  providers: [TISService, NzIconService, NzMessageService
     , {provide: NZ_I18N, useValue: zh_CN},
     {
       provide: TRASH_FOLDER_ID_TOKEN,
@@ -129,6 +129,9 @@ export class AppModule {
   constructor(iconService: NzIconService, tisService: TISService) {
     // console.log('iconService');
     // console.log( iconService.getCachedIcons() );
+    //(async function () {
+
+
     tisService.httpPost('/coredefine/corenodemanage.ajax'
       , `action=plugin_action&emethod=get_endtype_icons`)
       .then((result) => {
@@ -146,23 +149,24 @@ export class AppModule {
           id = iconDefs[i];
           if (id.ref) {
             ref = iconMap.get(id.ref + "_" + id.theme);
-            if(!ref){
-              throw new Error("resource reference:'"+ id.ref + "_" + id.theme+"' can not be null");
+            if (!ref) {
+              throw new Error("resource reference:'" + id.ref + "_" + id.theme + "' can not be null");
             }
             iconService.addIcon({name: id.name, theme: id.theme, icon: ref.icon});
           } else {
             iconService.addIcon(iconDefs[i]);
           }
         }
+       // console.log("xxxxxxxxxxxxxxxxxxxxx");
       });
-
+    // })();
     //
 
 
-
   }
 
 }
+
 interface TISIconDefinition extends IconDefinition {
   // 引用其他类型的Icon
   ref: string;
diff --git a/src/runtime/incr.pod.logs.status.component.ts b/src/runtime/incr.pod.logs.status.component.ts
index f5b5d45..b917099 100644
--- a/src/runtime/incr.pod.logs.status.component.ts
+++ b/src/runtime/incr.pod.logs.status.component.ts
@@ -40,7 +40,6 @@ import {PodsListComponent} from "../base/datax.worker.running.component";
         </ng-template>
         <nz-page-header>
           <nz-page-header-title>
-
             <nz-space>
 
               <span *nzSpaceItem><nz-tag >
@@ -60,7 +59,7 @@ import {PodsListComponent} from "../base/datax.worker.running.component";
           </nz-page-header-title>
           <nz-page-header-extra>
             <nz-space>
-              <button *nzSpaceItem nz-button nzType="primary" (click)="relauchIncrProcess()">重启</button>
+              <button *nzSpaceItem nz-button nzType="primary" (click)="relauchIncrProcess()"><span nz-icon nzType="reload" nzTheme="outline"></span>重启</button>
             </nz-space>
 
 
@@ -199,10 +198,14 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
    */
   relauchIncrProcess() {
     this._transactionProcessing = true;
+
+   // this.processMeta.targetNameGetter()
+    console.log(this.logType);
     switch (this.logType) {
       case LogType.DATAX_WORKER_POD_LOG:
         this.httpPost('/coredefine/corenodemanage.ajax'
-          , "event_submit_do_relaunch_pod_process=y&action=datax_action&podName=" + this.selectedPod.name + "&targetName=" + this.processMeta.targetName)
+          , "event_submit_do_relaunch_pod_process=y&action=datax_action&podName=" + this.selectedPod.name + "&targetName=" + this.processMeta.targetNameGetter(this.route.snapshot.params)// this.processMeta.targetName
+        )
           .then((r) => {
 
             if (r.success) {
diff --git a/src/runtime/misc/RCDeployment.ts b/src/runtime/misc/RCDeployment.ts
index 6233351..8e04d59 100644
--- a/src/runtime/misc/RCDeployment.ts
+++ b/src/runtime/misc/RCDeployment.ts
@@ -255,6 +255,7 @@ export interface Breadcrumb {
 }
 
 export interface ProcessMeta {
+  endType: string,
   init_get_job_worker_meta: string;
   targetNameGetter: (params: Params, justGroup?: boolean, dto?: DataxWorkerDTO) => string;
   runningTabRouterGetter: (params: Params) => Array<string>;
@@ -286,6 +287,8 @@ export interface ProcessMeta {
   launchClusterMethod: string;
   relaunchClusterMethod: string;
   runningStepCfg: { showPowerJobWorkflowInstance: boolean, defaultTabExecute: (cpt: DataxWorkerRunningComponent) => void }
+
+  afterSuccessDelete: (cpt: DataxWorkerRunningComponent) => void;
 }
 
 export class DataXJobWorkerStatus extends K8SControllerStatus {