From 44cb5f87196e0d6a5f6721b7457b8176413a0f1f Mon Sep 17 00:00:00 2001
From: zCans <1224895921@qq.com>
Date: Sun, 11 Sep 2022 23:03:31 +0800
Subject: [PATCH 01/16] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/lang/zh.js           |   3 +-
 neutrino-proxy-admin/src/router/index.js      |   3 +-
 .../src/views/system/jobManager.vue           | 279 ++++++++++++++++++
 3 files changed, 283 insertions(+), 2 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/views/system/jobManager.vue

diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index 007f9727..d7b41f2b 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -49,7 +49,8 @@ export default {
     portPool: '端口池管理',
     proxy: '代理配置',
     license: 'License管理',
-    portMapping: '端口映射'
+    portMapping: '端口映射',
+    jobManager: '调度管理'
   },
   navbar: {
     logOut: '退出登录',
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index dfb78116..5f5aabd1 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -265,7 +265,8 @@ export const asyncRouterMap = [
     },
     children: [
       { path: 'user', component: _import('system/user'), name: 'user', meta: { title: 'user' }},
-      { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }}
+      { path: 'portPool', component: _import('system/portPool'), name: 'portPool', meta: { title: 'portPool' }},
+      { path: 'jobManager', component: _import('system/jobManager'), name: 'jobManager', meta: { title: 'jobManager' }}
     ]
   }
 ]
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
new file mode 100644
index 00000000..89fb8292
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -0,0 +1,279 @@
+<template>
+  <div class="app-container calendar-list-container">
+    <div class="filter-container">
+      <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
+      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
+    </div>
+
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
+              style="width: 100%">
+      <el-table-column align="center" :label="$t('table.id')" width="100">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.port')" width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.port}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="150px" align="center" :label="$t('table.createTime')">
+        <template slot-scope="scope">
+          <span>{{scope.row.createTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column width="150px" align="center" :label="$t('table.updateTime')">
+        <template slot-scope="scope">
+          <span>{{scope.row.updateTime | parseTime('{y}-{m}-{d} {h}:{i}')}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class-name="status-col" :label="$t('table.enableStatus')" width="100">
+        <template slot-scope="scope">
+          <el-tag :type="scope.row.enable | statusFilter">{{scope.row.enable | statusName}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
+          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>
+<!--          <el-button v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
+            <ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px"/>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <div class="pagination-container">
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
+                     :page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
+      </el-pagination>
+    </div>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
+        <el-form-item :label="$t('table.port')" prop="port">
+          <el-input v-model="temp.port"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
+      </span>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import { fetchList, updateEnableStatus, createPortPool, deletePortPool } from '@/api/portPool'
+  import waves from '@/directive/waves' // 水波纹指令
+  import { parseTime } from '@/utils'
+  import ButtonPopover from '../../components/Button/buttonPopover'
+
+  const calendarTypeOptions = [
+    { key: 'CN', display_name: 'China' },
+    { key: 'US', display_name: 'USA' },
+    { key: 'JP', display_name: 'Japan' },
+    { key: 'EU', display_name: 'Eurozone' }
+  ]
+
+  // arr to obj ,such as { CN : "China", US : "USA" }
+  const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+    acc[cur.key] = cur.display_name
+    return acc
+  }, {})
+
+  export default {
+    name: 'jobManager',
+    directives: {
+      waves
+    },
+    components: {
+      ButtonPopover
+    },
+    data() {
+      return {
+        tableKey: 0,
+        list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          currentPage: 1,
+          pageSize: 20,
+          importance: undefined,
+          title: undefined,
+          type: undefined
+        },
+        importanceOptions: [1, 2, 3],
+        calendarTypeOptions,
+        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
+        statusOptions: ['published', 'draft', 'deleted'],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          importance: 1,
+          remark: '',
+          timestamp: new Date(),
+          title: '',
+          type: '',
+          status: 'published'
+        },
+        dialogFormVisible: false,
+        dialogStatus: '',
+        textMap: {
+          update: '编辑',
+          create: '新建'
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          port: [{ required: true, message: '端口必填', trigger: 'blur' }]
+        },
+        downloadLoading: false
+      }
+    },
+    filters: {
+      statusName(status) {
+        const statusMap = {
+          1: '启用',
+          2: '禁用'
+        }
+        return statusMap[status]
+      },
+      statusFilter(status) {
+        const statusMap = {
+          1: 'success',
+          2: 'danger'
+        }
+        return statusMap[status]
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type]
+      }
+    },
+    created() {
+      this.getList()
+    },
+    methods: {
+      getList() {
+        this.listLoading = true
+        fetchList(this.listQuery).then(response => {
+          this.list = response.data.data.records
+          this.total = response.data.data.total
+          this.listLoading = false
+        })
+      },
+      handleFilter() {
+        this.listQuery.currentPage = 1
+        this.getList()
+      },
+      handleSizeChange(val) {
+        this.listQuery.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.listQuery.currentPage = val
+        this.getList()
+      },
+      handleModifyStatus(row, enable) {
+        console.log('route', this.$route)
+        updateEnableStatus(row.id, enable).then(response => {
+          if (response.data.data.code === 0) {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+          this.getList()
+        })
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          importance: 1,
+          remark: '',
+          timestamp: new Date(),
+          title: '',
+          status: 'published',
+          type: ''
+        }
+      },
+      handleCreate() {
+        this.resetTemp()
+        this.dialogStatus = 'create'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      createData() {
+        this.$refs['dataForm'].validate((valid) => {
+          if (valid) {
+            createPortPool(this.temp).then(response => {
+              if (response.data.code === 0) {
+                this.dialogFormVisible = false
+                this.$notify({
+                  title: '成功',
+                  message: '创建成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row) // copy obj
+        this.temp.timestamp = new Date(this.temp.timestamp)
+        this.dialogStatus = 'update'
+        this.dialogFormVisible = true
+        this.$nextTick(() => {
+          this.$refs['dataForm'].clearValidate()
+        })
+      },
+      handleDelete(row) {
+        deletePortPool(row.id).then(response => {
+          if (response.data.code === 0) {
+            this.$notify({
+              title: '成功',
+              message: '删除成功',
+              type: 'success',
+              duration: 2000
+            })
+            this.getList()
+          }
+        })
+      },
+      handleDownload() {
+        this.downloadLoading = true
+        import('@/vendor/Export2Excel').then(excel => {
+          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
+          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
+          const data = this.formatJson(filterVal, this.list)
+          excel.export_json_to_excel(tHeader, data, 'table-list')
+          this.downloadLoading = false
+        })
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        }))
+      }
+    }
+  }
+</script>

From 27c85fff28b6f33915a952babda62d4edf27d806 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 12 Sep 2022 14:37:02 +0800
Subject: [PATCH 02/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=80=E8=A7=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/controller/ReportController.java   | 49 ++++++++++++++++
 .../controller/res/ReportDataViewRes.java     | 57 +++++++++++++++++++
 .../src/main/resources/sql/init-structure.sql |  2 +-
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
new file mode 100644
index 00000000..b69e0c26
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/ReportController.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller;
+
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.web.annotation.GetMapping;
+import fun.asgc.neutrino.core.web.annotation.RequestMapping;
+import fun.asgc.neutrino.core.web.annotation.RestController;
+import fun.asgc.neutrino.proxy.server.controller.res.ReportDataViewRes;
+
+/**
+ * 报表管理
+ * @author: aoshiguchen
+ * @date: 2022/9/12
+ */
+@NonIntercept
+@RequestMapping("report")
+@RestController
+public class ReportController {
+
+    @GetMapping("data-view")
+    public ReportDataViewRes dataView() {
+        return new ReportDataViewRes()
+                .setUserOnlineNumber(2).setEnableUserNumber(3).setUserNumber(5)
+                .setLicenseNumber(3).setEnableLicenseNumber(6).setLicenseNumber(6)
+                .setServerPortOnlineNumber(3).setEnableServerPortNumber(5).setServerPortNumber(6)
+                .setTotalUpstreamFlow("23K").setTotalDownwardFlow("47M")
+                ;
+    }
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java
new file mode 100644
index 00000000..442d5e4b
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/ReportDataViewRes.java
@@ -0,0 +1,57 @@
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/9/12
+ */
+@Accessors(chain = true)
+@Data
+public class ReportDataViewRes {
+    /**
+     * 在线用户数
+     */
+    private Integer userOnlineNumber;
+    /**
+     * 启用用户数
+     */
+    private Integer enableUserNumber;
+    /**
+     * 用户总数
+     */
+    private Integer userNumber;
+    /**
+     * 在线license数
+     */
+    private Integer licenseOnlineNumber;
+    /**
+     * 启用license数
+     */
+    private Integer enableLicenseNumber;
+    /**
+     * license总数
+     */
+    private Integer licenseNumber;
+    /**
+     * 服务端口在线数
+     */
+    private Integer serverPortOnlineNumber;
+    /**
+     * 启用服务端口数
+     */
+    private Integer enableServerPortNumber;
+    /**
+     * 总的服务端口数
+     */
+    private Integer serverPortNumber;
+    /**
+     * 累计上行流量
+     */
+    private String totalUpstreamFlow;
+    /**
+     * 累计下行流量
+     */
+    private String totalDownwardFlow;
+}
diff --git a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
index e83e5f96..e24d5c36 100644
--- a/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
+++ b/neutrino-proxy-server/src/main/resources/sql/init-structure.sql
@@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `user_connect_record` (
 CREATE TABLE IF NOT EXISTS `job_info` (
   `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
   `desc` VARCHAR(255) NOT NULL,
-  `handler` VARCHAR(255) DEFAULT NULL,
+  `handler` VARCHAR(255) NOT NULL,
   `cron` VARCHAR(128) NOT NULL ,
   `param` VARCHAR(512) DEFAULT NULL,
   `alarm_email` VARCHAR(255) DEFAULT NULL,

From 1d7b6036e6d535295a45eedd1e166cbf8cd02d19 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 12 Sep 2022 15:07:51 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/GithubCorner/index.vue     |   2 +-
 neutrino-proxy-admin/src/lang/zh.js           |   1 +
 neutrino-proxy-admin/src/router/index.js      |  67 ++--
 .../src/views/errorPage/401.vue               |   2 +-
 .../views/home/admin/components/BarChart.vue  | 106 ++++++
 .../views/home/admin/components/BoxCard.vue   | 118 +++++++
 .../views/home/admin/components/LineChart.vue | 150 +++++++++
 .../home/admin/components/PanelGroup.vue      | 138 ++++++++
 .../views/home/admin/components/PieChart.vue  |  84 +++++
 .../home/admin/components/RaddarChart.vue     | 120 +++++++
 .../home/admin/components/TodoList/Todo.vue   |  70 ++++
 .../home/admin/components/TodoList/index.scss | 317 ++++++++++++++++++
 .../home/admin/components/TodoList/index.vue  | 121 +++++++
 .../admin/components/TransactionTable.vue     |  50 +++
 .../src/views/home/admin/index.vue            | 110 ++++++
 .../src/views/home/editor/index.vue           |  74 ++++
 neutrino-proxy-admin/src/views/home/index.vue |  31 ++
 17 files changed, 1531 insertions(+), 30 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/BarChart.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/BoxCard.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/LineChart.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/PanelGroup.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/PieChart.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/RaddarChart.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/TodoList/Todo.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.scss
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/components/TransactionTable.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/admin/index.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/editor/index.vue
 create mode 100644 neutrino-proxy-admin/src/views/home/index.vue

diff --git a/neutrino-proxy-admin/src/components/GithubCorner/index.vue b/neutrino-proxy-admin/src/components/GithubCorner/index.vue
index 8f09e9de..e8b10aa1 100644
--- a/neutrino-proxy-admin/src/components/GithubCorner/index.vue
+++ b/neutrino-proxy-admin/src/components/GithubCorner/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a href="https://github.com/PanJiaChen/vue-element-admin" target="_blank" class="github-corner" aria-label="View source on Github">
+  <a href="https://gitee.com/asgc/neutrino-proxy" target="_blank" class="github-corner" aria-label="View source on Gitee">
     <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#40c9c6; color:#fff; position: absolute; top: 84px; border: 0; right: 0;"
       aria-hidden="true">
       <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path>
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index d7b41f2b..bd78fe64 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -1,6 +1,7 @@
 export default {
   route: {
     dashboard: '首页',
+    home: '首页',
     introduction: '简述',
     documentation: '文档',
     permission: '权限测试页',
diff --git a/neutrino-proxy-admin/src/router/index.js b/neutrino-proxy-admin/src/router/index.js
index 5f5aabd1..4ea90863 100644
--- a/neutrino-proxy-admin/src/router/index.js
+++ b/neutrino-proxy-admin/src/router/index.js
@@ -29,15 +29,26 @@ export const constantRouterMap = [
   { path: '/authredirect', component: _import('login/authredirect'), hidden: true },
   { path: '/404', component: _import('errorPage/404'), hidden: true },
   { path: '/401', component: _import('errorPage/401'), hidden: true },
+  // {
+  //   path: '',
+  //   component: Layout,
+  //   redirect: 'dashboard',
+  //   children: [{
+  //     path: 'dashboard',
+  //     component: _import('dashboard/index'),
+  //     name: 'dashboard',
+  //     meta: { title: 'dashboard', icon: 'dashboard', noCache: true }
+  //   }]
+  // },
   {
     path: '',
     component: Layout,
-    redirect: 'dashboard',
+    redirect: 'home',
     children: [{
-      path: 'dashboard',
-      component: _import('dashboard/index'),
-      name: 'dashboard',
-      meta: { title: 'dashboard', icon: 'dashboard', noCache: true }
+      path: 'home',
+      component: _import('home/index'),
+      name: 'home',
+      meta: { title: 'home', icon: 'dashboard', noCache: true }
     }]
   }
 
@@ -89,29 +100,29 @@ export const asyncRouterMap = [
   //   }]
   // },
   //
-  {
-    path: '/components',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'component-demo',
-    meta: {
-      title: 'components',
-      icon: 'component'
-    },
-    children: [
-      { path: 'tinymce', component: _import('components-demo/tinymce'), name: 'tinymce-demo', meta: { title: 'tinymce' }},
-      { path: 'markdown', component: _import('components-demo/markdown'), name: 'markdown-demo', meta: { title: 'markdown' }},
-      { path: 'json-editor', component: _import('components-demo/jsonEditor'), name: 'jsonEditor-demo', meta: { title: 'jsonEditor' }},
-      { path: 'dnd-list', component: _import('components-demo/dndList'), name: 'dndList-demo', meta: { title: 'dndList' }},
-      { path: 'splitpane', component: _import('components-demo/splitpane'), name: 'splitpane-demo', meta: { title: 'splitPane' }},
-      { path: 'avatar-upload', component: _import('components-demo/avatarUpload'), name: 'avatarUpload-demo', meta: { title: 'avatarUpload' }},
-      { path: 'dropzone', component: _import('components-demo/dropzone'), name: 'dropzone-demo', meta: { title: 'dropzone' }},
-      { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
-      { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
-      { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
-      { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }}
-    ]
-  },
+  // {
+  //   path: '/components',
+  //   component: Layout,
+  //   redirect: 'noredirect',
+  //   name: 'component-demo',
+  //   meta: {
+  //     title: 'components',
+  //     icon: 'component'
+  //   },
+  //   children: [
+  //     { path: 'tinymce', component: _import('components-demo/tinymce'), name: 'tinymce-demo', meta: { title: 'tinymce' }},
+  //     { path: 'markdown', component: _import('components-demo/markdown'), name: 'markdown-demo', meta: { title: 'markdown' }},
+  //     { path: 'json-editor', component: _import('components-demo/jsonEditor'), name: 'jsonEditor-demo', meta: { title: 'jsonEditor' }},
+  //     { path: 'dnd-list', component: _import('components-demo/dndList'), name: 'dndList-demo', meta: { title: 'dndList' }},
+  //     { path: 'splitpane', component: _import('components-demo/splitpane'), name: 'splitpane-demo', meta: { title: 'splitPane' }},
+  //     { path: 'avatar-upload', component: _import('components-demo/avatarUpload'), name: 'avatarUpload-demo', meta: { title: 'avatarUpload' }},
+  //     { path: 'dropzone', component: _import('components-demo/dropzone'), name: 'dropzone-demo', meta: { title: 'dropzone' }},
+  //     { path: 'sticky', component: _import('components-demo/sticky'), name: 'sticky-demo', meta: { title: 'sticky' }},
+  //     { path: 'count-to', component: _import('components-demo/countTo'), name: 'countTo-demo', meta: { title: 'countTo' }},
+  //     { path: 'mixin', component: _import('components-demo/mixin'), name: 'componentMixin-demo', meta: { title: 'componentMixin' }},
+  //     { path: 'back-to-top', component: _import('components-demo/backToTop'), name: 'backToTop-demo', meta: { title: 'backToTop' }}
+  //   ]
+  // },
   //
   // {
   //   path: '/charts',
diff --git a/neutrino-proxy-admin/src/views/errorPage/401.vue b/neutrino-proxy-admin/src/views/errorPage/401.vue
index e36c83a2..311ba6ec 100644
--- a/neutrino-proxy-admin/src/views/errorPage/401.vue
+++ b/neutrino-proxy-admin/src/views/errorPage/401.vue
@@ -10,7 +10,7 @@
         <ul class="list-unstyled">
           <li>或者你可以去:</li>
           <li class="link-type">
-            <router-link to="/dashboard">回首页</router-link>
+            <router-link to="/home">回首页</router-link>
           </li>
           <li class="link-type"><a href="https://www.taobao.com/">随便看看</a></li>
           <li><a @click.prevent="dialogVisible=true" href="#">点我看图</a></li>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/BarChart.vue b/neutrino-proxy-admin/src/views/home/admin/components/BarChart.vue
new file mode 100644
index 00000000..e0606b2d
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/BarChart.vue
@@ -0,0 +1,106 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+const animationDuration = 6000
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHanlder = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHanlder)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        grid: {
+          top: 10,
+          left: '2%',
+          right: '2%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [{
+          type: 'category',
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          axisTick: {
+            alignWithLabel: true
+          }
+        }],
+        yAxis: [{
+          type: 'value',
+          axisTick: {
+            show: false
+          }
+        }],
+        series: [{
+          name: 'pageA',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [79, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageB',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [80, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }, {
+          name: 'pageC',
+          type: 'bar',
+          stack: 'vistors',
+          barWidth: '60%',
+          data: [30, 52, 200, 334, 390, 330, 220],
+          animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/BoxCard.vue b/neutrino-proxy-admin/src/views/home/admin/components/BoxCard.vue
new file mode 100644
index 00000000..c6c6aa6e
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/BoxCard.vue
@@ -0,0 +1,118 @@
+<template>
+  <el-card class="box-card-component" style="margin-left:8px;">
+    <div slot="header" class="box-card-header">
+      <img src='https://wpimg.wallstcn.com/e7d23d71-cf19-4b90-a1cc-f56af8c0903d.png'>
+    </div>
+    <div style="position:relative;">
+      <pan-thumb class="panThumb" :image="avatar"></pan-thumb>
+      <mallki className='mallki-text' text='vue-element-admin'></mallki>
+      <div style="padding-top:35px;" class='progress-item'>
+        <span>Vue</span>
+        <el-progress :percentage="70"></el-progress>
+      </div>
+      <div class='progress-item'>
+        <span>JavaScript</span>
+        <el-progress :percentage="18"></el-progress>
+      </div>
+      <div class='progress-item'>
+        <span>Css</span>
+        <el-progress :percentage="12"></el-progress>
+      </div>
+       <div class='progress-item'>
+        <span>ESLint</span>
+        <el-progress :percentage="100" status="success"></el-progress>
+      </div>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanThumb from '@/components/PanThumb'
+import Mallki from '@/components/TextHoverEffect/Mallki'
+
+export default {
+  components: { PanThumb, Mallki },
+
+  data() {
+    return {
+      statisticsData: {
+        article_count: 1024,
+        pageviews_count: 1024
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'avatar',
+      'roles'
+    ])
+  },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        success: 'success',
+        pending: 'danger'
+      }
+      return statusMap[status]
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" >
+.box-card-component{
+  .el-card__header {
+    padding: 0px!important;
+  }
+}
+</style>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.box-card-component {
+  .box-card-header {
+    position: relative;
+    height: 220px;
+    img {
+      width: 100%;
+      height: 100%;
+      transition: all 0.2s linear;
+      &:hover {
+        transform: scale(1.1, 1.1);
+        filter: contrast(130%);
+      }
+    }
+  }
+  .mallki-text {
+    position: absolute;
+    top: 0px;
+    right: 0px;
+    font-size: 20px;
+    font-weight: bold;
+  }
+  .panThumb {
+    z-index: 100;
+    height: 70px!important;
+    width: 70px!important;
+    position: absolute!important;
+    top: -45px;
+    left: 0px;
+    border: 5px solid #ffffff;
+    background-color: #fff;
+    margin: auto;
+    box-shadow: none!important;
+    /deep/ .pan-info {
+      box-shadow: none!important;
+    }
+  }
+  .progress-item {
+    margin-bottom: 10px;
+    font-size: 14px;
+  }
+  @media only screen and (max-width: 1510px){
+    .mallki-text{
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/LineChart.vue b/neutrino-proxy-admin/src/views/home/admin/components/LineChart.vue
new file mode 100644
index 00000000..9be9c92d
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/LineChart.vue
@@ -0,0 +1,150 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '350px'
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
+    },
+    chartData: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    if (this.autoResize) {
+      this.__resizeHanlder = debounce(() => {
+        if (this.chart) {
+          this.chart.resize()
+        }
+      }, 100)
+      window.addEventListener('resize', this.__resizeHanlder)
+    }
+
+    // 监听侧边栏的变化
+    const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+    sidebarElm.addEventListener('transitionend', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    if (this.autoResize) {
+      window.removeEventListener('resize', this.__resizeHanlder)
+    }
+
+    const sidebarElm = document.getElementsByClassName('sidebar-container')[0]
+    sidebarElm.removeEventListener('transitionend', this.__resizeHanlder)
+
+    this.chart.dispose()
+    this.chart = null
+  },
+  watch: {
+    chartData: {
+      deep: true,
+      handler(val) {
+        this.setOptions(val)
+      }
+    }
+  },
+  methods: {
+    setOptions({ expectedData, actualData } = {}) {
+      this.chart.setOption({
+        xAxis: {
+          data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
+          boundaryGap: false,
+          axisTick: {
+            show: false
+          }
+        },
+        grid: {
+          left: 10,
+          right: 10,
+          bottom: 20,
+          top: 30,
+          containLabel: true
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
+          },
+          padding: [5, 10]
+        },
+        yAxis: {
+          axisTick: {
+            show: false
+          }
+        },
+        legend: {
+          data: ['expected', 'actual']
+        },
+        series: [{
+          name: 'expected', itemStyle: {
+            normal: {
+              color: '#FF005A',
+              lineStyle: {
+                color: '#FF005A',
+                width: 2
+              }
+            }
+          },
+          smooth: true,
+          type: 'line',
+          data: expectedData,
+          animationDuration: 2800,
+          animationEasing: 'cubicInOut'
+        },
+        {
+          name: 'actual',
+          smooth: true,
+          type: 'line',
+          itemStyle: {
+            normal: {
+              color: '#3888fa',
+              lineStyle: {
+                color: '#3888fa',
+                width: 2
+              },
+              areaStyle: {
+                color: '#f3f8ff'
+              }
+            }
+          },
+          data: actualData,
+          animationDuration: 2800,
+          animationEasing: 'quadraticOut'
+        }]
+      })
+    },
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+      this.setOptions(this.chartData)
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/PanelGroup.vue b/neutrino-proxy-admin/src/views/home/admin/components/PanelGroup.vue
new file mode 100644
index 00000000..8b7394a1
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/PanelGroup.vue
@@ -0,0 +1,138 @@
+<template>
+  <el-row class="panel-group" :gutter="40">
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class='card-panel' @click="handleSetLineChartData('newVisitis')">
+        <div class="card-panel-icon-wrapper icon-people">
+          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">New Visits</div>
+          <count-to class="card-panel-num" :startVal="0" :endVal="102400" :duration="2600"></count-to>
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('messages')">
+        <div class="card-panel-icon-wrapper icon-message">
+          <svg-icon icon-class="message" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">Messages</div>
+          <count-to class="card-panel-num" :startVal="0" :endVal="81212" :duration="3000"></count-to>
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('purchases')">
+        <div class="card-panel-icon-wrapper icon-money">
+          <svg-icon icon-class="money" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">Purchases</div>
+          <count-to class="card-panel-num" :startVal="0" :endVal="9280" :duration="3200"></count-to>
+        </div>
+      </div>
+    </el-col>
+    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+        <div class="card-panel-icon-wrapper icon-shoppingCard">
+          <svg-icon icon-class="shoppingCard" class-name="card-panel-icon" />
+        </div>
+        <div class="card-panel-description">
+          <div class="card-panel-text">Shoppings</div>
+          <count-to class="card-panel-num" :startVal="0" :endVal="13600" :duration="3600"></count-to>
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+import CountTo from 'vue-count-to'
+
+export default {
+  components: {
+    CountTo
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.$emit('handleSetLineChartData', type)
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.panel-group {
+  margin-top: 18px;
+  .card-panel-col{
+    margin-bottom: 32px;
+  }
+  .card-panel {
+    height: 108px;
+    cursor: pointer;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    &:hover {
+      .card-panel-icon-wrapper {
+        color: #fff;
+      }
+      .icon-people {
+         background: #40c9c6;
+      }
+      .icon-message {
+        background: #36a3f7;
+      }
+      .icon-money {
+        background: #f4516c;
+      }
+      .icon-shoppingCard {
+        background: #34bfa3
+      }
+    }
+    .icon-people {
+      color: #40c9c6;
+    }
+    .icon-message {
+      color: #36a3f7;
+    }
+    .icon-money {
+      color: #f4516c;
+    }
+    .icon-shoppingCard {
+      color: #34bfa3
+    }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+</style>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/PieChart.vue b/neutrino-proxy-admin/src/views/home/admin/components/PieChart.vue
new file mode 100644
index 00000000..773b5f47
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/PieChart.vue
@@ -0,0 +1,84 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHanlder = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHanlder)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'item',
+          formatter: '{a} <br/>{b} : {c} ({d}%)'
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Industries', 'Technology', 'Forex', 'Gold', 'Forecasts']
+        },
+        calculable: true,
+        series: [
+          {
+            name: 'WEEKLY WRITE ARTICLES',
+            type: 'pie',
+            roseType: 'radius',
+            radius: [15, 95],
+            center: ['50%', '38%'],
+            data: [
+              { value: 320, name: 'Industries' },
+              { value: 240, name: 'Technology' },
+              { value: 149, name: 'Forex' },
+              { value: 100, name: 'Gold' },
+              { value: 59, name: 'Forecasts' }
+            ],
+            animationEasing: 'cubicInOut',
+            animationDuration: 2600
+          }
+        ]
+      })
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/RaddarChart.vue b/neutrino-proxy-admin/src/views/home/admin/components/RaddarChart.vue
new file mode 100644
index 00000000..f7d3bf36
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/RaddarChart.vue
@@ -0,0 +1,120 @@
+<template>
+  <div :class="className" :style="{height:height,width:width}"></div>
+</template>
+
+<script>
+import echarts from 'echarts'
+require('echarts/theme/macarons') // echarts theme
+import { debounce } from '@/utils'
+
+const animationDuration = 3000
+
+export default {
+  props: {
+    className: {
+      type: String,
+      default: 'chart'
+    },
+    width: {
+      type: String,
+      default: '100%'
+    },
+    height: {
+      type: String,
+      default: '300px'
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  mounted() {
+    this.initChart()
+    this.__resizeHanlder = debounce(() => {
+      if (this.chart) {
+        this.chart.resize()
+      }
+    }, 100)
+    window.addEventListener('resize', this.__resizeHanlder)
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    window.removeEventListener('resize', this.__resizeHanlder)
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    initChart() {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: { // 坐标轴指示器，坐标轴触发有效
+            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+          }
+        },
+        radar: {
+          radius: '66%',
+          center: ['50%', '42%'],
+          splitNumber: 8,
+          splitArea: {
+            areaStyle: {
+              color: 'rgba(127,95,132,.3)',
+              opacity: 1,
+              shadowBlur: 45,
+              shadowColor: 'rgba(0,0,0,.5)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 15
+            }
+          },
+          indicator: [
+            { name: 'Sales', max: 10000 },
+            { name: 'Administration', max: 20000 },
+            { name: 'Information Techology', max: 20000 },
+            { name: 'Customer Support', max: 20000 },
+            { name: 'Development', max: 20000 },
+            { name: 'Marketing', max: 20000 }
+          ]
+        },
+        legend: {
+          left: 'center',
+          bottom: '10',
+          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
+        },
+        series: [{
+          type: 'radar',
+          symbolSize: 0,
+          areaStyle: {
+            normal: {
+              shadowBlur: 13,
+              shadowColor: 'rgba(0,0,0,.2)',
+              shadowOffsetX: 0,
+              shadowOffsetY: 10,
+              opacity: 1
+            }
+          },
+          data: [
+            {
+              value: [5000, 7000, 12000, 11000, 15000, 14000],
+              name: 'Allocated Budget'
+            },
+            {
+              value: [4000, 9000, 15000, 15000, 13000, 11000],
+              name: 'Expected Spending'
+            },
+            {
+              value: [5500, 11000, 12000, 15000, 12000, 12000],
+              name: 'Actual Spending'
+            }
+          ],
+          animationDuration: animationDuration
+        }]
+      })
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/TodoList/Todo.vue b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/Todo.vue
new file mode 100644
index 00000000..028acfc7
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/Todo.vue
@@ -0,0 +1,70 @@
+<template>
+  <li class="todo" :class="{ completed: todo.done, editing: editing }">
+    <div class="view">
+      <input class="toggle"
+        type="checkbox"
+        :checked="todo.done"
+        @change="toggleTodo( todo)">
+      <label v-text="todo.text" @dblclick="editing = true"></label>
+      <button class="destroy" @click="deleteTodo( todo )"></button>
+    </div>
+    <input class="edit"
+      v-show="editing"
+      v-focus="editing"
+      :value="todo.text"
+      @keyup.enter="doneEdit"
+      @keyup.esc="cancelEdit"
+      @blur="doneEdit">
+  </li>
+</template>
+
+<script>
+export default {
+  name: 'Todo',
+  props: ['todo'],
+  data() {
+    return {
+      editing: false
+    }
+  },
+  directives: {
+    focus(el, { value }, { context }) {
+      if (value) {
+        context.$nextTick(() => {
+          el.focus()
+        })
+      }
+    }
+  },
+  methods: {
+    deleteTodo(todo) {
+      this.$emit('deleteTodo', todo)
+    },
+    editTodo({ todo, value }) {
+      this.$emit('editTodo', { todo, value })
+    },
+    toggleTodo(todo) {
+      this.$emit('toggleTodo', todo)
+    },
+    doneEdit(e) {
+      const value = e.target.value.trim()
+      const { todo } = this
+      if (!value) {
+        this.deleteTodo({
+          todo
+        })
+      } else if (this.editing) {
+        this.editTodo({
+          todo,
+          value
+        })
+        this.editing = false
+      }
+    },
+    cancelEdit(e) {
+      e.target.value = this.todo.text
+      this.editing = false
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.scss b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.scss
new file mode 100644
index 00000000..0632ac90
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.scss
@@ -0,0 +1,317 @@
+.todoapp {
+	font: 14px 'Helvetica Neue', Helvetica, Arial, sans-serif;
+	line-height: 1.4em;
+	color: #4d4d4d;
+	min-width: 230px;
+	max-width: 550px;
+	margin: 0 auto ;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	font-weight: 300;
+	background: #fff;
+	z-index: 1;
+	position: relative;
+	button {
+		margin: 0;
+		padding: 0;
+		border: 0;
+		background: none;
+		font-size: 100%;
+		vertical-align: baseline;
+		font-family: inherit;
+		font-weight: inherit;
+		color: inherit;
+		-webkit-appearance: none;
+		appearance: none;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+	:focus {
+		outline: 0;
+	}
+	.hidden {
+		display: none;
+	}
+	.todoapp {
+		background: #fff;
+		margin: 130px 0 40px 0;
+		position: relative;
+		box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
+	}
+	.todoapp input::-webkit-input-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp input::-moz-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp input::input-placeholder {
+		font-style: italic;
+		font-weight: 300;
+		color: #e6e6e6;
+	}
+	.todoapp h1 {
+		position: absolute;
+		top: -155px;
+		width: 100%;
+		font-size: 100px;
+		font-weight: 100;
+		text-align: center;
+		color: rgba(175, 47, 47, 0.15);
+		-webkit-text-rendering: optimizeLegibility;
+		-moz-text-rendering: optimizeLegibility;
+		text-rendering: optimizeLegibility;
+	}
+	.new-todo,
+	.edit {
+		position: relative;
+		margin: 0;
+		width: 100%;
+		font-size: 18px;
+		font-family: inherit;
+		font-weight: inherit;
+		line-height: 1.4em;
+		border: 0;
+		color: inherit;
+		padding: 6px;
+		border: 1px solid #999;
+		box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
+		box-sizing: border-box;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+	.new-todo {
+		padding: 10px 16px 16px 60px;
+		border: none;
+		background: rgba(0, 0, 0, 0.003);
+		box-shadow: inset 0 -2px 1px rgba(0, 0, 0, 0.03);
+	}
+	.main {
+		position: relative;
+		z-index: 2;
+		border-top: 1px solid #e6e6e6;
+	}
+	.toggle-all {
+		text-align: center;
+		border: none;
+		/* Mobile Safari */
+		opacity: 0;
+		position: absolute;
+	}
+	.toggle-all+label {
+		width: 60px;
+		height: 34px;
+		font-size: 0;
+		position: absolute;
+		top: -52px;
+		left: -13px;
+		-webkit-transform: rotate(90deg);
+		transform: rotate(90deg);
+	}
+	.toggle-all+label:before {
+		content: '❯';
+		font-size: 22px;
+		color: #e6e6e6;
+		padding: 10px 27px 10px 27px;
+	}
+	.toggle-all:checked+label:before {
+		color: #737373;
+	}
+	.todo-list {
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+	.todo-list li {
+		position: relative;
+		font-size: 24px;
+		border-bottom: 1px solid #ededed;
+	}
+	.todo-list li:last-child {
+		border-bottom: none;
+	}
+	.todo-list li.editing {
+		border-bottom: none;
+		padding: 0;
+	}
+	.todo-list li.editing .edit {
+		display: block;
+		width: 506px;
+		padding: 12px 16px;
+		margin: 0 0 0 43px;
+	}
+	.todo-list li.editing .view {
+		display: none;
+	}
+	.todo-list li .toggle {
+		text-align: center;
+		width: 40px;
+		/* auto, since non-WebKit browsers doesn't support input styling */
+		height: auto;
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		margin: auto 0;
+		border: none;
+		/* Mobile Safari */
+		-webkit-appearance: none;
+		appearance: none;
+	}
+	.todo-list li .toggle {
+		opacity: 0;
+	}
+	.todo-list li .toggle+label {
+		/*
+		Firefox requires `#` to be escaped - https://bugzilla.mozilla.org/show_bug.cgi?id=922433
+		IE and Edge requires *everything* to be escaped to render, so we do that instead of just the `#` - https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/7157459/
+	*/
+		background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23ededed%22%20stroke-width%3D%223%22/%3E%3C/svg%3E');
+		background-repeat: no-repeat;
+		background-position: center left;
+		background-size: 36px;
+	}
+	.todo-list li .toggle:checked+label {
+		background-size: 36px;
+		background-image: url('data:image/svg+xml;utf8,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20width%3D%2240%22%20height%3D%2240%22%20viewBox%3D%22-10%20-18%20100%20135%22%3E%3Ccircle%20cx%3D%2250%22%20cy%3D%2250%22%20r%3D%2250%22%20fill%3D%22none%22%20stroke%3D%22%23bddad5%22%20stroke-width%3D%223%22/%3E%3Cpath%20fill%3D%22%235dc2af%22%20d%3D%22M72%2025L42%2071%2027%2056l-4%204%2020%2020%2034-52z%22/%3E%3C/svg%3E');
+	}
+	.todo-list li label {
+		word-break: break-all;
+		padding: 15px 15px 15px 50px;
+		display: block;
+		line-height: 1.0;
+		    font-size: 14px;
+		transition: color 0.4s;
+	}
+	.todo-list li.completed label {
+		color: #d9d9d9;
+		text-decoration: line-through;
+	}
+	.todo-list li .destroy {
+		display: none;
+		position: absolute;
+		top: 0;
+		right: 10px;
+		bottom: 0;
+		width: 40px;
+		height: 40px;
+		margin: auto 0;
+		font-size: 30px;
+		color: #cc9a9a;
+		transition: color 0.2s ease-out;
+	}
+	.todo-list li .destroy:hover {
+		color: #af5b5e;
+	}
+	.todo-list li .destroy:after {
+		content: '×';
+	}
+	.todo-list li:hover .destroy {
+		display: block;
+	}
+	.todo-list li .edit {
+		display: none;
+	}
+	.todo-list li.editing:last-child {
+		margin-bottom: -1px;
+	}
+	.footer {
+		color: #777;
+		position: relative;
+		padding: 10px 15px;
+		height: 40px;
+		text-align: center;
+		border-top: 1px solid #e6e6e6;
+	}
+	.footer:before {
+		content: '';
+		position: absolute;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		height: 50px;
+		overflow: hidden;
+		box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2);
+	}
+	.todo-count {
+		float: left;
+		text-align: left;
+	}
+	.todo-count strong {
+		font-weight: 300;
+	}
+	.filters {
+		margin: 0;
+		padding: 0;
+		list-style: none;
+	}
+	.filters li {
+		display: inline;
+	}
+	.filters li a {
+		color: inherit;
+		font-size: 12px;
+		padding: 3px 7px;
+		text-decoration: none;
+		border: 1px solid transparent;
+		border-radius: 3px;
+	}
+	.filters li a:hover {
+		border-color: rgba(175, 47, 47, 0.1);
+	}
+	.filters li a.selected {
+		border-color: rgba(175, 47, 47, 0.2);
+	}
+	.clear-completed,
+	html .clear-completed:active {
+		float: right;
+		position: relative;
+		line-height: 20px;
+		text-decoration: none;
+		cursor: pointer;
+	}
+	.clear-completed:hover {
+		text-decoration: underline;
+	}
+	.info {
+		margin: 65px auto 0;
+		color: #bfbfbf;
+		font-size: 10px;
+		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+		text-align: center;
+	}
+	.info p {
+		line-height: 1;
+	}
+	.info a {
+		color: inherit;
+		text-decoration: none;
+		font-weight: 400;
+	}
+	.info a:hover {
+		text-decoration: underline;
+	}
+	/*
+	Hack to remove background from Mobile Safari.
+	Can't use it globally since it destroys checkboxes in Firefox
+*/
+	@media screen and (-webkit-min-device-pixel-ratio:0) {
+		.toggle-all,
+		.todo-list li .toggle {
+			background: none;
+		}
+		.todo-list li .toggle {
+			height: 40px;
+		}
+	}
+	@media (max-width: 430px) {
+		.footer {
+			height: 50px;
+		}
+		.filters {
+			bottom: 10px;
+		}
+	}
+}
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.vue b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.vue
new file mode 100644
index 00000000..34f0241d
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/TodoList/index.vue
@@ -0,0 +1,121 @@
+<template>
+  <section class="todoapp">
+    <!-- header -->
+    <header class="header">
+      <input class="new-todo" autocomplete="off" placeholder="Todo List" @keyup.enter="addTodo">
+    </header>
+    <!-- main section -->
+    <section class="main" v-show="todos.length">
+      <input class="toggle-all" id="toggle-all" type="checkbox" :checked="allChecked" @change="toggleAll({ done: !allChecked })">
+      <label for="toggle-all"></label>
+      <ul class="todo-list">
+        <todo @toggleTodo='toggleTodo' @editTodo='editTodo' @deleteTodo='deleteTodo' v-for="(todo, index) in filteredTodos" :key="index"
+          :todo="todo"></todo>
+      </ul>
+    </section>
+    <!-- footer -->
+    <footer class="footer" v-show="todos.length">
+      <span class="todo-count">
+        <strong>{{ remaining }}</strong>
+        {{ remaining | pluralize('item') }} left
+      </span>
+      <ul class="filters">
+        <li v-for="(val, key) in filters" :key="key">
+          <a :class="{ selected: visibility === key }" @click.prevent="visibility = key">{{ key | capitalize }}</a>
+        </li>
+      </ul>
+      <!-- <button class="clear-completed" v-show="todos.length > remaining" @click="clearCompleted">
+        Clear completed
+      </button> -->
+    </footer>
+  </section>
+</template>
+
+<script>
+import Todo from './Todo.vue'
+
+const STORAGE_KEY = 'todos'
+const filters = {
+  all: todos => todos,
+  active: todos => todos.filter(todo => !todo.done),
+  completed: todos => todos.filter(todo => todo.done)
+}
+const defalutList = [
+  { text: 'star this repository', done: false },
+  { text: 'fork this repository', done: false },
+  { text: 'follow author', done: false },
+  { text: 'vue-element-admin', done: true },
+  { text: 'vue', done: true },
+  { text: 'element-ui', done: true },
+  { text: 'axios', done: true },
+  { text: 'webpack', done: true }
+]
+export default {
+  components: { Todo },
+  data() {
+    return {
+      visibility: 'all',
+      filters,
+      // todos: JSON.parse(window.localStorage.getItem(STORAGE_KEY)) || defalutList
+      todos: defalutList
+    }
+  },
+  computed: {
+    allChecked() {
+      return this.todos.every(todo => todo.done)
+    },
+    filteredTodos() {
+      return filters[this.visibility](this.todos)
+    },
+    remaining() {
+      return this.todos.filter(todo => !todo.done).length
+    }
+  },
+  methods: {
+    setLocalStorgae() {
+      window.localStorage.setItem(STORAGE_KEY, JSON.stringify(this.todos))
+    },
+    addTodo(e) {
+      const text = e.target.value
+      if (text.trim()) {
+        this.todos.push({
+          text,
+          done: false
+        })
+        this.setLocalStorgae()
+      }
+      e.target.value = ''
+    },
+    toggleTodo(val) {
+      val.done = !val.done
+      this.setLocalStorgae()
+    },
+    deleteTodo(todo) {
+      this.todos.splice(this.todos.indexOf(todo), 1)
+      this.setLocalStorgae()
+    },
+    editTodo({ todo, value }) {
+      todo.text = value
+      this.setLocalStorgae()
+    },
+    clearCompleted() {
+      this.todos = this.todos.filter(todo => !todo.done)
+      this.setLocalStorgae()
+    },
+    toggleAll({ done }) {
+      this.todos.forEach(todo => {
+        todo.done = done
+        this.setLocalStorgae()
+      })
+    }
+  },
+  filters: {
+    pluralize: (n, w) => n === 1 ? w : w + 's',
+    capitalize: s => s.charAt(0).toUpperCase() + s.slice(1)
+  }
+}
+</script>
+
+<style lang="scss">
+  @import './index.scss';
+</style>
diff --git a/neutrino-proxy-admin/src/views/home/admin/components/TransactionTable.vue b/neutrino-proxy-admin/src/views/home/admin/components/TransactionTable.vue
new file mode 100644
index 00000000..90f4a914
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/components/TransactionTable.vue
@@ -0,0 +1,50 @@
+<template>
+  <el-table :data="list" style="width: 100%;padding-top: 15px;">
+    <el-table-column label="Order_No" show-overflow-tooltip>
+      <template slot-scope="scope">
+        {{scope.row.order_no}}
+      </template>
+    </el-table-column>
+    <el-table-column label="Price" width="195" align="center">
+      <template slot-scope="scope">
+        ¥{{scope.row.price | toThousandslsFilter}}
+      </template>
+    </el-table-column>
+    <el-table-column label="Status" width="100" align="center">
+      <template slot-scope="scope">
+        <el-tag :type="scope.row.status | statusFilter"> {{scope.row.status}}</el-tag>
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+import { fetchList } from '@/api/transaction'
+
+export default {
+  data() {
+    return {
+      list: null
+    }
+  },
+  filters: {
+    statusFilter(status) {
+      const statusMap = {
+        success: 'success',
+        pending: 'danger'
+      }
+      return statusMap[status]
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      fetchList().then(response => {
+        this.list = response.data.items.slice(0, 7)
+      })
+    }
+  }
+}
+</script>
diff --git a/neutrino-proxy-admin/src/views/home/admin/index.vue b/neutrino-proxy-admin/src/views/home/admin/index.vue
new file mode 100644
index 00000000..e35aef26
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/admin/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="dashboard-editor-container">
+    <github-corner></github-corner>
+
+    <panel-group @handleSetLineChartData="handleSetLineChartData"></panel-group>
+
+    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+      <line-chart :chart-data="lineChartData"></line-chart>
+    </el-row>
+
+    <el-row :gutter="32">
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <raddar-chart></raddar-chart>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <pie-chart></pie-chart>
+        </div>
+      </el-col>
+      <el-col :xs="24" :sm="24" :lg="8">
+        <div class="chart-wrapper">
+          <bar-chart></bar-chart>
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="8">
+      <el-col :xs="{span: 24}" :sm="{span: 24}" :md="{span: 24}" :lg="{span: 12}" :xl="{span: 12}" style="padding-right:8px;margin-bottom:30px;">
+        <transaction-table></transaction-table>
+      </el-col>
+      <el-col :xs="{span: 12}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 5}">
+        <todo-list></todo-list>
+      </el-col>
+      <el-col :xs="{span: 12}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 5}">
+        <box-card></box-card>
+      </el-col>
+    </el-row>
+
+  </div>
+</template>
+
+<script>
+import GithubCorner from '@/components/GithubCorner'
+import PanelGroup from './components/PanelGroup'
+import LineChart from './components/LineChart'
+import RaddarChart from './components/RaddarChart'
+import PieChart from './components/PieChart'
+import BarChart from './components/BarChart'
+import TransactionTable from './components/TransactionTable'
+import TodoList from './components/TodoList'
+import BoxCard from './components/BoxCard'
+
+const lineChartData = {
+  newVisitis: {
+    expectedData: [100, 120, 161, 134, 105, 160, 165],
+    actualData: [120, 82, 91, 154, 162, 140, 145]
+  },
+  messages: {
+    expectedData: [200, 192, 120, 144, 160, 130, 140],
+    actualData: [180, 160, 151, 106, 145, 150, 130]
+  },
+  purchases: {
+    expectedData: [80, 100, 121, 104, 105, 90, 100],
+    actualData: [120, 90, 100, 138, 142, 130, 130]
+  },
+  shoppings: {
+    expectedData: [130, 140, 141, 142, 145, 150, 160],
+    actualData: [120, 82, 91, 154, 162, 140, 130]
+  }
+}
+
+export default {
+  name: 'dashboard-admin',
+  components: {
+    GithubCorner,
+    PanelGroup,
+    LineChart,
+    RaddarChart,
+    PieChart,
+    BarChart,
+    TransactionTable,
+    TodoList,
+    BoxCard
+  },
+  data() {
+    return {
+      lineChartData: lineChartData.newVisitis
+    }
+  },
+  methods: {
+    handleSetLineChartData(type) {
+      this.lineChartData = lineChartData[type]
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dashboard-editor-container {
+  padding: 32px;
+  background-color: rgb(240, 242, 245);
+  .chart-wrapper {
+    background: #fff;
+    padding: 16px 16px 0;
+    margin-bottom: 32px;
+  }
+}
+</style>
diff --git a/neutrino-proxy-admin/src/views/home/editor/index.vue b/neutrino-proxy-admin/src/views/home/editor/index.vue
new file mode 100644
index 00000000..ae1f7995
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/editor/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <div class="dashboard-editor-container">
+    <div class=" clearfix">
+      <pan-thumb style="float: left" :image="avatar"> Your roles:
+        <span class="pan-info-roles" :key='item' v-for="item in roles">{{item}}</span>
+      </pan-thumb>
+      <github-corner></github-corner>
+      <div class="info-container">
+        <span class="display_name">{{name}}</span>
+        <span style="font-size:20px;padding-top:20px;display:inline-block;">editor : dashboard</span>
+      </div>
+    </div>
+    <div>
+      <img class="emptyGif" :src="emptyGif">
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import PanThumb from '@/components/PanThumb'
+import GithubCorner from '@/components/GithubCorner'
+
+export default {
+  name: 'dashboard-editor',
+  components: { PanThumb, GithubCorner },
+  data() {
+    return {
+      emptyGif: 'https://wpimg.wallstcn.com/0e03b7da-db9e-4819-ba10-9016ddfdaed3'
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'avatar',
+      'roles'
+    ])
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+	.emptyGif {
+		display: block;
+		width: 45%;
+		margin: 0 auto;
+	}
+
+	.dashboard-editor-container {
+		background-color: #e3e3e3;
+		min-height: 100vh;
+		margin-top: -50px;
+		padding: 100px 60px 0px;
+		.pan-info-roles {
+			font-size: 12px;
+			font-weight: 700;
+			color: #333;
+			display: block;
+		}
+		.info-container {
+			position: relative;
+			margin-left: 190px;
+			height: 150px;
+			line-height: 200px;
+			.display_name {
+				font-size: 48px;
+				line-height: 48px;
+				color: #212121;
+				position: absolute;
+				top: 25px;
+			}
+		}
+	}
+</style>
diff --git a/neutrino-proxy-admin/src/views/home/index.vue b/neutrino-proxy-admin/src/views/home/index.vue
new file mode 100644
index 00000000..046f6e30
--- /dev/null
+++ b/neutrino-proxy-admin/src/views/home/index.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="dashboard-container">
+    <component :is="currentRole"></component>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import adminDashboard from './admin'
+import editorDashboard from './editor'
+
+export default {
+  name: 'dashboard',
+  components: { adminDashboard, editorDashboard },
+  data() {
+    return {
+      currentRole: 'adminDashboard'
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'roles'
+    ])
+  },
+  created() {
+    if (!this.roles.includes('admin')) {
+      this.currentRole = 'editorDashboard'
+    }
+  }
+}
+</script>

From d810a10c7af9df957214bd8b31937f093506945f Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 12 Sep 2022 20:56:59 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=E6=96=B0=E5=A2=9Ecompiler=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/aop/compiler/AsgcCompiler.java       | 77 ++++++++++++++++++-
 .../aop/compiler/CustomJavaFileObject.java    |  2 +-
 .../core/aop/compiler/DynamicClassLoader.java |  2 +-
 .../aop/compiler/DynamicJavaFileManager.java  |  2 +-
 .../core/aop/compiler/MemoryByteCode.java     |  2 +-
 .../aop/compiler/PackageInternalsFinder.java  |  2 +-
 .../core/aop/compiler/StringSource.java       |  2 +-
 7 files changed, 81 insertions(+), 8 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java
index 4d5edf18..1b040b2d 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/AsgcCompiler.java
@@ -36,7 +36,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- *
+ * asgc编译器
  * @author: aoshiguchen
  * @date: 2022/8/17
  */
@@ -58,10 +58,17 @@ public class AsgcCompiler {
 	private final List<Diagnostic<? extends JavaFileObject>> errors = new ArrayList<Diagnostic<? extends JavaFileObject>>();
 	private final List<Diagnostic<? extends JavaFileObject>> warnings = new ArrayList<Diagnostic<? extends JavaFileObject>>();
 
+	/**
+	 * 构造编译器
+	 */
 	public AsgcCompiler() {
 		this(ClassLoader.getSystemClassLoader());
 	}
 
+	/**
+	 * 构造编译器
+	 * @param classLoader
+	 */
 	public AsgcCompiler(ClassLoader classLoader) {
 		if (null == javaCompiler) {
 			throw new RuntimeException("Can not load JavaCompiler from javax.tools.ToolProvider#getSystemJavaCompiler(),\n please confirm the application running in JDK not JRE.");
@@ -78,6 +85,10 @@ public class AsgcCompiler {
 		addOption("-target", "1.8");
 	}
 
+	/**
+	 * 添加类路径
+	 * @param classpath
+	 */
 	public void addClasspath(String classpath) {
 		if (this.classpathList.contains(classpath)) {
 			return;
@@ -85,18 +96,34 @@ public class AsgcCompiler {
 		this.classpathList.add(classpath);
 	}
 
+	/**
+	 * 设置是否保存类文件
+	 * @param saveClassFile
+	 */
 	public void setSaveClassFile(boolean saveClassFile) {
 		this.isSaveClassFile = saveClassFile;
 	}
 
+	/**
+	 * 设置是否保存源代码文件
+	 * @param saveSourceCodeFile
+	 */
 	public void setSaveSourceCodeFile(boolean saveSourceCodeFile) {
 		isSaveSourceCodeFile = saveSourceCodeFile;
 	}
 
+	/**
+	 * 设置保存代码路径
+	 * @param generatorCodeSavePath
+	 */
 	public void setGeneratorCodeSavePath(String generatorCodeSavePath) {
 		this.generatorCodeSavePath = generatorCodeSavePath;
 	}
 
+	/**
+	 * 获取options
+	 * @return
+	 */
 	private List<String> getOptions() {
 		List<String> list = Lists.newArrayList(options);
 		List<String> cp = getClasspathList();
@@ -107,19 +134,37 @@ public class AsgcCompiler {
 		return list;
 	}
 
+	/**
+	 * 添加option
+	 * @param option
+	 */
 	private void addOption(String option) {
 		this.options.add(option);
 	}
 
+	/**
+	 * 添加option
+	 * @param key
+	 * @param val
+	 */
 	private void addOption(String key, String val) {
 		this.options.add(key);
 		this.options.add(val);
 	}
 
+	/**
+	 * 添加源代码
+	 * @param className
+	 * @param source
+	 */
 	private void addSource(String className, String source) {
 		addSource(new StringSource(className, source));
 	}
 
+	/**
+	 * 添加源代码
+	 * @param javaFileObject
+	 */
 	private void addSource(JavaFileObject javaFileObject) {
 		compilationUnits.add(javaFileObject);
 	}
@@ -165,6 +210,11 @@ public class AsgcCompiler {
 		return dynamicClassLoader.findClass(pkg + "." + className);
 	}
 
+	/**
+	 * 获取编译诊断信息
+	 * @param diagnostics
+	 * @return
+	 */
 	private List<String> diagnosticToString(List<Diagnostic<? extends JavaFileObject>> diagnostics) {
 
 		List<String> diagnosticMessages = new ArrayList<String>();
@@ -178,14 +228,25 @@ public class AsgcCompiler {
 
 	}
 
+	/**
+	 * 获取异常信息
+	 * @return
+	 */
 	public List<String> getErrors() {
 		return diagnosticToString(errors);
 	}
 
+	/**
+	 * 获取警告信息
+	 * @return
+	 */
 	public List<String> getWarnings() {
 		return diagnosticToString(warnings);
 	}
 
+	/**
+	 * 打印编译日志
+	 */
 	private void log() {
 		List<String> warnings = getWarnings();
 		List<String> errors = getErrors();
@@ -193,10 +254,14 @@ public class AsgcCompiler {
 //			log.warn(warnings.stream().collect(Collectors.joining()));
 //		}
 		if (!CollectionUtil.isEmpty(errors)) {
-			log.warn(errors.stream().collect(Collectors.joining()));
+			log.error(errors.stream().collect(Collectors.joining()));
 		}
 	}
 
+	/**
+	 * 获取URL类路径加载器
+	 * @return
+	 */
 	private URLClassLoader getURLClassLoader() {
 		ClassLoader ret = Thread.currentThread().getContextClassLoader();
 		if (null == ret) {
@@ -205,6 +270,10 @@ public class AsgcCompiler {
 		return (ret instanceof URLClassLoader) ? (URLClassLoader)ret : null;
 	}
 
+	/**
+	 * 获取类路径列表
+	 * @return
+	 */
 	public List<String> getClasspathList() {
 		List<String> classpathList = new ArrayList<>();
 		List<String> defaultClasspathList = getDefaultClasspathList();
@@ -218,6 +287,10 @@ public class AsgcCompiler {
 		return classpathList;
 	}
 
+	/**
+	 * 获取默认的类路径列表
+	 * @return
+	 */
 	private synchronized List<String> getDefaultClasspathList() {
 		if (!CollectionUtil.isEmpty(defaultClassPathList)) {
 			return defaultClassPathList;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/CustomJavaFileObject.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/CustomJavaFileObject.java
index 34a223d5..2bb5ce9c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/CustomJavaFileObject.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/CustomJavaFileObject.java
@@ -28,7 +28,7 @@ import java.io.*;
 import java.net.URI;
 
 /**
- *
+ * 自定义java文件对象
  * @author: aoshiguchen
  * @date: 2022/8/25
  */
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicClassLoader.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicClassLoader.java
index bba1c78c..d25ed611 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicClassLoader.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicClassLoader.java
@@ -37,7 +37,7 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
 /**
- *
+ * 动态类加载器
  * @author: aoshiguchen
  * @date: 2022/8/25
  */
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicJavaFileManager.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicJavaFileManager.java
index 836cce2d..a42b66e1 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicJavaFileManager.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/DynamicJavaFileManager.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- *
+ * 动态java文件管理器
  * @author: aoshiguchen
  * @date: 2022/8/17
  */
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/MemoryByteCode.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/MemoryByteCode.java
index f48f9d05..16f3b363 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/MemoryByteCode.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/MemoryByteCode.java
@@ -29,7 +29,7 @@ import java.net.URI;
 import java.net.URISyntaxException;
 
 /**
- *
+ * 内存字节码
  * @author: aoshiguchen
  * @date: 2022/8/25
  */
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/PackageInternalsFinder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/PackageInternalsFinder.java
index 50723908..24c65628 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/PackageInternalsFinder.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/PackageInternalsFinder.java
@@ -35,7 +35,7 @@ import java.util.List;
 import java.util.jar.JarEntry;
 
 /**
- *
+ * 包内部查询器
  * @author: aoshiguchen
  * @date: 2022/8/25
  */
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/StringSource.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/StringSource.java
index 3359e411..a6f3ad18 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/StringSource.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/aop/compiler/StringSource.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.net.URI;
 
 /**
- *
+ * 字符串源码
  * @author: aoshiguchen
  * @date: 2022/8/25
  */

From e3cada7b29d27aed8dc268dce5ba7e48aeb7966f Mon Sep 17 00:00:00 2001
From: zCans <1224895921@qq.com>
Date: Mon, 12 Sep 2022 21:50:31 +0800
Subject: [PATCH 05/16] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E8=B0=83=E5=BA=A6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=AF=E7=94=A8=E7=A6=81=E7=94=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=203=E3=80=81=E6=96=B0=E5=A2=9E=E6=89=A7=E8=A1=8C=E8=B0=83?=
 =?UTF-8?q?=E5=BA=A6=E4=BB=BB=E5=8A=A1=E5=89=8D=E7=AB=AF=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/jobInfo.js       |  28 +++
 neutrino-proxy-admin/src/lang/zh.js           |   8 +-
 .../src/views/system/jobManager.vue           | 185 ++++--------------
 .../server/constant/ExceptionConstant.java    |   2 +
 .../server/controller/JobInfoController.java  |  43 +++-
 .../controller/req/JobInfoExecuteReq.java     |  41 ++++
 .../server/controller/req/JobInfoListReq.java |  34 ++++
 .../req/JobInfoUpdateEnableStatusReq.java     |  43 ++++
 .../controller/res/JobInfoExecuteRes.java     |  34 ++++
 .../server/controller/res/JobInfoListRes.java |  72 +++++++
 .../res/JobInfoUpdateEnableStatusRes.java     |  34 ++++
 .../controller/res/JobInfoUpdateRes.java      |  34 ++++
 .../proxy/server/dal/JobInfoMapper.java       |  19 ++
 .../proxy/server/service/JobInfoService.java  |  28 +++
 14 files changed, 455 insertions(+), 150 deletions(-)
 create mode 100644 neutrino-proxy-admin/src/api/jobInfo.js
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java

diff --git a/neutrino-proxy-admin/src/api/jobInfo.js b/neutrino-proxy-admin/src/api/jobInfo.js
new file mode 100644
index 00000000..42d0eb32
--- /dev/null
+++ b/neutrino-proxy-admin/src/api/jobInfo.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+export function fetchList(query) {
+  return request({
+    url: '/job-info/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function updateEnableStatus(id, enable) {
+  return request({
+    url: '/job-info/update/enable-status',
+    method: 'post',
+    data: {
+      id: id,
+      enable: enable
+    }
+  })
+}
+
+export function execute(data) {
+  return request({
+    url: '/job-info/execute',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/neutrino-proxy-admin/src/lang/zh.js b/neutrino-proxy-admin/src/lang/zh.js
index bd78fe64..555dd24b 100644
--- a/neutrino-proxy-admin/src/lang/zh.js
+++ b/neutrino-proxy-admin/src/lang/zh.js
@@ -125,7 +125,13 @@ export default {
     isOnline: '在线状态',
     enableStatus: '启用状态',
     serverPort: '服务端口',
-    proxyClient: '代理客户端'
+    proxyClient: '代理客户端',
+    desc: '描述',
+    handler: '处理器',
+    cron: 'cron',
+    jobParam: '任务参数',
+    alarmEmail: '任务报警邮箱',
+    alarmDing: '任务报警钉钉'
   },
   errorLog: {
     tips: '请点击右上角bug小图标',
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index 89fb8292..c55a01e4 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -2,19 +2,27 @@
   <div class="app-container calendar-list-container">
     <div class="filter-container">
       <el-button class="filter-item" type="primary" v-waves icon="el-icon-search" @click="handleFilter">{{$t('table.search')}}</el-button>
-      <el-button class="filter-item" style="margin-left: 10px;" @click="handleCreate" type="primary" icon="el-icon-edit">{{$t('table.add')}}</el-button>
     </div>
 
-    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row
-              style="width: 100%">
+    <el-table :key='tableKey' :data="list" v-loading="listLoading" element-loading-text="给我一点时间" border fit highlight-current-row style="width: 100%">
       <el-table-column align="center" :label="$t('table.id')" width="100">
         <template slot-scope="scope">
           <span>{{scope.row.id}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" :label="$t('table.port')" width="200">
+      <el-table-column align="center" :label="$t('table.desc')" width="200">
         <template slot-scope="scope">
-          <span>{{scope.row.port}}</span>
+          <span>{{scope.row.desc}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.handler')" width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.handler}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('table.cron')" width="200">
+        <template slot-scope="scope">
+          <span>{{scope.row.cron}}</span>
         </template>
       </el-table-column>
       <el-table-column width="150px" align="center" :label="$t('table.createTime')">
@@ -34,72 +42,42 @@
       </el-table-column>
       <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{$t('table.disable')}}</el-button>
-          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{$t('table.enable')}}</el-button>
-<!--          <el-button v-if="scope.row.status!='deleted'" size="mini" type="danger" @click="handleDelete(scope.row,'deleted')">{{$t('table.delete')}}</el-button>-->
-            <ButtonPopover @handleCommitClick="handleDelete(scope.row)" style="margin-left: 10px"/>
+          <el-button size="mini" type="primary" @click="handleExecuteClick(scope.row)">执行</el-button>
+          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{'停止'}}</el-button>
+          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{'启动'}}</el-button>
         </template>
       </el-table-column>
     </el-table>
-
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.currentPage"
                      :page-sizes="[10,20,30, 50]" :page-size="listQuery.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
 
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form :rules="rules" ref="dataForm" :model="temp" label-position="left" label-width="70px" style='width: 400px; margin-left:50px;'>
-        <el-form-item :label="$t('table.port')" prop="port">
-          <el-input v-model="temp.port"></el-input>
+    <el-dialog title="执行" :visible.sync="executeVisible">
+      <el-form ref="dataForm" :model="temp" label-position="left" label-width="70px">
+        <el-form-item :label="$t('table.jobParam')" prop="param">
+          <el-input v-model="temp.param" type="textarea" :rows="4" placeholder="请输入任务执行参数" :maxlength="200" show-word-limit style="padding-right: 20px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible = false">{{$t('table.cancel')}}</el-button>
-        <el-button v-if="dialogStatus=='create'" type="primary" @click="createData">{{$t('table.confirm')}}</el-button>
+        <el-button @click="executeVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button type="primary" @click="commitExecute">{{$t('table.confirm')}}</el-button>
       </div>
     </el-dialog>
 
-    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
-      <el-table :data="pvData" border fit highlight-current-row style="width: 100%">
-        <el-table-column prop="key" label="Channel"> </el-table-column>
-        <el-table-column prop="pv" label="Pv"> </el-table-column>
-      </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogPvVisible = false">{{$t('table.confirm')}}</el-button>
-      </span>
-    </el-dialog>
-
   </div>
 </template>
 
 <script>
-  import { fetchList, updateEnableStatus, createPortPool, deletePortPool } from '@/api/portPool'
+  import { fetchList, updateEnableStatus, execute } from '@/api/jobInfo'
   import waves from '@/directive/waves' // 水波纹指令
-  import { parseTime } from '@/utils'
-  import ButtonPopover from '../../components/Button/buttonPopover'
-
-  const calendarTypeOptions = [
-    { key: 'CN', display_name: 'China' },
-    { key: 'US', display_name: 'USA' },
-    { key: 'JP', display_name: 'Japan' },
-    { key: 'EU', display_name: 'Eurozone' }
-  ]
-
-  // arr to obj ,such as { CN : "China", US : "USA" }
-  const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
-    acc[cur.key] = cur.display_name
-    return acc
-  }, {})
 
   export default {
     name: 'jobManager',
     directives: {
       waves
     },
-    components: {
-      ButtonPopover
-    },
     data() {
       return {
         tableKey: 0,
@@ -113,39 +91,18 @@
           title: undefined,
           type: undefined
         },
-        importanceOptions: [1, 2, 3],
-        calendarTypeOptions,
-        sortOptions: [{ label: 'ID Ascending', key: '+id' }, { label: 'ID Descending', key: '-id' }],
-        statusOptions: ['published', 'draft', 'deleted'],
-        showReviewer: false,
         temp: {
-          id: undefined,
-          importance: 1,
-          remark: '',
-          timestamp: new Date(),
-          title: '',
-          type: '',
-          status: 'published'
+          id: '',
+          param: ''
         },
-        dialogFormVisible: false,
-        dialogStatus: '',
-        textMap: {
-          update: '编辑',
-          create: '新建'
-        },
-        dialogPvVisible: false,
-        pvData: [],
-        rules: {
-          port: [{ required: true, message: '端口必填', trigger: 'blur' }]
-        },
-        downloadLoading: false
+        executeVisible: false
       }
     },
     filters: {
       statusName(status) {
         const statusMap = {
-          1: '启用',
-          2: '禁用'
+          1: '启动',
+          2: '停止'
         }
         return statusMap[status]
       },
@@ -155,9 +112,6 @@
           2: 'danger'
         }
         return statusMap[status]
-      },
-      typeFilter(type) {
-        return calendarTypeKeyValue[type]
       }
     },
     created() {
@@ -185,7 +139,6 @@
         this.getList()
       },
       handleModifyStatus(row, enable) {
-        console.log('route', this.$route)
         updateEnableStatus(row.id, enable).then(response => {
           if (response.data.data.code === 0) {
             this.$message({
@@ -196,83 +149,21 @@
           this.getList()
         })
       },
-      resetTemp() {
-        this.temp = {
-          id: undefined,
-          importance: 1,
-          remark: '',
-          timestamp: new Date(),
-          title: '',
-          status: 'published',
-          type: ''
-        }
+      handleExecuteClick(row) {
+        this.temp.id = row.id
+        this.temp.param = row.param
+        this.executeVisible = true
       },
-      handleCreate() {
-        this.resetTemp()
-        this.dialogStatus = 'create'
-        this.dialogFormVisible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      createData() {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            createPortPool(this.temp).then(response => {
-              if (response.data.code === 0) {
-                this.dialogFormVisible = false
-                this.$notify({
-                  title: '成功',
-                  message: '创建成功',
-                  type: 'success',
-                  duration: 2000
-                })
-                this.getList()
-              }
-            })
-          }
-        })
-      },
-      handleUpdate(row) {
-        this.temp = Object.assign({}, row) // copy obj
-        this.temp.timestamp = new Date(this.temp.timestamp)
-        this.dialogStatus = 'update'
-        this.dialogFormVisible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].clearValidate()
-        })
-      },
-      handleDelete(row) {
-        deletePortPool(row.id).then(response => {
+      commitExecute() {
+        execute(this.temp).then(response => {
           if (response.data.code === 0) {
-            this.$notify({
-              title: '成功',
-              message: '删除成功',
-              type: 'success',
-              duration: 2000
+            this.executeVisible = false
+            this.$message({
+              message: '操作成功',
+              type: 'success'
             })
-            this.getList()
           }
         })
-      },
-      handleDownload() {
-        this.downloadLoading = true
-        import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['timestamp', 'title', 'type', 'importance', 'status']
-          const filterVal = ['timestamp', 'title', 'type', 'importance', 'status']
-          const data = this.formatJson(filterVal, this.list)
-          excel.export_json_to_excel(tHeader, data, 'table-list')
-          this.downloadLoading = false
-        })
-      },
-      formatJson(filterVal, jsonData) {
-        return jsonData.map(v => filterVal.map(j => {
-          if (j === 'timestamp') {
-            return parseTime(v[j])
-          } else {
-            return v[j]
-          }
-        }))
       }
     }
   }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
index 97b7c7b9..c72bfc2e 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/constant/ExceptionConstant.java
@@ -51,6 +51,8 @@ public enum ExceptionConstant {
 	// 端口映射管理(14000)
 	PORT_MAPPING_NOT_EXIST(14000, "端口映射记录不存在"),
 	PORT_CANNOT_REPEAT_MAPPING(14001, "服务端口[{}]不能重复映射"),
+	// 调度管理(15000)
+	JOB_INFO_NOT_EXIST(15000, "调度管理记录不存在"),
 	SYSTEM_ERROR(500, "系统异常"),
 	;
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
index 5e361fcf..f3ef886b 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
@@ -21,18 +21,57 @@
  */
 package fun.asgc.neutrino.proxy.server.controller;
 
+import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.web.annotation.RequestMapping;
-import fun.asgc.neutrino.core.web.annotation.RestController;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.core.web.annotation.*;
+import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq;
+import fun.asgc.neutrino.proxy.server.controller.req.PortMappingUpdateEnableStatusReq;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.controller.res.PortMappingUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.service.JobInfoService;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  *
  * @author: aoshiguchen
  * @date: 2022/9/5
  */
+@Slf4j
 @NonIntercept
 @RequestMapping("job-info")
 @RestController
 public class JobInfoController {
+    @Autowired
+    private JobInfoService jobInfoService;
+
+    @GetMapping("page")
+    public Page<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
+        ParamCheckUtil.checkNotNull(pageQuery, "pageQuery");
+        return jobInfoService.page(pageQuery, req);
+    }
+
+    @OnlyAdmin
+    @PostMapping("update/enable-status")
+    public JobInfoUpdateEnableStatusRes updateEnableStatus(@RequestBody JobInfoUpdateEnableStatusReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
+        ParamCheckUtil.checkNotNull(req.getEnable(), "enable");
+        return jobInfoService.updateEnableStatus(req);
+    }
+
+    @OnlyAdmin
+    @PostMapping("execute")
+    public JobInfoExecuteRes execute(@RequestBody JobInfoExecuteReq req) {
+
+        return new JobInfoExecuteRes();
+    }
 
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java
new file mode 100644
index 00000000..ee994c7c
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoExecuteReq.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 调度管理执行请求
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoExecuteReq {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 任务参数
+     */
+    private String param;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java
new file mode 100644
index 00000000..688e0513
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoListReq.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 端口映射列表请求
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoListReq {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java
new file mode 100644
index 00000000..395b186f
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateEnableStatusReq.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+/**
+ * 调度管理更新启用状态请求
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoUpdateEnableStatusReq {
+
+	/**
+	 * id
+	 */
+	private Integer id;
+	/**
+	 * 启用状态
+	 */
+	private Integer enable;
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java
new file mode 100644
index 00000000..8dba8f0e
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoExecuteRes.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+/**
+ * 调度管理执行响应
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoExecuteRes {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java
new file mode 100644
index 00000000..c6bad582
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoListRes.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * 调度管理列表响应
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoListRes {
+	private Integer id;
+	/**
+	 * 描述
+	 */
+	private String desc;
+	/**
+	 * 处理器
+	 */
+	private String handler;
+	/**
+	 * cron
+	 */
+	private String cron;
+	/**
+	 * 任务参数
+	 */
+	private String param;
+	/**
+	 * 任务报警邮箱
+	 */
+	private String alarmEmail;
+	/**
+	 * 任务报警钉钉
+	 */
+	private String alarmDing;
+	/**
+	 * 启用状态
+	 * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum}
+	 */
+	private Integer enable;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java
new file mode 100644
index 00000000..e8b51c2b
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateEnableStatusRes.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+/**
+ * 调度管理列表响应
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoUpdateEnableStatusRes {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java
new file mode 100644
index 00000000..2606df17
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/res/JobInfoUpdateRes.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.res;
+
+import lombok.Data;
+
+/**
+ * 调度管理更新响应
+ * @author: zCans
+ * @date: 2022/9/12
+ */
+@Data
+public class JobInfoUpdateRes {
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
index c7472fb6..abc22e99 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
@@ -22,8 +22,18 @@
 package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.Param;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.ResultType;
+import fun.asgc.neutrino.core.db.annotation.Select;
+import fun.asgc.neutrino.core.db.annotation.Update;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
+
+import java.util.Date;
 
 /**
  *
@@ -34,4 +44,13 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 @Component
 public interface JobInfoMapper extends SqlMapper {
 
+    @ResultType(JobInfoListRes.class)
+    @Select("select * from job_info")
+    void page(Page page, JobInfoListReq req);
+
+    @Select("select * from job_info where id = ?")
+    JobInfoDO findById(Integer id);
+
+    @Update("update `job_info` set enable = :enable,update_time = :updateTime where id = :id")
+    void updateEnableStatus(@Param("id") Integer id, @Param("enable") Integer enable, @Param("updateTime") Date updateTime);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
index ad7956bf..f2b7f9fc 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
@@ -21,10 +21,23 @@
  */
 package fun.asgc.neutrino.proxy.server.service;
 
+import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.db.page.Page;
+import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
+import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Date;
+
 /**
  *
  * @author: aoshiguchen
@@ -35,4 +48,19 @@ import lombok.extern.slf4j.Slf4j;
 @Component
 public class JobInfoService {
 
+    @Autowired
+    private JobInfoMapper jobInfoMapper;
+
+    public Page<JobInfoListRes> page(PageQuery pageQuery, JobInfoListReq req) {
+        Page<JobInfoListRes> page = Page.create(pageQuery);
+        jobInfoMapper.page(page, req);
+        return page;
+    }
+
+    public JobInfoUpdateEnableStatusRes updateEnableStatus(JobInfoUpdateEnableStatusReq req) {
+        JobInfoDO jobInfoDO = jobInfoMapper.findById(req.getId());
+        ParamCheckUtil.checkExpression(null != jobInfoDO, ExceptionConstant.JOB_INFO_NOT_EXIST);
+        jobInfoMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        return new JobInfoUpdateEnableStatusRes();
+    }
 }

From 688296a5017720080a0c650823c843bd88d2ec3e Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 13 Sep 2022 19:22:35 +0800
Subject: [PATCH 06/16] =?UTF-8?q?job=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96=EF=BC=8Cjob=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E4=BB=8E=E6=B3=A8=E8=A7=A3=E6=94=B9=E4=B8=BA=E4=BB=8E?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/quartz/JobExecutor.java     |  1 +
 .../server/base/rest/config/JobConfig.java    |  6 ++-
 .../server/controller/JobInfoController.java  |  4 +-
 .../proxy/server/dal/JobInfoMapper.java       |  5 +++
 .../proxy/server/service/JobInfoService.java  | 39 ++++++++++++++++++-
 .../proxy/server/service/LicenseService.java  |  6 +--
 .../server/service/PortMappingService.java    | 20 +++++-----
 .../proxy/server/service/PortPoolService.java |  2 +-
 .../proxy/server/util/ParamCheckUtil.java     | 30 ++++++++++++++
 9 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
index 08a35f4b..4cb24a5d 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
@@ -106,6 +106,7 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 		for (JobInfo jobInfo : jobInfoList) {
 			add(jobInfo);
 		}
+		log.info("Job初始化完成.");
 	}
 
 	@Override
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java
index 18ad334e..749de7c9 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/base/rest/config/JobConfig.java
@@ -25,8 +25,8 @@ import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Bean;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.base.CustomThreadFactory;
-import fun.asgc.neutrino.core.quartz.DefaultJobSource;
 import fun.asgc.neutrino.core.quartz.JobExecutor;
+import fun.asgc.neutrino.proxy.server.service.JobInfoService;
 import fun.asgc.neutrino.proxy.server.service.JobLogService;
 
 import java.util.concurrent.LinkedBlockingQueue;
@@ -42,11 +42,13 @@ import java.util.concurrent.TimeUnit;
 public class JobConfig {
 	@Autowired
 	private JobLogService jobLogService;
+	@Autowired
+	private JobInfoService jobInfoService;
 
 	@Bean
 	public JobExecutor jobExecutor() {
 		JobExecutor executor = new JobExecutor();
-		executor.setJobSource(new DefaultJobSource());
+		executor.setJobSource(jobInfoService);
 		executor.setThreadPoolExecutor(new ThreadPoolExecutor(5, 20, 10L, TimeUnit.SECONDS,
 			new LinkedBlockingQueue<>(), new CustomThreadFactory("JobPool")));
 		executor.setJobCallback(jobLogService);
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
index f3ef886b..3e6a79c4 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
@@ -70,8 +70,10 @@ public class JobInfoController {
     @OnlyAdmin
     @PostMapping("execute")
     public JobInfoExecuteRes execute(@RequestBody JobInfoExecuteReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+        ParamCheckUtil.checkNotNull(req.getId(), "id");
 
-        return new JobInfoExecuteRes();
+        return jobInfoService.execute(req);
     }
 
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
index abc22e99..085424f4 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
@@ -34,6 +34,7 @@ import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
 import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -53,4 +54,8 @@ public interface JobInfoMapper extends SqlMapper {
 
     @Update("update `job_info` set enable = :enable,update_time = :updateTime where id = :id")
     void updateEnableStatus(@Param("id") Integer id, @Param("enable") Integer enable, @Param("updateTime") Date updateTime);
+
+    @ResultType(JobInfoDO.class)
+    @Select("select * from job_info where enable = 1")
+    List<JobInfoDO> findEnableList();
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
index f2b7f9fc..f18079c9 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
@@ -21,14 +21,22 @@
  */
 package fun.asgc.neutrino.proxy.server.service;
 
+import com.google.common.collect.Lists;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
+import fun.asgc.neutrino.core.quartz.IJobSource;
+import fun.asgc.neutrino.core.quartz.JobInfo;
+import fun.asgc.neutrino.core.util.CollectionUtil;
+import fun.asgc.neutrino.core.util.StringUtil;
+import fun.asgc.neutrino.core.web.annotation.RequestBody;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
+import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
 import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
 import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq;
+import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes;
 import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
 import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes;
 import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper;
@@ -37,6 +45,7 @@ import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  *
@@ -46,7 +55,7 @@ import java.util.Date;
 @Slf4j
 @NonIntercept
 @Component
-public class JobInfoService {
+public class JobInfoService implements IJobSource {
 
     @Autowired
     private JobInfoMapper jobInfoMapper;
@@ -59,8 +68,34 @@ public class JobInfoService {
 
     public JobInfoUpdateEnableStatusRes updateEnableStatus(JobInfoUpdateEnableStatusReq req) {
         JobInfoDO jobInfoDO = jobInfoMapper.findById(req.getId());
-        ParamCheckUtil.checkExpression(null != jobInfoDO, ExceptionConstant.JOB_INFO_NOT_EXIST);
+        ParamCheckUtil.checkNotNull(jobInfoDO, ExceptionConstant.JOB_INFO_NOT_EXIST);
         jobInfoMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
         return new JobInfoUpdateEnableStatusRes();
     }
+
+    public JobInfoExecuteRes execute(JobInfoExecuteReq req) {
+
+
+        return new JobInfoExecuteRes();
+    }
+
+    @Override
+    public List<JobInfo> sourceList() {
+        List<JobInfo> jobInfoList = Lists.newArrayList();
+        List<JobInfoDO> jobInfoDOList = jobInfoMapper.findEnableList();
+        if (CollectionUtil.isEmpty(jobInfoDOList)) {
+            return jobInfoList;
+        }
+        for (JobInfoDO item : jobInfoDOList) {
+            jobInfoList.add(new JobInfo()
+                    .setId(String.valueOf(item.getId()))
+                    .setName(item.getHandler())
+                    .setDesc(item.getDesc())
+                    .setCron(item.getCron())
+                    .setParam(item.getParam())
+            );
+        }
+
+        return jobInfoList;
+    }
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
index 7a4c5215..0895ad95 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java
@@ -103,7 +103,7 @@ public class LicenseService {
 	 */
 	public LicenseCreateRes create(LicenseCreateReq req) {
 		LicenseDO licenseDO = licenseMapper.checkRepeat(req.getUserId(), req.getName());
-		ParamCheckUtil.checkExpression(null == licenseDO, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
+		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
 
 		String key = UUID.randomUUID().toString().replaceAll("-", "");
 		Date now = new Date();
@@ -122,10 +122,10 @@ public class LicenseService {
 
 	public LicenseUpdateRes update(LicenseUpdateReq req) {
 		LicenseDO oldLicenseDO = licenseMapper.findById(req.getId());
-		ParamCheckUtil.checkExpression(null != oldLicenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(oldLicenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 
 		LicenseDO licenseCheck = licenseMapper.checkRepeat(oldLicenseDO.getUserId(), req.getName(), Sets.newHashSet(oldLicenseDO.getId()));
-		ParamCheckUtil.checkExpression(null == licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
+		ParamCheckUtil.checkNotNull(licenseCheck, ExceptionConstant.LICENSE_NAME_CANNOT_REPEAT);
 
 		licenseMapper.update(req.getId(), req.getName(), new Date());
 		return new LicenseUpdateRes();
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
index 25aaf1ad..fd9843f3 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java
@@ -100,14 +100,14 @@ public class PortMappingService {
 
 	public PortMappingCreateRes create(PortMappingCreateReq req) {
 		LicenseDO licenseDO = licenseMapper.findById(req.getLicenseId());
-		ParamCheckUtil.checkExpression(null != licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 		if (!SystemContextHolder.isAdmin()) {
 			// 临时处理，如果当前用户不是管理院，则操作userId不能为1
 			ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
 		}
 		PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
-		ParamCheckUtil.checkExpression(null != portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
-		ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort()), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
+		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(portMappingMapper.findByPort(req.getServerPort()), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
 
 
 		Date now = new Date();
@@ -126,14 +126,14 @@ public class PortMappingService {
 
 	public PortMappingUpdateRes update(PortMappingUpdateReq req) {
 		LicenseDO licenseDO = licenseMapper.findById(req.getLicenseId());
-		ParamCheckUtil.checkExpression(null != licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 		if (!SystemContextHolder.isAdmin()) {
 			// 临时处理，如果当前用户不是管理员，则操作userId不能为1
 			ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
 		}
 		PortPoolDO portPoolDO = portPoolMapper.findByPort(req.getServerPort());
-		ParamCheckUtil.checkExpression(null != portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
-		ParamCheckUtil.checkExpression(null == portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
+		ParamCheckUtil.checkNotNull(portPoolDO, ExceptionConstant.PORT_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(portMappingMapper.findByPort(req.getServerPort(), Sets.newHashSet(req.getId())), ExceptionConstant.PORT_CANNOT_REPEAT_MAPPING, req.getServerPort());
 
 		PortMappingDO portMappingDO = new PortMappingDO();
 		portMappingDO.setId(req.getId());
@@ -177,10 +177,10 @@ public class PortMappingService {
 
 	public PortMappingUpdateEnableStatusRes updateEnableStatus(PortMappingUpdateEnableStatusReq req) {
 		PortMappingDO portMappingDO = portMappingMapper.findById(req.getId());
-		ParamCheckUtil.checkExpression(null != portMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(portMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
 		LicenseDO licenseDO = licenseMapper.findById(portMappingDO.getLicenseId());
-		ParamCheckUtil.checkExpression(null != licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 		if (!SystemContextHolder.isAdmin()) {
 			// 临时处理，如果当前用户不是管理员，则操作userId不能为1
 			ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
@@ -193,10 +193,10 @@ public class PortMappingService {
 
 	public void delete(Integer id) {
 		PortMappingDO portMappingDO = portMappingMapper.findById(id);
-		ParamCheckUtil.checkExpression(null != portMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(portMappingDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
 
 		LicenseDO licenseDO = licenseMapper.findById(portMappingDO.getLicenseId());
-		ParamCheckUtil.checkExpression(null != licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
+		ParamCheckUtil.checkNotNull(licenseDO, ExceptionConstant.LICENSE_NOT_EXIST);
 		if (!SystemContextHolder.isAdmin()) {
 			// 临时处理，如果当前用户不是管理员，则操作userId不能为1
 			ParamCheckUtil.checkExpression(!licenseDO.getUserId().equals(1), ExceptionConstant.NO_PERMISSION_VISIT);
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
index e4166fa0..5fef3d10 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java
@@ -65,7 +65,7 @@ public class PortPoolService {
 
 	public PortPoolCreateRes create(PortPoolCreateReq req) {
 		PortPoolDO oldPortPoolDO = portPoolMapper.findByPort(req.getPort());
-		ParamCheckUtil.checkExpression(null == oldPortPoolDO, ExceptionConstant.PORT_CANNOT_REPEAT);
+		ParamCheckUtil.checkNotNull(oldPortPoolDO, ExceptionConstant.PORT_CANNOT_REPEAT);
 
 		Date now = new Date();
 
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
index a3e89174..f1980e10 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/util/ParamCheckUtil.java
@@ -66,6 +66,36 @@ public class ParamCheckUtil {
 		}
 	}
 
+	public static void checkNotNull(Object obj, ExceptionConstant constant, Object... params) {
+		if (null == obj) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
+	public static void checkNotEmpty(String str, ExceptionConstant constant, Object... params) {
+		if (StringUtil.isEmpty(str)) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
+	public static void checkNotEmpty(Collection collection, ExceptionConstant constant, Object... params) {
+		if (null == collection || collection.isEmpty()) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
+	public static void checkNotEmpty(Map map, ExceptionConstant constant, Object... params) {
+		if (null == map || map.isEmpty()) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
+	public static void checkNotEmpty(Set set, ExceptionConstant constant, Object... params) {
+		if (null == set || set.isEmpty()) {
+			throw ServiceException.create(constant, params);
+		}
+	}
+
 	public static void checkExpression(boolean expression, ExceptionConstant constant, Object... params) {
 		if (!expression) {
 			throw ServiceException.create(constant, params);

From f9d9e9e9fc93bdadad31fce6e46e23822784453e Mon Sep 17 00:00:00 2001
From: zCans <1224895921@qq.com>
Date: Tue, 13 Sep 2022 21:53:26 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=BB=BB=E5=8A=A1=E5=89=8D=E7=AB=AF=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-admin/src/api/jobInfo.js       |  8 +++
 .../src/views/system/jobManager.vue           | 68 +++++++++++++++++--
 2 files changed, 71 insertions(+), 5 deletions(-)

diff --git a/neutrino-proxy-admin/src/api/jobInfo.js b/neutrino-proxy-admin/src/api/jobInfo.js
index 42d0eb32..961935b9 100644
--- a/neutrino-proxy-admin/src/api/jobInfo.js
+++ b/neutrino-proxy-admin/src/api/jobInfo.js
@@ -26,3 +26,11 @@ export function execute(data) {
     data: data
   })
 }
+
+export function updateJobInfo(data) {
+  return request({
+    url: '/job-info/update',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index c55a01e4..e906b7d5 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -42,9 +42,10 @@
       </el-table-column>
       <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="primary" @click="handleEditClick(scope.row)" :disabled="scope.row.enable === 1">编辑</el-button>
           <el-button size="mini" type="primary" @click="handleExecuteClick(scope.row)">执行</el-button>
-          <el-button v-if="scope.row.enable =='1'" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">{{'停止'}}</el-button>
-          <el-button v-if="scope.row.enable =='2'" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">{{'启动'}}</el-button>
+          <el-button v-if="scope.row.enable === 1" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">停止</el-button>
+          <el-button v-if="scope.row.enable === 2" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">启动</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -55,7 +56,7 @@
     </div>
 
     <el-dialog title="执行" :visible.sync="executeVisible">
-      <el-form ref="dataForm" :model="temp" label-position="left" label-width="70px">
+      <el-form ref="dataForm" :model="temp" label-position="right" label-width="70px">
         <el-form-item :label="$t('table.jobParam')" prop="param">
           <el-input v-model="temp.param" type="textarea" :rows="4" placeholder="请输入任务执行参数" :maxlength="200" show-word-limit style="padding-right: 20px"/>
         </el-form-item>
@@ -66,11 +67,38 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="编辑" :visible.sync="editVisible">
+      <el-form ref="editForm" :rules="editRules" :model="edit" label-position="right" label-width="100px" style="padding-right: 20px">
+        <el-form-item :label="$t('table.handler')" prop="handler">
+          <el-input v-model="edit.handler" :placeholder="'请输入'+$t('table.handler')" disabled/>
+        </el-form-item>
+        <el-form-item :label="$t('table.cron')" prop="cron">
+          <el-input v-model="edit.cron" :placeholder="'请输入'+$t('table.cron')"/>
+        </el-form-item>
+        <el-form-item :label="$t('table.desc')" prop="desc">
+          <el-input v-model="edit.desc" type="textarea" :rows="2" :placeholder="'请输入'+$t('table.desc')" show-word-limit/>
+        </el-form-item>
+        <el-form-item :label="$t('table.jobParam')" prop="param">
+          <el-input v-model="edit.param" type="textarea" :rows="2" :placeholder="'请输入'+$t('table.jobParam')" show-word-limit/>
+        </el-form-item>
+        <el-form-item :label="$t('table.alarmEmail')" prop="alarmEmail">
+          <el-input v-model="edit.alarmEmail" :placeholder="'请输入'+$t('table.alarmEmail')"/>
+        </el-form-item>
+        <el-form-item :label="$t('table.alarmDing')" prop="alarmDing">
+          <el-input v-model="edit.alarmDing" :placeholder="'请输入'+$t('table.alarmDing')"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="editVisible = false">{{$t('table.cancel')}}</el-button>
+        <el-button type="primary" @click="commitEdit">{{$t('table.confirm')}}</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
-  import { fetchList, updateEnableStatus, execute } from '@/api/jobInfo'
+  import { fetchList, updateEnableStatus, execute, updateJobInfo } from '@/api/jobInfo'
   import waves from '@/directive/waves' // 水波纹指令
 
   export default {
@@ -95,7 +123,22 @@
           id: '',
           param: ''
         },
-        executeVisible: false
+        executeVisible: false,
+        editVisible: false,
+        edit: {
+          id: '',
+          desc: '',
+          handler: '',
+          cron: '',
+          alarmEmail: '',
+          alarmDing: '',
+          param: ''
+        },
+        editRules: {
+          desc: [{ required: true, message: '描述必填', trigger: 'blur' }],
+          handler: [{ required: true, message: '处理器必填', trigger: 'blur' }],
+          cron: [{ required: true, message: 'cron必填', trigger: 'blur' }]
+        }
       }
     },
     filters: {
@@ -154,6 +197,10 @@
         this.temp.param = row.param
         this.executeVisible = true
       },
+      handleEditClick(row) {
+        this.edit = row
+        this.editVisible = true
+      },
       commitExecute() {
         execute(this.temp).then(response => {
           if (response.data.code === 0) {
@@ -164,6 +211,17 @@
             })
           }
         })
+      },
+      commitEdit() {
+        updateJobInfo(this.edit).then(response => {
+          if (response.data.code === 0) {
+            this.editVisible = false
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+          }
+        })
       }
     }
   }

From 6e3311ede3706bf6f5b78271325e9d95b96e6f27 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 14 Sep 2022 19:17:56 +0800
Subject: [PATCH 08/16] =?UTF-8?q?Job=E6=A0=B8=E5=BF=83=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/quartz/JobExecutor.java     | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
index 4cb24a5d..4f0e550b 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
@@ -56,6 +56,7 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 	private Map<String, IJobHandler> jobHandlerMap = new ConcurrentHashMap<>();
 	private Set<String> runJobSet = Sets.newHashSet();
 	private IJobCallback jobCallback;
+	private Map<String, TriggerKey> triggerKeyMap = new ConcurrentHashMap<>();
 
 	@Override
 	public void run(String[] args) throws JobException {
@@ -114,9 +115,10 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 		if (null == jobInfo || StringUtil.isEmpty(jobInfo.getName()) || StringUtil.isEmpty(jobInfo.getCron()) || jobInfoMap.containsKey(jobInfo.getName())) {
 			return;
 		}
-		jobInfoMap.put(jobInfo.getName(), jobInfo);
+		jobInfoMap.put(jobInfo.getId(), jobInfo);
 
-		TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getName());
+		TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getId());
+		triggerKeyMap.put(jobInfo.getId(), triggerKey);
 		JobKey jobKey = new JobKey(jobInfo.getName());
 
 		CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(jobInfo.getCron()).withMisfireHandlingInstructionDoNothing();
@@ -145,15 +147,32 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 		if (null == context || null == context.getTrigger()) {
 			return;
 		}
-		if (!jobInfoMap.containsKey(context.getTrigger().getKey().getName())
-			|| !jobHandlerMap.containsKey(context.getTrigger().getKey().getName())) {
+		String jobId = context.getTrigger().getKey().getName();
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			TriggerKey triggerKey = triggerKeyMap.get(jobId);
+			if (null != triggerKey) {
+				try {
+					scheduler.unscheduleJob(triggerKey);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
 			return;
 		}
+		doExecute(jobId, jobInfo.getParam());
+	}
 
+	private void doExecute(String jobId, String param) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		IJobHandler jobHandler =jobHandlerMap.get(jobInfo.getName());
+		if (null == jobHandler) {
+			return;
+		}
 		threadPoolExecutor.submit(() -> {
-			JobInfo jobInfo = jobInfoMap.get(context.getTrigger().getKey().getName());
-			IJobHandler jobHandler =jobHandlerMap.get(jobInfo.getName());
-
 			try {
 				jobHandler.execute(jobInfo.getParam());
 				if (null != jobCallback) {

From ac0047f2db1671c62b140d49967fd59c4ebc7a5f Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 14 Sep 2022 19:36:57 +0800
Subject: [PATCH 09/16] =?UTF-8?q?job=E5=90=AF=E5=8A=A8=E3=80=81=E5=81=9C?=
 =?UTF-8?q?=E6=AD=A2=E3=80=81=E6=89=A7=E8=A1=8C=E9=80=BB=E8=BE=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/quartz/JobExecutor.java     | 66 +++++++++++--------
 .../proxy/server/service/JobInfoService.java  | 17 ++++-
 2 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
index 4f0e550b..e317e962 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
@@ -72,7 +72,6 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 					continue;
 				}
 				jobHandlerMap.put(jobHandler.name(), item);
-				runJobSet.add(jobHandler.name());
 			}
 		}
 
@@ -111,36 +110,47 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 	}
 
 	@Override
-	public synchronized void add(JobInfo jobInfo) throws JobException {
-		if (null == jobInfo || StringUtil.isEmpty(jobInfo.getName()) || StringUtil.isEmpty(jobInfo.getCron()) || jobInfoMap.containsKey(jobInfo.getName())) {
+	public void add(JobInfo jobInfo) throws JobException {
+		if (null == jobInfo || StringUtil.isEmpty(jobInfo.getId()) || StringUtil.isEmpty(jobInfo.getName()) ||
+				StringUtil.isEmpty(jobInfo.getCron()) || runJobSet.contains(jobInfo.getName())) {
 			return;
 		}
-		jobInfoMap.put(jobInfo.getId(), jobInfo);
+		synchronized (jobInfo.getId()) {
+			runJobSet.add(jobInfo.getName());
+			jobInfoMap.put(jobInfo.getId(), jobInfo);
 
-		TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getId());
-		triggerKeyMap.put(jobInfo.getId(), triggerKey);
-		JobKey jobKey = new JobKey(jobInfo.getName());
+			TriggerKey triggerKey = TriggerKey.triggerKey(jobInfo.getId());
+			triggerKeyMap.put(jobInfo.getId(), triggerKey);
+			JobKey jobKey = new JobKey(jobInfo.getName());
 
-		CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(jobInfo.getCron()).withMisfireHandlingInstructionDoNothing();
-		CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
-		JobDetail jobDetail = JobBuilder.newJob(JobBean.class).withIdentity(jobKey).build();
+			CronScheduleBuilder cronScheduleBuilder = CronScheduleBuilder.cronSchedule(jobInfo.getCron()).withMisfireHandlingInstructionDoNothing();
+			CronTrigger cronTrigger = TriggerBuilder.newTrigger().withIdentity(triggerKey).withSchedule(cronScheduleBuilder).build();
+			JobDetail jobDetail = JobBuilder.newJob(JobBean.class).withIdentity(jobKey).build();
 
-		try {
-			scheduler.scheduleJob(jobDetail, cronTrigger);
-			scheduler.start();
-		} catch (Exception e) {
-			throw new RuntimeException(String.format("新增job[name=%s]异常", jobInfo.getName()));
+			try {
+				scheduler.scheduleJob(jobDetail, cronTrigger);
+				scheduler.start();
+			} catch (Exception e) {
+				throw new RuntimeException(String.format("新增job[name=%s]异常", jobInfo.getName()));
+			}
 		}
 	}
 
 	@Override
-	public void remove(String jobName) {
-		runJobSet.remove(jobName);
+	public void remove(String jobId) {
+		JobInfo jobInfo = jobInfoMap.get(jobId);
+		if (null == jobInfo) {
+			return;
+		}
+		synchronized (jobId) {
+			runJobSet.remove(jobInfo.getName());
+			unscheduleJob(jobId);
+		}
 	}
 
 	@Override
 	public void trigger(String jobId, String param) {
-
+		doExecute(jobId, param);
 	}
 
 	public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -150,19 +160,23 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 		String jobId = context.getTrigger().getKey().getName();
 		JobInfo jobInfo = jobInfoMap.get(jobId);
 		if (null == jobInfo) {
-			TriggerKey triggerKey = triggerKeyMap.get(jobId);
-			if (null != triggerKey) {
-				try {
-					scheduler.unscheduleJob(triggerKey);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
+			unscheduleJob(jobId);
 			return;
 		}
 		doExecute(jobId, jobInfo.getParam());
 	}
 
+	private void unscheduleJob(String jobId) {
+		TriggerKey triggerKey = triggerKeyMap.get(jobId);
+		if (null != triggerKey) {
+			try {
+				scheduler.unscheduleJob(triggerKey);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
 	private void doExecute(String jobId, String param) {
 		JobInfo jobInfo = jobInfoMap.get(jobId);
 		if (null == jobInfo) {
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
index f18079c9..d0824bcb 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
@@ -28,10 +28,13 @@ import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.quartz.IJobSource;
+import fun.asgc.neutrino.core.quartz.JobExecutor;
 import fun.asgc.neutrino.core.quartz.JobInfo;
+import fun.asgc.neutrino.core.util.BeanManager;
 import fun.asgc.neutrino.core.util.CollectionUtil;
 import fun.asgc.neutrino.core.util.StringUtil;
 import fun.asgc.neutrino.core.web.annotation.RequestBody;
+import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
 import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
 import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
@@ -70,12 +73,22 @@ public class JobInfoService implements IJobSource {
         JobInfoDO jobInfoDO = jobInfoMapper.findById(req.getId());
         ParamCheckUtil.checkNotNull(jobInfoDO, ExceptionConstant.JOB_INFO_NOT_EXIST);
         jobInfoMapper.updateEnableStatus(req.getId(), req.getEnable(), new Date());
+        if (EnableStatusEnum.ENABLE.getStatus().equals(req.getEnable())) {
+            BeanManager.getBean(JobExecutor.class).add(new JobInfo()
+                    .setId(String.valueOf(jobInfoDO.getId()))
+                    .setName(jobInfoDO.getHandler())
+                    .setDesc(jobInfoDO.getDesc())
+                    .setCron(jobInfoDO.getCron())
+                    .setParam(jobInfoDO.getParam())
+            );
+        } else {
+            BeanManager.getBean(JobExecutor.class).remove(String.valueOf(req.getId()));
+        }
         return new JobInfoUpdateEnableStatusRes();
     }
 
     public JobInfoExecuteRes execute(JobInfoExecuteReq req) {
-
-
+        BeanManager.getBean(JobExecutor.class).trigger(String.valueOf(req.getId()), req.getParam());
         return new JobInfoExecuteRes();
     }
 

From 1534b67bedbd9883d87db7f058e2720ac1f3d43e Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 14 Sep 2022 22:34:27 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
index 437b04f8..863ee2bf 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
@@ -37,7 +37,6 @@ import fun.asgc.neutrino.core.context.NeutrinoLauncher;
 public class ProxyServer {
 
 	public static void main(String[] args) {
-		GlobalConfig.setIsSaveGeneratorCode(true);
 		NeutrinoLauncher.run(ProxyServer.class, args).sync();
 	}
 

From d5d094bdb1a7d9a30552e02bf4850ebe36a64517 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 14 Sep 2022 22:35:30 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E4=BB=A3=E7=A0=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
index 863ee2bf..e3e379dc 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/ProxyServer.java
@@ -37,7 +37,7 @@ import fun.asgc.neutrino.core.context.NeutrinoLauncher;
 public class ProxyServer {
 
 	public static void main(String[] args) {
-		NeutrinoLauncher.run(ProxyServer.class, args).sync();
+		NeutrinoLauncher.run(ProxyServer.class, args);
 	}
 
 }

From 4225c5a92aa949d7bf27b3f636a1f9bac6d6ecf2 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 15 Sep 2022 09:30:19 +0800
Subject: [PATCH 12/16] =?UTF-8?q?Job=E6=89=A7=E8=A1=8C=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
index e317e962..0e14ed57 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/quartz/JobExecutor.java
@@ -188,7 +188,7 @@ public class JobExecutor implements ApplicationRunner, IJobExecutor {
 		}
 		threadPoolExecutor.submit(() -> {
 			try {
-				jobHandler.execute(jobInfo.getParam());
+				jobHandler.execute(param);
 				if (null != jobCallback) {
 					jobCallback.executeLog(jobInfo, null);
 				}

From f1a8121ec8ab9ee153bb8dbd323c5dff6ee15dd5 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Thu, 15 Sep 2022 11:44:49 +0800
Subject: [PATCH 13/16] =?UTF-8?q?bean=E7=9B=B8=E5=85=B3=E5=8C=85=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84=E8=B0=83=E6=95=B4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino/core/bean/{ => factory}/AbstractBeanFactory.java | 4 ++--
 .../asgc/neutrino/core/bean/{ => factory}/BeanFactory.java    | 3 ++-
 .../neutrino/core/bean/{ => factory}/BeanFactoryAware.java    | 2 +-
 .../neutrino/core/bean/{ => factory}/SimpleBeanFactory.java   | 3 ++-
 .../fun/asgc/neutrino/core/context/ApplicationContext.java    | 4 ++--
 .../asgc/neutrino/core/context/ExtensionServiceLoader.java    | 2 +-
 .../main/java/fun/asgc/neutrino/core/util/BeanManager.java    | 4 ++--
 .../asgc/neutrino/core/web/context/WebApplicationContext.java | 2 +-
 .../fun/asgc/neutrino/core/web/context/WebContextHolder.java  | 2 +-
 .../test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java | 2 +-
 10 files changed, 15 insertions(+), 13 deletions(-)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/AbstractBeanFactory.java (99%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/BeanFactory.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/BeanFactoryAware.java (96%)
 rename neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/{ => factory}/SimpleBeanFactory.java (99%)

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java
similarity index 99%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java
index dad96d35..29f10d19 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/AbstractBeanFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/AbstractBeanFactory.java
@@ -19,9 +19,10 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.bean;
+package fun.asgc.neutrino.core.bean.factory;
 
 import fun.asgc.neutrino.core.base.CustomThreadFactory;
+import fun.asgc.neutrino.core.bean.*;
 import fun.asgc.neutrino.core.context.Environment;
 import fun.asgc.neutrino.core.context.LifeCycle;
 import fun.asgc.neutrino.core.context.LifeCycleManager;
@@ -35,7 +36,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java
index 5d365a3b..d4ffceeb 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactory.java
@@ -19,8 +19,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.bean;
+package fun.asgc.neutrino.core.bean.factory;
 
+import fun.asgc.neutrino.core.bean.BeanIdentity;
 import fun.asgc.neutrino.core.exception.BeanException;
 
 import java.util.List;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java
similarity index 96%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java
index 7388daa9..032461be 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/BeanFactoryAware.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/BeanFactoryAware.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.bean;
+package fun.asgc.neutrino.core.bean.factory;
 
 /**
  * 用于标识需要beanFactory的组件
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java
similarity index 99%
rename from neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java
rename to neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java
index 0c900201..17f4b009 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/SimpleBeanFactory.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/bean/factory/SimpleBeanFactory.java
@@ -19,7 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package fun.asgc.neutrino.core.bean;
+package fun.asgc.neutrino.core.bean.factory;
 
 import com.google.common.collect.Lists;
 import fun.asgc.neutrino.core.annotation.*;
@@ -28,6 +28,7 @@ import fun.asgc.neutrino.core.aop.interceptor.ExceptionHandler;
 import fun.asgc.neutrino.core.aop.interceptor.Filter;
 import fun.asgc.neutrino.core.aop.interceptor.Interceptor;
 import fun.asgc.neutrino.core.aop.interceptor.ResultAdvice;
+import fun.asgc.neutrino.core.bean.*;
 import fun.asgc.neutrino.core.exception.BeanException;
 import fun.asgc.neutrino.core.context.ApplicationRunner;
 import fun.asgc.neutrino.core.util.*;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java
index 12a0d3d7..603d34af 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ApplicationContext.java
@@ -24,8 +24,8 @@ package fun.asgc.neutrino.core.context;
 
 import fun.asgc.neutrino.core.annotation.PreLoad;
 import fun.asgc.neutrino.core.base.GlobalConfig;
-import fun.asgc.neutrino.core.bean.BeanFactoryAware;
-import fun.asgc.neutrino.core.bean.SimpleBeanFactory;
+import fun.asgc.neutrino.core.bean.factory.BeanFactoryAware;
+import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory;
 import fun.asgc.neutrino.core.util.*;
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java
index 451c4513..58f2929c 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/context/ExtensionServiceLoader.java
@@ -24,7 +24,7 @@ package fun.asgc.neutrino.core.context;
 import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
-import fun.asgc.neutrino.core.bean.SimpleBeanFactory;
+import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory;
 import fun.asgc.neutrino.core.web.context.WebApplicationContext;
 import fun.asgc.neutrino.core.web.context.WebContextHolder;
 
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java
index be64545f..7032490e 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/util/BeanManager.java
@@ -23,8 +23,8 @@
 package fun.asgc.neutrino.core.util;
 
 import fun.asgc.neutrino.core.annotation.Component;
-import fun.asgc.neutrino.core.bean.BeanFactory;
-import fun.asgc.neutrino.core.bean.BeanFactoryAware;
+import fun.asgc.neutrino.core.bean.factory.BeanFactory;
+import fun.asgc.neutrino.core.bean.factory.BeanFactoryAware;
 import fun.asgc.neutrino.core.bean.BeanIdentity;
 import fun.asgc.neutrino.core.exception.BeanException;
 import lombok.extern.slf4j.Slf4j;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java
index 38479c8d..7b1fd2f7 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebApplicationContext.java
@@ -23,7 +23,7 @@ package fun.asgc.neutrino.core.web.context;
 
 import com.google.common.collect.Sets;
 import fun.asgc.neutrino.core.annotation.*;
-import fun.asgc.neutrino.core.bean.SimpleBeanFactory;
+import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory;
 import fun.asgc.neutrino.core.context.ApplicationContext;
 import fun.asgc.neutrino.core.context.ApplicationRunner;
 import fun.asgc.neutrino.core.web.HttpRequestHandler;
diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java
index a5231add..fb1e21a0 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/web/context/WebContextHolder.java
@@ -26,7 +26,7 @@ import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.Init;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.bean.BeanWrapper;
-import fun.asgc.neutrino.core.bean.SimpleBeanFactory;
+import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory;
 import fun.asgc.neutrino.core.context.ApplicationConfig;
 import fun.asgc.neutrino.core.util.*;
 import fun.asgc.neutrino.core.web.annotation.RestController;
diff --git a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java
index c0579700..a0aa7f36 100644
--- a/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java
+++ b/neutrino-core/src/test/java/fun/asgc/neutrino/core/bean/test1/Launcher.java
@@ -24,7 +24,7 @@ package fun.asgc.neutrino.core.bean.test1;
 import fun.asgc.neutrino.core.annotation.*;
 import fun.asgc.neutrino.core.base.GlobalConfig;
 import fun.asgc.neutrino.core.bean.BeanMatchMode;
-import fun.asgc.neutrino.core.bean.SimpleBeanFactory;
+import fun.asgc.neutrino.core.bean.factory.SimpleBeanFactory;
 import fun.asgc.neutrino.core.context.NeutrinoLauncher;
 
 import java.util.List;

From 9734e12a8689f22c949ada3535bc2391de033c14 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 16 Sep 2022 19:19:41 +0800
Subject: [PATCH 14/16] =?UTF-8?q?job=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/JobLogMapper.java        |  5 +++++
 .../dal/entity/{JobLog.java => JobLogDO.java} |  2 +-
 .../proxy/server/service/JobLogService.java   | 22 +++++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
 rename neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/{JobLog.java => JobLogDO.java} (98%)

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
index c5f9db0c..2d9e6d5c 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobLogMapper.java
@@ -23,7 +23,10 @@ package fun.asgc.neutrino.proxy.server.dal;
 
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Insert;
 import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
 
 /**
  *
@@ -34,4 +37,6 @@ import fun.asgc.neutrino.core.db.mapper.SqlMapper;
 @Component
 public interface JobLogMapper extends SqlMapper {
 
+    @Insert("insert into job_log(`job_id`,`handler`,`param`,`code`,`msg`,`alarm_status`,`create_time`) values(:jobId,:handler,:param,:code,:msg,:alarmStatus,:createTime)")
+    void add(JobLogDO jobLog);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
similarity index 98%
rename from neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java
rename to neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
index 6880bf14..f54172ab 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLog.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/entity/JobLogDO.java
@@ -38,7 +38,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @Data
 @Table("job_log")
-public class JobLog {
+public class JobLogDO {
 	@Autowired
 	private Integer id;
 	private Integer jobId;
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
index 555387f0..250300ac 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java
@@ -21,11 +21,17 @@
  */
 package fun.asgc.neutrino.proxy.server.service;
 
+import fun.asgc.neutrino.core.annotation.Autowired;
 import fun.asgc.neutrino.core.annotation.Component;
 import fun.asgc.neutrino.core.annotation.NonIntercept;
 import fun.asgc.neutrino.core.quartz.IJobCallback;
 import fun.asgc.neutrino.core.quartz.JobInfo;
+import fun.asgc.neutrino.proxy.server.dal.JobLogMapper;
+import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+
+import java.util.Date;
 
 /**
  *
@@ -36,14 +42,30 @@ import lombok.extern.slf4j.Slf4j;
 @NonIntercept
 @Component
 public class JobLogService implements IJobCallback {
+	@Autowired
+	private JobLogMapper jobLogMapper;
 
 	@Override
 	public void executeLog(JobInfo jobInfo, Throwable throwable) {
+		Integer code = 0;
+		String msg = "";
 		if (null == throwable) {
+			msg = "执行成功";
 			log.info("job[id={},name={}]执行完毕", jobInfo.getId(), jobInfo.getName());
 		} else {
 			log.error("job[id={},name={}]执行异常", jobInfo.getId(), jobInfo.getName(), throwable);
+			msg = "执行异常:\r\n" + ExceptionUtils.getStackTrace(throwable);
+			code = -1;
 		}
+		jobLogMapper.add(new JobLogDO()
+				.setJobId(Integer.valueOf(jobInfo.getId()))
+				.setHandler(jobInfo.getName())
+				.setParam(jobInfo.getParam())
+				.setCode(code)
+				.setMsg(msg)
+				.setAlarmStatus(0)
+				.setCreateTime(new Date())
+		);
 	}
 
 }

From 258fe61c98cd5b02d8043cc62f98e898c19fc468 Mon Sep 17 00:00:00 2001
From: zCans <1224895921@qq.com>
Date: Sat, 17 Sep 2022 20:30:50 +0800
Subject: [PATCH 15/16] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E6=B1=BAsqlMapper?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BANull=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=202=E3=80=81=E5=A2=9E=E5=8A=A0=E8=B0=83=E5=BA=A6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=BC=96=E8=BE=91=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PreparedStatementJdbcCallback.java        |  2 +-
 .../src/views/system/jobManager.vue           |  2 +-
 .../server/controller/JobInfoController.java  | 17 +++--
 .../controller/req/JobInfoUpdateReq.java      | 73 +++++++++++++++++++
 .../proxy/server/dal/JobInfoMapper.java       |  2 +
 .../proxy/server/service/JobInfoService.java  | 26 +++++--
 .../main/resources/mapper/JobInfoMapper.xml   |  8 ++
 7 files changed, 112 insertions(+), 18 deletions(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java
 create mode 100644 neutrino-proxy-server/src/main/resources/mapper/JobInfoMapper.xml

diff --git a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/template/PreparedStatementJdbcCallback.java b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/template/PreparedStatementJdbcCallback.java
index d50c802c..d482dabb 100644
--- a/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/template/PreparedStatementJdbcCallback.java
+++ b/neutrino-core/src/main/java/fun/asgc/neutrino/core/db/template/PreparedStatementJdbcCallback.java
@@ -48,7 +48,7 @@ public abstract class PreparedStatementJdbcCallback<T> implements JdbcCallback<T
 		StringBuffer sb = new StringBuffer();
 		if (ArrayUtil.notEmpty(params)) {
 			for(Object o : params){
-				sb.append(o.toString()).append(",");
+				sb.append(o).append(",");
 			}
 
 			if(sb.length() > 0 && sb.charAt(sb.length() - 1) == ','){
diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue
index e906b7d5..94a4fb53 100644
--- a/neutrino-proxy-admin/src/views/system/jobManager.vue
+++ b/neutrino-proxy-admin/src/views/system/jobManager.vue
@@ -42,7 +42,7 @@
       </el-table-column>
       <el-table-column align="center" :label="$t('table.actions')" width="230" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="primary" @click="handleEditClick(scope.row)" :disabled="scope.row.enable === 1">编辑</el-button>
+          <el-button size="mini" type="primary" @click="handleEditClick(scope.row)">编辑</el-button>
           <el-button size="mini" type="primary" @click="handleExecuteClick(scope.row)">执行</el-button>
           <el-button v-if="scope.row.enable === 1" size="mini" type="danger" @click="handleModifyStatus(scope.row,2)">停止</el-button>
           <el-button v-if="scope.row.enable === 2" size="mini" type="success" @click="handleModifyStatus(scope.row,1)">启动</el-button>
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
index 3e6a79c4..fc219ffe 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/JobInfoController.java
@@ -27,14 +27,8 @@ import fun.asgc.neutrino.core.db.page.Page;
 import fun.asgc.neutrino.core.db.page.PageQuery;
 import fun.asgc.neutrino.core.web.annotation.*;
 import fun.asgc.neutrino.proxy.server.base.rest.annotation.OnlyAdmin;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq;
-import fun.asgc.neutrino.proxy.server.controller.req.PortMappingUpdateEnableStatusReq;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes;
-import fun.asgc.neutrino.proxy.server.controller.res.PortMappingUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.controller.req.*;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.service.JobInfoService;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -76,4 +70,11 @@ public class JobInfoController {
         return jobInfoService.execute(req);
     }
 
+    @PostMapping("update")
+    public JobInfoUpdateRes update(@RequestBody JobInfoUpdateReq req) {
+        ParamCheckUtil.checkNotNull(req, "req");
+
+        return jobInfoService.update(req);
+    }
+
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java
new file mode 100644
index 00000000..4dc91596
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/controller/req/JobInfoUpdateReq.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2022 aoshiguchen
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package fun.asgc.neutrino.proxy.server.controller.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 调度管理更新请求
+ * @author: zCans
+ * @date: 2022/9/17
+ */
+@Data
+public class JobInfoUpdateReq {
+	private Integer id;
+	/**
+	 * 描述
+	 */
+	private String desc;
+	/**
+	 * 处理器
+	 */
+	private String handler;
+	/**
+	 * cron
+	 */
+	private String cron;
+	/**
+	 * 任务参数
+	 */
+	private String param;
+	/**
+	 * 任务报警邮箱
+	 */
+	private String alarmEmail;
+	/**
+	 * 任务报警钉钉
+	 */
+	private String alarmDing;
+	/**
+	 * 启用状态
+	 * {@link fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum}
+	 */
+	private Integer enable;
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+	/**
+	 * 更新时间
+	 */
+	private Date updateTime;
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
index 085424f4..8f164f53 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/JobInfoMapper.java
@@ -58,4 +58,6 @@ public interface JobInfoMapper extends SqlMapper {
     @ResultType(JobInfoDO.class)
     @Select("select * from job_info where enable = 1")
     List<JobInfoDO> findEnableList();
+
+    void update(JobInfoDO jobInfoDO);
 }
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
index d0824bcb..45f3a043 100644
--- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java
@@ -32,16 +32,10 @@ import fun.asgc.neutrino.core.quartz.JobExecutor;
 import fun.asgc.neutrino.core.quartz.JobInfo;
 import fun.asgc.neutrino.core.util.BeanManager;
 import fun.asgc.neutrino.core.util.CollectionUtil;
-import fun.asgc.neutrino.core.util.StringUtil;
-import fun.asgc.neutrino.core.web.annotation.RequestBody;
 import fun.asgc.neutrino.proxy.server.constant.EnableStatusEnum;
 import fun.asgc.neutrino.proxy.server.constant.ExceptionConstant;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoExecuteReq;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoListReq;
-import fun.asgc.neutrino.proxy.server.controller.req.JobInfoUpdateEnableStatusReq;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoExecuteRes;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoListRes;
-import fun.asgc.neutrino.proxy.server.controller.res.JobInfoUpdateEnableStatusRes;
+import fun.asgc.neutrino.proxy.server.controller.req.*;
+import fun.asgc.neutrino.proxy.server.controller.res.*;
 import fun.asgc.neutrino.proxy.server.dal.JobInfoMapper;
 import fun.asgc.neutrino.proxy.server.dal.entity.JobInfoDO;
 import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil;
@@ -111,4 +105,20 @@ public class JobInfoService implements IJobSource {
 
         return jobInfoList;
     }
+
+    public JobInfoUpdateRes update(JobInfoUpdateReq req) {
+        JobInfoDO  jobInfoDO = jobInfoMapper.findById(req.getId());
+        ParamCheckUtil.checkNotNull( jobInfoDO, ExceptionConstant.PORT_MAPPING_NOT_EXIST);
+        JobInfoDO jobInfo = new JobInfoDO();
+        jobInfo.setId(req.getId());
+        jobInfo.setCron(req.getCron());
+        jobInfo.setDesc(req.getDesc());
+        jobInfo.setAlarmEmail(req.getAlarmEmail());
+        jobInfo.setAlarmDing(req.getAlarmDing());
+        jobInfo.setParam(req.getParam());
+        jobInfo.setUpdateTime(new Date());
+
+        jobInfoMapper.update( jobInfo);
+        return new JobInfoUpdateRes();
+    }
 }
diff --git a/neutrino-proxy-server/src/main/resources/mapper/JobInfoMapper.xml b/neutrino-proxy-server/src/main/resources/mapper/JobInfoMapper.xml
new file mode 100644
index 00000000..10bbc771
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/mapper/JobInfoMapper.xml
@@ -0,0 +1,8 @@
+<mapper namespace = "fun.asgc.neutrino.proxy.server.dal.JobInfoMapper">
+
+    <update id="update">
+        update `job_info`
+        set cron = :cron,desc = :desc,alarm_email=:alarmEmail,alarm_ding=:alarmDing,param=:param,update_time=:updateTime
+        where id =:id
+    </update>
+</mapper>

From eeda81804199c1c173c90559cdeb8e56ff08e710 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Sat, 17 Sep 2022 22:09:14 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B8=85=E7=90=86job=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96sql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../proxy/server/dal/DataCleanMapper.java     | 21 +++++++
 .../proxy/server/job/DataCleanJob.java        | 61 +++++++++++++++++++
 .../src/main/resources/sql/job_info.data.sql  |  5 ++
 .../src/main/resources/sql/job_info.sql       |  1 -
 4 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
 create mode 100644 neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
 create mode 100644 neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
 delete mode 100644 neutrino-proxy-server/src/main/resources/sql/job_info.sql

diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
new file mode 100644
index 00000000..87dbc372
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/dal/DataCleanMapper.java
@@ -0,0 +1,21 @@
+package fun.asgc.neutrino.proxy.server.dal;
+
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.aop.Intercept;
+import fun.asgc.neutrino.core.db.annotation.Delete;
+import fun.asgc.neutrino.core.db.mapper.SqlMapper;
+
+import java.util.Date;
+
+/**
+ * @author: aoshiguchen
+ * @date: 2022/9/17
+ */
+@Intercept(ignoreGlobal = true)
+@Component
+public interface DataCleanMapper extends SqlMapper {
+
+    @Delete("delete from `job_log` where create_time < ?")
+    void cleanJobLog(Date date);
+
+}
diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
new file mode 100644
index 00000000..094ab87a
--- /dev/null
+++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/job/DataCleanJob.java
@@ -0,0 +1,61 @@
+package fun.asgc.neutrino.proxy.server.job;
+
+import com.alibaba.fastjson.JSONObject;
+import fun.asgc.neutrino.core.annotation.Autowired;
+import fun.asgc.neutrino.core.annotation.Component;
+import fun.asgc.neutrino.core.annotation.NonIntercept;
+import fun.asgc.neutrino.core.quartz.IJobHandler;
+import fun.asgc.neutrino.core.quartz.annotation.JobHandler;
+import fun.asgc.neutrino.core.util.DateUtil;
+import fun.asgc.neutrino.proxy.server.dal.DataCleanMapper;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 日志清理Job
+ * @author: aoshiguchen
+ * @date: 2022/9/17
+ */
+@Slf4j
+@NonIntercept
+@Component
+@JobHandler(name = "DataCleanJob", cron = "0 0 1 * * ?")
+public class DataCleanJob implements IJobHandler {
+    @Autowired
+    private DataCleanMapper dataCleanMapper;
+    private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+    /**
+     * Job日志保存天数
+     */
+    private static final Integer JOB_LOG_KEEP_DAYS = 7;
+
+    @Override
+    public void execute(String s) throws Exception {
+        JobParams jobParams = getParams(s);
+
+        Date date = DateUtil.addDate(new Date(), Calendar.DATE, jobParams.getJobLogKeepDays());
+        log.info("清理调度管理日志 date:{}", sdf.format(date));
+        dataCleanMapper.cleanJobLog(date);
+    }
+
+    public static JobParams getParams(String s) {
+        try {
+            return JSONObject.parseObject(s, JobParams.class);
+        } catch (Exception e) {
+            // ignore
+        }
+        return new JobParams()
+                .setJobLogKeepDays(JOB_LOG_KEEP_DAYS);
+    }
+
+    @Accessors(chain = true)
+    @Data
+    public static class JobParams {
+        private Integer jobLogKeepDays;
+    }
+}
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
new file mode 100644
index 00000000..cacaf11c
--- /dev/null
+++ b/neutrino-proxy-server/src/main/resources/sql/job_info.data.sql
@@ -0,0 +1,5 @@
+#job_qrtz_trigger_info
+insert into job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) values
+(1, '示例Job', 'DemoJob', '0/10 * * * * ?', '{"a":101}', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
+insert into job_info(`id`, `desc`, `handler`, `cron`, `param`, `enable`, `create_time`, `update_time`) values
+(2, '数据清理任务', 'DataCleanJob', '0 0 1 * * ?', '', 1, STRFTIME('%s000', 'NOW'), STRFTIME('%s000', 'NOW'));
\ No newline at end of file
diff --git a/neutrino-proxy-server/src/main/resources/sql/job_info.sql b/neutrino-proxy-server/src/main/resources/sql/job_info.sql
deleted file mode 100644
index 3517160f..00000000
--- a/neutrino-proxy-server/src/main/resources/sql/job_info.sql
+++ /dev/null
@@ -1 +0,0 @@
-#job_qrtz_trigger_info