From ca472b06c3e7ee03415004caeed3d41029cf2792 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Wed, 18 Nov 2020 22:41:05 +0800
Subject: [PATCH 01/16] upate audit page

---
 web/config/router.config.js              |  6 +-
 web/src/pages/Settings/Security/Audit.js | 79 ++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 5 deletions(-)
 create mode 100644 web/src/pages/Settings/Security/Audit.js

diff --git a/web/config/router.config.js b/web/config/router.config.js
index b82b0695..192177df 100644
--- a/web/config/router.config.js
+++ b/web/config/router.config.js
@@ -265,16 +265,12 @@ export default [
                   path: '/settings/security',
                   name: 'security',
                   component: './Settings/Security/General',
-                }, {
-                  path: '/settings/security/general',
-                  name: 'general',
-                  component: './Forms/BasicForm',
                 },
             ]
           }, {
             path: '/settings/audit',
             name: 'audit',
-            component: './List/TableList',
+            component: './Settings/Security/Audit',
           },
         ]
       },
diff --git a/web/src/pages/Settings/Security/Audit.js b/web/src/pages/Settings/Security/Audit.js
new file mode 100644
index 00000000..230c8f6f
--- /dev/null
+++ b/web/src/pages/Settings/Security/Audit.js
@@ -0,0 +1,79 @@
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+@Form.create()
+class Audit extends Component {
+
+    componentDidMount() {
+    }
+
+    auditTable() {
+        const columns = [
+            {
+                title: 'ID',
+                dataIndex: 'key',
+                key: 'key',
+                render: text => <a>{text}</a>,
+            },
+            {
+                title: '用户名',
+                dataIndex: 'username',
+                key: 'username',
+            },
+            {
+                title: '消息日志',
+                dataIndex: 'message',
+                key: 'message',
+            }, {
+                title: '时间',
+                key: 'time',
+                dataIndex: 'time',
+            },
+            {
+                title: '操作',
+                key: 'action',
+                render: (text, record) => (
+                    <span>
+                        <a>详情</a>
+                    </span>
+                ),
+            },
+        ];
+
+        const data = [
+            {
+                key: '1',
+                username: 'admin',
+                enabled: true,
+                message: "User Login Success",
+                time: "Oct 19, 2019",
+
+            }, {
+                key: '2',
+                username: 'user',
+                enabled: true,
+                message: "User Login Failed",
+                time: "Oct 19, 2019",
+            },
+        ];
+        return (<Table columns={columns} dataSource={data} />);
+    }
+
+    render() {
+        return (
+            < Fragment >
+                < Card>{ this.auditTable() }</Card>
+            </Fragment>
+        );
+    }
+}
+
+export default Audit;

From 5ff01f8e12a3e985ba3e74aa3a8979b36d6f339f Mon Sep 17 00:00:00 2001
From: chenhua <huachen_1@tujia.com>
Date: Thu, 19 Nov 2020 00:05:12 +0800
Subject: [PATCH 02/16] #search manage  keyword modify

---
 web/src/pages/SearchManage/dict/Common.js     | 621 +++++++++---------
 .../pages/SearchManage/dict/Professional.js   | 246 ++++---
 2 files changed, 417 insertions(+), 450 deletions(-)

diff --git a/web/src/pages/SearchManage/dict/Common.js b/web/src/pages/SearchManage/dict/Common.js
index 530ea6b5..e56bd3c3 100644
--- a/web/src/pages/SearchManage/dict/Common.js
+++ b/web/src/pages/SearchManage/dict/Common.js
@@ -1,15 +1,20 @@
 import React, { PureComponent, Fragment } from 'react';
 import { connect } from 'dva';
 import {
-  Row,
-  Col,
-  Card,
-  Form,
-  Input,
-  Button,
-  Modal,
-  message,
-  Divider,
+Row,
+Col,
+Card,
+Form,
+Input,
+Button,
+Modal,
+message,
+Divider,
+Icon,
+DatePicker,
+TimePicker,
+Select,
+Popover,
 } from 'antd';
 import StandardTable from '@/components/StandardTable';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
@@ -18,413 +23,401 @@ import styles from '../../List/TableList.less';
 
 const FormItem = Form.Item;
 const { TextArea } = Input;
