diff --git a/.doc/contents/Update/README.md b/.doc/contents/Update/README.md
new file mode 100644
index 0000000..1fe6bea
--- /dev/null
+++ b/.doc/contents/Update/README.md
@@ -0,0 +1,19 @@
+
+## 更新日志
+
+###  2020-07-15  
+> 重要内容更新：权限分配页中，按钮展示优化，去掉了 `_{id}` 非必要部分.  [4f74b43](https://github.com/anjoy8/Blog.Admin/commit/4f74b43ba0cfa59166391cdfe01b2d4e8492fce5)  
+> 注意要保证后端代码同步更新。
+
+
+###  2020-07-13  
+> 重要内容更新：左侧导航条支持外链（必须满足正确的 `URL` 要求，比如带 `Http` 协议） [7d822c9](https://github.com/anjoy8/Blog.Admin/commit/7d822c987c39ec7b00deb1c5b1c54c06b023f928)
+
+
+###  2020-05-01  
+> 重要内容更新：集成按钮级别权限
+
+
+###  2020-04-30  
+> 新增：主分支，通过global.js配置，一键切换JWT和Ids4认证授权模式    
+
diff --git a/.doc/contents/guide/getting-started.md b/.doc/contents/guide/getting-started.md
index c79b627..41100af 100644
--- a/.doc/contents/guide/getting-started.md
+++ b/.doc/contents/guide/getting-started.md
@@ -40,32 +40,4 @@ Gitee（国内） 下载 [https://gitee.com/laozhangIsPhi/Blog.Admin](https://gi
 根目录会出现一个 `dist` 文件夹，  
 然后拷贝到服务器，用  `Nginx` 或者 `IIS` 进行代理即可。
 
-### Nginx 部署
 
-1. 直接执行 `build` 命令后，把 `dist` 文件夹拷贝到服务器，然后配置 `nginx` 即可；  
-2. 重点是在 `nginx` 中，需要做跨域代理，比如这样的：  
-
-```
-        location /api/ {
-            rewrite  ^.+apb/?(.*)$ /$1 break;
-            include  uwsgi_params;
-            proxy_pass http://localhost:8081;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            #proxy_set_header Connection "upgrade";
-            #proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        }
-```
-
-### IIS 部署
-
-1. 如果使用 `IIS` 部署的话，就只能使用后端 `CORS` 跨域了，必须保证你的后端项目已经配置好了前端的端口，来允许前端项目能访问，具体的可以查看我的 `Blog.Core` 后端项目中的 `appsettings.json` 中 `Startup/Cors/IPs` 下的配置；  
-2. 同时，我们请求后端的 `api` 就必须使用绝对路径了，因此，我们需要在 `api.js` 文件中，修改 `base` ，配置为后端项目的端口；  
-
-
-### 页面刷新 404 问题
-
-具体的查看我的文章：
-https://www.cnblogs.com/laozhang-is-phi/p/beautifulPublish-mostBugs.html#autoid-3-10-0
diff --git a/package-lock.json b/package-lock.json
index f4543ab..c43414c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2589,8 +2589,7 @@
     "base64-js": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
-      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==",
-      "dev": true
+      "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
     },
     "batch": {
       "version": "0.6.1",
@@ -3894,6 +3893,11 @@
         "randomfill": "^1.0.3"
       }
     },
+    "crypto-js": {
+      "version": "3.1.9-1",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz",
+      "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg="
+    },
     "css": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/css/-/css-2.2.4.tgz",
@@ -9308,6 +9312,24 @@
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
+    "oidc-client": {
+      "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/oidc-client/-/oidc-client-1.10.1.tgz",
+      "integrity": "sha512-/QB5Nl7c9GmT9ir1E+OVY3+yZZnuk7Qa9ZEAJqSvDq0bAyAU9KAgeKipTEfKjGdGLTeOLy9FRWuNpULMkfZydQ==",
+      "requires": {
+        "base64-js": "^1.3.0",
+        "core-js": "^2.6.4",
+        "crypto-js": "^3.1.9-1",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "2.6.11",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
+          "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+        }
+      }
+    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
diff --git a/package.json b/package.json
index cc28ecc..cf2012d 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "element-ui": "^2.8.2",
     "font-awesome": "^4.7.0",
     "js-cookie": "^2.2.0",
+    "oidc-client": "^1.4.1",
     "v-charts": "^1.19.0",
     "vue": "^2.5.21",
     "vue-i18n": "^8.10.0",
diff --git a/src/App.vue b/src/App.vue
index 01fc8b6..678aec8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -153,8 +153,12 @@
     import ScrollPane from './components/ScrollPane'
     import {getUserByToken} from './api/api';
 
+    import applicationUserManager from "./Auth/applicationusermanager";
+    import userAuth from "./Auth/UserAuth";
+
     export default {
         components: {Sidebar, ScrollPane},
+        mixins: [userAuth],
         data() {
             return {
                 sysName: 'BlogAdmin',
@@ -253,8 +257,14 @@
                     this.tagsList = [];
                     this.routes = [];
                     this.$store.commit("saveTagsData", "");
-                    _this.$router.push('/login');
-                    window.location.reload()
+
+                    if (global.IS_IDS4) {
+                        applicationUserManager.logout();
+                    } else {
+                        _this.$router.push('/login');
+                        window.location.reload()
+                    }
+                    
                 }).catch(() => {
 
                 });
@@ -421,7 +431,12 @@
         },
         watch: {
             // 对router进行监听，每当访问router时，对tags的进行修改
-            $route(newValue) {
+            $route: async function(newValue, from) {
+                
+                if (global.IS_IDS4) {
+                    await this.refreshUserInfo();
+                }
+
                 this.setTags(newValue);
 
                 const tags = this.$refs.tag
@@ -482,7 +497,6 @@
         position: relative;
         overflow: hidden;
         border: 1px solid #f0f0f0;
-        margin-bottom: 20px;
         background: #f0f0f0;
     }
 
diff --git a/src/Auth/UserAuth.js b/src/Auth/UserAuth.js
new file mode 100644
index 0000000..b73dc3c
--- /dev/null
+++ b/src/Auth/UserAuth.js
@@ -0,0 +1,27 @@
+import applicationUserManager from "./applicationusermanager";
+const userAuth = {
+  data() {
+    return {
+      user: {
+        name: "",
+        isAuthenticated: false
+      }
+    };
+  },
+  methods: {
+    async refreshUserInfo() {
+      const user = await applicationUserManager.getUser();
+      if (user) {
+        this.user.name = user.profile.name;
+        this.user.isAuthenticated = true;
+      } else {
+        this.user.name = "";
+        this.user.isAuthenticated = false;
+      }
+    }
+  },
+  async created() {
+    await this.refreshUserInfo();
+  }
+};
+export default userAuth;
diff --git a/src/Auth/applicationusermanager.js b/src/Auth/applicationusermanager.js
new file mode 100644
index 0000000..df23efb
--- /dev/null
+++ b/src/Auth/applicationusermanager.js
@@ -0,0 +1,26 @@
+import { UserManager } from 'oidc-client'
+
+class ApplicationUserManager extends UserManager {
+  constructor () {
+    super({
+      authority: 'https://ids.neters.club',
+      client_id: 'blogadminjs',
+      redirect_uri: 'http://vueadmin.neters.club/callback',
+      response_type: 'id_token token',
+      scope: 'openid profile roles blog.core.api',
+      post_logout_redirect_uri: 'http://vueadmin.neters.club'
+    })
+  }
+
+  async login () {
+    await this.signinRedirect()
+    return this.getUser()
+  }
+
+  async logout () {
+    return this.signoutRedirect()
+  }
+}
+
+const applicationUserManager = new ApplicationUserManager()
+export { applicationUserManager as default }
diff --git a/src/api/api.js b/src/api/api.js
index f6e8c88..795a0e7 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -4,6 +4,8 @@ import router from '../router/index'
 import store from "../store";
 import Vue from 'vue';
 
+import applicationUserManager from "../Auth/applicationusermanager";
+
 let base = '';
 // 如果是IIS部署，用这个，因为 IIS 只能是 CORS 跨域，不能代理
 // let base = process.env.NODE_ENV=="production"? 'http://localhost:8081':'';
@@ -64,14 +66,14 @@ axios.interceptors.response.use(
                                 type: 'success'
                             });
 
-                            store.commit("saveToken", res.token);
+                            store.commit("saveToken", res.response.token);
 
                             var curTime = new Date();
-                            var expiredate = new Date(curTime.setSeconds(curTime.getSeconds() + res.expires_in));
+                            var expiredate = new Date(curTime.setSeconds(curTime.getSeconds() + res.response.expires_in));
                             store.commit("saveTokenExpire", expiredate);
 
                             error.config.__isRetryRequest = true;
-                            error.config.headers.Authorization = 'Bearer ' + res.token;
+                            error.config.headers.Authorization = 'Bearer ' + res.response.token;
                             return axios(error.config);
                         } else {
                             // 刷新token失败 清除token信息并跳转到登录页面
@@ -92,6 +94,14 @@ axios.interceptors.response.use(
                 });
                 return null;
             }
+            // 429 ip限流
+            if (error.response.status == 429) {
+                Vue.prototype.$message({
+                    message: '刷新次数过多，请稍事休息重试！',
+                    type: 'error'
+                });
+                return null;
+            }
         }
         return ""; // 返回接口返回的错误信息
     }
@@ -126,19 +136,25 @@ export const saveRefreshtime = params => {
     }
 };
  const ToLogin = params => {
+     
      store.commit("saveToken", "");
      store.commit("saveTokenExpire", "");
      store.commit("saveTagsData", "");
      window.localStorage.removeItem('user');
      window.localStorage.removeItem('NavigationBar');
 
-     router.replace({
-         path: "/login",
-         query: {redirect: router.currentRoute.fullPath}
-     });
-
-      window.location.reload()
-
+     
+                
+    if (global.IS_IDS4) {
+        applicationUserManager.login();
+    } else {
+        router.replace({
+            path: "/login",
+            query: {redirect: router.currentRoute.fullPath}
+        });
+
+        window.location.reload()
+    }
 };
 
 export const getUserByToken = params => {
@@ -272,3 +288,34 @@ export const getAccessApiByDate = params => {
 export const getAccessApiByHour = params => {
     return axios.get(`${base}/api/Monitor/GetAccessApiByHour`, {params: params});
 };
+export const getServerInfo = params => {
+    return axios.get(`${base}/api/Monitor/Server`, {params: params});
+};
+export const getAccessLogs = params => {
+    return axios.get(`${base}/api/Monitor/GetAccessLogs`, {params: params});
+};
+
+
+// Task管理
+export const getTaskListPage = params => {
+    return axios.get(`${base}/api/TasksQz/get`, {params: params});
+};
+export const removeTask = params => {
+    return axios.delete(`${base}/api/TasksQz/delete`, {params: params});
+};
+export const editTask = params => {
+    return axios.put(`${base}/api/TasksQz/put`, params);
+};
+export const addTask = params => {
+    return axios.post(`${base}/api/TasksQz/post`, params);
+};
+
+export const startJob = params => {
+    return axios.get(`${base}/api/TasksQz/StartJob`, {params: params});
+};
+export const stopJob = params => {
+    return axios.get(`${base}/api/TasksQz/StopJob`, {params: params});
+};
+export const reCovery = params => {
+    return axios.get(`${base}/api/TasksQz/ReCovery`, {params: params});
+};
\ No newline at end of file
diff --git a/src/components/AppLink.vue b/src/components/AppLink.vue
new file mode 100644
index 0000000..ca5fcb5
--- /dev/null
+++ b/src/components/AppLink.vue
@@ -0,0 +1,43 @@
+<template>
+  <component :is="type" v-bind="linkProps(to)">
+    <slot />
+  </component>
+</template>
+
+<script>
+import { isExternal } from '../../util/validate'
+
+export default {
+  props: {
+    to: {
+      type: String,
+      required: true
+    }
+  },
+  computed: {
+    isExternal() {
+      return isExternal(this.to)
+    },
+    type() {
+      if (this.isExternal) {
+        return 'a'
+      }
+      return 'router-link'
+    }
+  },
+  methods: {
+    linkProps(to) {
+      if (this.isExternal) {
+        return {
+          href: to,
+          target: '_blank',
+          style:'color:#fff;'
+        }
+      }
+      return {
+        to: to
+      }
+    }
+  }
+}
+</script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 01d67e4..43fbb38 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!-- if 有子节点，渲染节点递归 -->
     <template v-if="item.children">
       <el-submenu
         v-if="!(item.path!=''&&item.path!=' '&&item.path!='-')&&!item.IsButton"
@@ -23,40 +24,57 @@
               :index="child.id"
               :key="child.path"
             />
-            <el-menu-item v-else :key="child.path" :index="child.path" @click="cop">
-              <!-- {{child.name}}2 -->
-              <i class="fa" :class="child.iconCls"></i>
-              <template slot="title">
-                <span class="title-name" slot="title">{{child.name}}</span>
-              </template>
-            </el-menu-item>
+            <app-link :to="child.path" v-else :key="child.path">
+              <el-menu-item :key="child.path" 
+          :index="isExternalLink(child.path)? '':child.path"
+               @click="cop">
+                <i class="fa" :class="child.iconCls"></i>
+                <template slot="title">
+                  <span class="title-name" slot="title">{{child.name}}</span>
+                </template>
+              </el-menu-item>
+            </app-link>
           </template>
         </template>
       </el-submenu>
       <template v-else>
-        <el-menu-item v-if="!item.IsButton" :index="item.path" :key="item.path+'d'">
+        <app-link :to="item.path" v-if="!item.IsButton" :key="item.path+'d'">
+          <el-menu-item
+          :index="isExternalLink(item.path)? '':item.path"
+           :key="item.path+'d'">
+            <i class="fa" :class="item.iconCls"></i>
+            <template slot="title">
+              <span class="title-name" slot="title">{{item.name}}</span>
+            </template>
+          </el-menu-item>
+        </app-link>
+      </template>
+    </template>
+    <!-- else 没有子节点，直接输出 -->
+    <template v-else>
+      <app-link :to="item.path" :key="item.path+'d'">
+        <el-menu-item
+          :index="isExternalLink(item.path)? '':item.path"
+          :key="item.path+'d'"
+          @click="cop"
+        >
           <i class="fa" :class="item.iconCls"></i>
           <template slot="title">
             <span class="title-name" slot="title">{{item.name}}</span>
           </template>
         </el-menu-item>
-      </template>
-    </template>
-    <!-- 没有子节点，直接输出 -->
-    <template v-else>
-      <el-menu-item :index="item.path" :key="item.path+'d'" @click="cop">
-        <i class="fa" :class="item.iconCls"></i>
-        <template slot="title">
-          <span class="title-name" slot="title">{{item.name}}</span>
-        </template>
-      </el-menu-item>
+      </app-link>
     </template>
   </div>
 </template>
 
 <script>
+import AppLink from "./AppLink";
+import { isExternal } from "../../util/validate";
+
 export default {
   name: "Sidebar",
+  components: { AppLink },
   props: {
     item: {
       type: Object,
@@ -64,6 +82,9 @@ export default {
     }
   },
   methods: {
+    isExternalLink(to) {
+      return isExternal(to);
+    },
     cop: function() {
       // 子组件中触发父组件方法collaFa并传值123
       this.$emit("collaFa", "123");
diff --git a/src/components/Toolbar.vue b/src/components/Toolbar.vue
index bc82fbc..ddc1a29 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/Toolbar.vue
@@ -1,13 +1,13 @@
 <template>
-  <el-col v-if="buttonList.length>0" :span="24" class="toolbar" style="padding-bottom: 0px;">
+  <el-col v-if="buttonList!=null&&buttonList.length>0" :span="24" class="toolbar" style="padding-bottom: 0px;">
     <el-form :inline="true" @submit.native.prevent>
       <el-form-item>
         <el-input v-model="searchVal" placeholder="请输入内容"></el-input>
       </el-form-item>
       <!-- 这个就是当前页面内，所有的btn列表 -->
-      <el-form-item v-for="item in buttonList">
+      <el-form-item v-for="item in buttonList" v-bind:key="item.id">
         <!-- 这里触发点击事件 -->
-        <el-button type="primary" @click="callFunc(item)">{{item.name}}</el-button>
+        <el-button :type="item.Func&&(item.Func.toLowerCase().indexOf('handledel')!= -1 ||item.Func.toLowerCase().indexOf('stop')!= -1 )? 'danger':'primary'" v-if="!item.IsHide" @click="callFunc(item)">{{item.name}}</el-button>
       </el-form-item>
     </el-form>
   </el-col>
diff --git a/src/promissionRouter.js b/src/promissionRouter.js
index 30555a5..931ede7 100644
--- a/src/promissionRouter.js
+++ b/src/promissionRouter.js
@@ -4,11 +4,11 @@ import { resetRouter, filterAsyncRouter } from '@/router/index'
 import { getNavigationBar, saveRefreshtime } from '@/api/api';
 import store from "@/store";
 
+import applicationUserManager from "./Auth/applicationusermanager";
 
 //用来获取后台拿到的路由
 var getRouter
 if (!getRouter) {//不加这个判断，路由会陷入死循环
-
     if (!getObjArr('router')) {
         //本地没有，则从数据库获取
         var user = window.localStorage.user ? JSON.parse(window.localStorage.user) : null;
@@ -39,7 +39,6 @@ var storeTemp = store;
 router.beforeEach((to, from, next) => {
     //验证Token
     {
-
         if (!storeTemp.state.token) {
             storeTemp.commit("saveToken", window.localStorage.Token)
         }
@@ -62,12 +61,18 @@ router.beforeEach((to, from, next) => {
                 window.localStorage.removeItem('NavigationBar');
                 window.localStorage.removeItem('router');
 
-                next({
-                    path: "/login",
-                    query: { redirect: to.fullPath } // 将跳转的路由path作为参数，登录成功后跳转到该路由
-                });
+                
+                if (global.IS_IDS4) {
+                applicationUserManager.login();
+                }else{
+                    next({
+                        path: "/login",
+                        query: { redirect: to.fullPath } // 将跳转的路由path作为参数，登录成功后跳转到该路由
+                    });
+
+                    window.location.reload()
+                }
 
-                window.location.reload()
             }
         } else {
             next();
diff --git a/src/router/index.js b/src/router/index.js
index e532d60..d1fc540 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -2,12 +2,14 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import Login from '../views/Login.vue'
 import Welcome from '../views/Welcome'
-import Thanks from '../views/Thanks'
+import APIDoc from '../views/APIDoc'
 import NoPage from '../views/404'
 
 import Layout from "../views/Layout/Layout";
 const _import = require('@/router/_import_' + process.env.NODE_ENV)//获取组件的方法
 
+import LoginCallbackView from "../views/LoginCallbackView";
+
 Vue.use(Router)
 
 const createRouter = () => new Router({
@@ -25,9 +27,9 @@ const createRouter = () => new Router({
             hidden: true
         },
         {
-            path: '/Thanks', component: Thanks, name: 'Thanks',
+            path: '/APIDoc', component: APIDoc, name: 'APIDoc',
             meta: {
-                title: 'Thanks',
+                title: 'APIDoc',
                 requireAuth: false
             },
             hidden: true
@@ -55,6 +57,16 @@ const createRouter = () => new Router({
             },
             hidden: true
         },
+        {
+          path: "/callback",
+          name: "LoginCallbackView",
+          component: LoginCallbackView,
+          meta: {
+              title: '登出',
+              NoTabPage: true,
+          },
+          hidden: true
+        },
         {
             path: '*',
             hidden: true,
diff --git a/src/routerManuaConfig.js b/src/routerManuaConfig.js
index da2146b..2f4b2e8 100644
--- a/src/routerManuaConfig.js
+++ b/src/routerManuaConfig.js
@@ -21,7 +21,7 @@ import Charts from './views/Form/Charts.vue'
 import Blogs from './views/Blog/Blogs.vue'
 import Bugs from './views/Tibug/Bugs.vue'
 
-import Thanks from './views/Thanks'
+import APIDoc from './views/APIDoc'
 import {saveRefreshtime} from "./api/api";
 import NoPage from "./views/404";
 import TestOne from "./views/TestShow/TestOne";
@@ -31,6 +31,9 @@ import TestOne from "./views/TestShow/TestOne";
 Vue.use(Router)
 
 
+/**
+ * 这是手动注册的方式，弃用
+ */
 const router = new Router({
     mode: 'history',
     base: process.env.BASE_URL,
@@ -54,9 +57,9 @@ const router = new Router({
             hidden: true
         },
         {
-            path: '/Thanks', component: Thanks, name: 'Thanks',
+            path: '/APIDoc', component: APIDoc, name: 'APIDoc',
             meta: {
-                title: 'Thanks',
+                title: 'APIDoc',
                 requireAuth: false
             },
             hidden: true
@@ -91,14 +94,14 @@ const router = new Router({
             iconCls: 'fa-users',//图标样式class
             children: [
                 {
-                    path: '/Admin/Users', component: Table, name: '用户管理',
+                    path: '/User/Users', component: Table, name: '用户管理',
                     meta: {
                         title: '用户管理',
                         requireAuth: true
                     }
                 },
                 {
-                    path: '/Admin/Roles', component: Roles, name: '角色管理',
+                    path: '/User/Roles', component: Roles, name: '角色管理',
                     meta: {
                         title: '角色管理',
                         requireAuth: true // 添加该字段，表示进入这个路由是需要登录的
@@ -113,14 +116,14 @@ const router = new Router({
             iconCls: 'fa-sitemap',//图标样式class
             children: [
                 {
-                    path: '/Permission/Modules', component: Module, name: '接口管理',
+                    path: '/Permission/Module', component: Module, name: '接口管理',
                     meta: {
                         title: '接口管理',
                         requireAuth: true // 添加该字段，表示进入这个路由是需要登录的
                     }
                 },
                 {
-                    path: '/Permission/Menu', component: Permission, name: '菜单管理',
+                    path: '/Permission/Permission', component: Permission, name: '菜单管理',
                     meta: {
                         title: '菜单管理',
                         requireAuth: true // 添加该字段，表示进入这个路由是需要登录的
diff --git a/src/style/home.css b/src/style/home.css
index 51f7e27..439a758 100644
--- a/src/style/home.css
+++ b/src/style/home.css
@@ -208,8 +208,8 @@ body {
 }
 .content-az{
     border: 1px solid #f0f0f0;
-    /*margin: 10px 15px;*/
-    /*overflow: auto;*/
+    margin-top: 20px;
+    margin-left: 5px;
     margin-right: 10px;
     height: 100%;
     padding: 5px;
@@ -224,7 +224,7 @@ body {
     height: 100%;
 }
 .welcome-card{
-    width:30%;float:left;margin-right:10px;
+    width:100%;float:left;margin-right:10px;
 }
 @media screen and (max-width: 500px) {
    
@@ -239,4 +239,8 @@ body {
 
 .scrollbar-handle.el-scrollbar > :first-child {
     overflow-x: hidden !important;
+}
+
+a{
+    text-decoration: none;
 }
\ No newline at end of file
diff --git a/src/views/APIDoc.vue b/src/views/APIDoc.vue
new file mode 100644
index 0000000..f391452
--- /dev/null
+++ b/src/views/APIDoc.vue
@@ -0,0 +1,54 @@
+<template>
+  <div class="thanks">
+    <!-- <iframe
+      src="http://apk.neters.club"
+      id="apidoc"
+      scrolling="no"
+      frameborder="0"
+      style="width:100%;"
+    ></iframe> -->
+
+    <iframe
+      src="http://apk.neters.club"
+      scrolling="auto"
+      id="apidoc"
+      width="100%"
+      frameborder="0"
+    ></iframe>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "APIDoc",
+  data() {
+    return {};
+  },
+  mounted() {
+    /**
+     * iframe-宽高自适应显示
+     */
+    function changeMobsfIframe() {
+      const apidoc = document.getElementById("apidoc");
+      const deviceWidth = document.body.clientWidth;
+      const deviceHeight = document.body.clientHeight;
+      //   apidoc.style.width = Number(deviceWidth) - 120 + "px"; //数字是页面布局宽度差值
+      apidoc.style.height = Number(deviceHeight) - 128 + "px"; //数字是页面布局高度差
+    }
+
+    changeMobsfIframe();
+
+    window.onresize = function() {
+      changeMobsfIframe();
+    };
+  }
+};
+</script>
+
+<style scoped>
+.thanks {
+  text-align: center;
+  font-size: 30px;
+  color: darkgray;
+}
+</style>
diff --git a/src/views/Blog/Blogs.vue b/src/views/Blog/Blogs.vue
index e6dd709..79f9b48 100644
--- a/src/views/Blog/Blogs.vue
+++ b/src/views/Blog/Blogs.vue
@@ -1,22 +1,12 @@
 <template>
     <section>
         <!--工具条-->
-        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <el-form :inline="true" :model="filters" @submit.native.prevent>
-                <el-form-item>
-                    <el-input v-model="filters.LinkUrl" placeholder="标题/内容"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getRoles">查询</el-button>
-                </el-form-item>
-                <!--<el-form-item>-->
-                    <!--<el-button type="primary" @click="handleAdd">新增</el-button>-->
-                <!--</el-form-item>-->
-            </el-form>
-        </el-col>
+        <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
 
         <!--列表-->
-        <el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
+        <el-table :data="users" highlight-current-row
+        @current-change="selectCurrentRow" 
+        v-loading="listLoading" @selection-change="selsChange"
                   style="width: 100%;">
             <el-table-column type="selection" width="50">
             </el-table-column>
@@ -35,12 +25,12 @@
             <el-table-column prop="bCreateTime" label="创建时间" :formatter="formatCreateTime" width="250" sortable>
             </el-table-column>
 
-            <el-table-column label="操作" width="150">
+            <!-- <el-table-column label="操作" width="150">
                 <template scope="scope">
                     <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                     <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
 
         <!--工具条-->
@@ -103,10 +93,15 @@
 <script>
     import util from '../../../util/date'
     import {getBlogListPage,removeBlog} from '../../api/api';
+    import { getButtonList } from "../../promissionRouter";
+    import Toolbar from "../../components/Toolbar";
 
     export default {
+        components: { Toolbar },
         data() {
             return {
+                buttonList: [],
+                currentRow: null,
                 filters: {
                     LinkUrl: ''
                 },
@@ -157,6 +152,15 @@
             }
         },
         methods: {
+            selectCurrentRow(val) {
+            this.currentRow = val;
+            },
+            callFunction(item) {
+            this.filters = {
+                name: item.search
+            };
+            this[item.Func].apply(this, item);
+            },
             //性别显示转换
             formatbcontent: function (row, column) {
                 return row.bcontent ? row.bcontent.substring(20) : 'N/A';
@@ -166,10 +170,10 @@
             },
             handleCurrentChange(val) {
                 this.page = val;
-                this.getRoles();
+                this.getBlogs();
             },
             //获取用户列表
-            getRoles() {
+            getBlogs() {
                 let para = {
                     page: this.page,
                     key: this.filters.LinkUrl
@@ -185,7 +189,16 @@
                 });
             },
             //删除
-            handleDel: function (index, row) {
+            handleDel() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要删除的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.$confirm('确认删除该记录吗?', '提示', {
                     type: 'warning'
                 }).then(() => {
@@ -212,14 +225,23 @@
                             });
                         }
 
-                        this.getRoles();
+                        this.getBlogs();
                     });
                 }).catch(() => {
 
                 });
             },
             //显示编辑界面
-            handleEdit: function (index, row) {
+            handleEdit() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要编辑的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 // this.editFormVisible = true;
                 // this.editForm = Object.assign({}, row);
                 console.log(row.bID)
@@ -267,7 +289,7 @@
                                     });
                                     this.$refs['editForm'].resetFields();
                                     this.editFormVisible = false;
-                                    this.getRoles();
+                                    this.getBlogs();
                                 } else {
                                     this.$message({
                                         message: res.data.msg,
@@ -323,7 +345,7 @@
                                     });
                                     this.$refs['addForm'].resetFields();
                                     this.addFormVisible = false;
-                                    this.getRoles();
+                                    this.getBlogs();
                                 }
                                 else {
                                     this.$message({
@@ -351,7 +373,12 @@
             }
         },
         mounted() {
-            this.getRoles();
+            this.getBlogs();
+
+            let routers = window.localStorage.router
+            ? JSON.parse(window.localStorage.router)
+            : [];
+            this.buttonList = getButtonList(this.$route.path, routers);
         }
     }
 
diff --git a/src/views/Layout/Layout.vue b/src/views/Layout/Layout.vue
index 05f0924..61f6bcb 100644
--- a/src/views/Layout/Layout.vue
+++ b/src/views/Layout/Layout.vue
@@ -1,6 +1,9 @@
 <template>
-  <el-scrollbar style="height:100%" class="scrollbar-handle">
-    <router-view></router-view>
+  <el-scrollbar style="height:100%" class="scrollbar-handle">    
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
   </el-scrollbar>
 </template>
 
diff --git a/src/views/Login.vue b/src/views/Login.vue
index f503dfe..48fb1d0 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -1,8 +1,8 @@
 <template>
     <div class="wrapper">
         <ul class="bg-bubbles">
-            <li v-for="n in 10"></li>
-            <ol v-for="n in 5"></ol>
+            <li v-for="n in 10" :key="n+'n'"></li>
+            <ol v-for="m in 5"  :key="m+'m'"></ol>
         </ul>
         <div class="bg bg-blur" style="display: none;"></div>
         <div style="height: 10%;"></div>
@@ -306,10 +306,7 @@
     .login-container .remember {
         margin: 0px 0px 25px 0px;
     }
-
-    li {
-    }
-
+    
     .wrapper {
         background: #50a3a2;
         background: -webkit-linear-gradient(top left, #50a3a2 0%, #53e3a6 100%);
diff --git a/src/views/LoginCallbackView.vue b/src/views/LoginCallbackView.vue
new file mode 100644
index 0000000..f0ff71c
--- /dev/null
+++ b/src/views/LoginCallbackView.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div desktop="12" tablet="8">
+      <dl>
+        <dt>Login successful</dt>
+        <dt>Your browser should be redirected soon</dt>
+      </dl>
+    </div>
+  </div>
+</template>
+
+<script>
+import applicationUserManager from "../Auth/applicationusermanager";
+
+import {
+  requestLogin,
+  requestLoginMock,
+  getUserByToken,
+  getNavigationBar
+} from "../api/api";
+
+import router from "@/router";
+import { resetRouter, filterAsyncRouter } from "@/router/index";
+
+export default {
+  name: "logincallback-view",
+  data() {
+    return {};
+  },
+  async created() {
+    try {
+      await applicationUserManager.signinRedirectCallback();
+      let _this = this;
+      let user = await applicationUserManager.getUser();
+      _this.$store.commit("saveToken", user.access_token);
+
+      var curTime = new Date();
+      var expiredate = new Date(
+        curTime.setSeconds(curTime.getSeconds() + user.expires_in)
+      );
+      _this.$store.commit("saveTokenExpire", expiredate);
+
+      window.localStorage.refreshtime = expiredate;
+      window.localStorage.expires_in = user.expires_in;
+
+      _this.$notify({
+        type: "success",
+        message: `成功获取令牌，项目初始化中...`,
+        duration: 3000
+      });
+      
+      user.uRealName=user.profile.name;
+      user.uLoginName=user.profile.preferred_username;
+      user.uID=user.profile.sub;
+      window.localStorage.user = JSON.stringify(user);
+      if (user.uID > 0) {
+        _this.GetNavigationBar(user.uID);
+      }
+
+    } catch (e) {
+      this.$root.$emit("show-snackbar", { message: e });
+    }
+  },
+  methods: {
+    // 获取路由树
+    GetNavigationBar(uid) {
+      var _this = this;
+      var loginParams = { uid: uid, t: new Date() };
+
+      getNavigationBar(loginParams).then(data => {
+
+        if (!data.success) {
+          _this.$message({
+            message: data.message,
+            type: "error"
+          });
+        } else {
+          // _this.closeAlert()
+
+          _this.$message({
+            message: "后台初始化成功",
+            type: "success"
+          });
+          let userinfo = JSON.parse(
+            window.localStorage.user ? window.localStorage.user : null
+          );
+          _this.$notify({
+            type: "success",
+            message: `登录成功 \n 欢迎管理员：${
+              userinfo.uRealName
+            } ！Token 将在 ${parseInt(window.localStorage.expires_in / 60)} 分钟后过期！`,
+            duration: 6000
+          });
+
+          window.localStorage.router = JSON.stringify(data.response.children);
+
+          let getRouter = data.response.children; //后台拿到路由
+          getRouter = filterAsyncRouter(getRouter); //过滤路由
+          router.$addRoutes(getRouter); //动态添加路由
+
+          _this.$router.replace(
+            _this.$route.query.redirect ? _this.$route.query.redirect : "/"
+          );
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/Permission/Assign.vue b/src/views/Permission/Assign.vue
index e7a0f30..6668f7b 100644
--- a/src/views/Permission/Assign.vue
+++ b/src/views/Permission/Assign.vue
@@ -42,7 +42,9 @@
                         <span>
                         <el-checkbox-group v-model="assignBtns">
                         <el-checkbox v-for="btn in data.btns" :key="btn.value"
-                                     :label="btn.label+'_'+btn.value"></el-checkbox>
+                                     :label="btn.value.toString()">
+                                     {{btn.label}}
+                                     </el-checkbox>
                         </el-checkbox-group>
 
                         </span>
@@ -160,14 +162,15 @@
                 let _this=this;
                 this.loadingSave=true;
                 this.loadingSaveStr='保存中...';
-                console.log(this.$refs.tree.getCheckedKeys());
-                console.log(this.assignBtns)
+                //console.log(this.$refs.tree.getCheckedKeys());
+                //console.log(this.assignBtns)
                 let pids = this.$refs.tree.getCheckedKeys();
                 try {
                     if (this.assignBtns.length > 0) {
                         for (let i = 0; i < this.assignBtns.length; i++) {
-                            let assginbtn = this.assignBtns[i].split("_")[1];
-                            if (assginbtn > 0) {
+                            // let assginbtn = this.assignBtns[i].split("_")[1];
+                            let assginbtn = this.assignBtns[i];
+                            if (assginbtn && assginbtn > 0) {
                                 pids.push(assginbtn);
                             }
                         }
@@ -319,6 +322,7 @@
             this.loadingSave=true;
             this.loadingSaveStr='加载中...';
             this.getRoles();
+
             // this.getPermissions();
         }
     }
diff --git a/src/views/Permission/Module.vue b/src/views/Permission/Module.vue
index 482877d..ac55a7e 100644
--- a/src/views/Permission/Module.vue
+++ b/src/views/Permission/Module.vue
@@ -1,22 +1,12 @@
 <template>
     <section>
         <!--工具条-->
-        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <el-form :inline="true" :model="filters" @submit.native.prevent>
-                <el-form-item>
-                    <el-input v-model="filters.LinkUrl" placeholder="接口名"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getRoles">查询</el-button>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="handleAdd">新增</el-button>
-                </el-form-item>
-            </el-form>
-        </el-col>
+        <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
 
         <!--列表-->
-        <el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
+        <el-table :data="users" highlight-current-row 
+        @current-change="selectCurrentRow"
+        v-loading="listLoading" @selection-change="selsChange"
                   style="width: 100%;">
             <el-table-column type="selection" width="50">
             </el-table-column>
@@ -38,12 +28,12 @@
                     </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="150">
+            <!-- <el-table-column label="操作" width="150">
                 <template scope="scope">
                     <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                     <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
 
         <!--工具条-->
@@ -106,10 +96,15 @@
 <script>
     import util from '../../../util/date'
     import {getModuleListPage, removeModule, editModule, addModule} from '../../api/api';
+    import { getButtonList } from "../../promissionRouter";
+    import Toolbar from "../../components/Toolbar";
 
     export default {
+        components: { Toolbar },
         data() {
             return {
+                buttonList: [],
+                currentRow: null,
                 filters: {
                     LinkUrl: ''
                 },
@@ -160,6 +155,15 @@
             }
         },
         methods: {
+            selectCurrentRow(val) {
+            this.currentRow = val;
+            },
+            callFunction(item) {
+            this.filters = {
+                name: item.search
+            };
+            this[item.Func].apply(this, item);
+            },
             //性别显示转换
             formatEnabled: function (row, column) {
                 return row.Enabled ? '正常' : '未知';
@@ -169,10 +173,10 @@
             },
             handleCurrentChange(val) {
                 this.page = val;
-                this.getRoles();
+                this.getModules();
             },
             //获取用户列表
-            getRoles() {
+            getModules() {
                 let para = {
                     page: this.page,
                     key: this.filters.LinkUrl
@@ -188,7 +192,16 @@
                 });
             },
             //删除
-            handleDel: function (index, row) {
+            handleDel() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要删除的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.$confirm('确认删除该记录吗?', '提示', {
                     type: 'warning'
                 }).then(() => {
@@ -216,14 +229,23 @@
                             });
                         }
 
-                        this.getRoles();
+                        this.getModules();
                     });
                 }).catch(() => {
 
                 });
             },
             //显示编辑界面
-            handleEdit: function (index, row) {
+            handleEdit() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要编辑的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.editFormVisible = true;
                 this.editForm = Object.assign({}, row);
             },
@@ -263,7 +285,7 @@
                                     });
                                     this.$refs['editForm'].resetFields();
                                     this.editFormVisible = false;
-                                    this.getRoles();
+                                    this.getModules();
                                 } else {
                                     this.$message({
                                         message: res.data.msg,
@@ -320,7 +342,7 @@
                                     });
                                     this.$refs['addForm'].resetFields();
                                     this.addFormVisible = false;
-                                    this.getRoles();
+                                    this.getModules();
                                 }
                                 else {
                                     this.$message({
@@ -348,7 +370,12 @@
             }
         },
         mounted() {
-            this.getRoles();
+            this.getModules();
+
+            let routers = window.localStorage.router
+            ? JSON.parse(window.localStorage.router)
+            : [];
+            this.buttonList = getButtonList(this.$route.path, routers);
         }
     }
 
diff --git a/src/views/Permission/Permission.vue b/src/views/Permission/Permission.vue
index 586821b..b306d61 100644
--- a/src/views/Permission/Permission.vue
+++ b/src/views/Permission/Permission.vue
@@ -1,553 +1,635 @@
 <template>
-    <section>
-        <!--工具条-->
-        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <el-form :inline="true" :model="filters" @submit.native.prevent>
-                <el-form-item>
-                    <el-input v-model="filters.Name" placeholder="菜单/按钮名"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getPermissions">查询</el-button>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="handleAdd">新增</el-button>
-                </el-form-item>
-            </el-form>
-        </el-col>
-
-        <!--列表-->
-        <el-table :data="users" 
-        highlight-current-row 
-        v-loading="listLoading" 
-        @selection-change="selsChange"
-        row-key="Id"
-        border
-        lazy
-        :load="load"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        style="width: 100%;">
-            <el-table-column type="selection" width="50">
-            </el-table-column>
-            <el-table-column type="index" width="80">
-            </el-table-column>
-            <el-table-column label="菜单/按钮" width="200" sortable>
-                <template slot-scope="scope">
-                    <i class="fa" :class="scope.row.Icon"></i>
-                    {{scope.row.Name}}
-
-                </template>
-            </el-table-column>
-            <!-- <el-table-column prop="PnameArr" label="父节点" width="" sortable>
-            </el-table-column> -->
-            <el-table-column prop="Code" label="路由地址" width="" sortable>
-            </el-table-column>
-            <el-table-column prop="MName" label="API接口" width="" sortable>
-            </el-table-column>
-            <el-table-column prop="CreateTime" label="创建时间" :formatter="formatCreateTime" width="150" sortable>
-            </el-table-column>
-            <el-table-column prop="Enabled" label="状态" width="100" sortable>
-                <template slot-scope="scope">
-                    <el-tag
-                            :type="scope.row.Enabled  ? 'success' : 'danger'"
-                            disable-transitions>{{scope.row.Enabled ? "正常":"禁用"}}
-                    </el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column prop="OrderSort" label="Sort" width="" sortable>
-            </el-table-column>
-            <el-table-column prop="IsButton" label="是否按钮" width="100" sortable>
-                <template slot-scope="scope">
-                    <el-tag
-                            :type="!scope.row.IsButton  ? 'success' : 'danger'"
-                            disable-transitions>{{!scope.row.IsButton ? "否":"是"}}
-                    </el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column prop="Func" label="按钮事件" width="" sortable>
-            </el-table-column>
-            <el-table-column prop="IsHide" label="是否隐藏" width="100" sortable>
-                <template slot-scope="scope">
-                    <el-tag
-                            :type="!scope.row.IsHide  ? 'success' : 'danger'"
-                            disable-transitions>{{!scope.row.IsHide ? "否":"是"}}
-                    </el-tag>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" width="150">
+  <section>
+    <!--工具条-->
+    <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
+
+    <!--列表-->
+    <el-table
+      :data="users"
+      highlight-current-row
+      v-loading="listLoading"
+      @selection-change="selsChange"
+      @current-change="selectCurrentRow"
+      row-key="Id"
+      border
+      lazy
+      :load="load"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      style="width: 100%;"
+    >
+      <el-table-column type="selection" width="50"></el-table-column>
+      <el-table-column type="index" width="80"></el-table-column>
+      <el-table-column label="菜单/按钮" width="200" sortable>
+        <template slot-scope="scope">
+          <i class="fa" :class="scope.row.Icon"></i>
+
+          {{scope.row.Name}}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column prop="PnameArr" label="父节点" width="" sortable>
+      </el-table-column>-->
+      <el-table-column prop="Code" label="路由地址" width sortable></el-table-column>
+      <el-table-column prop="MName" label="API接口" width sortable></el-table-column>
+      <el-table-column prop="OrderSort" label="Sort" width sortable></el-table-column>
+      <el-table-column prop="IsButton" label="是否按钮" width="100" sortable>
+        <template slot-scope="scope">
+          <el-tag
+            :type="!scope.row.IsButton  ? 'success' : 'danger'"
+            disable-transitions
+          >{{!scope.row.IsButton ? "否":"是"}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Func" label="按钮事件" width sortable></el-table-column>
+      <el-table-column prop="IsHide" label="是否隐藏" width="100" sortable>
+        <template slot-scope="scope">
+          <el-tag
+            :type="!scope.row.IsHide  ? 'success' : 'danger'"
+            disable-transitions
+          >{{!scope.row.IsHide ? "否":"是"}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="IskeepAlive" label="keepAlive" width="100" sortable>
+        <template slot-scope="scope">
+          <el-tag
+            :type="!scope.row.IskeepAlive  ? 'success' : 'danger'"
+            disable-transitions
+          >{{!scope.row.IskeepAlive ? "否":"是"}}</el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="操作" width="150">
                 <template scope="scope">
                     <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                     <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
                 </template>
-            </el-table-column>
-        </el-table>
-
-        <!--工具条-->
-        <el-col :span="24" class="toolbar">
-            <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
-            <el-pagination layout="prev, pager, next" @current-change="handleCurrentChange" :page-size="50"
-                           :total="total" style="float:right;">
-            </el-pagination>
-        </el-col>
-
-        <!--编辑界面-->
-        <el-dialog title="编辑" :visible.sync="editFormVisible" v-model="editFormVisible" :close-on-click-modal="false">
-            <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
-                <el-form-item label="菜单名称" prop="Name">
-                    <el-input v-model="editForm.Name" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="路由地址" prop="Code">
-                    <el-tooltip class="item" effect="dark" content="如果是导航条且无路由，请填‘-’字符，如果是按钮，请输入空格即可" placement="top-start">
-                        <el-input v-model="editForm.Code" auto-complete="off"></el-input>
-                    </el-tooltip>
-                </el-form-item>
-                <el-form-item label="描述" prop="Description">
-                    <el-input v-model="editForm.Description" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="Icon" prop="Icon">
-                    <el-input v-model="editForm.Icon" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="状态" prop="Enabled">
-                    <el-select v-model="editForm.Enabled" placeholder="请选择状态">
-                        <el-option v-for="item in statusList" :key="item.value" :label="item.Name"
-                                   :value="item.value"></el-option>
-
-                    </el-select>
-                </el-form-item>
-
-                <el-form-item label="排序" prop="OrderSort">
-                    <el-input type="number" v-model="editForm.OrderSort" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="IsButton" label="是否按钮" width="" sortable>
-                    <el-switch v-model="editForm.IsButton" >
-                    </el-switch>
-                </el-form-item>
-                  <el-form-item label="按钮事件" prop="Func">
-                    <el-input v-model="editForm.Func" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="IsHide" label="隐藏菜单" width="" sortable>
-                    <el-switch v-model="editForm.IsHide" >
-                    </el-switch>
-                </el-form-item>
-                <el-form-item prop="PidArr" label="父级菜单" width="" sortable>
-                    <el-cascader placeholder="请选择，支持搜索功能" style="width: 400px"  v-model="editForm.PidArr"
-                                 :options="options"
-                                 filterable
-                                 change-on-select
-                    ></el-cascader>
-                </el-form-item>
-                <el-form-item prop="Mid" label="API接口" width="" sortable>
-                    <el-select style="width: 100%;" v-model="editForm.Mid" placeholder="请选择API">
-                        <el-option  :key="0"  :value="0" :label="'无需api'">
-                        </el-option>
-                        <el-option v-for="item in modules" :key="item.Id" :value="item.Id" :label="item.LinkUrl">
-                            <span style="float: left">{{ item.LinkUrl }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Name }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click.native="editFormVisible = false">取消</el-button>
-                <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+      </el-table-column>-->
+    </el-table>
+
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
+      <el-pagination
+        layout="prev, pager, next"
+        @current-change="handleCurrentChange"
+        :page-size="50"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
+    </el-col>
+
+    <!--编辑界面-->
+    <el-dialog
+      title="编辑"
+      :visible.sync="editFormVisible"
+      v-model="editFormVisible"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="editForm" label-width="80px" :rules="editFormRules" ref="editForm">
+        <el-form-item label="菜单名称" prop="Name">
+          <el-input v-model="editForm.Name" auto-complete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="路由地址" prop="Code">
+          <el-tooltip placement="top">
+            <div slot="content">
+              如果是目录，请填‘-’字符
+              <br />如果是按钮，请输入空格即可
+              <br />如果是外链，请带上协议，比如 https://www.baidu.com
+              <br />
             </div>
-        </el-dialog>
-
-        <!--新增界面-->
-        <el-dialog title="新增" :visible.sync="addFormVisible" v-model="addFormVisible" :close-on-click-modal="false">
-            <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
-                <el-form-item label="菜单名称" prop="Name">
-                    <el-input v-model="addForm.Name" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="路由地址" prop="Code">
-                    <el-tooltip class="item" effect="dark" content="如果是导航条且无路由，请填‘-’字符，如果是按钮，请输入空格即可" placement="top-start">
-                    <el-input v-model="addForm.Code" auto-complete="off"></el-input>
-                    </el-tooltip>
-                </el-form-item>
-                <el-form-item label="描述" prop="Description">
-                    <el-input v-model="addForm.Description" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item label="状态" prop="Enabled">
-                    <el-select v-model="addForm.Enabled" placeholder="请选择状态">
-                        <el-option v-for="item in statusList" :key="item.value" :label="item.Name"
-                                   :value="item.value"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="排序" prop="OrderSort">
-                    <el-input v-model="addForm.OrderSort" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="IsButton" label="是否按钮" width="" sortable>
-                    <el-switch v-model="addForm.IsButton" >
-                    </el-switch>
-                </el-form-item>
-                  <el-form-item label="按钮事件" prop="Func">
-                    <el-input v-model="addForm.Func" auto-complete="off"></el-input>
-                </el-form-item>
-                <el-form-item prop="IsHide" label="隐藏菜单" width="" sortable>
-                    <el-switch v-model="addForm.IsHide" >
-                    </el-switch>
-                </el-form-item>
-                <el-form-item prop="PidArr" label="父级菜单" width="" sortable>
-                    <el-cascader style="width: 400px" v-model="addForm.PidArr"
-                            :options="options"
-                            filterable
-                            change-on-select
-                    ></el-cascader>
-
-                </el-form-item>
-
-
-                <el-form-item prop="Mid" label="API接口" width="" sortable>
-                    <el-select style="width: 100%;" v-model="addForm.Mid" placeholder="请选择API">
-                        <el-option  :key="0"  :value="0" :label="'无需api'">
-                        </el-option>
-                        <el-option v-for="item in modules" :key="item.Id" :value="item.Id" :label="item.LinkUrl">
-                            <span style="float: left">{{ item.LinkUrl }}</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Name }}</span>
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-
-            </el-form>
-            <div slot="footer" class="dialog-footer">
-                <el-button @click.native="addFormVisible = false">取消</el-button>
-                <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+            <el-input v-model="editForm.Code" auto-complete="off"></el-input>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item label="描述" prop="Description">
+          <el-input v-model="editForm.Description" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="Icon" prop="Icon">
+          <el-input v-model="editForm.Icon" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="Enabled">
+          <el-select v-model="editForm.Enabled" placeholder="请选择状态">
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.Name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="排序" prop="OrderSort">
+          <el-input type="number" v-model="editForm.OrderSort" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item prop="IsButton" label="是否按钮" width sortable>
+          <el-switch v-model="editForm.IsButton"></el-switch>
+        </el-form-item>
+        <el-form-item label="按钮事件" prop="Func">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            content="只写方法名即可，不用带括号，比如：handleEdit"
+            placement="top-start"
+          >
+            <el-input v-model="editForm.Func" auto-complete="off"></el-input>
+          </el-tooltip>
+        </el-form-item>
+        <el-form-item prop="IsHide" label="隐藏菜单" width sortable>
+          <el-switch v-model="editForm.IsHide"></el-switch>
+        </el-form-item>
+        <el-form-item prop="IskeepAlive" label="keepAlive" width sortable>
+          <el-switch v-model="editForm.IskeepAlive"></el-switch>
+        </el-form-item>
+        <el-form-item prop="PidArr" label="父级菜单" width sortable>
+          <el-cascader
+            placeholder="请选择，支持搜索功能"
+            style="width: 400px"
+            v-model="editForm.PidArr"
+            :options="options"
+            filterable
+            change-on-select
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item prop="Mid" label="API接口" width sortable>
+          <el-select style="width: 100%;" v-model="editForm.Mid" placeholder="请选择API">
+            <el-option :key="0" :value="0" :label="'无需api'"></el-option>
+            <el-option
+              v-for="item in modules"
+              :key="item.Id"
+              :value="item.Id"
+              :label="item.LinkUrl"
+            >
+              <span style="float: left">{{ item.LinkUrl }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Name }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="editFormVisible = false">取消</el-button>
+        <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <!--新增界面-->
+    <el-dialog
+      title="新增"
+      :visible.sync="addFormVisible"
+      v-model="addFormVisible"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="addForm" label-width="80px" :rules="addFormRules" ref="addForm">
+        <el-form-item label="菜单名称" prop="Name">
+          <el-input v-model="addForm.Name" auto-complete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item label="菜单类型">
+          <el-radio-group @change="clkType" v-model="addForm.MenuType">
+            <el-radio label="目录"></el-radio>
+            <el-radio label="页面"></el-radio>
+            <el-radio label="按钮"></el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="路由地址" prop="Code">
+          <el-tooltip placement="top">
+            <div slot="content">
+              如果是目录，请填‘-’字符
+              <br />如果是按钮，请输入空格即可
+              <br />如果是外链，请带上协议，比如 https://www.baidu.com
+              <br />
             </div>
-        </el-dialog>
-    </section>
+            <el-input v-model="addForm.Code" auto-complete="off"></el-input>
+          </el-tooltip>
+
+        </el-form-item>
+        <el-form-item label="描述" prop="Description">
+          <el-input v-model="addForm.Description" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="Enabled">
+          <el-select v-model="addForm.Enabled" placeholder="请选择状态">
+            <el-option
+              v-for="item in statusList"
+              :key="item.value"
+              :label="item.Name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="排序" prop="OrderSort">
+          <el-input v-model="addForm.OrderSort" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item prop="IsButton" label="是否按钮" width sortable>
+          <el-switch v-model="addForm.IsButton"></el-switch>
+        </el-form-item>
+        <el-form-item label="按钮事件" prop="Func">
+          <el-input v-model="addForm.Func" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item prop="IsHide" label="隐藏菜单" width sortable>
+          <el-switch v-model="addForm.IsHide"></el-switch>
+        </el-form-item>
+        <el-form-item prop="IskeepAlive" label="keepAlive" width sortable>
+          <el-switch v-model="addForm.IskeepAlive"></el-switch>
+        </el-form-item>
+        <el-form-item prop="PidArr" label="父级菜单" width sortable>
+          <el-cascader
+            style="width: 400px"
+            v-model="addForm.PidArr"
+            :options="options"
+            filterable
+            change-on-select
+          ></el-cascader>
+        </el-form-item>
+
+        <el-form-item prop="Mid" label="API接口" width sortable>
+          <el-select style="width: 100%;" v-model="addForm.Mid" placeholder="请选择API">
+            <el-option :key="0" :value="0" :label="'无需api'"></el-option>
+            <el-option
+              v-for="item in modules"
+              :key="item.Id"
+              :value="item.Id"
+              :label="item.LinkUrl"
+            >
+              <span style="float: left">{{ item.LinkUrl }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.Name }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="addFormVisible = false">取消</el-button>
+        <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+      </div>
+    </el-dialog>
+  </section>
 </template>
 
 <script>
-    import util from '../../../util/date'
-    import {getPermissionListPage,getPermissionTreeTable, removePermission, editPermission, addPermission,getPermissionTree,getModuleListPage} from '../../api/api';
-
-    export default {
-        data() {
-            return {
-                options: [],
-                filters: {
-                    Name: ''
-                },
-                users: [],
-                modules:[],//接口api列表
-                statusList: [{Name: '激活', value: true}, {Name: '禁用', value: false}],
-                total: 0,
-                page: 1,
-                listLoading: false,
-                sels: [],//列表选中列
-
-                addDialogFormVisible: false,
-                editFormVisible: false,//编辑界面是否显示
-                editLoading: false,
-                editFormRules: {
-                    Name: [
-                        {required: true, message: '请输入菜单名称', trigger: 'blur'}
-                    ],
-                    Code: [
-                        {required: true, message: '请输入路由地址', trigger: 'blur'}
-                    ],
-
-                },
-                //编辑界面数据
-                editForm: {
-                    Id: 0,
-                    Mid: 0,
-                    OrderSort:0,
-                    PidArr: [],
-                    CreateBy: '',
-                    Name: '',
-                    Code: '',
-                    Description: '',
-                    Icon: '',
-                    Func: '',
-                    Enabled: true,
-                    IsButton: false,
-                    IsHide: false,
-                },
-
-                addFormVisible: false,//新增界面是否显示
-                addLoading: false,
-                addFormRules: {
-                    Name: [
-                        {required: true, message: '请输入菜单名称', trigger: 'blur'}
-                    ],
-                    Code: [
-                        {required: true, message: '请输入路由地址', trigger: 'blur'}
-                    ],
-
-                },
-                //新增界面数据
-                addForm: {
-                    CreateBy: '',
-                    CreateId: '',
-                    PidArr: [],
-                    Mid: 0,
-                    OrderSort:0,
-                    Name: '',
-                    Code: '',
-                    Description: '',
-                    Icon: '',
-                    Func: '',
-                    Enabled: true,
-                    IsButton: false,
-                    IsHide: false,
-                }
-
+import util from "../../../util/date";
+import {
+  getPermissionListPage,
+  getPermissionTreeTable,
+  removePermission,
+  editPermission,
+  addPermission,
+  getPermissionTree,
+  getModuleListPage
+} from "../../api/api";
+import { getButtonList } from "../../promissionRouter";
+import Toolbar from "../../components/Toolbar";
+
+export default {
+  components: { Toolbar },
+  data() {
+    return {
+      buttonList: [],
+      currentRow: null,
+      options: [],
+      filters: {
+        Name: ""
+      },
+      users: [],
+      modules: [], //接口api列表
+      statusList: [
+        { Name: "激活", value: true },
+        { Name: "禁用", value: false }
+      ],
+      total: 0,
+      page: 1,
+      listLoading: false,
+      sels: [], //列表选中列
+
+      addDialogFormVisible: false,
+      editFormVisible: false, //编辑界面是否显示
+      editLoading: false,
+      editFormRules: {
+        Name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
+        Code: [{ required: true, message: "请输入路由地址", trigger: "blur" }]
+      },
+      //编辑界面数据
+      editForm: {
+        Id: 0,
+        Mid: 0,
+        OrderSort: 0,
+        PidArr: [],
+        CreateBy: "",
+        Name: "",
+        Code: "",
+        Description: "",
+        Icon: "",
+        Func: "",
+        Enabled: true,
+        IsButton: false,
+        IsHide: false,
+        IskeepAlive: false
+      },
+
+      addFormVisible: false, //新增界面是否显示
+      addLoading: false,
+      addFormRules: {
+        Name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
+        Code: [{ required: true, message: "请输入路由地址", trigger: "blur" }]
+      },
+      //新增界面数据
+      addForm: {
+        CreateBy: "",
+        CreateId: "",
+        PidArr: [],
+        Mid: 0,
+        OrderSort: 0,
+        Name: "",
+        Code: "",
+        Description: "",
+        Icon: "",
+        Func: "",
+        Enabled: true,
+        IsButton: false,
+        IsHide: false,
+        IskeepAlive: false
+      }
+    };
+  },
+  methods: {
+    selectCurrentRow(val) {
+      this.currentRow = val;
+    },
+    clkType() {
+      this.addForm.IsButton = false;
+      if (this.addForm.MenuType == "页面") {
+        this.addForm.Code = "";
+      } else if (this.addForm.MenuType == "目录") {
+        this.addForm.Code = "-";
+      } else if (this.addForm.MenuType == "按钮") {
+        this.addForm.Code = " ";
+        this.addForm.IsButton = true;
+      }
+    },
+    callFunction(item) {
+      this.filters = {
+        name: item.search
+      };
+      this[item.Func].apply(this, item);
+    },
+    //性别显示转换
+    formatEnabled: function(row, column) {
+      return row.Enabled ? "正常" : "未知";
+    },
+    formatCreateTime: function(row, column) {
+      return !row.CreateTime || row.CreateTime == ""
+        ? ""
+        : util.formatDate.format(new Date(row.CreateTime), "yyyy-MM-dd");
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getPermissions();
+    },
+    load(tree, treeNode, resolve) {
+      let para = {
+        page: this.page,
+        f: tree.Id,
+        key: this.filters.Name
+      };
+      getPermissionTreeTable(para).then(res => {
+        resolve(res.data.response);
+      });
+    },
+    //获取用户列表
+    getPermissions() {
+      let para = {
+        page: this.page,
+        key: this.filters.Name
+      };
+      this.listLoading = true;
+
+      //NProgress.start();
+      getPermissionTreeTable(para).then(res => {
+        this.users = res.data.response;
+        this.listLoading = false;
+        //NProgress.done();
+      });
+    },
+    //删除
+    handleDel() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要删除的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      this.$confirm("确认删除该记录吗?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.listLoading = true;
+          //NProgress.start();
+          let para = { id: row.Id };
+          removePermission(para).then(res => {
+            if (util.isEmt.format(res)) {
+              this.listLoading = false;
+              return;
+            }
+            this.listLoading = false;
+            //NProgress.done();
+            if (res.data.success) {
+              this.$message({
+                message: "删除成功",
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.data.msg,
+                type: "error"
+              });
             }
-        },
-        methods: {
-            //性别显示转换
-            formatEnabled: function (row, column) {
-                return row.Enabled ? '正常' : '未知';
-            },
-            formatCreateTime: function (row, column) {
-                return (!row.CreateTime || row.CreateTime == '') ? '' : util.formatDate.format(new Date(row.CreateTime), 'yyyy-MM-dd');
-            },
-            handleCurrentChange(val) {
-                this.page = val;
-                this.getPermissions();
-            },  
-            load(tree, treeNode, resolve) {
-                 let para = {
-                    page: this.page,
-                    f:tree.Id,
-                    key: this.filters.Name
-                };
-                  getPermissionTreeTable(para).then((res) => {
-                   resolve(res.data.response)
-                });
 
-                
-            },
-            //获取用户列表
-            getPermissions() {
-                let para = {
-                    page: this.page,
-                    key: this.filters.Name
-                };
-                this.listLoading = true;
-
-                //NProgress.start();
-                getPermissionTreeTable(para).then((res) => {
-                    this.users = res.data.response;
-                    this.listLoading = false;
-                    //NProgress.done();
-                });
-            },
-            //删除
-            handleDel: function (index, row) {
-                this.$confirm('确认删除该记录吗?', '提示', {
-                    type: 'warning'
-                }).then(() => {
-                    this.listLoading = true;
-                    //NProgress.start();
-                    let para = {id: row.Id};
-                    removePermission(para).then((res) => {
-
-                        if (util.isEmt.format(res)) {
-                            this.listLoading = false;
-                            return;
-                        }
-                        this.listLoading = false;
-                        //NProgress.done();
-                        if (res.data.success) {
-                            this.$message({
-                                message: '删除成功',
-                                type: 'success'
-                            });
-
-                        } else {
-                            this.$message({
-                                message: res.data.msg,
-                                type: 'error'
-                            });
-                        }
-
-                        this.getPermissions();
-                    });
-                }).catch(() => {
+            this.getPermissions();
+          });
+        })
+        .catch(() => {});
+    },
+    //显示编辑界面
+    handleEdit() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要编辑的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      let that = this;
+      that.editLoading = true;
+
+      this.editFormVisible = true;
+      this.editForm = {};
+
+      this.options = [];
+      let para = { pid: row.Id };
+      getPermissionTree(para).then(res => {
+        this.options.push(res.data.response);
+        that.editForm = Object.assign({}, row);
+        that.editLoading = false;
+      });
+    },
+    //显示新增界面
+    handleAdd() {
+      this.options = [];
+      this.addFormVisible = true;
+      this.addForm = {
+        CreateBy: "",
+        CreateId: "",
+        PidArr: [],
+        Name: "",
+        Code: "",
+        OrderSort: 0,
+        Description: "",
+        Enabled: true,
+        Icon: "",
+        IsButton: false,
+        IsHide: false,
+        IskeepAlive: false
+      };
+
+      let para = { pid: 0 };
+      getPermissionTree(para).then(res => {
+        this.options.push(res.data.response);
+      });
+    },
+    //编辑
+    editSubmit: function() {
+      this.$refs.editForm.validate(valid => {
+        if (valid) {
+          this.$confirm("确认提交吗？", "提示", {}).then(() => {
+            this.editLoading = true;
+            //NProgress.start();
+            let para = Object.assign({}, this.editForm);
+
+            para.ModifyTime = util.formatDate.format(new Date(), "yyyy-MM-dd");
+
+            para.Pid = para.PidArr.pop();
+
+            if (para.Id == para.Pid) {
+              this.$message({
+                message: "警告，父节点不能是自己！",
+                type: "error"
+              });
+
+              this.editLoading = false;
+              return;
+            }
 
+            editPermission(para).then(res => {
+              if (util.isEmt.format(res)) {
+                this.editLoading = false;
+                return;
+              }
+              this.editLoading = false;
+              if (res.data.success) {
+                this.editLoading = false;
+                //NProgress.done();
+                this.$message({
+                  message: res.data.msg,
+                  type: "success"
                 });
-            },
-            //显示编辑界面
-            handleEdit: function (index, row) {
-                let that=this;
-                that.editLoading = true;
-
-                this.editFormVisible = true;
-                this.editForm = {};
-
-                this.options=[];
-                let para={pid:row.Id};
-                getPermissionTree(para).then((res) => {
-                    this.options.push(res.data.response);
-                    that.editForm = Object.assign({}, row);
-                    that.editLoading = false;
-                });
-            },
-            //显示新增界面
-            handleAdd() {
-                this.options=[];
-                this.addFormVisible = true;
-                this.addForm = {
-                    CreateBy: '',
-                    CreateId: '',
-                    PidArr: [],
-                    Name: '',
-                    Code: '',
-                    OrderSort:0,
-                    Description: '',
-                    Enabled: true,
-                    Icon: '',
-                    IsButton: false,
-                    IsHide: false,
-                };
-
-                let para={pid:0};
-                getPermissionTree(para).then((res) => {
-
-                    this.options.push(res.data.response);
+                this.$refs["editForm"].resetFields();
+                this.editFormVisible = false;
+                this.getPermissions();
+              } else {
+                this.$message({
+                  message: res.data.msg,
+                  type: "error"
                 });
+              }
+            });
+          });
+        }
+      });
+    },
+    //新增
+    addSubmit: function() {
+      let _this = this;
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          this.$confirm("确认提交吗？", "提示", {}).then(() => {
+            this.addLoading = true;
+            //NProgress.start();
+            let para = Object.assign({}, this.addForm);
+
+            para.CreateTime = util.formatDate.format(new Date(), "yyyy-MM-dd");
+            para.ModifyTime = para.CreateTime;
+            para.IsDeleted = false;
+
+            para.Pid = para.PidArr.pop();
+
+            var user = JSON.parse(window.localStorage.user);
+
+            if (user && user.uID > 0) {
+              para.CreateId = user.uID;
+              para.CreateBy = user.uRealName;
+            } else {
+              this.$message({
+                message: "用户信息为空，先登录",
+                type: "error"
+              });
+              _this.$router.replace(
+                _this.$route.query.redirect ? _this.$route.query.redirect : "/"
+              );
+            }
 
-
-            },
-            //编辑
-            editSubmit: function () {
-                this.$refs.editForm.validate((valid) => {
-                    if (valid) {
-                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
-                            this.editLoading = true;
-                            //NProgress.start();
-                            let para = Object.assign({}, this.editForm);
-
-                            para.ModifyTime = util.formatDate.format(new Date(), 'yyyy-MM-dd');
-
-                            para.Pid = para.PidArr.pop();
-
-                            if(para.Id==para.Pid){
-
-                                this.$message({
-                                    message: "警告，父节点不能是自己！",
-                                    type: 'error'
-                                });
-
-                                this.editLoading = false;
-                                return;
-                            }
-
-
-                            editPermission(para).then((res) => {
-
-                                if (util.isEmt.format(res)) {
-                                    this.editLoading = false;
-                                    return;
-                                }
-                                this.editLoading = false;
-                                if (res.data.success) {
-                                    this.editLoading = false;
-                                    //NProgress.done();
-                                    this.$message({
-                                        message: res.data.msg,
-                                        type: 'success'
-                                    });
-                                    this.$refs['editForm'].resetFields();
-                                    this.editFormVisible = false;
-                                    this.getPermissions();
-                                } else {
-                                    this.$message({
-                                        message: res.data.msg,
-                                        type: 'error'
-                                    });
-
-                                }
-                            });
-                        });
-                    }
-                });
-            },
-            //新增
-            addSubmit: function () {
-                let _this = this;
-                this.$refs.addForm.validate((valid) => {
-                    if (valid) {
-                        this.$confirm('确认提交吗？', '提示', {}).then(() => {
-                            this.addLoading = true;
-                            //NProgress.start();
-                            let para = Object.assign({}, this.addForm);
-
-                            para.CreateTime = util.formatDate.format(new Date(), 'yyyy-MM-dd');
-                            para.ModifyTime = para.CreateTime;
-                            para.IsDeleted = false;
-
-                            para.Pid = para.PidArr.pop();
-
-                            var user = JSON.parse(window.localStorage.user);
-
-                            if (user && user.uID > 0) {
-                                para.CreateId = user.uID;
-                                para.CreateBy = user.uRealName;
-                            } else {
-                                this.$message({
-                                    message: '用户信息为空，先登录',
-                                    type: 'error'
-                                });
-                                _this.$router.replace(_this.$route.query.redirect ? _this.$route.query.redirect : "/");
-                            }
-
-
-                            addPermission(para).then((res) => {
-
-                                if (util.isEmt.format(res)) {
-                                    this.addLoading = false;
-                                    return;
-                                }
-                                this.addLoading = false;
-                                if (res.data.success) {
-                                    this.addLoading = false;
-                                    //NProgress.done();
-                                    this.$message({
-                                        message: res.data.msg,
-                                        type: 'success'
-                                    });
-                                    this.$refs['addForm'].resetFields();
-                                    this.addFormVisible = false;
-                                    this.getPermissions();
-                                }
-                                else {
-                                    this.$message({
-                                        message: res.data.msg,
-                                        type: 'error'
-                                    });
-
-                                }
-
-                            });
-
-                        });
-                    }
+            addPermission(para).then(res => {
+              if (util.isEmt.format(res)) {
+                this.addLoading = false;
+                return;
+              }
+              this.addLoading = false;
+              if (res.data.success) {
+                this.addLoading = false;
+                //NProgress.done();
+                this.$message({
+                  message: res.data.msg,
+                  type: "success"
                 });
-            },
-            selsChange: function (sels) {
-                this.sels = sels;
-            },
-            //批量删除
-            batchRemove: function () {
+                this.$refs["addForm"].resetFields();
+                this.addFormVisible = false;
+                this.getPermissions();
+              } else {
                 this.$message({
-                    message: '该功能未开放',
-                    type: 'warning'
+                  message: res.data.msg,
+                  type: "error"
                 });
-            }
-        },
-        mounted() {
-            this.getPermissions();
-
-            getModuleListPage().then((res) => {
-                this.modules = res.data.response.data;
+              }
             });
+          });
         }
+      });
+    },
+    selsChange: function(sels) {
+      this.sels = sels;
+    },
+    //批量删除
+    batchRemove: function() {
+      this.$message({
+        message: "该功能未开放",
+        type: "warning"
+      });
     }
-
+  },
+  mounted() {
+    this.getPermissions();
+
+    getModuleListPage().then(res => {
+      this.modules = res.data.response.data;
+    });
+
+    let routers = window.localStorage.router
+      ? JSON.parse(window.localStorage.router)
+      : [];
+    this.buttonList = getButtonList(this.$route.path, routers);
+  }
+};
 </script>
 
 <style scoped>
-
 </style>
diff --git a/src/views/Recursion/Menu_1/Menu_1_1/Menu_1_1_2.vue b/src/views/Recursion/Menu_1/Menu_1_1/Menu_1_1_2.vue
new file mode 100644
index 0000000..601c75b
--- /dev/null
+++ b/src/views/Recursion/Menu_1/Menu_1_1/Menu_1_1_2.vue
@@ -0,0 +1,15 @@
+<template >
+    <div style="padding:30px;">
+        <el-alert :closable="false" title="menu - 1 - 1 - 2" type="error" />
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "Menu111"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/System/My.vue b/src/views/System/My.vue
index a8bfd8e..0ae744c 100644
--- a/src/views/System/My.vue
+++ b/src/views/System/My.vue
@@ -13,11 +13,11 @@
     <el-form-item label="旧密码" prop="uLoginPWD">
       <el-input v-model="editForm.uLoginPWD" type="text" auto-complete="off"></el-input>
     </el-form-item>
-    <el-form-item label="新密码" prop="uLoginPWD">
-      <el-input v-model="editForm.uLoginPWD" show-password auto-complete="off"></el-input>
+    <el-form-item label="新密码" prop="uLoginPWDNew">
+      <el-input v-model="editForm.uLoginPWDNew" show-password auto-complete="off"></el-input>
     </el-form-item>
-    <el-form-item label="确认密码" prop="uLoginPWD">
-      <el-input v-model="editForm.uLoginPWD" show-password auto-complete="off"></el-input>
+    <el-form-item label="确认密码" prop="uLoginPWDConfirm">
+      <el-input v-model="editForm.uLoginPWDConfirm" show-password auto-complete="off"></el-input>
     </el-form-item>
 
     <el-form-item label="头像">
diff --git a/src/views/Task/QuartzJob.vue b/src/views/Task/QuartzJob.vue
new file mode 100644
index 0000000..b615d8b
--- /dev/null
+++ b/src/views/Task/QuartzJob.vue
@@ -0,0 +1,698 @@
+<template>
+  <section>
+    <!--工具条-->
+    <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
+
+    <!--列表-->
+    <el-table
+      :data="Tasks"
+      highlight-current-row
+      v-loading="listLoading"
+      @current-change="selectCurrentRow"
+      style="width: 100%;"
+    >
+      <el-table-column type="index" width="80"></el-table-column>
+      <el-table-column prop="JobGroup" label="任务组" width sortable></el-table-column>
+      <el-table-column prop="Name" label="名称" width sortable></el-table-column>
+      
+      <el-table-column prop="TriggerType" label="任务类型" width="" sortable>
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.TriggerType==1  ? 'success' : ''"
+            disable-transitions
+          >{{scope.row.TriggerType==1 ? "Cron":"Simple"}}</el-tag>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="Cron" label="Cron表达式" width sortable></el-table-column>
+      <el-table-column prop="IntervalSecond" label="循环s" width sortable></el-table-column>
+      <el-table-column prop="RunTimes" label="运行次数" width sortable></el-table-column>
+      <el-table-column prop="AssemblyName" label="程序集" width sortable></el-table-column>
+      <el-table-column prop="ClassName" label="执行类" width="150" sortable></el-table-column>
+      <el-table-column prop="BeginTime" label="开始时间" :formatter="formatBeginTime" width sortable></el-table-column>
+      <el-table-column prop="EndTime" label="结束时间" :formatter="formatEndTime" width sortable></el-table-column>
+      <!--<el-table-column prop="CreateBy" label="创建者" width="" sortable>-->
+      <!--</el-table-column>-->
+      <el-table-column prop="IsStart" label="状态" width="" sortable>
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.IsStart  ? 'success' : 'danger'"
+            disable-transitions
+          >{{scope.row.IsStart ? "运行中":"停止"}}</el-tag>
+        </template>
+      </el-table-column>
+
+      
+    <el-table-column
+      label="日志" >
+      <template slot-scope="scope">
+        <el-popover trigger="hover" placement="top">
+          <p v-html="scope.row.Remark"></p>
+          <div slot="reference" class="name-wrapper">
+            <el-tag size="medium">Log</el-tag>
+          </div>
+        </el-popover>
+      </template>
+    </el-table-column>
+
+    </el-table>
+
+    <!--工具条-->
+    <el-col :span="24" class="toolbar">
+      <el-button type="danger" @click="batchRemove" :disabled="this.sels.length===0">批量删除</el-button>
+      <el-pagination
+        layout="prev, pager, next"
+        @current-change="handleCurrentChange"
+        :page-size="50"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
+    </el-col>
+
+    <!--编辑界面-->
+    <el-dialog
+      title="编辑"
+      :visible.sync="editFormVisible"
+      v-model="editFormVisible"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">
+        <el-form-item label="任务组" prop="JobGroup">
+          <el-input v-model="editForm.JobGroup" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="名称" prop="Name">
+          <el-input v-model="editForm.Name" auto-complete="off"></el-input>
+        </el-form-item>
+         <el-form-item label="程序集" prop="AssemblyName">
+          <el-input v-model="editForm.AssemblyName" auto-complete="off"></el-input>
+        </el-form-item>
+         <el-form-item label="执行类名" prop="ClassName">
+          <el-input v-model="editForm.ClassName" auto-complete="off"></el-input>
+        </el-form-item>
+        
+        <el-form-item prop="TriggerType" label="是否Cron" width="" sortable>
+            <el-switch v-model="editForm.TriggerType" >
+            </el-switch>
+            <span style="float:right;color: #aaa;">(1：Cron模式，0：Simple模式)</span> 
+        </el-form-item>
+        
+        <el-form-item label="Cron表达式" v-if="editForm.TriggerType" prop="Cron">
+           <el-tooltip placement="top">
+            <div slot="content">
+                 每隔5秒执行一次：*/5 * * * * ?<br >
+                 每隔1分钟执行一次：0 */1 * * * ?<br >
+                 每天23点执行一次：0 0 23 * * ?<br >
+                 每天凌晨1点执行一次：0 0 1 * * ?<br >
+                 每月1号凌晨1点执行一次：0 0 1 1 * ?<br >
+                 每月最后一天23点执行一次：0 0 23 L * ?<br >
+                 每周星期天凌晨1点实行一次：0 0 1 ? * L<br >
+                 在26分、29分、33分执行一次：0 26,29,33 * * * ?<br >
+                 每天的0点、13点、18点、21点都执行一次：0 0 0,13,18,21 * * ?<br >
+            </div>
+          <el-input v-model="editForm.Cron" auto-complete="off"></el-input>
+         </el-tooltip>
+        </el-form-item>
+        <el-form-item label="循环周期" v-else prop="IntervalSecond">
+          <el-input-number v-model="editForm.IntervalSecond"  :min="1" style="width:200px;" auto-complete="off"></el-input-number>
+            <span style="float:right;color: #aaa;">(单位：秒)</span> 
+        </el-form-item>
+
+        <el-form-item label="是否激活" prop="IsStart">
+          <el-switch v-model="editForm.IsStart" >
+            </el-switch>
+        </el-form-item>
+
+        <el-form-item label="开始时间" prop="BeginTime">
+            <el-date-picker type="date" placeholder="选择日期" v-model="editForm.BeginTime"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="EndTime">
+            <el-date-picker type="date" placeholder="选择日期" v-model="editForm.EndTime"></el-date-picker>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="editFormVisible = false">取消</el-button>
+        <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <!--新增界面-->
+    <el-dialog
+      title="新增"
+      :visible.sync="addFormVisible"
+      v-model="addFormVisible"
+      :close-on-click-modal="false"
+    >
+      <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">
+         <el-form-item label="任务组" prop="JobGroup">
+          <el-input v-model="addForm.JobGroup" auto-complete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="名称" prop="Name">
+          <el-input v-model="addForm.Name" auto-complete="off"></el-input>
+        </el-form-item>
+         <el-form-item label="程序集" prop="AssemblyName">
+          <el-input v-model="addForm.AssemblyName" auto-complete="off"></el-input>
+        </el-form-item>
+         <el-form-item label="执行类名" prop="ClassName">
+          <el-input v-model="addForm.ClassName" auto-complete="off"></el-input>
+        </el-form-item>
+
+        <el-form-item prop="TriggerType" label="是否Cron" width="" sortable>
+            <el-switch v-model="addForm.TriggerType" >
+            </el-switch>
+            <span style="float:right;color: #aaa;">(1：Cron模式，0：Simple模式)</span> 
+        </el-form-item>
+        
+        <el-form-item label="Cron表达式"  v-if="addForm.TriggerType" prop="Cron">
+          <el-tooltip placement="top">
+            <div slot="content">
+                 每隔5秒执行一次：*/5 * * * * ?<br >
+                 每隔1分钟执行一次：0 */1 * * * ?<br >
+                 每天23点执行一次：0 0 23 * * ?<br >
+                 每天凌晨1点执行一次：0 0 1 * * ?<br >
+                 每月1号凌晨1点执行一次：0 0 1 1 * ?<br >
+                 每月最后一天23点执行一次：0 0 23 L * ?<br >
+                 每周星期天凌晨1点实行一次：0 0 1 ? * L<br >
+                 在26分、29分、33分执行一次：0 26,29,33 * * * ?<br >
+                 每天的0点、13点、18点、21点都执行一次：0 0 0,13,18,21 * * ?<br >
+            </div>
+          <el-input v-model="addForm.Cron" auto-complete="off"></el-input>
+         </el-tooltip>
+
+        </el-form-item>
+        <el-form-item label="循环周期" v-else  prop="IntervalSecond">
+          <el-input-number v-model="addForm.IntervalSecond"  :min="1" style="width:200px;" auto-complete="off"></el-input-number>
+            <span style="float:right;color: #aaa;">(单位：秒)</span> 
+        </el-form-item>
+
+        <el-form-item label="是否激活" prop="IsStart">
+          <el-switch v-model="addForm.IsStart" >
+            </el-switch>
+        </el-form-item>
+
+        <el-form-item label="开始时间" prop="BeginTime">
+            <el-date-picker type="date" placeholder="选择日期" v-model="addForm.BeginTime"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="EndTime">
+            <el-date-picker type="date" placeholder="选择日期" v-model="addForm.EndTime"></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click.native="addFormVisible = false">取消</el-button>
+        <el-button type="primary" @click.native="addSubmit" :loading="addLoading">提交</el-button>
+      </div>
+    </el-dialog>
+  </section>
+</template>
+
+<script>
+import util from "../../../util/date";
+import { getTaskListPage, removeTask, editTask, addTask,startJob, stopJob, reCovery } from "../../api/api";
+import { getButtonList } from "../../promissionRouter";
+import Toolbar from "../../components/Toolbar";
+
+export default {
+  components: { Toolbar },
+  data() {
+    return {
+      filters: {
+        name: ""
+      },
+      buttonList: [],
+      Tasks: [],
+      statusList: [
+        { name: "激活", value: true },
+        { name: "禁用", value: false }
+      ],
+      total: 0,
+      page: 1,
+      listLoading: false,
+      sels: [], //列表选中列
+      currentRow: null,
+      addDialogFormVisible: false,
+      editFormVisible: false, //编辑界面是否显示
+      editLoading: false,
+      editFormRules: {
+        JobGroup: [{ required: true, message: "请输入组名", trigger: "blur" }],
+        Name: [{ required: true, message: "请输入Job名", trigger: "blur" }],
+        BeginTime: [{ required: true, message: "请选择开始时间", trigger: "blur" }],
+        EndTime: [{ required: true, message: "请选择结束时间", trigger: "blur" }],
+        AssemblyName: [{ required: true, message: "请输入程序集名", trigger: "blur" }],
+        ClassName: [{ required: true, message: "请输入执行的Job类名", trigger: "blur" }],
+      },
+      //编辑界面数据
+      editForm: {
+        Id: 0,
+        Name: "",
+        JobGroup: "",
+        Name: "",
+        TriggerType: 1,
+        Cron: "",
+        IntervalSecond: 0,
+        BeginTime: "",
+        EndTime: "",
+        AssemblyName: "",
+        ClassName: "",
+        Remark: "",
+        JobParams:"",
+        IsDeleted:false,
+        IsStart: false
+      },
+
+      addFormVisible: false, //新增界面是否显示
+      addLoading: false,
+      addFormRules: {
+        JobGroup: [{ required: true, message: "请输入组名", trigger: "blur" }],
+        Name: [{ required: true, message: "请输入Job名", trigger: "blur" }],
+        BeginTime: [{ required: true, message: "请选择开始时间", trigger: "blur" }],
+        EndTime: [{ required: true, message: "请选择结束时间", trigger: "blur" }],
+        AssemblyName: [{ required: true, message: "请输入程序集名", trigger: "blur" }],
+        ClassName: [{ required: true, message: "请输入执行的Job类名", trigger: "blur" }],
+      },
+      //新增界面数据
+      addForm: {
+        Id: 0,
+        Name: "",
+        JobGroup: "",
+        Name: "",
+        TriggerType: 1,
+        Cron: "",
+        IntervalSecond: 0,
+        BeginTime: "",
+        EndTime: "",
+        AssemblyName: "",
+        ClassName: "",
+        JobParams:"",
+        Remark: "",
+        IsDeleted:false,
+        IsStart: false
+      }
+    };
+  },
+  methods: {
+    selectCurrentRow(val) {
+      this.currentRow = val;
+    },
+    callFunction(item) {
+      this.filters = {
+        name: item.search
+      };
+      this[item.Func].apply(this, item);
+    },
+    //性别显示转换
+    formatEnabled: function(row, column) {
+      return row.Enabled ? "正常" : "未知";
+    },
+    formatCreateTime: function(row, column) {
+      return !row.CreateTime || row.CreateTime == ""
+        ? ""
+        : util.formatDate.format(new Date(row.CreateTime), "yyyy-MM-dd");
+    },
+    formatBeginTime: function(row, column) {
+      return !row.BeginTime || row.BeginTime == ""
+        ? ""
+        : util.formatDate.format(new Date(row.BeginTime), "yyyy-MM-dd");
+    },
+    formatEndTime: function(row, column) {
+      return !row.EndTime || row.EndTime == ""
+        ? ""
+        : util.formatDate.format(new Date(row.EndTime), "yyyy-MM-dd");
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getTasks();
+    },
+    //获取用户列表
+    getTasks() {
+      let _this = this;
+      let para = {
+        page: this.page,
+        key: this.filters.name
+      };
+      this.listLoading = true;
+      //NProgress.start();
+      getTaskListPage(para).then(res => {
+        this.total = res.data.response.dataCount;
+        this.Tasks = res.data.response.data;
+        this.listLoading = false;
+
+        //NProgress.done();
+      });
+    },
+    //删除
+    handleDel() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要编辑的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      this.$confirm("确认删除该记录吗?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.listLoading = true;
+          //NProgress.start();
+          let para = { id: row.Id };
+          removeTask(para).then(res => {
+            if (util.isEmt.format(res)) {
+              this.listLoading = false;
+              return;
+            }
+            this.listLoading = false;
+            //NProgress.done();
+            if (res.data.success) {
+              this.$message({
+                message: "删除成功",
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.data.msg,
+                type: "error"
+              });
+            }
+
+            this.getTasks();
+          });
+        })
+        .catch(() => {});
+    },
+    //显示编辑界面
+    handleEdit() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要编辑的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+
+      if (row.TriggerType==1) {
+          row.TriggerType=true
+      }
+
+      this.editFormVisible = true;
+      this.editForm = Object.assign({}, row);
+    },
+    //显示新增界面
+    handleAdd() {
+      this.addFormVisible = true;
+      this.addForm = {
+        Id: 0,
+        Name: "",
+        JobGroup: "",
+        Name: "",
+        TriggerType: true,
+        Cron: "",
+        IntervalSecond: 0,
+        BeginTime: "",
+        EndTime: "",
+        AssemblyName: "",
+        ClassName: "",
+        Remark: "",
+        JobParams:"",
+        IsDeleted:false,
+        IsStart: false
+      };
+
+    },
+    //编辑
+    editSubmit: function() {
+      this.$refs.editForm.validate(valid => {
+        if (valid) {
+          this.$confirm("确认提交吗？", "提示", {}).then(() => {
+            this.editLoading = true;
+            //NProgress.start();
+            let para = Object.assign({}, this.editForm);
+
+            para.birth =
+              !para.birth || para.birth == ""
+                ? util.formatDate.format(new Date(), "yyyy-MM-dd")
+                : util.formatDate.format(new Date(para.birth), "yyyy-MM-dd");
+
+            if (para.TriggerType) {
+                para.TriggerType=1;
+            }else{
+                para.TriggerType=0;
+            }
+            editTask(para).then(res => {
+              if (util.isEmt.format(res)) {
+                this.editLoading = false;
+                return;
+              }
+
+              if (res.data.success) {
+                this.editLoading = false;
+                //NProgress.done();
+                this.$message({
+                  message: res.data.msg,
+                  type: "success"
+                });
+                this.$refs["editForm"].resetFields();
+                this.editFormVisible = false;
+                this.getTasks();
+              } else {
+                this.$message({
+                  message: res.data.msg,
+                  type: "error"
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    //新增
+    addSubmit: function() {
+      let _this = this;
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          this.$confirm("确认提交吗？", "提示", {}).then(() => {
+            this.addLoading = true;
+            //NProgress.start();
+            let para = Object.assign({}, this.addForm);
+            para.birth =
+              !para.birth || para.birth == ""
+                ? util.formatDate.format(new Date(), "yyyy-MM-dd")
+                : util.formatDate.format(new Date(para.birth), "yyyy-MM-dd");
+
+            var user = JSON.parse(window.localStorage.user);
+
+            if (user && user.uID > 0) {
+              para.CreateId = user.uID;
+              para.CreateBy = user.uRealName;
+            } else {
+              this.$message({
+                message: "用户信息为空，先登录",
+                type: "error"
+              });
+              _this.$router.replace(
+                _this.$route.query.redirect ? _this.$route.query.redirect : "/"
+              );
+            }
+
+            
+            if (para.TriggerType) {
+                para.TriggerType=1;
+            }else{
+                para.TriggerType=0;
+            }
+
+            addTask(para).then(res => {
+              if (util.isEmt.format(res)) {
+                this.addLoading = false;
+                return;
+              }
+              if (res.data.success) {
+                this.addLoading = false;
+                //NProgress.done();
+                this.$message({
+                  message: res.data.msg,
+                  type: "success"
+                });
+                this.$refs["addForm"].resetFields();
+                this.addFormVisible = false;
+                this.getTasks();
+              } else {
+                this.$message({
+                  message: res.data.msg,
+                  type: "error"
+                });
+              }
+            });
+          });
+        }
+      });
+    },
+    //开启job
+    handleStartJob() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要操作的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      this.$confirm("确认启动该Job吗?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.listLoading = true;
+          //NProgress.start();
+          let para = { jobId: row.Id };
+          startJob(para).then(res => {
+            if (util.isEmt.format(res)) {
+              this.listLoading = false;
+              return;
+            }
+            this.listLoading = false;
+            //NProgress.done();
+            if (res.data.success) {
+              this.$message({
+                message: "启动成功",
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.data.msg,
+                type: "error"
+              });
+            }
+
+            this.getTasks();
+          });
+        })
+        .catch(() => {});
+    },
+    //暂停job
+    handleStopJob() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要操作的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      this.$confirm("确认暂停该Job吗?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.listLoading = true;
+          //NProgress.start();
+          let para = { jobId: row.Id };
+          stopJob(para).then(res => {
+            if (util.isEmt.format(res)) {
+              this.listLoading = false;
+              return;
+            }
+            this.listLoading = false;
+            //NProgress.done();
+            if (res.data.success) {
+              this.$message({
+                message: "暂停成功",
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.data.msg,
+                type: "error"
+              });
+            }
+
+            this.getTasks();
+          });
+        })
+        .catch(() => {});
+    },
+    //重启job
+    handleReCoveryJob() {
+      let row = this.currentRow;
+      if (!row) {
+        this.$message({
+          message: "请选择要操作的一行数据！",
+          type: "error"
+        });
+
+        return;
+      }
+      this.$confirm("确认重启该Job吗?", "提示", {
+        type: "warning"
+      })
+        .then(() => {
+          this.listLoading = true;
+          //NProgress.start();
+          let para = { jobId: row.Id };
+          reCovery(para).then(res => {
+            if (util.isEmt.format(res)) {
+              this.listLoading = false;
+              return;
+            }
+            this.listLoading = false;
+            //NProgress.done();
+            if (res.data.success) {
+              this.$message({
+                message: "重启成功",
+                type: "success"
+              });
+            } else {
+              this.$message({
+                message: res.data.msg,
+                type: "error"
+              });
+            }
+
+            this.getTasks();
+          });
+        })
+        .catch(() => {});
+    },
+    selsChange: function(sels) {
+      this.sels = sels;
+    },
+    //批量删除
+    batchRemove: function() {
+      this.$message({
+        message: "该功能未开放",
+        type: "warning"
+      });
+    },
+    getButtonList2(routers) {
+      let _this = this;
+      routers.forEach(element => {
+        let path = this.$route.path.toLowerCase();
+        if (element.path && element.path.toLowerCase() == path) {
+          _this.buttonList = element.children;
+          return;
+        } else if (element.children) {
+          _this.getButtonList(element.children);
+        }
+      });
+    }
+  },
+  mounted() {
+    this.getTasks();
+console.log(this.addForm)
+    let routers = window.localStorage.router
+      ? JSON.parse(window.localStorage.router)
+      : [];
+    //第一种写法，每个页面都需要写方法，但是可以做特性化处理
+    // this.getButtonList(routers);
+    
+    //第二种写法，封装到 permissionRouter.js 中
+    this.buttonList = getButtonList(this.$route.path, routers);
+  }
+};
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/Thanks.vue b/src/views/Thanks.vue
deleted file mode 100644
index 6dcc6fb..0000000
--- a/src/views/Thanks.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-    <div class="thanks">感谢！</div>
-</template>
-
-<script>
-    export default {
-        name: "Thanks"
-    }
-</script>
-
-<style scoped>
-.thanks{
-
-    text-align: center;
-    font-size: 30px;
-    color: darkgray;
-}
-</style>
diff --git a/src/views/Tibug/Bugs.vue b/src/views/Tibug/Bugs.vue
index 5dd1e5b..4867e04 100644
--- a/src/views/Tibug/Bugs.vue
+++ b/src/views/Tibug/Bugs.vue
@@ -1,22 +1,12 @@
 <template>
     <section>
         <!--工具条-->
-        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <el-form :inline="true" :model="filters"  @submit.native.prevent>
-                <el-form-item>
-                    <el-input v-model="filters.LinkUrl" placeholder="标题"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getRoles">查询</el-button>
-                </el-form-item>
-                <el-form-item>
-                    <!--<el-button type="primary" @click="handleAdd">新增</el-button>-->
-                </el-form-item>
-            </el-form>
-        </el-col>
-
+        <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
+    
         <!--列表-->
-        <el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
+        <el-table :data="users" highlight-current-row 
+        @current-change="selectCurrentRow"
+        v-loading="listLoading" @selection-change="selsChange"
                   style="width: 100%;">
             <el-table-column type="selection" width="50">
             </el-table-column>
@@ -32,12 +22,6 @@
             </el-table-column>
             <el-table-column prop="tdCreatetime" label="创建时间" :formatter="formatCreateTime" width="" sortable>
             </el-table-column>
-            <!--<el-table-column label="操作" width="150">-->
-                <!--<template scope="scope">-->
-                    <!--<el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>-->
-                    <!--<el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>-->
-                <!--</template>-->
-            <!--</el-table-column>-->
         </el-table>
 
         <!--工具条-->
@@ -100,13 +84,18 @@
 <script>
     import util from '../../../util/date'
     import {getBugListPage, removeBug, editBug, addBug} from '../../api/api';
+    import { getButtonList } from "../../promissionRouter";
+    import Toolbar from "../../components/Toolbar";
 
     export default {
+        components: { Toolbar },
         data() {
             return {
                 filters: {
                     LinkUrl: ''
                 },
+                buttonList: [],
+                currentRow: null,
                 users: [],
                 statusList: [{LinkUrl: '激活', value: true}, {LinkUrl: '禁用', value: false}],
                 total: 0,
@@ -154,6 +143,15 @@
             }
         },
         methods: {
+            selectCurrentRow(val) {
+            this.currentRow = val;
+            },
+            callFunction(item) {
+            this.filters = {
+                name: item.search
+            };
+            this[item.Func].apply(this, item);
+            },
             //性别显示转换
             formattdDetail: function (row, column) {
                 return row.tdDetail? row.tdDetail.substring(0,20):"N/A";
@@ -163,10 +161,10 @@
             },
             handleCurrentChange(val) {
                 this.page = val;
-                this.getRoles();
+                this.getBugs();
             },
             //获取用户列表
-            getRoles() {
+            getBugs() {
                 let para = {
                     page: this.page,
                     key: this.filters.LinkUrl
@@ -183,7 +181,16 @@
                 });
             },
             //删除
-            handleDel: function (index, row) {
+            handleDel() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要删除的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.$confirm('确认删除该记录吗?', '提示', {
                     type: 'warning'
                 }).then(() => {
@@ -211,14 +218,23 @@
                             });
                         }
 
-                        this.getRoles();
+                        this.getBugs();
                     });
                 }).catch(() => {
 
                 });
             },
             //显示编辑界面
-            handleEdit: function (index, row) {
+            handleEdit() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要编辑的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.editFormVisible = true;
                 this.editForm = Object.assign({}, row);
             },
@@ -258,7 +274,7 @@
                                     });
                                     this.$refs['editForm'].resetFields();
                                     this.editFormVisible = false;
-                                    this.getRoles();
+                                    this.getBugs();
                                 } else {
                                     this.$message({
                                         message: res.data.msg,
@@ -314,7 +330,7 @@
                                     });
                                     this.$refs['addForm'].resetFields();
                                     this.addFormVisible = false;
-                                    this.getRoles();
+                                    this.getBugs();
                                 }
                                 else {
                                     this.$message({
@@ -342,7 +358,12 @@
             }
         },
         mounted() {
-            this.getRoles();
+            this.getBugs();
+
+            let routers = window.localStorage.router
+            ? JSON.parse(window.localStorage.router)
+            : [];
+            this.buttonList = getButtonList(this.$route.path, routers);
         }
     }
 
diff --git a/src/views/User/Users.vue b/src/views/User/Users.vue
index 82aa4fa..58c7167 100644
--- a/src/views/User/Users.vue
+++ b/src/views/User/Users.vue
@@ -1,22 +1,13 @@
 <template>
     <section>
         <!--工具条-->
-        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <el-form :inline="true" :model="filters" @submit.native.prevent>
-                <el-form-item>
-                    <el-input v-model="filters.name" placeholder="昵称/登录名"></el-input>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="getUsers">查询</el-button>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="handleAdd">新增</el-button>
-                </el-form-item>
-            </el-form>
-        </el-col>
+     <toolbar :buttonList="buttonList" @callFunction="callFunction"></toolbar>
+     
 
         <!--列表-->
-        <el-table :data="users" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
+        <el-table :data="users" highlight-current-row 
+        @current-change="selectCurrentRow"
+        v-loading="listLoading" @selection-change="selsChange"
                   style="width: 100%;">
             <el-table-column type="selection" width="50">
             </el-table-column>
@@ -45,12 +36,12 @@
                     </el-tag>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" width="150">
+            <!-- <el-table-column label="操作" width="150">
                 <template scope="scope">
                     <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
                     <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
         </el-table>
 
         <!--工具条-->
@@ -145,8 +136,11 @@
 <script>
     import util from '../../../util/date'
     import {testapi, getUserListPage,getRoleListPage , removeUser, batchRemoveUser, editUser, addUser} from '../../api/api';
+    import { getButtonList } from "../../promissionRouter";
+    import Toolbar from "../../components/Toolbar";
 
     export default {
+        components: { Toolbar },
         data() {
             return {
                 filters: {
@@ -155,6 +149,8 @@
                 users: [],
                 roles: [],
                 total: 0,
+                buttonList: [],
+                currentRow: null,
                 page: 1,
                 listLoading: false,
                 sels: [],//列表选中列
@@ -218,6 +214,15 @@
             }
         },
         methods: {
+            selectCurrentRow(val) {
+            this.currentRow = val;
+            },
+            callFunction(item) {
+            this.filters = {
+                name: item.search
+            };
+            this[item.Func].apply(this, item);
+            },
             //性别显示转换
             formatSex: function (row, column) {
                 return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
@@ -248,7 +253,16 @@
                 });
             },
             //删除
-            handleDel: function (index, row) {
+            handleDel() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要删除的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.$confirm('确认删除该记录吗?', '提示', {
                     type: 'warning'
                 }).then(() => {
@@ -283,7 +297,16 @@
                 });
             },
             //显示编辑界面
-            handleEdit: function (index, row) {
+            handleEdit() {
+                let row = this.currentRow;
+                if (!row) {
+                    this.$message({
+                    message: "请选择要编辑的一行数据！",
+                    type: "error"
+                    });
+
+                    return;
+                }
                 this.editFormVisible = true;
                 this.editForm = Object.assign({}, row);
 
@@ -418,6 +441,11 @@
         },
         mounted() {
             this.getUsers();
+
+            let routers = window.localStorage.router
+            ? JSON.parse(window.localStorage.router)
+            : [];
+            this.buttonList = getButtonList(this.$route.path, routers);
         }
     }
 
diff --git a/src/views/Welcome.vue b/src/views/Welcome.vue
index 9e809f2..03d6ef0 100644
--- a/src/views/Welcome.vue
+++ b/src/views/Welcome.vue
@@ -2,63 +2,158 @@
     <div style="margin-top: 30px;">
           <div style="margin: 20px;"> 欢迎来到 BlogAdmin 后台管理系统!</div>
 
-<el-card class="welcome-card">
-    <el-aside>快来加入我们吧：</el-aside>
+<el-card class="welcome-card note" style="width: calc(49% - 10px);margin-right: 10px;">
+   <div slot="header" class="clearfix">
+    <span>操作指南</span>
+  </div>
+  <div class="text item"><i class="el-icon-edit"></i>、在vue.config.js中配置项目端口号，以及代理后端API项目域名。  </div>
+  <div class="text item"><i class="el-icon-edit"></i>、在global.js中配置授权方案global.IS_IDS4。  </div>
+  <div class="text item"><i class="el-icon-edit"></i>、动态添加页面以及权限配置，看右侧两个动图。  </div>
+  <div class="text item"><i class="el-icon-edit"></i>、更多内容，查看官方文档：<a href="http://vueadmin.neters.club/.doc/" target="_blank">http://vueadmin.neters.club/.doc/</a>。  </div>
+</el-card>
+<el-card class="welcome-card"  style="width: 49%;margin: 0;font-size: 14px;">
+   <div slot="header" class="clearfix">
+    <span style="font-size: 16px;">服务器</span>
+   </div>
+  <div class="text item">环境变量：{{serverInfo.EnvironmentName}}</div>
+  <div class="text item">系统架构：{{serverInfo.OSArchitecture}}</div>
+  <div class="text item">ContentRootPath：{{serverInfo.ContentRootPath}}</div>
+  <div class="text item">WebRootPath：{{serverInfo.WebRootPath}}</div>
+  <div class="text item">.NET Core版本：{{serverInfo.FrameworkDescription}}</div>
+  <div class="text item">内存占用：{{serverInfo.MemoryFootprint}}</div>
+  <div class="text item">启动时间：{{serverInfo.WorkingTime}}</div>
+  <div><br ></div>
 
-    <br>
-    <img style="width: 300px;" src="../assets/QQGroup.png" />
+    
 </el-card>
-<el-card class="welcome-card">
-    <el-aside>动态添加一个vue页面：</el-aside>
+
+<el-card class="welcome-card" style="margin-top:20px;width: 98%;">
+    <div slot="header" class="clearfix">
+        <span>访问日志 <span style="font-size:12px;">(Top 50 desc)</span> </span>
+    </div>
+<el-table :data="logs" highlight-current-row border
+        v-loading="listLoading" 
+                  style="width: 100%;font-size: 12px;">
+            <el-table-column prop="User" label="访问者" width="150px" sortable>
+            </el-table-column>
+            <el-table-column prop="IP" label="请求地址" width="150px" >
+            </el-table-column>
+            <el-table-column prop="BeginTime" label="请求时间" width="150px" >
+            </el-table-column>
+            <el-table-column prop="API" label="访问接口" width="" >
+            </el-table-column>
+            <el-table-column prop="RequestMethod" label="Method" width="100px" >
+            </el-table-column>
+            <el-table-column prop="OPTime" label="响应时长" width="100px" >
+            </el-table-column>
+            <el-table-column prop="RequestData" label="参数" width="" >
+            </el-table-column>
+            <el-table-column prop="Agent" label="Agent" width="80" show-overflow-tooltip>
+                <template scope="scope">
+                    <div style="text-decoration:underline;cursor:pointer;">
+                        {{ scope.row.Agent}}
+                    </div>
+                </template>
+            </el-table-column>
+          
+        </el-table>
+
 
     <br>
-    <img style="width: 300px;" src="http://apk.neters.club/images/addVuePages.gif" />
 </el-card>
-<el-card class="welcome-card">
-    <el-aside>快速配置接口权限：</el-aside>
+
+
+<el-card class="welcome-card" style="margin-top: 20px;width: 98%;">
+    <div slot="header" class="clearfix">
+        <span>相关配置</span>
+    </div>
+
+
+    <el-aside>1、动态添加一个vue页面：</el-aside>
+
+    <br>
+    
+    <div class="text item"><i class="el-icon-edit"></i>、更多内容，查看博客园文档：<a href="https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0" target="_blank">https://www.cnblogs.com/laozhang-is-phi/p/10643993.html#autoid-2-6-0</a>。  </div>
+
+    <br>
+    <hr>
+    <br>
+
+    <el-aside>2、快速配置接口权限：</el-aside>
 
     <br>
     <div style="height: 300px;overflow-y: auto;">
         <el-steps direction="vertical">
-            <el-step title="步骤 1" description="创建一个控制台controller"></el-step>
-            <el-step title="步骤 2" description="修改接口地址，带上 action，编译"></el-step>
-            <el-step title="步骤 3" description="因为我这里是全局的权限公约，所以新建的controller，不用配置权限，默认已经加上了权限"></el-step>
-            <el-step title="步骤 4" description="测试 department 接口，是否已经被保护"></el-step>
-            <el-step title="步骤 5.1" description="vueadmin 后台 配置权限：第一步：新建api接口"></el-step>
+            <el-step title="步骤 1" description="创建一个测试控制器 DemoController"></el-step>
+            <el-step title="步骤 2" description="修改接口路由地址，带上 [action] ，比如，/api/[controller]/[action]，编译是否正常"></el-step>
+            <el-step title="步骤 3" description="给需要加权限的路由api上，增加授权特性[[Authorize(Permissions.Name)]]"></el-step>
+            <el-step title="步骤 4" description="测试 /api/demo/get 接口，是否已经被保护"></el-step>
+            <el-step title="步骤 5.1" description="vueadmin 后台 配置权限：第一步：登录后台，新建api接口"></el-step>
             <el-step title="步骤 5.2" description="第二步：添加一个菜单，可以是一个查询按钮，也可以是一个路由页面"></el-step>
             <el-step title="步骤 5.3" description="第三步：权限分配！勾选角色和刚刚的菜单"></el-step>
-            <el-step title="步骤 6" description="netcore 停掉服务，或者等10+分钟以上，因为有缓存"></el-step>
-            <el-step title="步骤 7" description="重启服务，访问接口，登录，查看是否有权限"></el-step>
+            <el-step title="步骤 6" description="如果后端netcore资源服务器有缓存，记得清理"></el-step>
+            <el-step title="步骤 7" description="重新登录Admin管理后台，访问接口，查看是否有权限"></el-step>
         </el-steps>
     </div>
 
 
     <br>
-    <br>
-    <br>
-    <img style="width: 300px;" src="http://apk.neters.club/images/addpermission.gif" />
 </el-card>
     </div>
 </template>
 
 <script>
-    export default {
+    import applicationUserManager from "../Auth/applicationusermanager";
+    import {getServerInfo,getAccessLogs} from '../api/api';
+  
+  export default {
         name: "Welcome",
+         data() {
+            return {
+                listLoading: false,
+                logs: [],
+                serverInfo:{}
+            }
+        },
         mounted() {
             var curTime = new Date()
             if(window.localStorage.TokenExpire){
                 var expiretime = new Date(Date.parse(window.localStorage.TokenExpire))
                 if(curTime>=expiretime){
-                    this.$router.push('/login');
+                    if (global.IS_IDS4) {
+                        applicationUserManager.login();
+                    } else {
+                        this.$router.push('/login');
+                    }
                 }
             }else {
-                this.$router.push('/login');
+                if (global.IS_IDS4) {
+                    applicationUserManager.login();
+                } else {
+                    this.$router.push('/login');
+                }
             }
 
+            getServerInfo({}).then((res) => {
+                this.serverInfo = res.data.response;
+            });
+
+               getAccessLogs({}).then((res) => {
+                    this.logs = res.data.response;
+                    this.listLoading = false;
+                    //NProgress.done();
+                });
+
         },
     }
 </script>
 
 <style scoped>
+.note .text {
+    font-size: 14px;
+  }
 
+ .note .item {
+    margin-bottom: 18px;
+  }
 </style>
diff --git a/util/global.js b/util/global.js
index 675c102..329e67e 100644
--- a/util/global.js
+++ b/util/global.js
@@ -1 +1,2 @@
-global.antRouter = ''//全局的路由
\ No newline at end of file
+global.antRouter = ''//全局的路由
+global.IS_IDS4 = false // 默认false，表示使用JWT模式，如果true，表示使用ids4
\ No newline at end of file
diff --git a/util/validate.js b/util/validate.js
new file mode 100644
index 0000000..79ab93c
--- /dev/null
+++ b/util/validate.js
@@ -0,0 +1,28 @@
+
+export function isExternal(path) {
+  return /^(https?:|mailto:|tel:)/.test(path)
+}
+
+export function validURL(url) {
+  const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
+  return reg.test(url)
+}
+
+export function validEmail(email) {
+  const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
+  return reg.test(email)
+}
+
+export function isString(str) {
+  if (typeof str === 'string' || str instanceof String) {
+    return true
+  }
+  return false
+}
+
+export function isArray(arg) {
+  if (typeof Array.isArray === 'undefined') {
+    return Object.prototype.toString.call(arg) === '[object Array]'
+  }
+  return Array.isArray(arg)
+}