+const fieldLabels = {
+keyword_type: '关键词分类'
+
+};
+
 
 const CreateForm = Form.create()(props => {
-  const { modalVisible, form, handleAdd, handleModalVisible } = props;
-  const okHandle = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleAdd(fieldsValue);
-    });
-  };
-  return (
-    <Modal
-      destroyOnClose
-      title="新建模板"
-      visible={modalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板名称">
-        {form.getFieldDecorator('name', {
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板设置">
-        {form.getFieldDecorator('settings', {
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
+    const { modalVisible, form, handleAdd, handleModalVisible } = props;
+    const okHandle = () => {
+        form.validateFields((err, fieldsValue) => {
+            if (err) return;
+            form.resetFields();
+            handleAdd(fieldsValue);
+        });
+    };
+    return (
+        <Modal
+    destroyOnClose
+    title="新建模板"
+    visible={modalVisible}
+    width={640}
+    onOk={okHandle}
+    onCancel={() => handleModalVisible()}>
+    <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
+            {form.getFieldDecorator('name', {
+                rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
+            })(<Input placeholder="请输入关键词" />)}
+    </FormItem>
+    <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }}  label='关键词分类'>
+    {form.getFieldDecorator('keyword_type', {
+        rules: [{ required: true, message: '请选择关键词类型' }],
+    })(
+    <Select labelCol={{ span: 5 }} wrapperCol={{ span: 15 }}  placeholder="请选择关键词类型">
+        <Option value="keyun">敏感词</Option>
+        <Option value="huoyun">提示词</Option>
+        <Option value="xianlu1">同义词</Option>
+        <Option value="xianlu2">过滤词</Option>
+        <Option value="xianlu3">停用词</Option>
+        <Option value="xianlu4">保留词</Option>
+        <Option value="xianlu5">纠错词</Option>
+        <Option value="xianlu6">相关搜索</Option>
+        <Option value="xianlu7">热点词管理</Option>
+     </Select>
+    )}
+    </Form.Item>
     </Modal>
-  );
+);
 });
 
 const UpdateForm = Form.create()(props => {
-  const { updateModalVisible, handleUpdateModalVisible, handleUpdate,values,form } = props;
+const { updateModalVisible, handleUpdateModalVisible, handleUpdate,values,form } = props;
 
-  const okHandle = () => {
+const okHandle = () => {
     form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleUpdate(fieldsValue);
+        if (err) return;
+        form.resetFields();
+        handleUpdate(fieldsValue);
     });
-  };
-  
-  return (
-    <Modal
-      destroyOnClose
-      title="模板设置"
-      visible={updateModalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleUpdateModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板名称">
-        {form.getFieldDecorator('name', {
-          initialValue: values.name,
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
+};
+
+return (
+    <Modal destroyOnClose title="新增关键词" visible={updateModalVisible} width={640} onOk={okHandle}
+      onCancel={() => handleUpdateModalVisible()}>
+
+      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
+          {form.getFieldDecorator('keyword', {
+              initialValue: values.nakeywordme,
+              rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
+          })(<Input placeholder="请输入关键词" />)}
       </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板设置">
-        {form.getFieldDecorator('settings', {
-          initialValue: values.processors,
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
-    </Modal>
-  );
-});
+
+        <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label={fieldLabels.keyword_type}>
+        {form.getFieldDecorator('keyword_type', {
+            rules: [{ required: true, message: '请选择关键词类型' }],
+        })(
+        <Select placeholder="请选择关键词类型">
+            <Option value="keyun">敏感词</Option>
+            <Option value="huoyun">提示词</Option>
+            <Option value="xianlu">同义词</Option>
+            <Option value="xianlu">过滤词</Option>
+            <Option value="xianlu">停用词</Option>
+            <Option value="xianlu">保留词</Option>
+            <Option value="xianlu">纠错词</Option>
+            <Option value="xianlu">相关搜索</Option>
+            <Option value="xianlu">热点词管理</Option>
+            </Select>
+        )}
+      </Form.Item>
+      </Modal>
+      );
+      });
 
 /* eslint react/no-multi-comp:0 */
 @connect(({ pipeline, loading }) => ({
-  pipeline,
-  loading: loading.models.pipeline,
+    pipeline,
+    loading: loading.models.pipeline,
 }))
 @Form.create()
 class Common extends PureComponent {
-  state = {
-    modalVisible: false,
-    updateModalVisible: false,
-    expandForm: false,
-    selectedRows: [],
-    formValues: {},
-    updateFormValues: {},
-  };
-  //index template detail example
-  // {
-  //   ".ml-state" : {
-  //     "order" : 0,
-  //     "version" : 7090199,
-  //     "index_patterns" : [
-  //       ".ml-state*"
-  //     ],
-  //     "settings" : {
-  //       "index" : {
-  //         "hidden" : "true",
-  //         "lifecycle" : {
-  //           "name" : "ml-size-based-ilm-policy",
-  //           "rollover_alias" : ".ml-state-write"
-  //         },
-  //         "auto_expand_replicas" : "0-1"
-  //       }
-  //     },
-  //     "mappings" : {
-  //       "_meta" : {
-  //         "version" : "7090199"
-  //       },
-  //       "enabled" : false
-  //     },
-  //     "aliases" : { }
-  //   }
-  // }
-  datasource = `
-  [
-    {
-      "name" : "filebeat-7.9.1",
-      "index_patterns" : "[filebeat-7.9.1-*]",
-      "order" : "1",
-      "version" : null,
-      "composed_of" : ""
-    },
-    {
-      "name" : "apm-7.9.1-span",
-      "index_patterns" : "[apm-7.9.1-span*]",
-      "order" : "2",
-      "version" : null,
-      "composed_of" : ""
-    },
-    {
-      "name" : ".lists-default",
-      "index_patterns" : "[.lists-default-*]",
-      "order" : "0",
-      "version" : null,
-      "composed_of" : ""
-    },
-    {
-      "name" : ".monitoring-es",
-      "index_patterns" : "[.monitoring-es-7-*]",
-      "order" : "0",
-      "version" : "7000199",
-      "composed_of" : ""
-    },
-    {
-      "name" : ".monitoring-beats",
-      "index_patterns" : "[.monitoring-beats-7-*]",
-      "order" : "0",
-      "version" : "7000199",
-      "composed_of" : ""
-    }]`;
+    state = {
+        modalVisible: false,
+        updateModalVisible: false,
+        expandForm: false,
+        selectedRows: [],
+        formValues: {},
+        updateFormValues: {},
+    };
+    datasource = `
+          [
+          {
+          "keyword" : "验收标准",
+          "type" : "停用词"
+          },
+          {
+          "keyword" : "桥梁施工技术规范",
+          "type" : "停用词"
+          },{
+          "keyword" : "路规",
+          "type" : "停用词"
+          },{
+          "keyword" : "遂规",
+          "type" : "热点词"
+          },
+          {
+          "keyword" : "铁路技术管理规则",
+          "type" : "热点词"
+          },{
+          "keyword" : "行车组织规则",
+          "type" : "热点词"
+          },
+          {
+          "keyword" : "铁路交通事故调查处理规则",
+          "type" : "热点词"
+          }]`;
 
-  columns = [
-    {
-      title: '模板名称',
-      dataIndex: 'name',
-    },
-    {
-      title: '模式',
-      dataIndex: 'index_patterns',
-    },
-    {
-      title: 'order',
-      dataIndex: 'order'
-    },
-    {
-      title: '版本',
-      dataIndex: 'version'
-    },
-    {
-      title: '操作',
-      render: (text, record) => (
-        <Fragment>
-          <a onClick={() => this.handleUpdateModalVisible(true, record)}>设置</a>
-          <Divider type="vertical" />
-          <a onClick={() => {
-            this.state.selectedRows.push(record);
-            this.handleDeleteClick();
-          }}>删除</a>
-        </Fragment>
-      ),
-    },
-  ];
+    columns = [
+        {
+            title: '关键词名称',
+            dataIndex: 'keyword',
+        },
+        {
+            title: '关键词分类',
+            dataIndex: 'type',
+        },
+        {
+            title: '操作',
+            render: (text, record) => (
+                <Fragment>
+                <a onClick={() => this.handleUpdateModalVisible(true, record)}>修改</a>
+<Divider type="vertical" />
+    <a onClick={() => {
+    this.state.selectedRows.push(record);
+    this.handleDeleteClick();
+}}>删除</a>
+</Fragment>
+),
+},
+];
 
-  componentDidMount() {
+componentDidMount() {
     const { dispatch } = this.props;
     // dispatch({
     //   type: 'pipeline/fetch',
     // });
-  }
+}
 
-  handleStandardTableChange = (pagination, filtersArg, sorter) => {
+handleStandardTableChange = (pagination, filtersArg, sorter) => {
     const { dispatch } = this.props;
     const { formValues } = this.state;
 
     const filters = Object.keys(filtersArg).reduce((obj, key) => {
-      const newObj = { ...obj };
-      newObj[key] = getValue(filtersArg[key]);
-      return newObj;
+        const newObj = { ...obj };
+        newObj[key] = getValue(filtersArg[key]);
+        return newObj;
     }, {});
 
     const params = {
-      currentPage: pagination.current,
-      pageSize: pagination.pageSize,
-      ...formValues,
-      ...filters,
+        currentPage: pagination.current,
+        pageSize: pagination.pageSize,
+        ...formValues,
+        ...filters,
     };
     if (sorter.field) {
-      params.sorter = `${sorter.field}_${sorter.order}`;
+        params.sorter = `${sorter.field}_${sorter.order}`;
     }
 
     dispatch({
-      type: 'pipeline/fetch',
-      payload: params,
+        type: 'pipeline/fetch',
+        payload: params,
     });
-  };
+};
 
-  handleFormReset = () => {
+handleFormReset = () => {
     const { form, dispatch } = this.props;
     form.resetFields();
     this.setState({
-      formValues: {},
+        formValues: {},
     });
     dispatch({
-      type: 'pipeline/fetch',
-      payload: {},
+        type: 'pipeline/fetch',
+        payload: {},
     });
-  };
+};
 
-  handleDeleteClick = e => {
+handleDeleteClick = e => {
     const { dispatch } = this.props;
     const { selectedRows } = this.state;
 
     if (!selectedRows) return;
-        dispatch({
-          type: 'pipeline/delete',
-          payload: {
+    dispatch({
+        type: 'pipeline/delete',
+        payload: {
             key: selectedRows.map(row => row.name),
-          },
-          callback: () => {
+        },
+        callback: () => {
             this.setState({
-              selectedRows: [],
+                selectedRows: [],
             });
-          },
-        });
-  };
-
-  handleSelectRows = rows => {
-    this.setState({
-      selectedRows: rows,
+        },
     });
-  };
+};
 
-  handleSearch = e => {
+handleSelectRows = rows => {
+    this.setState({
+        selectedRows: rows,
+    });
+};
+
+handleSearch = e => {
     e.preventDefault();
 
     const { dispatch, form } = this.props;
 
     form.validateFields((err, fieldsValue) => {
-      if (err) return;
+        if (err) return;
 
-      const values = {
-        ...fieldsValue,
-        updatedAt: fieldsValue.updatedAt && fieldsValue.updatedAt.valueOf(),
-      };
+        const values = {
+            ...fieldsValue,
+            updatedAt: fieldsValue.updatedAt && fieldsValue.updatedAt.valueOf(),
+        };
 
-      this.setState({
-        formValues: values,
-      });
+        this.setState({
+            formValues: values,
+        });
 
-      dispatch({
-        type: 'rule/fetch',
-        payload: values,
-      });
+        dispatch({
+            type: 'rule/fetch',
+            payload: values,
+        });
     });
-  };
+};
 
-  handleModalVisible = flag => {
+handleModalVisible = flag => {
     this.setState({
-      modalVisible: !!flag,
+        modalVisible: !!flag,
     });
-  };
+};
 
-  handleUpdateModalVisible = (flag, record) => {
+handleUpdateModalVisible = (flag, record) => {
     this.setState({
-      updateModalVisible: !!flag,
-      updateFormValues: record || {},
+        updateModalVisible: !!flag,
+        updateFormValues: record || {},
     });
-  };
+};
 
-  handleAdd = fields => {
+handleAdd = fields => {
     const { dispatch } = this.props;
     dispatch({
-      type: 'pipeline/add',
-      payload: {
-        name: fields.name,
-        desc: fields.desc,
-        processors: fields.processors,
-      },
+        type: 'pipeline/add',
+        payload: {
+            name: fields.name,
+            desc: fields.desc,
+            processors: fields.processors,
+        },
     });
 
     message.success('添加成功');
     this.handleModalVisible();
-  };
+};
 
-  handleUpdate = fields => {
+handleUpdate = fields => {
     const { dispatch } = this.props;
     dispatch({
-      type: 'pipeline/update',
-      payload: {
-        name: fields.name,
-        desc: fields.desc,
-        processors: fields.processors,
-      },
+        type: 'pipeline/update',
+        payload: {
+            name: fields.name,
+            desc: fields.desc,
+            processors: fields.processors,
+        },
     });
 
     message.success('修改成功');
     this.handleUpdateModalVisible();
-  };
+};
 
-  renderSimpleForm() {
+renderSimpleForm() {
     const {
-      form: { getFieldDecorator },
+        form: { getFieldDecorator },
     } = this.props;
     return (
-      <Form onSubmit={this.handleSearch} layout="inline">
+        <Form onSubmit={this.handleSearch} layout="inline">
         <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
-          <Col md={8} sm={24}>
-            <FormItem label="模板名称">
-              {getFieldDecorator('name')(<Input placeholder="请输入" />)}
-            </FormItem>
-          </Col>
-          <Col md={8} sm={24}>
-            <span className={styles.submitButtons}>
-              <Button type="primary" htmlType="submit">
+        <Col lg={6} md={12} sm={24}>
+                <Form.Item label={fieldLabels.keyword_type}>
+            {getFieldDecorator('keyword_type', {
+                rules: [{ required: true, message: '请选择关键词类型' }],
+            })(
+            <Select placeholder="请选择关键词类型">
+                <Option value="keyun">敏感词</Option>
+                <Option value="huoyun">提示词</Option>
+                <Option value="xianlu">同义词</Option>
+                <Option value="xianlu">过滤词</Option>
+                <Option value="xianlu">停用词</Option>
+                <Option value="xianlu">保留词</Option>
+                <Option value="xianlu">纠错词</Option>
+                <Option value="xianlu">相关搜索</Option>
+                <Option value="xianlu">热点词管理</Option>
+                </Select>
+            )}
+        </Form.Item>
+            </Col>
+            <Col md={8} sm={24}>
+                <FormItem label="关键词">
+                {getFieldDecorator('name')(<Input placeholder="请输入关键词" />)}
+        </FormItem>
+            </Col>
+            <Col md={8} sm={24}>
+                <span className={styles.submitButtons}>
+        <Button type="primary" htmlType="submit">
                 查询
-              </Button>
-              <Button style={{ marginLeft: 8 }} onClick={this.handleFormReset}>
-                重置
-              </Button>
-            </span>
-          </Col>
-        </Row>
-      </Form>
-    );
-  }
+                </Button>
+                <Button style={{ marginLeft: 8 }} onClick={this.handleFormReset}>
+            重置
+            </Button>
+    </span>
+    </Col>
+    </Row>
+    </Form>
+);
+}
 
-  renderForm() {
+renderForm() {
     return this.renderSimpleForm();
-  }
+}
 
-  render() {
+render() {
     const data = {
-      list: JSON.parse(this.datasource),
-      pagination: {
-        pageSize: 5,
-      },
+        list: JSON.parse(this.datasource),
+        pagination: {
+            pageSize: 5,
+        },
     };
     const { selectedRows, modalVisible, updateModalVisible, updateFormValues } = this.state;
     const parentMethods = {
-      handleAdd: this.handleAdd,
-      handleModalVisible: this.handleModalVisible,
+        handleAdd: this.handleAdd,
+        handleModalVisible: this.handleModalVisible,
     };
     const updateMethods = {
-      handleUpdateModalVisible: this.handleUpdateModalVisible,
-      handleUpdate: this.handleUpdate,
+        handleUpdateModalVisible: this.handleUpdateModalVisible,
+        handleUpdate: this.handleUpdate,
     };
     return (
-      <Fragment>
+        <Fragment>
         <Card bordered={false}>
-          <div className={styles.tableList}>
-            <div className={styles.tableListForm}>{this.renderForm()}</div>
+        <div className={styles.tableList}>
+        <div className={styles.tableListForm}>{this.renderForm()}</div>
             <div className={styles.tableListOperator}>
-              <Button icon="plus" type="primary" onClick={() => this.handleModalVisible(true)}>
-                新建
-              </Button>
-              {selectedRows.length > 0 && (
-                <span>
-                  <Button onClick={() => this.handleDeleteClick()}>删除</Button>
-                </span>
-              )}
-            </div>
+        <Button icon="plus" type="primary" onClick={() => this.handleModalVisible(true)}>
+            新增关键词
+            </Button>
+            {selectedRows.length > 0 && (
+            <span>
+            <Button onClick={() => this.handleDeleteClick()}>删除</Button>
+            </span>
+            )}
+        </div>
             <StandardTable
-              selectedRows={selectedRows}
-              data={data}
-              columns={this.columns}
-              onSelectRow={this.handleSelectRows}
-              onChange={this.handleStandardTableChange}
+            selectedRows={selectedRows}
+            data={data}
+            columns={this.columns}
+            onSelectRow={this.handleSelectRows}
+            onChange={this.handleStandardTableChange}
             />
-          </div>
-        </Card>
-        <CreateForm {...parentMethods} modalVisible={modalVisible} />
-        {updateFormValues && Object.keys(updateFormValues).length ? (
-          <UpdateForm
-            {...updateMethods}
-            updateModalVisible={updateModalVisible}
-            values={updateFormValues}
-          />
-        ) : null}
-      </Fragment>
-    );
-  }
+            </div>
+            </Card>
+            <CreateForm {...parentMethods} modalVisible={modalVisible} />
+            {updateFormValues && Object.keys(updateFormValues).length ? (
+                <UpdateForm
+                {...updateMethods}
+                updateModalVisible={updateModalVisible}
+                values={updateFormValues}
+                />
+            ) : null}
+        </Fragment>
+        );
+    }
 }
-
 export default Common;
diff --git a/web/src/pages/SearchManage/dict/Professional.js b/web/src/pages/SearchManage/dict/Professional.js
index 8be3b880..a9583997 100644
--- a/web/src/pages/SearchManage/dict/Professional.js
+++ b/web/src/pages/SearchManage/dict/Professional.js
@@ -10,6 +10,11 @@ import {
   Modal,
   message,
   Divider,
+  Icon,
+  DatePicker,
+  TimePicker,
+  Select,
+  Popover,
 } from 'antd';
 import StandardTable from '@/components/StandardTable';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
@@ -18,81 +23,82 @@ import styles from '../../List/TableList.less';
 
 const FormItem = Form.Item;
 const { TextArea } = Input;
+const fieldLabels = {
+    keyword_type: '关键词分类'
 
+};
 const CreateForm = Form.create()(props => {
-  const { modalVisible, form, handleAdd, handleModalVisible } = props;
-  const okHandle = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleAdd(fieldsValue);
-    });
-  };
-  return (
-    <Modal
-      destroyOnClose
-      title="新建模板"
-      visible={modalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板名称">
+    const { modalVisible, form, handleAdd, handleModalVisible } = props;
+    const okHandle = () => {
+        form.validateFields((err, fieldsValue) => {
+            if (err) return;
+            form.resetFields();
+            handleAdd(fieldsValue);
+        });
+    };
+    return (
+        <Modal
+    destroyOnClose
+    title="新建模板"
+    visible={modalVisible}
+    width={640}
+    onOk={okHandle}
+    onCancel={() => handleModalVisible()}>
+<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
         {form.getFieldDecorator('name', {
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板设置">
-        {form.getFieldDecorator('settings', {
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
+            rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
+        })(<Input placeholder="请输入关键词" />)}
+</FormItem>
+    <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }}  label='关键词分类'>
+        {form.getFieldDecorator('keyword_type', {
+            rules: [{ required: true, message: '请选择关键词类型' }],
+        })(
+        <Select placeholder="请选择关键词类型">
+        <Option value="keyun">客运</Option>
+        <Option value="huoyun">货运</Option>
+        <Option value="xianlu">线路</Option>
+        </Select>
+)}
+</Form.Item>
     </Modal>
-  );
+);
 });
 
 const UpdateForm = Form.create()(props => {
-  const { updateModalVisible, handleUpdateModalVisible, handleUpdate,values,form } = props;
+    const { updateModalVisible, handleUpdateModalVisible, handleUpdate,values,form } = props;
 
-  const okHandle = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleUpdate(fieldsValue);
-    });
-  };
-  
-  return (
-    <Modal
-      destroyOnClose
-      title="模板设置"
-      visible={updateModalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleUpdateModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板名称">
-        {form.getFieldDecorator('name', {
-          initialValue: values.name,
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板设置">
-        {form.getFieldDecorator('settings', {
-          initialValue: values.processors,
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
+    const okHandle = () => {
+        form.validateFields((err, fieldsValue) => {
+            if (err) return;
+            form.resetFields();
+            handleUpdate(fieldsValue);
+        });
+    };
+
+    return (
+        <Modal destroyOnClose title="新增关键词" visible={updateModalVisible} width={640} onOk={okHandle}
+    onCancel={() => handleUpdateModalVisible()}>
+
+<FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
+        {form.getFieldDecorator('keyword', {
+            initialValue: values.nakeywordme,
+            rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
+        })(<Input placeholder="请输入关键词" />)}
+</FormItem>
+
+    <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label={fieldLabels.keyword_type}>
+    {form.getFieldDecorator('keyword_type', {
+        rules: [{ required: true, message: '请选择关键词类型' }],
+    })(
+    <Select placeholder="请选择关键词类型">
+        <Option value="keyun">客运</Option>
+        <Option value="huoyun">货运</Option>
+        <Option value="xianlu">线路</Option>
+        </Select>
+    )}
+</Form.Item>
     </Modal>
-  );
+);
 });
 
 /* eslint react/no-multi-comp:0 */
@@ -110,93 +116,48 @@ class Professional extends PureComponent {
     formValues: {},
     updateFormValues: {},
   };
-  //index template detail example
-  // {
-  //   ".ml-state" : {
-  //     "order" : 0,
-  //     "version" : 7090199,
-  //     "index_patterns" : [
-  //       ".ml-state*"
-  //     ],
-  //     "settings" : {
-  //       "index" : {
-  //         "hidden" : "true",
-  //         "lifecycle" : {
-  //           "name" : "ml-size-based-ilm-policy",
-  //           "rollover_alias" : ".ml-state-write"
-  //         },
-  //         "auto_expand_replicas" : "0-1"
-  //       }
-  //     },
-  //     "mappings" : {
-  //       "_meta" : {
-  //         "version" : "7090199"
-  //       },
-  //       "enabled" : false
-  //     },
-  //     "aliases" : { }
-  //   }
-  // }
   datasource = `
   [
     {
-      "name" : "filebeat-7.9.1",
-      "index_patterns" : "[filebeat-7.9.1-*]",
-      "order" : "1",
-      "version" : null,
-      "composed_of" : ""
+      "keyword" : "验收标准",
+      "type" : "客运"
     },
     {
-      "name" : "apm-7.9.1-span",
-      "index_patterns" : "[apm-7.9.1-span*]",
-      "order" : "2",
-      "version" : null,
-      "composed_of" : ""
+      "keyword" : "桥梁施工技术规范",
+      "type" : "客运"
+    },{
+      "keyword" : "路规",
+      "type" : "客运"
+    },{
+      "keyword" : "遂规",
+      "type" : "客运"
     },
     {
-      "name" : ".lists-default",
-      "index_patterns" : "[.lists-default-*]",
-      "order" : "0",
-      "version" : null,
-      "composed_of" : ""
+      "keyword" : "铁路技术管理规则",
+      "type" : "客运"
+    },{
+      "keyword" : "行车组织规则",
+      "type" : "客运"
     },
     {
-      "name" : ".monitoring-es",
-      "index_patterns" : "[.monitoring-es-7-*]",
-      "order" : "0",
-      "version" : "7000199",
-      "composed_of" : ""
-    },
-    {
-      "name" : ".monitoring-beats",
-      "index_patterns" : "[.monitoring-beats-7-*]",
-      "order" : "0",
-      "version" : "7000199",
-      "composed_of" : ""
+      "keyword" : "铁路交通事故调查处理规则",
+      "type" : "客运"
     }]`;
 
   columns = [
     {
-      title: '模板名称',
-      dataIndex: 'name',
+      title: '关键词名称',
+      dataIndex: 'keyword',
     },
     {
-      title: '模式',
-      dataIndex: 'index_patterns',
-    },
-    {
-      title: 'order',
-      dataIndex: 'order'
-    },
-    {
-      title: '版本',
-      dataIndex: 'version'
+      title: '关键词分类',
+      dataIndex: 'type',
     },
     {
       title: '操作',
       render: (text, record) => (
         <Fragment>
-          <a onClick={() => this.handleUpdateModalVisible(true, record)}>设置</a>
+          <a onClick={() => this.handleUpdateModalVisible(true, record)}>修改</a>
           <Divider type="vertical" />
           <a onClick={() => {
             this.state.selectedRows.push(record);
@@ -350,9 +311,22 @@ class Professional extends PureComponent {
     return (
       <Form onSubmit={this.handleSearch} layout="inline">
         <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
+          <Col lg={6} md={12} sm={24}>
+                  <Form.Item label={fieldLabels.keyword_type}>
+              {getFieldDecorator('keyword_type', {
+                  rules: [{ required: true, message: '请选择关键词类型' }],
+              })(
+                 <Select placeholder="请选择关键词类型">
+                  <Option value="keyun">客运</Option>
+                  <Option value="huoyun">货运</Option>
+                  <Option value="xianlu">线路</Option>
+                  </Select>
+              )}
+          </Form.Item>
+              </Col>
           <Col md={8} sm={24}>
-            <FormItem label="模板名称">
-              {getFieldDecorator('name')(<Input placeholder="请输入" />)}
+            <FormItem label="关键词">
+              {getFieldDecorator('name')(<Input placeholder="请输入关键词" />)}
             </FormItem>
           </Col>
           <Col md={8} sm={24}>
@@ -397,7 +371,7 @@ class Professional extends PureComponent {
             <div className={styles.tableListForm}>{this.renderForm()}</div>
             <div className={styles.tableListOperator}>
               <Button icon="plus" type="primary" onClick={() => this.handleModalVisible(true)}>
-                新建
+                新增关键词
               </Button>
               {selectedRows.length > 0 && (
                 <span>

From d56a58b8aeee43d4eabc92bcc96829ec7fa07993 Mon Sep 17 00:00:00 2001
From: chenhua <huachen_1@tujia.com>
Date: Thu, 19 Nov 2020 00:17:14 +0800
Subject: [PATCH 03/16] #search manage  keyword modify

---
 web/src/pages/SearchManage/dict/Common.js       | 2 +-
 web/src/pages/SearchManage/dict/Professional.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/pages/SearchManage/dict/Common.js b/web/src/pages/SearchManage/dict/Common.js
index e56bd3c3..c2857b5e 100644
--- a/web/src/pages/SearchManage/dict/Common.js
+++ b/web/src/pages/SearchManage/dict/Common.js
@@ -89,7 +89,7 @@ return (
 
       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
           {form.getFieldDecorator('keyword', {
-              initialValue: values.nakeywordme,
+              initialValue: values.keyword,
               rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
           })(<Input placeholder="请输入关键词" />)}
       </FormItem>
diff --git a/web/src/pages/SearchManage/dict/Professional.js b/web/src/pages/SearchManage/dict/Professional.js
index a9583997..20dafe7b 100644
--- a/web/src/pages/SearchManage/dict/Professional.js
+++ b/web/src/pages/SearchManage/dict/Professional.js
@@ -81,7 +81,7 @@ const UpdateForm = Form.create()(props => {
 
 <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="关键词">
         {form.getFieldDecorator('keyword', {
-            initialValue: values.nakeywordme,
+            initialValue: values.keyword,
             rules: [{ required: true, message: '请输入至少一个字符的名称！', min: 1 }],
         })(<Input placeholder="请输入关键词" />)}
 </FormItem>

From 5cb525b13701fba078b289acc9beec030072aaa5 Mon Sep 17 00:00:00 2001
From: chenhua <huachen_1@tujia.com>
Date: Thu, 19 Nov 2020 00:28:32 +0800
Subject: [PATCH 04/16] #search manage  keyword modify

---
 web/src/pages/SearchManage/dict/Common.js     | 22 +++++++++++------
 .../pages/SearchManage/dict/Professional.js   | 24 ++++++++++++-------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/web/src/pages/SearchManage/dict/Common.js b/web/src/pages/SearchManage/dict/Common.js
index c2857b5e..cfb54e0a 100644
--- a/web/src/pages/SearchManage/dict/Common.js
+++ b/web/src/pages/SearchManage/dict/Common.js
@@ -96,6 +96,7 @@ return (
 
         <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label={fieldLabels.keyword_type}>
         {form.getFieldDecorator('keyword_type', {
+            initialValue: values.value,
             rules: [{ required: true, message: '请选择关键词类型' }],
         })(
         <Select placeholder="请选择关键词类型">
@@ -134,28 +135,35 @@ class Common extends PureComponent {
           [
           {
           "keyword" : "验收标准",
-          "type" : "停用词"
+          "type" : "停用词",
+          "value": "keyun"
           },
           {
           "keyword" : "桥梁施工技术规范",
-          "type" : "停用词"
+          "type" : "停用词",
+          "value": "keyun"
           },{
           "keyword" : "路规",
-          "type" : "停用词"
+          "type" : "停用词",
+          "value": "keyun"
           },{
           "keyword" : "遂规",
-          "type" : "热点词"
+          "type" : "热点词",
+          "value": "keyun"
           },
           {
           "keyword" : "铁路技术管理规则",
-          "type" : "热点词"
+          "type" : "热点词",
+          "value": "keyun"
           },{
           "keyword" : "行车组织规则",
-          "type" : "热点词"
+          "type" : "热点词",
+          "value": "keyun"
           },
           {
           "keyword" : "铁路交通事故调查处理规则",
-          "type" : "热点词"
+          "type" : "热点词",
+          "value": "keyun"
           }]`;
 
     columns = [
diff --git a/web/src/pages/SearchManage/dict/Professional.js b/web/src/pages/SearchManage/dict/Professional.js
index 20dafe7b..f8f20c6c 100644
--- a/web/src/pages/SearchManage/dict/Professional.js
+++ b/web/src/pages/SearchManage/dict/Professional.js
@@ -88,6 +88,7 @@ const UpdateForm = Form.create()(props => {
 
     <Form.Item labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label={fieldLabels.keyword_type}>
     {form.getFieldDecorator('keyword_type', {
+        initialValue: values.value,
         rules: [{ required: true, message: '请选择关键词类型' }],
     })(
     <Select placeholder="请选择关键词类型">
@@ -96,7 +97,7 @@ const UpdateForm = Form.create()(props => {
         <Option value="xianlu">线路</Option>
         </Select>
     )}
-</Form.Item>
+    </Form.Item>
     </Modal>
 );
 });
@@ -120,28 +121,35 @@ class Professional extends PureComponent {
   [
     {
       "keyword" : "验收标准",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },
     {
       "keyword" : "桥梁施工技术规范",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },{
       "keyword" : "路规",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },{
       "keyword" : "遂规",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },
     {
       "keyword" : "铁路技术管理规则",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },{
       "keyword" : "行车组织规则",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     },
     {
       "keyword" : "铁路交通事故调查处理规则",
-      "type" : "客运"
+      "type" : "客运",
+      "value": "keyun"
     }]`;
 
   columns = [

From 6699f6e75e703a28f3d352d389d2725a6c078094 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 19:37:33 +0800
Subject: [PATCH 05/16] update license

---
 LICENSE | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/LICENSE b/LICENSE
index d5bfd919..04544e21 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,21 @@
-End-User License Agreement (EULA) of INFINI LOGGING CENTER
+End-User License Agreement (EULA) of INFINI SOFTWARE
 
 This End-User License Agreement ("EULA") is a legal agreement between you and HUNAN INFINI TECHNOLOGY CO,LTD
 
-This EULA agreement governs your acquisition and use of our INFINI LOGGING CENTER software ("Software") directly from HUNAN INFINI TECHNOLOGY CO,LTD or indirectly through a HUNAN INFINI TECHNOLOGY CO,LTD authorized reseller or distributor (a "Reseller").
+This EULA agreement governs your acquisition and use of our INFINI software ("Software") directly from HUNAN INFINI TECHNOLOGY CO,LTD or indirectly through a HUNAN INFINI TECHNOLOGY CO,LTD authorized reseller or distributor (a "Reseller").
 
-Please read this EULA agreement carefully before completing the installation process and using the INFINI LOGGING CENTER software. It provides a license to use the INFINI LOGGING CENTER software and contains warranty information and liability disclaimers.
+Please read this EULA agreement carefully before completing the installation process and using the INFINI software. It provides a license to use the INFINI LOGGING CENTER software and contains warranty information and liability disclaimers.
 
-If you register for a free trial of the INFINI LOGGING CENTER software, this EULA agreement will also govern that trial. By clicking "accept" or installing and/or using the INFINI LOGGING CENTER software, you are confirming your acceptance of the Software and agreeing to become bound by the terms of this EULA agreement.
+If you register for a free trial of the INFINI software, this EULA agreement will also govern that trial. By clicking "accept" or installing and/or using the INFINI LOGGING CENTER software, you are confirming your acceptance of the Software and agreeing to become bound by the terms of this EULA agreement.
 
 If you are entering into this EULA agreement on behalf of a company or other legal entity, you represent that you have the authority to bind such entity and its affiliates to these terms and conditions. If you do not have such authority or if you do not agree with the terms and conditions of this EULA agreement, do not install or use the Software, and you must not accept this EULA agreement.
 
 This EULA agreement shall apply only to the Software supplied by HUNAN INFINI TECHNOLOGY CO,LTD herewith regardless of whether other software is referred to or described herein. The terms also apply to any HUNAN INFINI TECHNOLOGY CO,LTD updates, supplements, Internet-based services, and support services for the Software, unless other terms accompany those items on delivery. If so, those terms apply.
 
 License Grant
-HUNAN INFINI TECHNOLOGY CO,LTD hereby grants you a personal, non-transferable, non-exclusive licence to use the INFINI LOGGING CENTER software on your devices in accordance with the terms of this EULA agreement.
+HUNAN INFINI TECHNOLOGY CO,LTD hereby grants you a personal, non-transferable, non-exclusive licence to use the INFINI software on your devices in accordance with the terms of this EULA agreement.
 
-You are permitted to load the INFINI LOGGING CENTER software (for example a PC, laptop, mobile or tablet) under your control. You are responsible for ensuring your device meets the minimum requirements of the INFINI LOGGING CENTER software.
+You are permitted to load the INFINI software (for example a PC, laptop, mobile or tablet) under your control. You are responsible for ensuring your device meets the minimum requirements of the INFINI LOGGING CENTER software.
 
 You are not permitted to:
 
@@ -35,4 +35,4 @@ This EULA agreement is effective from the date you first use the Software and sh
 It will also terminate immediately if you fail to comply with any term of this EULA agreement. Upon such termination, the licenses granted by this EULA agreement will immediately terminate and you agree to stop all access and use of the Software. The provisions that by their nature continue and survive will survive any termination of this EULA agreement.
 
 Governing Law
-This EULA agreement, and any dispute arising out of or in connection with this EULA agreement, shall be governed by and construed in accordance with the laws of cn.
\ No newline at end of file
+This EULA agreement, and any dispute arising out of or in connection with this EULA agreement, shall be governed by and construed in accordance with the laws of cn.

From 94237bf06bde14773792fc282bff3df0669945a6 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 19:38:00 +0800
Subject: [PATCH 06/16] fix app

---
 main.go           | 23 ++++++++++-------------
 search-center.yml | 19 ++++++++++++++++++-
 ui.go             |  4 ++--
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/main.go b/main.go
index 737d3a6f..8b1c6221 100644
--- a/main.go
+++ b/main.go
@@ -15,19 +15,16 @@ var appUI *UI
 
 func main() {
 
-	terminalHeader := ("   __ _  __ ____ __ _  __ __       \n")
-	terminalHeader += ("  / // |/ // __// // |/ // /       \n")
-	terminalHeader += (" / // || // _/ / // || // /        \n")
-	terminalHeader += ("/_//_/|_//_/  /_//_/|_//_/         \n")
-	terminalHeader += ("   __   _    __   __   __ _  __  __\n")
-	terminalHeader += ("  / / ,' \\ ,'_/ ,'_/  / // |/ /,'_/\n")
-	terminalHeader += (" / /_/ o |/ /_n/ /_n / // || // /_n\n")
-	terminalHeader += ("/___/|_,' |__,'|__,'/_//_/|_/ |__,'\n")
-	terminalHeader += ("   __  ___  _  __ _____ ___  ___   \n")
-	terminalHeader += (" ,'_/ / _/ / |/ //_  _// _/ / o |  \n")
-	terminalHeader += ("/ /_ / _/ / || /  / / / _/ /  ,'   \n")
-	terminalHeader += ("|__//___//_/|_/  /_/ /___//_/`_\\   \n")
-	terminalHeader += ("                                   \n")
+	terminalHeader := ("                                       .__     \n")
+	terminalHeader += ("  ______  ____  _____  _______   ____  |  |__  \n")
+	terminalHeader += (" /  ___/_/ __ \\ \\__  \\ \\_  __ \\_/ ___\\ |  |  \\ \n")
+	terminalHeader += (" \\___ \\ \\  ___/  / __ \\_|  | \\/\\  \\___ |   Y  \\ \n")
+	terminalHeader += ("/____  > \\___  >(____  /___|    \\___  >|___|  /\n")
+	terminalHeader += ("  ____/  ____\\/  ____\\_/  |_   ____ _______ \\/ \n")
+	terminalHeader += ("_/ ___\\_/ __ \\  /    \\\\   __\\_/ __ \\\\_  __ \\   \n")
+	terminalHeader += ("\\  \\___\\  ___/ |   |  \\|  |  \\  ___/ |  | \\/   \n")
+	terminalHeader += (" \\___  >\\___  >|___|  /|__|   \\___  >|__|      \n")
+	terminalHeader += ("     \\/     \\/      \\/            \\/           \n")
 
 	terminalFooter := ("   __ _  __ ____ __ _  __ __    __ _____ __                         \n")
 	terminalFooter += ("  / // |/ // __// // |/ // /   / //_  _//  \\                        \n")
diff --git a/search-center.yml b/search-center.yml
index d0e77c7f..e026a2d9 100644
--- a/search-center.yml
+++ b/search-center.yml
@@ -1,13 +1,30 @@
 elasticsearch:
   - name: default
     enabled: true
-    endpoint: https://192.168.3.98:9200
+    endpoint: http://localhost:9200
     index_prefix: infini-
     basic_auth:
       username: elastic
       password: 13A1EcwWs1He6w3BXHuJ
 
+web:
+  enabled: true
+  ui:
+    enabled: true
+    path: .public
+    vfs: true
+    local: true
+  network:
+    binding: 127.0.0.1:2900
+    skip_occupied_port: true
+
 modules:
+  - name: elastic
+    elasticsearch: default
+    enabled: true
+    indexer_enabled: false
+    store_enabled: false
+    orm_enabled: false
   - name: web
     enabled: true
     network:
diff --git a/ui.go b/ui.go
index 9f2c7d13..7d6b5f32 100644
--- a/ui.go
+++ b/ui.go
@@ -8,7 +8,7 @@ import (
 	"infini.sh/framework/core/util"
 	"infini.sh/framework/core/vfs"
 	"infini.sh/search-center/.public"
-	"infini.sh/search-center/api/index_management"
+	uiapi "infini.sh/search-center/api"
 	"infini.sh/search-center/config"
 	"net/http"
 )
@@ -24,7 +24,7 @@ func (h UI) InitUI() {
 
 	ui.HandleUI("/", vfs.FileServer(vfs.VFS()))
 
-	index_management.Init()
+	uiapi.Init()
 
 	ui.HandleUIFunc("/api/", func(w http.ResponseWriter, req *http.Request) {
 		log.Warn("api: ",req.URL," not implemented")

From e333e08410f790a1bcb505b63148d02f151c9a22 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 19:38:38 +0800
Subject: [PATCH 07/16] fix site name in top layout

---
 web/src/components/TopNavHeader/index.js | 3 ++-
 web/src/locales/en-US.js                 | 5 ++---
 web/src/locales/zh-CN.js                 | 2 +-
 web/src/pages/document.ejs               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/src/components/TopNavHeader/index.js b/web/src/components/TopNavHeader/index.js
index e89dbd61..ed1da50b 100644
--- a/web/src/components/TopNavHeader/index.js
+++ b/web/src/components/TopNavHeader/index.js
@@ -3,6 +3,7 @@ import Link from 'umi/link';
 import RightContent from '../GlobalHeader/RightContent';
 import BaseMenu from '../SiderMenu/BaseMenu';
 import styles from './index.less';
+import { formatMessage, FormattedMessage } from 'umi/locale';
 
 export default class TopNavHeader extends PureComponent {
   state = {
@@ -30,7 +31,7 @@ export default class TopNavHeader extends PureComponent {
             <div className={styles.logo} key="logo" id="logo">
               <Link to="/">
                 <img src={logo} alt="logo" />
-                <h1>Logging Center</h1>
+                <h1>{formatMessage({ id: 'app.setting.appname' })}</h1>
               </Link>
             </div>
             <div
diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index eb964182..31fb5a03 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -3,6 +3,8 @@ export default {
 
   'layout.user.appname':"INFINI SEARCH CENTER",
   'layout.user.appslogon':"INFINI search center is the best search platform in the world",
+  'app.setting.appname':"Search Center",
+
 
   'layout.user.link.help': 'Help',
   'layout.user.link.privacy': 'Privacy',
@@ -202,9 +204,6 @@ export default {
   'app.monitor.popular-searches': 'Popular Searches',
   'app.monitor.resource-surplus': 'Resource Surplus',
   'app.monitor.fund-surplus': 'Fund Surplus',
-  
-  'app.setting.appname':"Search Center",
-
 
   'app.settings.security.update':"Update Setting",
   'app.settings.global.update':"Update Setting",
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index e19bc5cf..f36f37ac 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -3,6 +3,7 @@ export default {
   
   'layout.user.appname':"极限搜索管理后台",
   'layout.user.appslogon':"极限科技的搜索平台是东半球最好用的搜索服务平台",
+  'app.setting.appname':"极限搜索中心",
 
   'layout.user.link.help': '帮助',
   'layout.user.link.privacy': '隐私',
@@ -212,7 +213,6 @@ export default {
   'app.monitor.resource-surplus': '资源剩余',
   'app.monitor.fund-surplus': '补贴资金剩余',
   
-  'app.setting.appname':"极限搜索中心",
 
   'app.settings.security.update':"更新设置",
   'app.settings.global.update':"更新设置",
diff --git a/web/src/pages/document.ejs b/web/src/pages/document.ejs
index c5992413..1c9434f5 100644
--- a/web/src/pages/document.ejs
+++ b/web/src/pages/document.ejs
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>INFINI</title>
-  <link rel="icon" href="/public/favicon.ico" type="image/x-icon">
+  <link rel="icon" href="/favicon.ico" type="image/x-icon">
   <script src="https://gw.alipayobjects.com/os/antv/pkg/_antv.data-set-0.9.6/dist/data-set.min.js"></script>
 </head>
 <body>

From b4109f6cd934255af9e680603bfcf820b94d09b5 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 19:51:51 +0800
Subject: [PATCH 08/16] improve site name style

---
 web/src/components/SiderMenu/index.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/SiderMenu/index.less b/web/src/components/SiderMenu/index.less
index 082b445d..58d3fb02 100644
--- a/web/src/components/SiderMenu/index.less
+++ b/web/src/components/SiderMenu/index.less
@@ -21,7 +21,7 @@
     display: inline-block;
     vertical-align: middle;
     font-size: 20px;
-    margin: 3px 0 0 12px;
+    margin: 6px 0 0 12px;
     font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
     font-weight: 600;
   }

From dee9cef08652beb73c81cafb1ae17b4513d57e28 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 20:46:04 +0800
Subject: [PATCH 09/16] re-layout log pages

---
 web/config/router.config.js              | 30 ++++++++-
 web/src/locales/en-US.js                 |  6 +-
 web/src/locales/zh-CN.js                 |  6 +-
 web/src/pages/Settings/Logs/Audit.js     | 74 ++++++++++++++++++++++
 web/src/pages/Settings/Logs/Base.js      | 73 ++++++++++++++++++++++
 web/src/pages/Settings/Logs/Overview.js  | 26 ++++++++
 web/src/pages/Settings/Security/Audit.js | 79 ------------------------
 7 files changed, 210 insertions(+), 84 deletions(-)
 create mode 100644 web/src/pages/Settings/Logs/Audit.js
 create mode 100644 web/src/pages/Settings/Logs/Base.js
 create mode 100644 web/src/pages/Settings/Logs/Overview.js
 delete mode 100644 web/src/pages/Settings/Security/Audit.js

diff --git a/web/config/router.config.js b/web/config/router.config.js
index 192177df..542bcea3 100644
--- a/web/config/router.config.js
+++ b/web/config/router.config.js
@@ -268,9 +268,33 @@ export default [
                 },
             ]
           }, {
-            path: '/settings/audit',
-            name: 'audit',
-            component: './Settings/Security/Audit',
+            path: '/settings/logs',
+            name: 'logs',
+            component: './Settings/Logs/Base',
+            hideChildrenInMenu: true,
+            routes: [
+            {
+                path: '/settings/logs',
+                redirect: '/settings/logs/overview',
+            },
+            {
+                path: '/settings/logs/overview',
+                name: 'overview',
+                component: './Settings/Logs/Overview',
+            }, {
+                path: '/settings/logs/audit',
+                name: 'audit',
+                component: './Settings/Logs/Audit',
+            }, {
+                path: '/settings/logs/query',
+                name: 'query',
+                component: './Settings/Logs/Audit',
+            }, {
+                path: '/settings/logs/slow',
+                name: 'slow',
+                component: './Settings/Logs/Audit',
+            },
+            ]
           },
         ]
       },
diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index 31fb5a03..9d7e8ac3 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -100,7 +100,11 @@ export default {
   'menu.settings': 'SETTINGS',
   'menu.settings.global': 'GLOBAL',
   'menu.settings.security': 'SECURITY',
-  'menu.settings.audit': 'AUDIT',
+  'menu.settings.logs': 'LOGS',
+  'menu.settings.logs.overview': 'OVERVIEW',
+  'menu.settings.logs.audit': 'AUDIT',
+  'menu.settings.logs.query': 'QUERY',
+  'menu.settings.logs.slow': 'SLOW',
 
 
   'menu.form': 'Form',
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index f36f37ac..9c164870 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -108,7 +108,11 @@ export default {
   'menu.settings.global': '全局设置',
   'menu.settings.security': '安全设置',
   'menu.settings.authorization': '授权管理',
-  'menu.settings.audit': '审计日志',
+  'menu.settings.logs': '系统日志',
+  'menu.settings.logs.overview': '日志概要',
+  'menu.settings.logs.audit': '审计日志',
+  'menu.settings.logs.query': '查询日志',
+  'menu.settings.logs.slow': '慢日志',
 
 
   'menu.form': '表单页',
diff --git a/web/src/pages/Settings/Logs/Audit.js b/web/src/pages/Settings/Logs/Audit.js
new file mode 100644
index 00000000..2202238d
--- /dev/null
+++ b/web/src/pages/Settings/Logs/Audit.js
@@ -0,0 +1,74 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+const columns = [
+    {
+        title: 'ID',
+        dataIndex: 'key',
+        key: 'key',
+        render: text => <a>{text}</a>,
+    },
+    {
+        title: '用户名',
+        dataIndex: 'username',
+        key: 'username',
+    },
+    {
+        title: '消息日志',
+        dataIndex: 'message',
+        key: 'message',
+    }, {
+        title: '时间',
+        key: 'time',
+        dataIndex: 'time',
+    },
+    {
+        title: '操作',
+        key: 'action',
+        render: (text, record) => (
+            <span>
+                        <a>详情</a>
+                    </span>
+        ),
+    },
+];
+
+const data = [
+    {
+        key: '1',
+        username: 'admin',
+        enabled: true,
+        message: "User Login Success",
+        time: "Oct 19, 2019",
+
+    }, {
+        key: '2',
+        username: 'user',
+        enabled: true,
+        message: "User Login Failed",
+        time: "Oct 19, 2019",
+    },
+];
+
+@connect()
+class Audit extends Component {
+
+    render() {
+        return (
+            <Card><Table columns={columns} dataSource={data} /></Card>
+        );
+    }
+}
+
+export default Audit;
diff --git a/web/src/pages/Settings/Logs/Base.js b/web/src/pages/Settings/Logs/Base.js
new file mode 100644
index 00000000..04bb98e3
--- /dev/null
+++ b/web/src/pages/Settings/Logs/Base.js
@@ -0,0 +1,73 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+
+@connect()
+class Overview extends Component {
+    handleTabChange = key => {
+        const { match,children } = this.props;
+        switch (key) {
+            case 'overview':
+                router.push(`${match.url}/overview`);
+                break;
+            case 'audit':
+                router.push(`${match.url}/audit`);
+                break;
+            case 'query':
+                router.push(`${match.url}/query`);
+                break;
+            case 'slow':
+                router.push(`${match.url}/slow`);
+                break;
+            default:
+                break;
+        }
+    }
+
+    render() {
+        const tabList = [
+            {
+                key: 'overview',
+                tab: '日志概要',
+            },
+            {
+                key: 'audit',
+                tab: '审计日志',
+            },
+            {
+                key: 'query',
+                tab: '查询日志',
+            },
+            {
+                key: 'slow',
+                tab: '慢日志',
+            }
+        ];
+
+        const { match, children, location } = this.props;
+
+        return (
+            <PageHeaderWrapper
+                tabList={tabList}
+                tabActiveKey={location.pathname.replace(`${match.path}/`, '')}
+                onTabChange={this.handleTabChange}
+            >
+                {children}
+            </PageHeaderWrapper>
+        );
+    }
+}
+
+export default Overview;
diff --git a/web/src/pages/Settings/Logs/Overview.js b/web/src/pages/Settings/Logs/Overview.js
new file mode 100644
index 00000000..3e4f2960
--- /dev/null
+++ b/web/src/pages/Settings/Logs/Overview.js
@@ -0,0 +1,26 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+@connect()
+class Overview extends Component {
+
+    render() {
+        return (
+            <Card>Overview</Card>
+        );
+    }
+}
+
+export default Overview;
diff --git a/web/src/pages/Settings/Security/Audit.js b/web/src/pages/Settings/Security/Audit.js
deleted file mode 100644
index 230c8f6f..00000000
--- a/web/src/pages/Settings/Security/Audit.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, {Component, Fragment} from 'react';
-
-import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
-import {formatMessage} from 'umi/locale';
-
-const {Option} = Select;
-
-const FormItem = Form.Item;
-const {TextArea} = Input;
-
-
-@Form.create()
-class Audit extends Component {
-
-    componentDidMount() {
-    }
-
-    auditTable() {
-        const columns = [
-            {
-                title: 'ID',
-                dataIndex: 'key',
-                key: 'key',
-                render: text => <a>{text}</a>,
-            },
-            {
-                title: '用户名',
-                dataIndex: 'username',
-                key: 'username',
-            },
-            {
-                title: '消息日志',
-                dataIndex: 'message',
-                key: 'message',
-            }, {
-                title: '时间',
-                key: 'time',
-                dataIndex: 'time',
-            },
-            {
-                title: '操作',
-                key: 'action',
-                render: (text, record) => (
-                    <span>
-                        <a>详情</a>
-                    </span>
-                ),
-            },
-        ];
-
-        const data = [
-            {
-                key: '1',
-                username: 'admin',
-                enabled: true,
-                message: "User Login Success",
-                time: "Oct 19, 2019",
-
-            }, {
-                key: '2',
-                username: 'user',
-                enabled: true,
-                message: "User Login Failed",
-                time: "Oct 19, 2019",
-            },
-        ];
-        return (<Table columns={columns} dataSource={data} />);
-    }
-
-    render() {
-        return (
-            < Fragment >
-                < Card>{ this.auditTable() }</Card>
-            </Fragment>
-        );
-    }
-}
-
-export default Audit;

From 5cc41c39b6bc3e6136d7ee8bc3436b204a2eb407 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 21:27:46 +0800
Subject: [PATCH 10/16] update security pages

---
 web/config/router.config.js                |  27 +-
 web/src/pages/Settings/Logs/Base.js        |   4 +-
 web/src/pages/Settings/Security/Base.js    |  80 +++++
 web/src/pages/Settings/Security/Certs.js   |  26 ++
 web/src/pages/Settings/Security/General.js | 345 ++++-----------------
 web/src/pages/Settings/Security/Roles.js   |  26 ++
 web/src/pages/Settings/Security/SSO.js     |  87 ++++++
 web/src/pages/Settings/Security/Users.js   | 102 ++++++
 8 files changed, 411 insertions(+), 286 deletions(-)
 create mode 100644 web/src/pages/Settings/Security/Base.js
 create mode 100644 web/src/pages/Settings/Security/Certs.js
 create mode 100644 web/src/pages/Settings/Security/Roles.js
 create mode 100644 web/src/pages/Settings/Security/SSO.js
 create mode 100644 web/src/pages/Settings/Security/Users.js

diff --git a/web/config/router.config.js b/web/config/router.config.js
index 542bcea3..cf86246a 100644
--- a/web/config/router.config.js
+++ b/web/config/router.config.js
@@ -259,12 +259,33 @@ export default [
           }, {
             path: '/settings/security',
             name: 'security',
+            component: './Settings/Security/Base',
             hideChildrenInMenu: true,
             routes: [
                 {
-                  path: '/settings/security',
-                  name: 'security',
-                  component: './Settings/Security/General',
+                    path: '/settings/security',
+                    redirect: '/settings/security/general',
+                },
+                {
+                    path: '/settings/security/general',
+                    name: 'general',
+                    component: './Settings/Security/General',
+                }, {
+                    path: '/settings/security/sso',
+                    name: 'sso',
+                    component: './Settings/Security/SSO',
+                }, {
+                    path: '/settings/security/roles',
+                    name: 'roles',
+                    component: './Settings/Security/Roles',
+                }, {
+                    path: '/settings/security/users',
+                    name: 'users',
+                    component: './Settings/Security/Users',
+                }, {
+                    path: '/settings/security/certs',
+                    name: 'certs',
+                    component: './Settings/Security/Certs',
                 },
             ]
           }, {
diff --git a/web/src/pages/Settings/Logs/Base.js b/web/src/pages/Settings/Logs/Base.js
index 04bb98e3..95634eda 100644
--- a/web/src/pages/Settings/Logs/Base.js
+++ b/web/src/pages/Settings/Logs/Base.js
@@ -15,7 +15,7 @@ const {TextArea} = Input;
 
 
 @connect()
-class Overview extends Component {
+class Base extends Component {
     handleTabChange = key => {
         const { match,children } = this.props;
         switch (key) {
@@ -70,4 +70,4 @@ class Overview extends Component {
     }
 }
 
-export default Overview;
+export default Base;
diff --git a/web/src/pages/Settings/Security/Base.js b/web/src/pages/Settings/Security/Base.js
new file mode 100644
index 00000000..b324a3af
--- /dev/null
+++ b/web/src/pages/Settings/Security/Base.js
@@ -0,0 +1,80 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+
+@connect()
+class Base extends Component {
+    handleTabChange = key => {
+        const { match,children } = this.props;
+        switch (key) {
+            case 'general':
+                router.push(`${match.url}/general`);
+                break;
+            case 'sso':
+                router.push(`${match.url}/sso`);
+                break;
+            case 'roles':
+                router.push(`${match.url}/roles`);
+                break;
+            case 'users':
+                router.push(`${match.url}/users`);
+                break;
+            case 'certs':
+                router.push(`${match.url}/certs`);
+                break;
+            default:
+                break;
+        }
+    }
+
+    render() {
+        const tabList = [
+            {
+                key: 'general',
+                tab: '基础设置',
+            },
+            {
+                key: 'sso',
+                tab: '单点登录',
+            },
+            {
+                key: 'roles',
+                tab: '角色管理',
+            },
+            {
+                key: 'users',
+                tab: '用户管理',
+            },
+            {
+                key: 'certs',
+                tab: '证书管理',
+            }
+        ];
+
+        const { match, children, location } = this.props;
+
+        return (
+            <PageHeaderWrapper
+                tabList={tabList}
+                tabActiveKey={location.pathname.replace(`${match.path}/`, '')}
+                onTabChange={this.handleTabChange}
+            >
+                {children}
+            </PageHeaderWrapper>
+        );
+    }
+}
+
+export default Base;
diff --git a/web/src/pages/Settings/Security/Certs.js b/web/src/pages/Settings/Security/Certs.js
new file mode 100644
index 00000000..1684430d
--- /dev/null
+++ b/web/src/pages/Settings/Security/Certs.js
@@ -0,0 +1,26 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+@connect()
+class Certs extends Component {
+
+    render() {
+        return (
+            <Card>Certs</Card>
+        );
+    }
+}
+
+export default Certs;
diff --git a/web/src/pages/Settings/Security/General.js b/web/src/pages/Settings/Security/General.js
index 5840d66e..c197db46 100644
--- a/web/src/pages/Settings/Security/General.js
+++ b/web/src/pages/Settings/Security/General.js
@@ -1,305 +1,88 @@
+import {formatMessage, FormattedMessage} from 'umi/locale';
+
 import React, {Component, Fragment} from 'react';
 import {connect} from 'dva';
-import {Card, Form, Input, Select,Switch, Button, message, Divider, Drawer, Descriptions} from 'antd';
+import {Card, Form, Input, Select,Switch, Button,Row, message,Col, Divider, Drawer, Descriptions} from 'antd';
 import { Table, Tag } from 'antd';
 import { Icon } from 'antd';
 
-const {Option} = Select;
-import {formatMessage, FormattedMessage} from 'umi/locale';
+import router from 'umi/router';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
 import styles from './General.less';
-import PhoneView from "../../Account/Settings/PhoneView";
+
+
+const {Option} = Select;
 
 const FormItem = Form.Item;
 const {TextArea} = Input;
-import {Row, Col} from 'antd';
 
-const operationTabList = [
-    {
-        key: 'tab1',
-        tab: '基本设置',
-    },
-    {
-        key: 'tab2',
-        tab: 'SSO 集成',
-    },
-    {
-        key: 'tab3',
-        tab: '角色管理',
-    },
-    {
-        key: 'tab4',
-        tab: '用户管理',
-    },
-    {
-        key: 'tab5',
-        tab: '证书管理',
-    }
-];
-
-// @connect(({logstash,loading }) => ({
-//     data: logstash.logstash,
-//     loading: loading.models.logstash,
-//     submitting: loading.effects['logstash/submitLogstashConfig'],
-// }))
-
-@Form.create()
+@connect()
 class General extends Component {
-    state = {
-        operationkey: 'tab1',
-        snapshotVisible: false,
-        repVisible: false,
-    };
 
-    componentDidMount() {
-        // message.loading('数据加载中..', 'initdata');
-        // const { dispatch } = this.props;
-        // dispatch({
-        //   type: 'logstash/queryInitialLogstashConfig',
-        // });
-    }
-
-    onOperationTabChange = key => {
-        this.setState({operationkey: key});
-    };
-
-    ssoSettings() {
-        const columns = [
-            {
-                title: 'ID',
-                dataIndex: 'key',
-                key: 'key',
-                render: text => <a>{text}</a>,
-            },
-            {
-                title: '名称',
-                dataIndex: 'name',
-                key: 'name',
-            },
-            {
-                title: '类型',
-                dataIndex: 'type',
-                key: 'type',
-            },
-            {
-                title: '启用',
-                key: 'enabled',
-                dataIndex: 'enabled',
-                render: text => <Icon type="check-square" />,
-            }, {
-                title: '最后更新时间',
-                key: 'modify_time',
-                dataIndex: 'modify_time',
-            }, {
-                title: '创建时间',
-                key: 'create_time',
-                dataIndex: 'create_time',
-            },
-            {
-                title: '操作',
-                key: 'action',
-                render: (text, record) => (
-                    <span>
-        <a>修改</a>
-        <Divider type="vertical" />
-        <a>删除</a>
-      </span>
-                ),
-            },
-        ];
-
-        const data = [
-            {
-                key: '1',
-                name: 'github',
-                type: "OAuth2",
-                enabled: true,
-                modify_time: "Mar 01, 2020",
-                create_time: "Oct 19, 2019",
-            },{
-                key: '2',
-                name: 'okta',
-                type: "OAuth2",
-                enabled: true,
-                modify_time: "Mar 02, 2020",
-                create_time: "Oct 29, 2019",
-            },
-        ];
-        return (<Table columns={columns} dataSource={data} />);
-    }
-
-    userSettings() {
-        const columns = [
-            {
-                title: 'ID',
-                dataIndex: 'key',
-                key: 'key',
-                render: text => <a>{text}</a>,
-            },
-            {
-                title: '用户名',
-                dataIndex: 'user_name',
-                key: 'user_name',
-            },
-            {
-                title: '电子邮件地址',
-                dataIndex: 'email',
-                key: 'email',
-            },
-            {
-                title: '已激活',
-                key: 'enabled',
-                dataIndex: 'enabled',
-                render: text => <Icon type="check-square" />,
-            }, {
-                title: '管理员',
-                key: 'is_admin',
-                dataIndex: 'is_admin',
-                render: (text, record) => {
-                    if (record.is_admin){
-                        return <Icon type="check-square" />
-                    }else{
-                        return <Icon type="border" />
-                    }
-                },
-            }, {
-                title: '创建时间',
-                key: 'create_time',
-                dataIndex: 'create_time',
-            },{
-                title: '上次登录',
-                key: 'last_login_time',
-                dataIndex: 'last_login_time',
-            },
-            {
-                title: '操作',
-                key: 'action',
-                render: (text, record) => (
-                    <span>
-        <a>修改</a>
-        <Divider type="vertical" />
-        <a>删除</a>
-      </span>
-                ),
-            },
-        ];
-
-        const data = [
-            {
-                key: '1',
-                user_name: 'admin',
-                email: "admin@infini.ltd",
-                enabled: true,
-                is_admin: true,
-                create_time: "Oct 19, 2019",
-                last_login_time: "Mar 01, 2020",
-
-            }, {
-                key: '2',
-                user_name: 'user',
-                email: "user@infini.ltd",
-                enabled: true,
-                is_admin: false,
-                create_time: "Oct 19, 2019",
-                last_login_time: "Mar 01, 2020",
-
-            },
-        ];
-        return (<Table columns={columns} dataSource={data} />);
-    }
-
-    generalSettings = () => {
+    render() {
         const {
             form: {getFieldDecorator},
         } = this.props;
+
         return (
-            < div >
-            < Row
-        type = "flex"
-        justify = "end" >
-            < Col
-        span = {16} >
-            < div > < Form
-        layout = "vertical"
-        hideRequiredMark >
+            <Card>
+                <div>
+                <Row
+                    type = "flex"
+                    justify = "end" >
+                    <Col
+                        span = {16} >
+                        <div>
+                            <Form layout = "vertical"
+                                  hideRequiredMark >
 
 
-        <Form.Item label = {formatMessage({id: 'app.settings.security.auth2factor_enabled'})}>
-            {getFieldDecorator('auth2factor_enabled', {
-                initialValue: true,
-                rules: [
-                    {
-                        required: true,
-                        message: formatMessage({id: 'app.settings.security.auth2factor_enabled-message'}, {}),
-                    },
-                ],
-            })(
-                <Switch defaultChecked onChange={()=>{}} />
-            )}
-        </Form.Item>
+                                <Form.Item label = {formatMessage({id: 'app.settings.security.auth2factor_enabled'})}>
+                                    {getFieldDecorator('auth2factor_enabled', {
+                                        initialValue: true,
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.security.auth2factor_enabled-message'}, {}),
+                                            },
+                                        ],
+                                    })(
+                                        <Switch defaultChecked onChange={()=>{}} />
+                                    )}
+                                </Form.Item>
 
-        < FormItem
-        label = {formatMessage({id: 'app.settings.security.audit_enabled'})} >
-            {getFieldDecorator('audit_enabled',
-        {
-            rules: [
-                {
-                    required: true,
-                    message: formatMessage({id: 'app.settings.security.audit_enabled-message'}, {}),
-                },
-            ],
-        }
-    )
-            (
-                <Switch defaultChecked onChange={()=>{}} />
-            )
-    }
-    </FormItem>
+                                <FormItem label = {formatMessage({id: 'app.settings.security.audit_enabled'})} >
+                                    {getFieldDecorator('audit_enabled',
+                                        {
+                                            rules: [
+                                                {
+                                                    required: true,
+                                                    message: formatMessage({id: 'app.settings.security.audit_enabled-message'}, {}),
+                                                },
+                                            ],
+                                        }
+                                    )
+                                    (
+                                        <Switch defaultChecked onChange={()=>{}} />
+                                    )
+                                    }
+                                </FormItem>
 
 
-        < Button
-        type = "primary" >
-            < FormattedMessage
-        id = "app.settings.security.update"
-        defaultMessage = "Update Setting"
-            / >
-            < /Button>
-            < /Form></
-        div >
-        < /Col>
-        < Col
-        span = {8} >
-
-            < /Col>
-            < /Row>
-            < /div>
-    )
-        ;
-    };
-
-    render() {
-        const {operationkey} = this.state;
-        const contentList = {
-            tab1: ( < div > {this.generalSettings()} < /div>),
-            tab2: ( < div > {this.ssoSettings()}< /div>),
-        tab3: ( < div > 角色管理 < /div>),
-        tab4: ( < div > {this.userSettings()} < /div>),
-        tab5: ( < div > 证书管理 < /div>),
-    }
-        ;
-        return (
-            < Fragment >
-            < Card
-        className = {styles.tabsCard}
-        bordered = {false}
-        tabList = {operationTabList}
-        onTabChange = {this.onOperationTabChange}
-            >
-            {contentList[operationkey]}
-            < /Card>
-            < /Fragment>
-    )
-        ;
+                                <Button
+                                    type = "primary" >
+                                    <FormattedMessage
+                                        id = "app.settings.security.update"
+                                        defaultMessage = "Update Setting" />
+                                </Button>
+                            </Form>
+                        </div>
+                    </Col>
+                    <Col span = {8} ></Col>
+                </Row>
+            </div></Card>
+        );
     }
 }
 
-export default General;
+export default Form.create()(General);
diff --git a/web/src/pages/Settings/Security/Roles.js b/web/src/pages/Settings/Security/Roles.js
new file mode 100644
index 00000000..77a287e4
--- /dev/null
+++ b/web/src/pages/Settings/Security/Roles.js
@@ -0,0 +1,26 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+@connect()
+class Roles extends Component {
+
+    render() {
+        return (
+            <Card>Roles</Card>
+        );
+    }
+}
+
+export default Roles;
diff --git a/web/src/pages/Settings/Security/SSO.js b/web/src/pages/Settings/Security/SSO.js
new file mode 100644
index 00000000..08102f2e
--- /dev/null
+++ b/web/src/pages/Settings/Security/SSO.js
@@ -0,0 +1,87 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+const columns = [
+    {
+        title: 'ID',
+        dataIndex: 'key',
+        key: 'key',
+        render: text => <a>{text}</a>,
+    },
+    {
+        title: '名称',
+        dataIndex: 'name',
+        key: 'name',
+    },
+    {
+        title: '类型',
+        dataIndex: 'type',
+        key: 'type',
+    },
+    {
+        title: '启用',
+        key: 'enabled',
+        dataIndex: 'enabled',
+        render: text => <Icon type="check-square" />,
+    }, {
+        title: '最后更新时间',
+        key: 'modify_time',
+        dataIndex: 'modify_time',
+    }, {
+        title: '创建时间',
+        key: 'create_time',
+        dataIndex: 'create_time',
+    },
+    {
+        title: '操作',
+        key: 'action',
+        render: (text, record) => (
+            <span>
+        <a>修改</a>
+        <Divider type="vertical" />
+        <a>删除</a>
+      </span>
+        ),
+    },
+];
+
+const data = [
+    {
+        key: '1',
+        name: 'github',
+        type: "OAuth2",
+        enabled: true,
+        modify_time: "Mar 01, 2020",
+        create_time: "Oct 19, 2019",
+    },{
+        key: '2',
+        name: 'okta',
+        type: "OAuth2",
+        enabled: true,
+        modify_time: "Mar 02, 2020",
+        create_time: "Oct 29, 2019",
+    },
+];
+
+@connect()
+class SSO extends Component {
+
+    render() {
+        return (
+            <Card><Table columns={columns} dataSource={data} /></Card>
+        );
+    }
+}
+
+export default SSO;
diff --git a/web/src/pages/Settings/Security/Users.js b/web/src/pages/Settings/Security/Users.js
new file mode 100644
index 00000000..a4951bfd
--- /dev/null
+++ b/web/src/pages/Settings/Security/Users.js
@@ -0,0 +1,102 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+const columns = [
+    {
+        title: 'ID',
+        dataIndex: 'key',
+        key: 'key',
+        render: text => <a>{text}</a>,
+    },
+    {
+        title: '用户名',
+        dataIndex: 'user_name',
+        key: 'user_name',
+    },
+    {
+        title: '电子邮件地址',
+        dataIndex: 'email',
+        key: 'email',
+    },
+    {
+        title: '已激活',
+        key: 'enabled',
+        dataIndex: 'enabled',
+        render: text => <Icon type="check-square" />,
+    }, {
+        title: '管理员',
+        key: 'is_admin',
+        dataIndex: 'is_admin',
+        render: (text, record) => {
+            if (record.is_admin){
+                return <Icon type="check-square" />
+            }else{
+                return <Icon type="border" />
+            }
+        },
+    }, {
+        title: '创建时间',
+        key: 'create_time',
+        dataIndex: 'create_time',
+    },{
+        title: '上次登录',
+        key: 'last_login_time',
+        dataIndex: 'last_login_time',
+    },
+    {
+        title: '操作',
+        key: 'action',
+        render: (text, record) => (
+            <span>
+        <a>修改</a>
+        <Divider type="vertical" />
+        <a>删除</a>
+      </span>
+        ),
+    },
+];
+
+const data = [
+    {
+        key: '1',
+        user_name: 'admin',
+        email: "admin@infini.ltd",
+        enabled: true,
+        is_admin: true,
+        create_time: "Oct 19, 2019",
+        last_login_time: "Mar 01, 2020",
+
+    }, {
+        key: '2',
+        user_name: 'user',
+        email: "user@infini.ltd",
+        enabled: true,
+        is_admin: false,
+        create_time: "Oct 19, 2019",
+        last_login_time: "Mar 01, 2020",
+
+    },
+];
+
+@connect()
+class Users extends Component {
+
+    render() {
+        return (
+            <Card><Table columns={columns} dataSource={data} /></Card>
+        );
+    }
+}
+
+export default Users;

From ecf99fd1a06f0f2d73d2bb9e0206bf5ec28545b7 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 21:32:13 +0800
Subject: [PATCH 11/16] update security locales

---
 web/src/locales/en-US.js | 7 +++++++
 web/src/locales/zh-CN.js | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index 9d7e8ac3..645b86c1 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -100,6 +100,13 @@ export default {
   'menu.settings': 'SETTINGS',
   'menu.settings.global': 'GLOBAL',
   'menu.settings.security': 'SECURITY',
+
+  'menu.settings.security.general': 'GENERAL',
+  'menu.settings.security.sso': 'SSO',
+  'menu.settings.security.roles': 'ROLES',
+  'menu.settings.security.users': 'USERS',
+  'menu.settings.security.certs': 'CERTS',
+
   'menu.settings.logs': 'LOGS',
   'menu.settings.logs.overview': 'OVERVIEW',
   'menu.settings.logs.audit': 'AUDIT',
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index 9c164870..b73b27a8 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -107,7 +107,12 @@ export default {
   'menu.settings': '系统设置',
   'menu.settings.global': '全局设置',
   'menu.settings.security': '安全设置',
-  'menu.settings.authorization': '授权管理',
+  'menu.settings.security.general': '基础设置',
+  'menu.settings.security.sso': '单点登录',
+  'menu.settings.security.roles': '角色管理',
+  'menu.settings.security.users': '用户管理',
+  'menu.settings.security.certs': '证书管理',
+
   'menu.settings.logs': '系统日志',
   'menu.settings.logs.overview': '日志概要',
   'menu.settings.logs.audit': '审计日志',

From 1c8267330607d50e15664943fe4dad32e1f4de0c Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 21:59:04 +0800
Subject: [PATCH 12/16] update system settings

---
 web/config/router.config.js                   |  82 ++++----
 web/src/locales/zh-CN.js                      |  29 +--
 web/src/pages/Settings/Global/Global.js       | 175 ------------------
 .../pages/{Settings => System}/Logs/Audit.js  |   0
 .../pages/{Settings => System}/Logs/Base.js   |   0
 .../{Settings => System}/Logs/Overview.js     |   0
 .../{Settings => System}/Security/Base.js     |   0
 .../{Settings => System}/Security/Certs.js    |   0
 .../{Settings => System}/Security/General.js  |   0
 .../Security/General.less                     |   0
 .../{Settings => System}/Security/Roles.js    |   0
 .../{Settings => System}/Security/SSO.js      |   0
 .../{Settings => System}/Security/Users.js    |   0
 web/src/pages/System/Settings/Base.js         |  59 ++++++
 web/src/pages/System/Settings/Gateway.js      |  25 +++
 web/src/pages/System/Settings/Global.js       | 139 ++++++++++++++
 16 files changed, 288 insertions(+), 221 deletions(-)
 delete mode 100644 web/src/pages/Settings/Global/Global.js
 rename web/src/pages/{Settings => System}/Logs/Audit.js (100%)
 rename web/src/pages/{Settings => System}/Logs/Base.js (100%)
 rename web/src/pages/{Settings => System}/Logs/Overview.js (100%)
 rename web/src/pages/{Settings => System}/Security/Base.js (100%)
 rename web/src/pages/{Settings => System}/Security/Certs.js (100%)
 rename web/src/pages/{Settings => System}/Security/General.js (100%)
 rename web/src/pages/{Settings => System}/Security/General.less (100%)
 rename web/src/pages/{Settings => System}/Security/Roles.js (100%)
 rename web/src/pages/{Settings => System}/Security/SSO.js (100%)
 rename web/src/pages/{Settings => System}/Security/Users.js (100%)
 create mode 100644 web/src/pages/System/Settings/Base.js
 create mode 100644 web/src/pages/System/Settings/Gateway.js
 create mode 100644 web/src/pages/System/Settings/Global.js

diff --git a/web/config/router.config.js b/web/config/router.config.js
index cf86246a..b7ec9cc5 100644
--- a/web/config/router.config.js
+++ b/web/config/router.config.js
@@ -247,73 +247,89 @@ export default [
 
       //settings
       {
-        path: '/settings',
-        name: 'settings',
+        path: '/system',
+        name: 'system',
         icon: 'setting',
-        // component: './List/TableList',
         routes: [
           {
-            path: '/settings/global',
-            name: 'global',
-            component: './Settings/Global/Global',
-          }, {
-            path: '/settings/security',
+            path: '/system/settings',
+            name: 'settings',
+            component: './System/Settings/Base',
+              hideChildrenInMenu: true,
+              routes: [
+                  {
+                      path: '/system/settings',
+                      redirect: '/system/settings/global',
+                  },
+                  {
+                      path: '/system/settings/global',
+                      name: 'global',
+                      component: './System/Settings/Global',
+                  }, {
+                      path: '/system/settings/gateway',
+                      name: 'gateway',
+                      component: './System/Settings/Gateway',
+                  },
+              ]
+          },
+            {
+            path: '/system/security',
             name: 'security',
-            component: './Settings/Security/Base',
+            component: './System/Security/Base',
             hideChildrenInMenu: true,
             routes: [
                 {
-                    path: '/settings/security',
-                    redirect: '/settings/security/general',
+                    path: '/system/security',
+                    redirect: '/system/security/general',
                 },
                 {
-                    path: '/settings/security/general',
+                    path: '/system/security/general',
                     name: 'general',
-                    component: './Settings/Security/General',
+                    component: './System/Security/General',
                 }, {
-                    path: '/settings/security/sso',
+                    path: '/system/security/sso',
                     name: 'sso',
-                    component: './Settings/Security/SSO',
+                    component: './System/Security/SSO',
                 }, {
-                    path: '/settings/security/roles',
+                    path: '/system/security/roles',
                     name: 'roles',
-                    component: './Settings/Security/Roles',
+                    component: './System/Security/Roles',
                 }, {
-                    path: '/settings/security/users',
+                    path: '/system/security/users',
                     name: 'users',
-                    component: './Settings/Security/Users',
+                    component: './System/Security/Users',
                 }, {
-                    path: '/settings/security/certs',
+                    path: '/system/security/certs',
                     name: 'certs',
-                    component: './Settings/Security/Certs',
+                    component: './System/Security/Certs',
                 },
             ]
           }, {
-            path: '/settings/logs',
+            path: '/system/logs',
             name: 'logs',
-            component: './Settings/Logs/Base',
+            component: './System/Logs/Base',
             hideChildrenInMenu: true,
             routes: [
             {
-                path: '/settings/logs',
-                redirect: '/settings/logs/overview',
+                path: '/system/logs',
+                redirect: '/system/logs/overview',
             },
             {
-                path: '/settings/logs/overview',
+                path: '/system/logs/overview',
                 name: 'overview',
-                component: './Settings/Logs/Overview',
+                component: './System/Logs/Overview',
             }, {
-                path: '/settings/logs/audit',
+                path: '/system/logs/audit',
                 name: 'audit',
-                component: './Settings/Logs/Audit',
+                component: './System/Logs/Audit',
             }, {
-                path: '/settings/logs/query',
+                path: '/system/logs/query',
                 name: 'query',
-                component: './Settings/Logs/Audit',
+                component: './System/Logs/Audit',
             }, {
-                path: '/settings/logs/slow',
+                path: '/system/logs/slow',
                 name: 'slow',
-                component: './Settings/Logs/Audit',
+                component: './System/Logs/Audit',
             },
             ]
           },
diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js
index b73b27a8..8b02cc24 100644
--- a/web/src/locales/zh-CN.js
+++ b/web/src/locales/zh-CN.js
@@ -104,20 +104,23 @@ export default {
   'menu.search.analyzer': '分词管理',
   'menu.search.nlp': '自然语言处理',
 
-  'menu.settings': '系统设置',
-  'menu.settings.global': '全局设置',
-  'menu.settings.security': '安全设置',
-  'menu.settings.security.general': '基础设置',
-  'menu.settings.security.sso': '单点登录',
-  'menu.settings.security.roles': '角色管理',
-  'menu.settings.security.users': '用户管理',
-  'menu.settings.security.certs': '证书管理',
+  'menu.system': '系统管理',
+  'menu.system.settings': '系统设置',
+  'menu.system.settings.global': '全局设置',
+  'menu.system.settings.gateway': '网关设置',
 
-  'menu.settings.logs': '系统日志',
-  'menu.settings.logs.overview': '日志概要',
-  'menu.settings.logs.audit': '审计日志',
-  'menu.settings.logs.query': '查询日志',
-  'menu.settings.logs.slow': '慢日志',
+  'menu.system.security': '安全设置',
+  'menu.system.security.general': '基础设置',
+  'menu.system.security.sso': '单点登录',
+  'menu.system.security.roles': '角色管理',
+  'menu.system.security.users': '用户管理',
+  'menu.system.security.certs': '证书管理',
+
+  'menu.system.logs': '系统日志',
+  'menu.system.logs.overview': '日志概要',
+  'menu.system.logs.audit': '审计日志',
+  'menu.system.logs.query': '查询日志',
+  'menu.system.logs.slow': '慢日志',
 
 
   'menu.form': '表单页',
diff --git a/web/src/pages/Settings/Global/Global.js b/web/src/pages/Settings/Global/Global.js
deleted file mode 100644
index 0a831963..00000000
--- a/web/src/pages/Settings/Global/Global.js
+++ /dev/null
@@ -1,175 +0,0 @@
-import React, {Component, Fragment} from 'react';
-import {connect} from 'dva';
-import {Card, Form, Input,Switch, Select, Button, message, Divider, Drawer, Descriptions} from 'antd';
-
-const {Option} = Select;
-import {formatMessage, FormattedMessage} from 'umi/locale';
-
-const FormItem = Form.Item;
-const {TextArea} = Input;
-import {Row, Col} from 'antd';
-
-const operationTabList = [
-    {
-        key: 'tab1',
-        tab: '全局设置',
-    },
-];
-
-@Form.create()
-class Global extends Component {
-    state = {
-        operationkey: 'tab1',
-    };
-
-    componentDidMount() {
-    }
-
-    onOperationTabChange = key => {
-        this.setState({operationkey: key});
-    };
-
-    globalSettings = () => {
-        const {
-            form: {getFieldDecorator},
-        } = this.props;
-        return (
-            < div >
-            < Row
-        type = "flex"
-        justify = "end" >
-            < Col
-        span = {16} >
-            < div > < Form
-        layout = "vertical"
-        hideRequiredMark >
-
-        < FormItem
-            label = {formatMessage({id: 'app.settings.global.site_name'})} >
-            {getFieldDecorator('site_name',
-                {
-                    rules: [
-                        {
-                            required: true,
-                            message: formatMessage({id: 'app.settings.global.site_name-message'}, {}),
-                        },
-                    ],
-                }
-            )
-            ( < Input / >)
-            }
-        </FormItem>
-
-        < FormItem
-        label = {formatMessage({id: 'app.settings.global.domain'})} >
-            {getFieldDecorator('domain',
-            {
-                rules: [
-                    {
-                        required: true,
-                        message: formatMessage({id: 'app.settings.global.domain-message'}, {}),
-                    },
-                ],
-            }
-        )
-            ( < Input / >)
-        }
-        </FormItem>
-                < FormItem
-                label = {formatMessage({id: 'app.settings.global.listen_addr'})} >
-                {getFieldDecorator('listen_addr',
-                {
-                rules: [
-                {
-                required: true,
-                message: formatMessage({id: 'app.settings.global.listen_addr-message'}, {}),
-                },
-                ],
-                }
-                )
-                ( < Input / >)
-                }
-        </FormItem>
-                <Form.Item label = {formatMessage({id: 'app.settings.global.is_tls'})}>
-                {getFieldDecorator('isTLS', {
-                initialValue: true,
-                rules: [
-                {
-                required: true,
-                message: formatMessage({id: 'app.settings.global.is_tls-message'}, {}),
-                },
-                ],
-                })(
-                <Switch defaultChecked onChange={()=>{}} />
-                )}
-                </Form.Item>
-
-
-        < FormItem
-        label = {formatMessage({id: 'app.settings.global.data_path'})} >
-        {getFieldDecorator('work_dir',
-        {
-        rules: [
-        {
-        required: true,
-        message: formatMessage({id: 'app.settings.global.data_path-message'}, {}),
-        },
-        ],
-        }
-        )
-        ( < Input / >)
-        }
-        </FormItem>
-
-        < FormItem
-        label = {formatMessage({id: 'app.settings.global.log_path'})} >
-        {getFieldDecorator('work_dir',
-        {
-        rules: [
-        {
-        required: true,
-        message: formatMessage({id: 'app.settings.global.log_path-message'}, {}),
-        },
-        ],
-        }
-        )
-        ( < Input / >)
-        }
-        </FormItem>
-
-
-        < Button type = "primary" >
-            < FormattedMessage
-        id = "app.settings.global.update"
-        defaultMessage = "Update Setting" /> </Button>
-            < /Form> </div>
-        < /Col>
-        < Col span = {8} >< /Col>
-            < /Row>
-            < /div>
-    )
-        ;
-    };
-
-    render() {
-        const {operationkey} = this.state;
-        const contentList = {
-            tab1: ( < div > {this.globalSettings()} < /div>),
-    }
-        ;
-        return (
-            < Fragment >
-            < Card
-        bordered = {false}
-        tabList = {operationTabList}
-        onTabChange = {this.onOperationTabChange}
-            >
-            {contentList[operationkey]}
-            < /Card>
-            < /Fragment>
-    )
-        ;
-    }
-}
-
-export default Global;
diff --git a/web/src/pages/Settings/Logs/Audit.js b/web/src/pages/System/Logs/Audit.js
similarity index 100%
rename from web/src/pages/Settings/Logs/Audit.js
rename to web/src/pages/System/Logs/Audit.js
diff --git a/web/src/pages/Settings/Logs/Base.js b/web/src/pages/System/Logs/Base.js
similarity index 100%
rename from web/src/pages/Settings/Logs/Base.js
rename to web/src/pages/System/Logs/Base.js
diff --git a/web/src/pages/Settings/Logs/Overview.js b/web/src/pages/System/Logs/Overview.js
similarity index 100%
rename from web/src/pages/Settings/Logs/Overview.js
rename to web/src/pages/System/Logs/Overview.js
diff --git a/web/src/pages/Settings/Security/Base.js b/web/src/pages/System/Security/Base.js
similarity index 100%
rename from web/src/pages/Settings/Security/Base.js
rename to web/src/pages/System/Security/Base.js
diff --git a/web/src/pages/Settings/Security/Certs.js b/web/src/pages/System/Security/Certs.js
similarity index 100%
rename from web/src/pages/Settings/Security/Certs.js
rename to web/src/pages/System/Security/Certs.js
diff --git a/web/src/pages/Settings/Security/General.js b/web/src/pages/System/Security/General.js
similarity index 100%
rename from web/src/pages/Settings/Security/General.js
rename to web/src/pages/System/Security/General.js
diff --git a/web/src/pages/Settings/Security/General.less b/web/src/pages/System/Security/General.less
similarity index 100%
rename from web/src/pages/Settings/Security/General.less
rename to web/src/pages/System/Security/General.less
diff --git a/web/src/pages/Settings/Security/Roles.js b/web/src/pages/System/Security/Roles.js
similarity index 100%
rename from web/src/pages/Settings/Security/Roles.js
rename to web/src/pages/System/Security/Roles.js
diff --git a/web/src/pages/Settings/Security/SSO.js b/web/src/pages/System/Security/SSO.js
similarity index 100%
rename from web/src/pages/Settings/Security/SSO.js
rename to web/src/pages/System/Security/SSO.js
diff --git a/web/src/pages/Settings/Security/Users.js b/web/src/pages/System/Security/Users.js
similarity index 100%
rename from web/src/pages/Settings/Security/Users.js
rename to web/src/pages/System/Security/Users.js
diff --git a/web/src/pages/System/Settings/Base.js b/web/src/pages/System/Settings/Base.js
new file mode 100644
index 00000000..9f18b2a5
--- /dev/null
+++ b/web/src/pages/System/Settings/Base.js
@@ -0,0 +1,59 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+
+
+@connect()
+class Base extends Component {
+    handleTabChange = key => {
+        const { match,children } = this.props;
+        switch (key) {
+            case 'global':
+                router.push(`${match.url}/global`);
+                break;
+            case 'gateway':
+                router.push(`${match.url}/gateway`);
+                break;
+            default:
+                break;
+        }
+    }
+
+    render() {
+        const tabList = [
+            {
+                key: 'global',
+                tab: '全局设置',
+            },
+            {
+                key: 'gateway',
+                tab: '网关设置',
+            },
+        ];
+
+        const { match, children, location } = this.props;
+
+        return (
+            <PageHeaderWrapper
+                tabList={tabList}
+                tabActiveKey={location.pathname.replace(`${match.path}/`, '')}
+                onTabChange={this.handleTabChange}
+            >
+                {children}
+            </PageHeaderWrapper>
+        );
+    }
+}
+
+export default Base;
diff --git a/web/src/pages/System/Settings/Gateway.js b/web/src/pages/System/Settings/Gateway.js
new file mode 100644
index 00000000..f0098f3b
--- /dev/null
+++ b/web/src/pages/System/Settings/Gateway.js
@@ -0,0 +1,25 @@
+import router from 'umi/router';
+import { connect } from 'dva';
+import PageHeaderWrapper from '@/components/PageHeaderWrapper';
+
+import React, {Component, Fragment} from 'react';
+
+import {Col, Divider,Card, Form, Icon, Input, Row, Select, Table} from 'antd';
+import {formatMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+@connect()
+class Gateway extends Component {
+
+    render() {
+        return (
+            <Card>Gateway</Card>
+        );
+    }
+}
+
+export default Gateway;
diff --git a/web/src/pages/System/Settings/Global.js b/web/src/pages/System/Settings/Global.js
new file mode 100644
index 00000000..ef593758
--- /dev/null
+++ b/web/src/pages/System/Settings/Global.js
@@ -0,0 +1,139 @@
+import React, {Component, Fragment} from 'react';
+import {Button, Card, Col, Form, Input, Row, Select, Switch} from 'antd';
+import {formatMessage, FormattedMessage} from 'umi/locale';
+
+const {Option} = Select;
+
+const FormItem = Form.Item;
+const {TextArea} = Input;
+
+@Form.create()
+class Global extends Component {
+
+    componentDidMount() {
+    }
+
+    render() {
+        const {
+            form: {getFieldDecorator},
+        } = this.props;
+        return (
+            <Card>
+                <Row
+                    type="flex"
+                    justify="end">
+                    <Col
+                        span={16}>
+                        <div><Form
+                            layout="vertical"
+                            hideRequiredMark>
+
+                            <FormItem
+                                label={formatMessage({id: 'app.settings.global.site_name'})}>
+                                {getFieldDecorator('site_name',
+                                    {
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.global.site_name-message'}, {}),
+                                            },
+                                        ],
+                                    }
+                                )
+                                (<Input/>)
+                                }
+                            </FormItem>
+
+                            <FormItem
+                                label={formatMessage({id: 'app.settings.global.domain'})}>
+                                {getFieldDecorator('domain',
+                                    {
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.global.domain-message'}, {}),
+                                            },
+                                        ],
+                                    }
+                                )
+                                (<Input/>)
+                                }
+                            </FormItem>
+                            <FormItem
+                                label={formatMessage({id: 'app.settings.global.listen_addr'})}>
+                                {getFieldDecorator('listen_addr',
+                                    {
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.global.listen_addr-message'}, {}),
+                                            },
+                                        ],
+                                    }
+                                )
+                                (<Input/>)
+                                }
+                            </FormItem>
+                            <Form.Item label={formatMessage({id: 'app.settings.global.is_tls'})}>
+                                {getFieldDecorator('isTLS', {
+                                    initialValue: true,
+                                    rules: [
+                                        {
+                                            required: true,
+                                            message: formatMessage({id: 'app.settings.global.is_tls-message'}, {}),
+                                        },
+                                    ],
+                                })(
+                                    <Switch defaultChecked onChange={() => {
+                                    }}/>
+                                )}
+                            </Form.Item>
+
+
+                            <FormItem
+                                label={formatMessage({id: 'app.settings.global.data_path'})}>
+                                {getFieldDecorator('work_dir',
+                                    {
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.global.data_path-message'}, {}),
+                                            },
+                                        ],
+                                    }
+                                )
+                                (<Input/>)
+                                }
+                            </FormItem>
+
+                            <FormItem
+                                label={formatMessage({id: 'app.settings.global.log_path'})}>
+                                {getFieldDecorator('work_dir',
+                                    {
+                                        rules: [
+                                            {
+                                                required: true,
+                                                message: formatMessage({id: 'app.settings.global.log_path-message'}, {}),
+                                            },
+                                        ],
+                                    }
+                                )
+                                (<Input/>)
+                                }
+                            </FormItem>
+
+
+                            <Button type="primary">
+                                <FormattedMessage
+                                    id="app.settings.global.update"
+                                    defaultMessage="Update Setting"/> </Button>
+                        </Form></div>
+                    </Col>
+                    <Col span={8}></Col>
+                </Row>
+            </Card>
+        );
+    }
+}
+
+export default Global;

From 80e89ab5c5e8902d77f45c4e0c56c7c6a7cfe396 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 22:04:11 +0800
Subject: [PATCH 13/16] update router, clean up breadcrumbnavigation

---
 web/config/router.config.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/web/config/router.config.js b/web/config/router.config.js
index b7ec9cc5..e11e99cc 100644
--- a/web/config/router.config.js
+++ b/web/config/router.config.js
@@ -263,11 +263,9 @@ export default [
                   },
                   {
                       path: '/system/settings/global',
-                      name: 'global',
                       component: './System/Settings/Global',
                   }, {
                       path: '/system/settings/gateway',
-                      name: 'gateway',
                       component: './System/Settings/Gateway',
                   },
               ]
@@ -284,23 +282,18 @@ export default [
                 },
                 {
                     path: '/system/security/general',
-                    name: 'general',
                     component: './System/Security/General',
                 }, {
                     path: '/system/security/sso',
-                    name: 'sso',
                     component: './System/Security/SSO',
                 }, {
                     path: '/system/security/roles',
-                    name: 'roles',
                     component: './System/Security/Roles',
                 }, {
                     path: '/system/security/users',
-                    name: 'users',
                     component: './System/Security/Users',
                 }, {
                     path: '/system/security/certs',
-                    name: 'certs',
                     component: './System/Security/Certs',
                 },
             ]
@@ -316,19 +309,15 @@ export default [
             },
             {
                 path: '/system/logs/overview',
-                name: 'overview',
                 component: './System/Logs/Overview',
             }, {
                 path: '/system/logs/audit',
-                name: 'audit',
                 component: './System/Logs/Audit',
             }, {
                 path: '/system/logs/query',
-                name: 'query',
                 component: './System/Logs/Audit',
             }, {
                 path: '/system/logs/slow',
-                name: 'slow',
                 component: './System/Logs/Audit',
             },
             ]

From 5d20dd6197f1f672627fd6e0a6ceecfd32f5baaf Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Thu, 19 Nov 2020 22:07:42 +0800
Subject: [PATCH 14/16] update menu locales

---
 web/src/locales/en-US.js | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js
index 645b86c1..c665d301 100644
--- a/web/src/locales/en-US.js
+++ b/web/src/locales/en-US.js
@@ -97,21 +97,24 @@ export default {
   'menu.search.analyzer': 'ANALYZER',
   'menu.search.nlp': 'NLP',
 
-  'menu.settings': 'SETTINGS',
-  'menu.settings.global': 'GLOBAL',
-  'menu.settings.security': 'SECURITY',
+  'menu.system': 'SYSTEM',
+  'menu.system.settings': 'SETTINGS',
+  'menu.system.settings.global': 'GLOBAL',
+  'menu.system.settings.gateway': 'GATEWAY',
 
-  'menu.settings.security.general': 'GENERAL',
-  'menu.settings.security.sso': 'SSO',
-  'menu.settings.security.roles': 'ROLES',
-  'menu.settings.security.users': 'USERS',
-  'menu.settings.security.certs': 'CERTS',
+  'menu.system.security': 'SECURITY',
+  'menu.system.security.general': 'GENERAL',
+  'menu.system.security.sso': 'SSO',
+  'menu.system.security.roles': 'ROLES',
+  'menu.system.security.users': 'USERS',
+  'menu.system.security.certs': 'CERTS',
 
-  'menu.settings.logs': 'LOGS',
-  'menu.settings.logs.overview': 'OVERVIEW',
-  'menu.settings.logs.audit': 'AUDIT',
-  'menu.settings.logs.query': 'QUERY',
-  'menu.settings.logs.slow': 'SLOW',
+
+  'menu.system.logs': 'LOGS',
+  'menu.system.logs.overview': 'OVERVIEW',
+  'menu.system.logs.audit': 'AUDIT',
+  'menu.system.logs.query': 'QUERY',
+  'menu.system.logs.slow': 'SLOW',
 
 
   'menu.form': 'Form',

From 7eb7a35038be238c5bd167c2d78b23789cc19dad Mon Sep 17 00:00:00 2001
From: silenceqi <silenceqi@hotmail.com>
Date: Thu, 19 Nov 2020 22:17:28 +0800
Subject: [PATCH 15/16] data backup cycle

---
 web/src/pages/DataManagement/Import.js        |   2 +-
 .../pages/DataManagement/backup/BakCycle.js   | 275 ++++++++++++------
 2 files changed, 187 insertions(+), 90 deletions(-)

diff --git a/web/src/pages/DataManagement/Import.js b/web/src/pages/DataManagement/Import.js
index 1acc6217..d7b6260b 100644
--- a/web/src/pages/DataManagement/Import.js
+++ b/web/src/pages/DataManagement/Import.js
@@ -1,6 +1,6 @@
 import React, { Component,Fragment } from 'react';
 import { connect } from 'dva';
-import { Card,Form,Input, Select,Button,message,Upload, Icon } from 'antd';
+import { Card,Form,Input, Select,Button,message,Upload, Icon,Switch } from 'antd';
 const { Option } = Select;
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import DescriptionList from '@/components/DescriptionList';
diff --git a/web/src/pages/DataManagement/backup/BakCycle.js b/web/src/pages/DataManagement/backup/BakCycle.js
index 921f8f3b..b2fcabd8 100644
--- a/web/src/pages/DataManagement/backup/BakCycle.js
+++ b/web/src/pages/DataManagement/backup/BakCycle.js
@@ -11,7 +11,13 @@ import {
   message,
   Divider,
   Drawer,
+  Steps,
+  Select,
+  TimePicker,
+  Switch,
+  Icon,
 } from 'antd';
+import moment from 'moment';
 import StandardTable from '@/components/StandardTable';
 
 import styles from '../../List/TableList.less';
@@ -19,81 +25,171 @@ import styles from '../../List/TableList.less';
 const FormItem = Form.Item;
 const { TextArea } = Input;
 
-const CreateForm = Form.create()(props => {
-  const { modalVisible, form, handleAdd, handleModalVisible } = props;
-  const okHandle = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleAdd(fieldsValue);
-    });
-  };
-  return (
-    <Modal
-      destroyOnClose
-      title="新建索引模板"
-      visible={modalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="索引模板名称">
-        {form.getFieldDecorator('name', {
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="模板设置">
-        {form.getFieldDecorator('settings', {
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
-    </Modal>
-  );
-});
-
-const UpdateForm = Form.create()(props => {
-  const { updateModalVisible, handleUpdateModalVisible, handleUpdate,values,form } = props;
-
-  const okHandle = () => {
-    form.validateFields((err, fieldsValue) => {
-      if (err) return;
-      form.resetFields();
-      handleUpdate(fieldsValue);
-    });
-  };
-  
-  return (
-    <Modal
-      destroyOnClose
-      title="索引模板设置"
-      visible={updateModalVisible}
-      width={640}
-      onOk={okHandle}
-      onCancel={() => handleUpdateModalVisible()}
-    >
-       <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="索引模板名称">
-        {form.getFieldDecorator('name', {
-          initialValue: values.name,
-          rules: [{ required: true, message: '请输入至少五个字符的名称！', min: 5 }],
-        })(<Input placeholder="请输入名称" />)}
-      </FormItem>
-      <FormItem labelCol={{ span: 5 }} wrapperCol={{ span: 15 }} label="索引模板设置">
-        {form.getFieldDecorator('policy', {
-          initialValue: values.policy,
-          rules: [{ required: true }],
-        })(<TextArea
-          style={{ minHeight: 24 }}
-          placeholder="请输入"
-          rows={9}
-      />)}
-      </FormItem>
-    </Modal>
-  );
-});
+@Form.create()
+class NewForm extends PureComponent {
+  state = {
+    currentStep: 0,
+  }
+    renderStep=()=>{
+      let {form} = this.props;
+      let retDom = '';
+      let formLayout = {
+        labelCol:{span:5},
+        wrapperCol:{span:15}
+      };
+      let sformLayout = {
+        labelCol:{span:15},
+        wrapperCol:{span:5}
+      };
+      const format = 'HH:mm';
+      switch(this.state.currentStep){
+        case 0:
+          retDom = (
+            <Form>
+              <Form.Item label="策略名称" {...formLayout}>
+                {form.getFieldDecorator('name', {
+                  rules: [{ required: true }],
+                })(<Input placeholder="请输入策略名称" style={{width:200}} />)}
+              </Form.Item>
+              <Form.Item label="快照名称" {...formLayout}>
+                {form.getFieldDecorator('snapshot', {
+                  rules: [{ required: true }],
+                })(<Input placeholder="请输入快照名称" style={{width:200}} />)}
+              </Form.Item>
+              <Form.Item label="选择仓库" {...formLayout}>
+                {form.getFieldDecorator('repo', {
+                  rules: [{ required: true }],
+                })(
+                  <Select style={{width:200}}>
+                    <Select.Option value="my_local_repo">
+                      my_local_repo
+                    </Select.Option>
+                    <Select.Option value="my_local_repo">
+                      my_remote_repo
+                    </Select.Option>
+                  </Select>
+                )}
+              </Form.Item>
+              <Form.Item label="频率" {...formLayout}>
+                {form.getFieldDecorator('frequency', {
+                  rules: [{ required: true }],
+                })(
+                  <Select style={{width:200}}>
+                    <Select.Option value="day">
+                      每天
+                    </Select.Option>
+                    <Select.Option value="month">
+                      每月
+                    </Select.Option>
+                  </Select>
+                )}
+              </Form.Item>
+              <Form.Item label="时间" {...formLayout}>
+                {form.getFieldDecorator('time', {
+                  rules: [{ required: true }],
+                })(
+                  <TimePicker defaultValue={moment('12:08', format)} format={format} style={{width:200}} />
+                )}
+              </Form.Item>
+            </Form>
+          );
+          break;
+        case 1:
+          retDom = (
+            <Form>
+              <Form.Item label="all data streams and indices, including system indices" {...sformLayout}>
+                {form.getFieldDecorator('indices', {
+                initialValue: true,
+                })(
+                  <Switch
+                    checkedChildren={<Icon type="check" />}
+                    unCheckedChildren={<Icon type="close" />}
+                    defaultChecked
+                  />
+                )}
+              </Form.Item>
+              <Form.Item label="Ignore unavaiable indices" {...sformLayout}>
+                {form.getFieldDecorator('unavaiable', {
+                initialValue: false,
+                })(
+                  <Switch
+                    checkedChildren={<Icon type="check" />}
+                    unCheckedChildren={<Icon type="close" />}
+                    defaultChecked
+                  />
+                )}
+              </Form.Item>
+              <Form.Item label="Allow partial indices" {...sformLayout}>
+                {form.getFieldDecorator('partial', {
+                initialValue: false,
+                })(
+                  <Switch
+                    checkedChildren={<Icon type="check" />}
+                    unCheckedChildren={<Icon type="close" />}
+                    defaultChecked
+                  />
+                )}
+              </Form.Item>
+              <Form.Item label="Include global state" {...sformLayout}>
+                {form.getFieldDecorator('global', {
+                initialValue: true,
+                })(
+                  <Switch
+                    checkedChildren={<Icon type="check" />}
+                    unCheckedChildren={<Icon type="close" />}
+                    defaultChecked
+                  />
+                )}
+              </Form.Item>
+            </Form>
+          );
+          break;
+        case 2:
+          break;
+      }
+      return retDom;
+    }
+    handleNext(currentStep){
+      this.setState({
+        currentStep: currentStep +1,
+      });
+    }
+    render(){
+      const {currentStep} = this.state;
+      return (
+        <div>
+          <Steps current={this.state.currentStep}>
+            <Steps.Step title="基本设置" description=""/>
+            <Steps.Step title="快照设置" description=""/>
+            <Steps.Step title="快照保存设置" description=""/>
+            <Steps.Step title="确认" description=""/>
+          </Steps>
+          <Divider />
+          {this.renderStep()}
+          <div style={{
+              position: 'absolute',
+              right: 0,
+              bottom: 0,
+              width: '100%',
+              borderTop: '1px solid #e9e9e9',
+              padding: '10px 16px',
+              background: '#fff',
+            }}>
+            <Button key="back" onClick={()=>this.backward(currentStep)}>
+            上一步
+            </Button>,
+            <Button key="forward" style={{marginLeft:'2em'}}  type="primary" onClick={() => this.handleNext(currentStep)}>
+              下一步
+            </Button>
+            <Button key="cancel"  style={{float:'right'}} onClick={() =>{}}>
+              取消
+            </Button>,
+           
+          </div>
+        </div>
+      )
+    }
+}
 
 /* eslint react/no-multi-comp:0 */
 @connect(({ pipeline, loading }) => ({
@@ -296,7 +392,7 @@ class BakCycle extends PureComponent {
       <Form onSubmit={this.handleSearch} layout="inline">
         <Row gutter={{ md: 8, lg: 24, xl: 48 }}>
           <Col md={8} sm={24}>
-            <FormItem label="索引模板名称">
+            <FormItem label="备份策略模板名称">
               {getFieldDecorator('name')(<Input placeholder="请输入" />)}
             </FormItem>
           </Col>
@@ -318,6 +414,17 @@ class BakCycle extends PureComponent {
   renderForm() {
     return this.renderSimpleForm();
   }
+  handleNewClick = ()=>{
+    this.setState({
+      drawerVisible: true,
+    });
+  };
+
+  onCloseDrawer = ()=>{
+    this.setState({
+      drawerVisible: false,
+    });
+  };
 
   render() {
     const data = {
@@ -341,7 +448,7 @@ class BakCycle extends PureComponent {
           <div className={styles.tableList}>
             <div className={styles.tableListForm}>{this.renderForm()}</div>
             <div className={styles.tableListOperator}>
-              <Button icon="plus" type="primary" onClick={() => this.handleModalVisible(true)}>
+              <Button icon="plus" type="primary" onClick={() => this.handleNewClick(true)}>
                 新建
               </Button>
               {selectedRows.length > 0 && (
@@ -359,14 +466,6 @@ class BakCycle extends PureComponent {
             />
           </div>
         </Card>
-        <CreateForm {...parentMethods} modalVisible={modalVisible} />
-        {updateFormValues && Object.keys(updateFormValues).length ? (
-          <UpdateForm
-            {...updateMethods}
-            updateModalVisible={updateModalVisible}
-            values={updateFormValues}
-          />
-        ) : null}
           <Drawer
               title="备份策略"
               placement="right"
@@ -374,10 +473,8 @@ class BakCycle extends PureComponent {
               onClose={this.onCloseDrawer}
               visible={this.state.drawerVisible}
             >
-              <p>Some contents...</p>
-              <p>Some contents...</p>
-              <p>Some contents...</p>
-            </Drawer>
+             <NewForm />
+          </Drawer>
       </Fragment>
     );
   }

From 79e73d6f27368a9c4488f04b150665921e9d3ce9 Mon Sep 17 00:00:00 2001
From: silenceqi <silenceqi@hotmail.com>
Date: Fri, 20 Nov 2020 23:20:40 +0800
Subject: [PATCH 16/16] add logstash config references

---
 .../pages/DataManagement/IngestPipeline.js    | 31 +++++---
 .../pages/DataManagement/LogstashConfig.js    | 77 +++++++++++++++++-
 .../pages/DataManagement/backup/BakCycle.js   | 78 +++++++++++--------
 3 files changed, 142 insertions(+), 44 deletions(-)

diff --git a/web/src/pages/DataManagement/IngestPipeline.js b/web/src/pages/DataManagement/IngestPipeline.js
index 12329d09..c7d0c597 100644
--- a/web/src/pages/DataManagement/IngestPipeline.js
+++ b/web/src/pages/DataManagement/IngestPipeline.js
@@ -19,7 +19,7 @@ import {
   Badge,
   Divider,
   Steps,
-  Radio,
+  Popconfirm
 } from 'antd';
 import StandardTable from '@/components/StandardTable';
 import PageHeaderWrapper from '@/components/PageHeaderWrapper';
@@ -213,21 +213,30 @@ class IngestPipeline extends PureComponent {
   };
 
   handleDeleteClick = e => {
+    Modal.confirm({
+      title: '删除Pipeline',
+      content: '确定删除该Pipeline吗？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk: () => this.deleteItem(),
+    });
+  };
+  deleteItem = ()=>{
     const { dispatch } = this.props;
     const { selectedRows } = this.state;
 
     if (!selectedRows) return;
-        dispatch({
-          type: 'pipeline/delete',
-          payload: {
-            key: selectedRows.map(row => row.name),
-          },
-          callback: () => {
-            this.setState({
-              selectedRows: [],
-            });
-          },
+    dispatch({
+      type: 'pipeline/delete',
+      payload: {
+        key: selectedRows.map(row => row.name),
+      },
+      callback: () => {
+        this.setState({
+          selectedRows: [],
         });
+      },
+    });
   };
 
   handleSelectRows = rows => {
diff --git a/web/src/pages/DataManagement/LogstashConfig.js b/web/src/pages/DataManagement/LogstashConfig.js
index 2b67b5fa..5fb9c703 100644
--- a/web/src/pages/DataManagement/LogstashConfig.js
+++ b/web/src/pages/DataManagement/LogstashConfig.js
@@ -1,6 +1,8 @@
 import React, { Component,Fragment } from 'react';
 import { connect } from 'dva';
-import { Card,Form,Input, Select,Button,message } from 'antd';
+import { Card,Form,Input, Select,Button,message, Drawer, 
+  List
+} from 'antd';
 const { Option } = Select;
 import { formatMessage, FormattedMessage } from 'umi/locale';
 import DescriptionList from '@/components/DescriptionList';
@@ -18,6 +20,28 @@ const operationTabList = [
       tab: '对接Kafka',
     }
   ];
+  const configRawData = [
+    {
+      title: 'schedule',
+      content: [`Schedule of when to periodically run statement, in Cron format for example: "* * * * *" (execute query every minute, on the minute)`,
+      `There is no schedule by default. If no schedule is given, then the statement is run exactly once.`],
+    },
+    {
+      title: 'jdbc_driver_library',
+      content: ['JDBC driver library path to third party driver library. In case of multiple libraries being required you can pass them separated by a comma.'],
+    },
+    {
+      title: 'jdbc_driver_class',
+      content: ['JDBC driver class to load, for example, "org.apache.derby.jdbc.ClientDriver"'],
+    },
+    {
+      title: 'jdbc_connection_string',
+      content: ['JDBC connection string, for example, "jdbc:oracle:test:@192.168.1.68:1521/testdb"'],
+    },{
+      title:'jdbc_paging_enabled',
+      content: ['This will cause a sql statement to be broken up into multiple queries. Each query will use limits and offsets to collectively retrieve the full result-set. The limit size is set with jdbc_page_size.','Be aware that ordering is not guaranteed between queries.']
+    },
+  ];
 
 @connect(({logstash,loading }) => ({
     data: logstash.logstash,
@@ -29,6 +53,8 @@ const operationTabList = [
 class LogstashConfig extends Component {
     state = {
         operationkey: 'tab1',
+        drawerVisible: false,
+        drawerData: configRawData,
     };
   componentDidMount() {
     message.loading('数据加载中..', 'initdata');
@@ -65,6 +91,28 @@ class LogstashConfig extends Component {
       }
     });
   };
+  
+  handleDrawerVisible = () => {
+    this.setState(preState=>{
+      return {
+        drawerVisible: !preState.drawerVisible,
+      }
+    })
+  };
+  onCloseDrawer = ()=>{
+    this.setState({
+      drawerVisible: false,
+    });
+  };
+
+  onDrawerSearch = (value)=>{
+    let data = configRawData.filter((conf)=>{
+      return conf.title.includes(value);
+    });
+    this.setState({
+      drawerData: data,
+    });
+  };
 
   render() {
     const { operationkey } = this.state;
@@ -92,7 +140,7 @@ class LogstashConfig extends Component {
       };
     const contentList = {
         tab1: (
-        <div>    
+        <div style={{position:"relative"}}>    
             <Form onSubmit={this.handleSubmit} name="jdbc" hideRequiredMark style={{ marginTop: 8 }}>
             <FormItem {...formItemLayout} label={<FormattedMessage id="form.dbtype.label" />}>
                 {getFieldDecorator('dbtype', {
@@ -112,6 +160,7 @@ class LogstashConfig extends Component {
                 </Select>
                 )}
                 </FormItem>
+                <a href="javascript:void(0);" onClick={this.handleDrawerVisible} style={{position:"absolute", top:15,right:50}}>配置释义</a>
                 <FormItem {...formItemLayout} label={<FormattedMessage id="form.logstash.jdbcconf.label" />}>
                 {getFieldDecorator('logstash.jdbcconf', {
                 initialValue: data.jdbc.config,
@@ -173,6 +222,30 @@ class LogstashConfig extends Component {
             onTabChange={this.onOperationTabChange}
             >
             {contentList[operationkey]}
+            <Drawer visible={this.state.drawerVisible}
+              title="配置释义"
+              onClose={this.onCloseDrawer}
+              width={720}
+            >
+              <Input.Search placeholder="input config key" onChange={(e) => {this.onDrawerSearch(e.target.value)}} onSearch={this.onDrawerSearch} enterButton />
+               <List
+                itemLayout="vertical"
+                size="small"
+                dataSource={this.state.drawerData}
+                renderItem={item => (
+                  <List.Item key={item.title}>
+                    <List.Item.Meta
+                      title={item.title}
+                    />
+                    <div>
+                      {item.content.map((c)=>{
+                        return (<p>{c}</p>);
+                      })}
+                    </div>
+                  </List.Item>
+                )}
+              />
+            </Drawer>
             </Card>
         </Fragment>
     );
diff --git a/web/src/pages/DataManagement/backup/BakCycle.js b/web/src/pages/DataManagement/backup/BakCycle.js
index b2fcabd8..ca0c808e 100644
--- a/web/src/pages/DataManagement/backup/BakCycle.js
+++ b/web/src/pages/DataManagement/backup/BakCycle.js
@@ -1,4 +1,4 @@
-import React, { PureComponent, Fragment } from 'react';
+import React, { PureComponent, Fragment,forwardRef } from 'react';
 import { connect } from 'dva';
 import {
   Row,
@@ -25,11 +25,28 @@ import styles from '../../List/TableList.less';
 const FormItem = Form.Item;
 const { TextArea } = Input;
 
+let RightSwitch = forwardRef((props, _ref) => {
+  return (
+    <div>
+      <Switch
+        name={props.id}
+        checkedChildren={<Icon type="check" />}
+        unCheckedChildren={<Icon type="close" />}
+        checked={props.value}
+        style={{marginRight:5}}
+        onChange={(v)=>{props.onChange(v)}}
+      />
+      {props.description}
+  </div>
+  )
+});
+
 @Form.create()
 class NewForm extends PureComponent {
   state = {
     currentStep: 0,
   }
+  
     renderStep=()=>{
       let {form} = this.props;
       let retDom = '';
@@ -88,7 +105,7 @@ class NewForm extends PureComponent {
                 {form.getFieldDecorator('time', {
                   rules: [{ required: true }],
                 })(
-                  <TimePicker defaultValue={moment('12:08', format)} format={format} style={{width:200}} />
+                  <TimePicker format={format} style={{width:200}} />
                 )}
               </Form.Item>
             </Form>
@@ -97,48 +114,32 @@ class NewForm extends PureComponent {
         case 1:
           retDom = (
             <Form>
-              <Form.Item label="all data streams and indices, including system indices" {...sformLayout}>
+              <Form.Item label="">
                 {form.getFieldDecorator('indices', {
-                initialValue: true,
+                  initialValue: true,
                 })(
-                  <Switch
-                    checkedChildren={<Icon type="check" />}
-                    unCheckedChildren={<Icon type="close" />}
-                    defaultChecked
-                  />
+                  <RightSwitch description="all data streams and indices, including system indices"/>
                 )}
               </Form.Item>
-              <Form.Item label="Ignore unavaiable indices" {...sformLayout}>
+              <Form.Item>
                 {form.getFieldDecorator('unavaiable', {
                 initialValue: false,
                 })(
-                  <Switch
-                    checkedChildren={<Icon type="check" />}
-                    unCheckedChildren={<Icon type="close" />}
-                    defaultChecked
-                  />
+                  <RightSwitch description="Ignore unavaiable indices"/>
                 )}
               </Form.Item>
-              <Form.Item label="Allow partial indices" {...sformLayout}>
+              <Form.Item label="">
                 {form.getFieldDecorator('partial', {
-                initialValue: false,
+                // initialValue: true,
                 })(
-                  <Switch
-                    checkedChildren={<Icon type="check" />}
-                    unCheckedChildren={<Icon type="close" />}
-                    defaultChecked
-                  />
+                  <RightSwitch description="Allow partial indices"/>
                 )}
               </Form.Item>
-              <Form.Item label="Include global state" {...sformLayout}>
+              <Form.Item label="" >
                 {form.getFieldDecorator('global', {
                 initialValue: true,
                 })(
-                  <Switch
-                    checkedChildren={<Icon type="check" />}
-                    unCheckedChildren={<Icon type="close" />}
-                    defaultChecked
-                  />
+                  <RightSwitch description="Include global state"/>
                 )}
               </Form.Item>
             </Form>
@@ -150,10 +151,26 @@ class NewForm extends PureComponent {
       return retDom;
     }
     handleNext(currentStep){
+      const {form} = this.props;
+      form.validateFieldsAndScroll((err, values) => {
+        console.log(values);
+      });
+      form.validate
       this.setState({
         currentStep: currentStep +1,
       });
     }
+    backward(){
+      this.setState(preState=>{
+        if(preState.currentStep < 1) {
+          return preState;
+        }
+        return {
+          currentStep: preState.currentStep - 1
+        };
+      });
+    }
+    
     render(){
       const {currentStep} = this.state;
       return (
@@ -177,14 +194,13 @@ class NewForm extends PureComponent {
             }}>
             <Button key="back" onClick={()=>this.backward(currentStep)}>
             上一步
-            </Button>,
+            </Button>
             <Button key="forward" style={{marginLeft:'2em'}}  type="primary" onClick={() => this.handleNext(currentStep)}>
               下一步
             </Button>
             <Button key="cancel"  style={{float:'right'}} onClick={() =>{}}>
               取消
-            </Button>,
-           
+            </Button>         
           </div>
         </div>
       )