From 1cc86b6cbb330d2565fb5fcd9a11f1ab1d8d8e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 14:52:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?1.Admin=E6=A8=A1=E5=9E=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=81=87=E5=88=A0=E9=99=A4=E7=9A=84=E4=BD=9C=E7=94=A8=E5=9F=9F?=
 =?UTF-8?q?=EF=BC=9B=202.=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=EF=BC=9A?=
 =?UTF-8?q?=E7=AE=A1=E8=B7=AF=E5=91=98=E6=95=B0=E9=87=8F=EF=BC=9B=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E6=8A=80=E8=83=BD=E6=B8=B2=E6=9F=93=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Model.php                          |   6 -
 app/Modules/Admin/Entities/Rabc/Admin.php     |  20 +
 .../Http/Controllers/IndexController.php      |   8 +-
 .../Resources/vue-element-admin/api/indexs.js |   8 +
 .../Resources/vue-element-admin/api/role.js   |  38 --
 .../dashboard/admin/components/BoxCard.vue    | 225 +++++------
 .../dashboard/admin/components/PanelGroup.vue | 352 +++++++++---------
 .../admin/components/RaddarChart.vue          | 116 ------
 .../views/dashboard/admin/index.vue           | 207 +++++-----
 app/Modules/Admin/Services/IndexService.php   |  41 ++
 10 files changed, 488 insertions(+), 533 deletions(-)
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/api/indexs.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/api/role.js
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/RaddarChart.vue
 create mode 100644 app/Modules/Admin/Services/IndexService.php

diff --git a/app/Models/Model.php b/app/Models/Model.php
index 4faebdc..50b4779 100644
--- a/app/Models/Model.php
+++ b/app/Models/Model.php
@@ -72,12 +72,6 @@ class Model extends EloquentModel
      */
     protected $guarded = [];
 
-
-
-
-
-
-
     /**
      * 模型的 "booted" 方法
      *
diff --git a/app/Modules/Admin/Entities/Rabc/Admin.php b/app/Modules/Admin/Entities/Rabc/Admin.php
index 2b20522..7aa794a 100644
--- a/app/Modules/Admin/Entities/Rabc/Admin.php
+++ b/app/Modules/Admin/Entities/Rabc/Admin.php
@@ -2,10 +2,12 @@
 
 namespace App\Modules\Admin\Entities\Rabc;
 
+use App\Scopes\DeleteScope;
 use App\Traits\Instance;
 use App\Traits\MysqlTable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Support\Facades\Storage;
+use Illuminate\Database\Eloquent\Builder;
 use Tymon\JWTAuth\Contracts\JWTSubject;
 
 class Admin extends Authenticatable implements JWTSubject
@@ -14,6 +16,8 @@ class Admin extends Authenticatable implements JWTSubject
     use MysqlTable;
 
     protected $primaryKey = 'admin_id';
+    protected $is_delete = 0; //是否开启删除（1.开启删除，就是直接删除；0.假删除）
+    protected $delete_field = 'is_delete'; //删除字段
 
     /**
      * 是否主动维护时间戳
@@ -31,6 +35,22 @@ class Admin extends Authenticatable implements JWTSubject
      */
     protected $guarded = [];
 
+    /**
+     * 模型的 "booted" 方法
+     *
+     * 应用全局作用域
+     *
+     * @return void
+     */
+    protected static function booted()
+    {
+        // 假删除的作用域
+        $static = new static;
+        static::addGlobalScope('delete', function(Builder $builder) use ($static){
+            if ($static->is_delete == 0) $builder->where($static->delete_field, $static->is_delete);
+        });
+    }
+
     public function getAdminByName(string $admin_name)
     {
         return $this->where('admin_name', $admin_name)->first();
diff --git a/app/Modules/Admin/Http/Controllers/IndexController.php b/app/Modules/Admin/Http/Controllers/IndexController.php
index 2ba5bd6..1dd29bc 100644
--- a/app/Modules/Admin/Http/Controllers/IndexController.php
+++ b/app/Modules/Admin/Http/Controllers/IndexController.php
@@ -3,13 +3,19 @@
 namespace App\Modules\Admin\Http\Controllers;
 
 use App\Models\MonthModel;
+use App\Modules\Admin\Services\IndexService;
 use Illuminate\Http\Request;
 
 class IndexController extends BaseController
 {
+    public function __construct(IndexService $indexService)
+    {
+        $this->service = $indexService;
+    }
+
     public function index(Request $request)
     {
-        return $this->successJson([]);
+        return $this->successJson($this->service->index());
     }
 
     /**
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/indexs.js b/app/Modules/Admin/Resources/vue-element-admin/api/indexs.js
new file mode 100644
index 0000000..e271250
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/indexs.js
@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function statistics() {
+    return request({
+        url: '/indexs',
+        method: 'get'
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/role.js b/app/Modules/Admin/Resources/vue-element-admin/api/role.js
deleted file mode 100644
index f011443..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/api/role.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import request from '@/utils/request'
-
-export function getRoutes() {
-    return request({
-        url: '/vue-element-admin/routes',
-        method: 'get'
-    })
-}
-
-export function getRoles() {
-    return request({
-        url: '/vue-element-admin/roles',
-        method: 'get'
-    })
-}
-
-export function addRole(data) {
-    return request({
-        url: '/vue-element-admin/role',
-        method: 'post',
-        data
-    })
-}
-
-export function updateRole(id, data) {
-    return request({
-        url: `/vue-element-admin/role/${id}`,
-        method: 'put',
-        data
-    })
-}
-
-export function deleteRole(id) {
-    return request({
-        url: `/vue-element-admin/role/${id}`,
-        method: 'delete'
-    })
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/BoxCard.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/BoxCard.vue
index 1ec1d37..271cf0e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/BoxCard.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/BoxCard.vue
@@ -1,118 +1,131 @@
 <template>
-  <el-card class="box-card-component" style="margin-left:8px;">
-    <div slot="header" class="box-card-header">
-      <img src="https://wpimg.wallstcn.com/e7d23d71-cf19-4b90-a1cc-f56af8c0903d.png">
-    </div>
-    <div style="position:relative;">
-      <pan-thumb :image="avatar" class="panThumb" />
-      <mallki class-name="mallki-text" text="vue-element-admin" />
-      <div style="padding-top:35px;" class="progress-item">
-        <span>Vue</span>
-        <el-progress :percentage="70" />
-      </div>
-      <div class="progress-item">
-        <span>JavaScript</span>
-        <el-progress :percentage="18" />
-      </div>
-      <div class="progress-item">
-        <span>CSS</span>
-        <el-progress :percentage="12" />
-      </div>
-      <div class="progress-item">
-        <span>ESLint</span>
-        <el-progress :percentage="100" status="success" />
-      </div>
-    </div>
-  </el-card>
+    <el-card class="box-card-component" style="margin-left:8px;">
+        <div slot="header" class="box-card-header">
+            <img src="https://wpimg.wallstcn.com/e7d23d71-cf19-4b90-a1cc-f56af8c0903d.png">
+        </div>
+        <div style="position:relative;">
+            <pan-thumb :image="avatar" class="panThumb"/>
+            <mallki class-name="mallki-text" text="vue-element-admin"/>
+            <!-- 技能百分比 -->
+            <div class="progress-item" v-for="(item, key) in skill" :style="key == 0 ? 'padding-top:35px;' : ''">
+                <span>{{item.name}}</span>
+                <el-progress v-if="item.value == 100" :percentage="item.value" status="success"/>
+                <el-progress v-else :percentage="item.value"/>
+            </div>
+        </div>
+    </el-card>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import PanThumb from '@/components/PanThumb'
-import Mallki from '@/components/TextHoverEffect/Mallki'
+    import {mapGetters} from 'vuex'
+    import PanThumb from '@/components/PanThumb'
+    import Mallki from '@/components/TextHoverEffect/Mallki'
 
-export default {
-  components: { PanThumb, Mallki },
-
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        success: 'success',
-        pending: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      statisticsData: {
-        article_count: 1024,
-        pageviews_count: 1024
-      }
+    export default {
+        components: {PanThumb, Mallki},
+        filters: {
+            statusFilter(status) {
+                const statusMap = {
+                    success: 'success',
+                    pending: 'danger'
+                }
+                return statusMap[status]
+            }
+        },
+        // 组件传值
+        props       : {
+            skill   : {
+                type    : Array,
+                default : []
+            }
+        },
+        // 监听
+        watch: {
+            //当 skill 属性的值发生改变时会执行下面的代码
+            skill: function (newValue, oldValue) {
+                this.skill = newValue;
+            }
+        },
+        data() {
+            return {
+                statisticsData: {
+                    article_count: 1024,
+                    pageviews_count: 1024
+                }
+            }
+        },
+        created() {
+            console.log(this.skill);
+        },
+        computed: {
+            ...mapGetters([
+                'name',
+                'avatar',
+                'roles'
+            ])
+        }
     }
-  },
-  computed: {
-    ...mapGetters([
-      'name',
-      'avatar',
-      'roles'
-    ])
-  }
-}
 </script>
 
-<style lang="scss" >
-.box-card-component{
-  .el-card__header {
-    padding: 0px!important;
-  }
-}
+<style lang="scss">
+    .box-card-component {
+        .el-card__header {
+            padding: 0px !important;
+        }
+    }
 </style>
 <style lang="scss" scoped>
-.box-card-component {
-  .box-card-header {
-    position: relative;
-    height: 220px;
-    img {
-      width: 100%;
-      height: 100%;
-      transition: all 0.2s linear;
-      &:hover {
-        transform: scale(1.1, 1.1);
-        filter: contrast(130%);
-      }
-    }
-  }
-  .mallki-text {
-    position: absolute;
-    top: 0px;
-    right: 0px;
-    font-size: 20px;
-    font-weight: bold;
-  }
-  .panThumb {
-    z-index: 100;
-    height: 70px!important;
-    width: 70px!important;
-    position: absolute!important;
-    top: -45px;
-    left: 0px;
-    border: 5px solid #ffffff;
-    background-color: #fff;
-    margin: auto;
-    box-shadow: none!important;
-    ::v-deep .pan-info {
-      box-shadow: none!important;
-    }
-  }
-  .progress-item {
-    margin-bottom: 10px;
-    font-size: 14px;
-  }
-  @media only screen and (max-width: 1510px){
-    .mallki-text{
-      display: none;
+    .box-card-component {
+        .box-card-header {
+            position: relative;
+            height: 220px;
+
+            img {
+                width: 100%;
+                height: 100%;
+                transition: all 0.2s linear;
+
+                &:hover {
+                    transform: scale(1.1, 1.1);
+                    filter: contrast(130%);
+                }
+            }
+        }
+
+        .mallki-text {
+            position: absolute;
+            top: 0px;
+            right: 0px;
+            font-size: 20px;
+            font-weight: bold;
+        }
+
+        .panThumb {
+            z-index: 100;
+            height: 70px !important;
+            width: 70px !important;
+            position: absolute !important;
+            top: -45px;
+            left: 0px;
+            border: 5px solid #ffffff;
+            background-color: #fff;
+            margin: auto;
+            box-shadow: none !important;
+
+            ::v-deep .pan-info {
+                box-shadow: none !important;
+            }
+        }
+
+        .progress-item {
+            margin-bottom: 10px;
+            font-size: 14px;
+        }
+
+        @media only screen and (max-width: 1510px) {
+            .mallki-text {
+                display: none;
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
index 589236e..0ef29f2 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
@@ -1,181 +1,195 @@
 <template>
-  <el-row :gutter="40" class="panel-group">
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-        <div class="card-panel-icon-wrapper icon-people">
-          <svg-icon icon-class="peoples" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            New Visits
-          </div>
-          <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('messages')">
-        <div class="card-panel-icon-wrapper icon-message">
-          <svg-icon icon-class="message" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Messages
-          </div>
-          <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('purchases')">
-        <div class="card-panel-icon-wrapper icon-money">
-          <svg-icon icon-class="money" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Purchases
-          </div>
-          <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-    <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-      <div class="card-panel" @click="handleSetLineChartData('shoppings')">
-        <div class="card-panel-icon-wrapper icon-shopping">
-          <svg-icon icon-class="shopping" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            Shoppings
-          </div>
-          <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
-        </div>
-      </div>
-    </el-col>
-  </el-row>
+    <el-row :gutter="40" class="panel-group">
+        <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+            <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+                <div class="card-panel-icon-wrapper icon-people">
+                    <svg-icon icon-class="peoples" class-name="card-panel-icon"/>
+                </div>
+                <div class="card-panel-description">
+                    <div class="card-panel-text">
+                        管理员数量
+                    </div>
+                    <count-to :start-val="0" :end-val="admins_count" :duration="2600" class="card-panel-num"/>
+                </div>
+            </div>
+        </el-col>
+        <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+            <div class="card-panel" @click="handleSetLineChartData('messages')">
+                <div class="card-panel-icon-wrapper icon-message">
+                    <svg-icon icon-class="message" class-name="card-panel-icon"/>
+                </div>
+                <div class="card-panel-description">
+                    <div class="card-panel-text">
+                        Messages
+                    </div>
+                    <count-to :start-val="0" :end-val="81212" :duration="3000" class="card-panel-num"/>
+                </div>
+            </div>
+        </el-col>
+        <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+            <div class="card-panel" @click="handleSetLineChartData('purchases')">
+                <div class="card-panel-icon-wrapper icon-money">
+                    <svg-icon icon-class="money" class-name="card-panel-icon"/>
+                </div>
+                <div class="card-panel-description">
+                    <div class="card-panel-text">
+                        Purchases
+                    </div>
+                    <count-to :start-val="0" :end-val="9280" :duration="3200" class="card-panel-num"/>
+                </div>
+            </div>
+        </el-col>
+        <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+            <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+                <div class="card-panel-icon-wrapper icon-shopping">
+                    <svg-icon icon-class="shopping" class-name="card-panel-icon"/>
+                </div>
+                <div class="card-panel-description">
+                    <div class="card-panel-text">
+                        Shoppings
+                    </div>
+                    <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num"/>
+                </div>
+            </div>
+        </el-col>
+    </el-row>
 </template>
 
 <script>
-import CountTo from 'vue-count-to'
-
-export default {
-  components: {
-    CountTo
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.$emit('handleSetLineChartData', type)
+    import CountTo from 'vue-count-to'
+
+    export default {
+        components: {
+            CountTo
+        },
+        // 组件传值
+        props: {
+            admins_count: {
+                type: Number,
+                default: 0
+            }
+        },
+        // 监听
+        watch: {
+            //当属性的值发生改变时会执行下面的代码
+            admins_count: function (newValue, oldValue) {
+                this.admins_count = newValue;
+            }
+        },
+        methods: {
+            handleSetLineChartData(type) {
+                this.$emit('handleSetLineChartData', type)
+            }
+        }
     }
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-.panel-group {
-  margin-top: 18px;
-
-  .card-panel-col {
-    margin-bottom: 32px;
-  }
-
-  .card-panel {
-    height: 108px;
-    cursor: pointer;
-    font-size: 12px;
-    position: relative;
-    overflow: hidden;
-    color: #666;
-    background: #fff;
-    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
-    border-color: rgba(0, 0, 0, .05);
-
-    &:hover {
-      .card-panel-icon-wrapper {
-        color: #fff;
-      }
-
-      .icon-people {
-        background: #40c9c6;
-      }
-
-      .icon-message {
-        background: #36a3f7;
-      }
-
-      .icon-money {
-        background: #f4516c;
-      }
-
-      .icon-shopping {
-        background: #34bfa3
-      }
+    .panel-group {
+        margin-top: 18px;
+
+        .card-panel-col {
+            margin-bottom: 32px;
+        }
+
+        .card-panel {
+            height: 108px;
+            cursor: pointer;
+            font-size: 12px;
+            position: relative;
+            overflow: hidden;
+            color: #666;
+            background: #fff;
+            box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+            border-color: rgba(0, 0, 0, .05);
+
+            &:hover {
+                .card-panel-icon-wrapper {
+                    color: #fff;
+                }
+
+                .icon-people {
+                    background: #40c9c6;
+                }
+
+                .icon-message {
+                    background: #36a3f7;
+                }
+
+                .icon-money {
+                    background: #f4516c;
+                }
+
+                .icon-shopping {
+                    background: #34bfa3
+                }
+            }
+
+            .icon-people {
+                color: #40c9c6;
+            }
+
+            .icon-message {
+                color: #36a3f7;
+            }
+
+            .icon-money {
+                color: #f4516c;
+            }
+
+            .icon-shopping {
+                color: #34bfa3
+            }
+
+            .card-panel-icon-wrapper {
+                float: left;
+                margin: 14px 0 0 14px;
+                padding: 16px;
+                transition: all 0.38s ease-out;
+                border-radius: 6px;
+            }
+
+            .card-panel-icon {
+                float: left;
+                font-size: 48px;
+            }
+
+            .card-panel-description {
+                float: right;
+                font-weight: bold;
+                margin: 26px;
+                margin-left: 0px;
+
+                .card-panel-text {
+                    line-height: 18px;
+                    color: rgba(0, 0, 0, 0.45);
+                    font-size: 16px;
+                    margin-bottom: 12px;
+                }
+
+                .card-panel-num {
+                    font-size: 20px;
+                }
+            }
+        }
     }
 
-    .icon-people {
-      color: #40c9c6;
+    @media (max-width: 550px) {
+        .card-panel-description {
+            display: none;
+        }
+
+        .card-panel-icon-wrapper {
+            float: none !important;
+            width: 100%;
+            height: 100%;
+            margin: 0 !important;
+
+            .svg-icon {
+                display: block;
+                margin: 14px auto !important;
+                float: none !important;
+            }
+        }
     }
-
-    .icon-message {
-      color: #36a3f7;
-    }
-
-    .icon-money {
-      color: #f4516c;
-    }
-
-    .icon-shopping {
-      color: #34bfa3
-    }
-
-    .card-panel-icon-wrapper {
-      float: left;
-      margin: 14px 0 0 14px;
-      padding: 16px;
-      transition: all 0.38s ease-out;
-      border-radius: 6px;
-    }
-
-    .card-panel-icon {
-      float: left;
-      font-size: 48px;
-    }
-
-    .card-panel-description {
-      float: right;
-      font-weight: bold;
-      margin: 26px;
-      margin-left: 0px;
-
-      .card-panel-text {
-        line-height: 18px;
-        color: rgba(0, 0, 0, 0.45);
-        font-size: 16px;
-        margin-bottom: 12px;
-      }
-
-      .card-panel-num {
-        font-size: 20px;
-      }
-    }
-  }
-}
-
-@media (max-width:550px) {
-  .card-panel-description {
-    display: none;
-  }
-
-  .card-panel-icon-wrapper {
-    float: none !important;
-    width: 100%;
-    height: 100%;
-    margin: 0 !important;
-
-    .svg-icon {
-      display: block;
-      margin: 14px auto !important;
-      float: none !important;
-    }
-  }
-}
 </style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/RaddarChart.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/RaddarChart.vue
deleted file mode 100644
index 52c8f9f..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/RaddarChart.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <div :class="className" :style="{height:height,width:width}" />
-</template>
-
-<script>
-import echarts from 'echarts'
-require('echarts/theme/macarons') // echarts theme
-import resize from './mixins/resize'
-
-const animationDuration = 3000
-
-export default {
-  mixins: [resize],
-  props: {
-    className: {
-      type: String,
-      default: 'chart'
-    },
-    width: {
-      type: String,
-      default: '100%'
-    },
-    height: {
-      type: String,
-      default: '300px'
-    }
-  },
-  data() {
-    return {
-      chart: null
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.initChart()
-    })
-  },
-  beforeDestroy() {
-    if (!this.chart) {
-      return
-    }
-    this.chart.dispose()
-    this.chart = null
-  },
-  methods: {
-    initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
-
-      this.chart.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: { // 坐标轴指示器，坐标轴触发有效
-            type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
-          }
-        },
-        radar: {
-          radius: '66%',
-          center: ['50%', '42%'],
-          splitNumber: 8,
-          splitArea: {
-            areaStyle: {
-              color: 'rgba(127,95,132,.3)',
-              opacity: 1,
-              shadowBlur: 45,
-              shadowColor: 'rgba(0,0,0,.5)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 15
-            }
-          },
-          indicator: [
-            { name: 'Sales', max: 10000 },
-            { name: 'Administration', max: 20000 },
-            { name: 'Information Technology', max: 20000 },
-            { name: 'Customer Support', max: 20000 },
-            { name: 'Development', max: 20000 },
-            { name: 'Marketing', max: 20000 }
-          ]
-        },
-        legend: {
-          left: 'center',
-          bottom: '10',
-          data: ['Allocated Budget', 'Expected Spending', 'Actual Spending']
-        },
-        series: [{
-          type: 'radar',
-          symbolSize: 0,
-          areaStyle: {
-            normal: {
-              shadowBlur: 13,
-              shadowColor: 'rgba(0,0,0,.2)',
-              shadowOffsetX: 0,
-              shadowOffsetY: 10,
-              opacity: 1
-            }
-          },
-          data: [
-            {
-              value: [5000, 7000, 12000, 11000, 15000, 14000],
-              name: 'Allocated Budget'
-            },
-            {
-              value: [4000, 9000, 15000, 15000, 13000, 11000],
-              name: 'Expected Spending'
-            },
-            {
-              value: [5500, 11000, 12000, 15000, 12000, 12000],
-              name: 'Actual Spending'
-            }
-          ],
-          animationDuration: animationDuration
-        }]
-      })
-    }
-  }
-}
-</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
index fcb0c1c..8ae1b51 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
@@ -1,114 +1,127 @@
 <template>
-  <div class="dashboard-editor-container">
-    <github-corner class="github-corner" />
+    <div class="dashboard-editor-container">
+        <github-corner class="github-corner"/>
 
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
+        <panel-group @handleSetLineChartData="handleSetLineChartData" :admins_count="admins_count"/>
 
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
+        <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
+            <line-chart :chart-data="lineChartData"/>
+        </el-row>
 
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
-
-    <el-row :gutter="8">
-      <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}" style="margin-bottom:30px;">
-        <box-card />
-      </el-col>
-    </el-row>
-  </div>
+        <el-row :gutter="32">
+            <el-col :xs="24" :sm="24" :lg="8">
+                <div class="chart-wrapper">
+                    <box-card :skill="skill"/>
+                </div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8">
+                <div class="chart-wrapper">
+                    <pie-chart/>
+                </div>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="8">
+                <div class="chart-wrapper">
+                    <bar-chart/>
+                </div>
+            </el-col>
+        </el-row>
+    </div>
 </template>
 
 <script>
-import GithubCorner from '@/components/GithubCorner'
-import PanelGroup from './components/PanelGroup'
-import LineChart from './components/LineChart'
-import RaddarChart from './components/RaddarChart'
-import PieChart from './components/PieChart'
-import BarChart from './components/BarChart'
-import BoxCard from './components/BoxCard'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
+    import GithubCorner from '@/components/GithubCorner'
+    import PanelGroup from './components/PanelGroup'
+    import LineChart from './components/LineChart'
+    import PieChart from './components/PieChart'
+    import BarChart from './components/BarChart'
+    import BoxCard from './components/BoxCard'
+    import {statistics} from "@/api/indexs";
+    import {getList as getMenus} from "@/api/admin_menus";
 
-export default {
-  name: 'DashboardAdmin',
-  components: {
-    GithubCorner,
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart,
-    BoxCard
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis
+    const lineChartData = {
+        newVisitis: {
+            expectedData: [100, 120, 161, 134, 105, 160, 165],
+            actualData: [120, 82, 91, 154, 162, 140, 145]
+        },
+        messages: {
+            expectedData: [200, 192, 120, 144, 160, 130, 140],
+            actualData: [180, 160, 151, 106, 145, 150, 130]
+        },
+        purchases: {
+            expectedData: [80, 100, 121, 104, 105, 90, 100],
+            actualData: [120, 90, 100, 138, 142, 130, 130]
+        },
+        shoppings: {
+            expectedData: [130, 140, 141, 142, 145, 150, 160],
+            actualData: [120, 82, 91, 154, 162, 140, 130]
+        }
     }
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
+
+    export default {
+        name: 'DashboardAdmin',
+        components: {
+            GithubCorner,
+            PanelGroup,
+            LineChart,
+            PieChart,
+            BarChart,
+            BoxCard
+        },
+        data() {
+            return {
+                lineChartData: lineChartData.newVisitis,
+                skill:[], // 技能组
+                admins_count:0, // 管理员数量
+            }
+        },
+        created() {
+            this.statistics();
+        },
+        methods: {
+            async statistics() {
+                this.listLoading = true;
+                const {data} = await statistics();
+
+                console.log(data);
+                // 管理员数量
+                this.admins_count = data.admins_count;
+                // 技能
+                this.skill = data.skill;
+
+                setTimeout(() => {
+                    this.listLoading = false;
+                }, 300);
+            },
+            handleSetLineChartData(type) {
+                this.lineChartData = lineChartData[type]
+            }
+        }
     }
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
+    .dashboard-editor-container {
+        padding: 32px;
+        background-color: rgb(240, 242, 245);
+        position: relative;
 
-  .github-corner {
-    position: absolute;
-    top: 0px;
-    border: 0;
-    right: 0;
-  }
+        .github-corner {
+            position: absolute;
+            top: 0px;
+            border: 0;
+            right: 0;
+        }
 
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
-}
+        .chart-wrapper {
+            background: #fff;
+            padding: 16px 16px 0;
+            margin-bottom: 32px;
+        }
+    }
 
-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
-  }
-}
+    @media (max-width: 1024px) {
+        .chart-wrapper {
+            padding: 8px;
+        }
+    }
 </style>
diff --git a/app/Modules/Admin/Services/IndexService.php b/app/Modules/Admin/Services/IndexService.php
new file mode 100644
index 0000000..8724937
--- /dev/null
+++ b/app/Modules/Admin/Services/IndexService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Rabc\Admin;
+
+class IndexService extends BaseService
+{
+    public function index()
+    {
+        return [
+            // 管理员人数
+            'admins_count' => Admin::getInstance()->count(),
+            // 技能
+            'skill' => $this->skill()
+        ];
+    }
+
+    private function skill()
+    {
+        $arr = [
+            'cnpscy' => 100,
+            'PHP' => rand(70, 99),
+            'Mysql' => rand(70, 99),
+            'Redis' => rand(70, 99),
+            'Thinkphp' => rand(70, 99),
+            'Laravel' => rand(50, 99),
+            'Hypref' => rand(50, 99),
+            'Vue' => rand(10, 99),
+            'JavaScript' => rand(20, 99),
+        ];
+        $list = [];
+        foreach ($arr as $key => $value){
+            $list[] = [
+                'name' => $key,
+                'value' => $value,
+            ];
+        }
+        return $list;
+    }
+}
-- 
Gitee


From 61fa63f44a530d3c0b22fbe3190e786f4dea5a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 15:21:09 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Article/ArticleCategoryController.php     |  25 +++
 .../Article/ArticleCategoryRequest.php        |  40 +++++
 .../vue-element-admin/api/admin_menus.js      |   8 -
 .../vue-element-admin/api/admin_roles.js      |   8 -
 .../Resources/vue-element-admin/api/admins.js |  14 +-
 .../vue-element-admin/api/article.js          |  41 -----
 .../api/article_categories.js                 |  40 +++++
 .../vue-element-admin/api/articles.js         |  12 --
 .../vue-element-admin/views/admins/index.vue  | 114 ++++++-------
 .../article_categories/components/detail.vue  | 109 ++++++++++++
 .../views/article_categories/index.vue        | 155 ++++++++++++++++++
 .../views/components-demo/dnd-list.vue        |  39 -----
 .../views/dashboard/admin/index.vue           |   2 +-
 app/Modules/Admin/Routes/web.php              |   9 +
 .../Admin/Services/ArticleCategoryService.php |  20 +++
 15 files changed, 464 insertions(+), 172 deletions(-)
 create mode 100644 app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
 create mode 100644 app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/api/article.js
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
 create mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dnd-list.vue
 create mode 100644 app/Modules/Admin/Services/ArticleCategoryService.php

diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
new file mode 100644
index 0000000..7f0df6b
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Modules\Admin\Http\Controllers\Article;
+
+use App\Modules\Admin\Http\Controllers\BaseController;
+use App\Modules\Admin\Http\Requests\Article\ArticleRequest;
+use App\Modules\Admin\Services\ArticleCategoryService;
+
+class ArticleCategoryController extends BaseController
+{
+    public function __construct(ArticleCategoryService $articleCategoryService)
+    {
+        $this->service = $articleCategoryService;
+    }
+
+    public function create(ArticleRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(ArticleRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php b/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
new file mode 100644
index 0000000..f42431a
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\Article;
+
+use App\Modules\Admin\Entities\Article\ArticleCategory;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class ArticleCategoryRequest extends BaseRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        $instance = ArticleCategory::getInstance();
+        $primarykey = $instance->getKeyName();
+        $validate_id = ',' . request()->input($primarykey, 0) . ',' .  $primarykey;
+
+        return [
+            'category_name' => [
+                'required',
+                'max:256',
+                'unique:' . $instance->getTable() . ',category_name' . $validate_id
+            ],
+            'category_sort' => [
+                'required',
+            ]
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'article_title.required' => '请输入标题！',
+            'article_cover.required'   => '请上传封面！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
index 5dda70f..f703136 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_menus.js
@@ -15,14 +15,6 @@ export function getList(params) {
     })
 }
 
-export function detail(data) {
-    return request({
-        url: '/admin_menus/detail',
-        method: 'get',
-        data
-    })
-}
-
 export function create(data) {
     return request({
         url: '/admin_menus',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
index c3d64de..ab16a24 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
@@ -15,14 +15,6 @@ export function getList(params) {
     })
 }
 
-export function detail(data) {
-    return request({
-        url: '/admin_roles/detail',
-        method: 'post',
-        data
-    })
-}
-
 export function create(data) {
     return request({
         url: '/admin_roles',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admins.js b/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
index 7ba1d62..0609060 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
@@ -15,13 +15,13 @@ export function getList(params) {
     })
 }
 
-export function detail(data) {
-    return request({
-        url: '/admins/detail',
-        method: 'post',
-        data
-    })
-}
+// export function detail(data) {
+//     return request({
+//         url: '/admins/detail',
+//         method: 'post',
+//         data
+//     })
+// }
 
 export function create(data) {
     return request({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/article.js b/app/Modules/Admin/Resources/vue-element-admin/api/article.js
deleted file mode 100644
index 407bda1..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/api/article.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import request from '@/utils/request'
-
-export function fetchList(query) {
-  return request({
-    url: '/vue-element-admin/article/list',
-    method: 'get',
-    params: query
-  })
-}
-
-export function fetchArticle(id) {
-  return request({
-    url: '/vue-element-admin/article/detail',
-    method: 'get',
-    params: { id }
-  })
-}
-
-export function fetchPv(pv) {
-  return request({
-    url: '/vue-element-admin/article/pv',
-    method: 'get',
-    params: { pv }
-  })
-}
-
-export function createArticle(data) {
-  return request({
-    url: '/vue-element-admin/article/create',
-    method: 'post',
-    data
-  })
-}
-
-export function updateArticle(data) {
-  return request({
-    url: '/vue-element-admin/article/update',
-    method: 'post',
-    data
-  })
-}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
new file mode 100644
index 0000000..c68ef8f
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
@@ -0,0 +1,40 @@
+import request from '@/utils/request'
+
+export function getMenusSelect() {
+    return request({
+        url: '/article_categorys/getSelectLists',
+        method: 'get'
+    })
+}
+
+export function getList(params) {
+    return request({
+        url: 'article_categorys',
+        method: 'get',
+        params
+    })
+}
+
+export function create(data) {
+    return request({
+        url: '/article_categorys',
+        method: 'post',
+        data
+    })
+}
+
+export function update(data) {
+    return request({
+        url: `/article_categorys`,
+        method: 'put',
+        data
+    })
+}
+
+export function setDel(data) {
+    return request({
+        url: `/article_categorys`,
+        method: 'delete',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/articles.js b/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
index d4f75be..0ddabf4 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
@@ -15,14 +15,6 @@ export function getList(params) {
     })
 }
 
-export function detail(data) {
-    return request({
-        url: '/articles/detail',
-        method: 'post',
-        data
-    })
-}
-
 export function create(data) {
     return request({
         url: '/articles',
@@ -46,7 +38,3 @@ export function setDel(data) {
         data
     })
 }
-
-export function fetchArticle() {
-
-}
\ No newline at end of file
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index c12c989..1462151 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -2,19 +2,19 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入管理员账户/邮箱"
-                    style="width: 200px;"
-                    class="filter-item"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入管理员账户/邮箱"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="handleFilter"
             />
             <el-select v-model="listQuery.is_check" placeholder="请选择启用状态" clearable class="filter-item">
                 <el-option
-                        v-for="item in calendarCheckOptions"
-                        :key="item.key"
-                        :checked="item.key == listQuery.is_check"
-                        :label="item.display_name+'('+item.key+')'"
-                        :value="item.key"
+                    v-for="item in calendarCheckOptions"
+                    :key="item.key"
+                    :checked="item.key == listQuery.is_check"
+                    :label="item.display_name+'('+item.key+')'"
+                    :value="item.key"
                 />
             </el-select>
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
@@ -24,51 +24,51 @@
                 批量删除
             </el-button>
             <el-button
-                    class="filter-item"
-                    style="margin-left: 10px;"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleEdit"
+                class="filter-item"
+                style="margin-left: 10px;"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleEdit"
             >
                 {{ $t('table.add') }}
             </el-button>
             <el-button
-                    v-waves
-                    :loading="downloadLoading"
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-download"
-                    @click="handleDownload"
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-download"
+                @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="admin_id"
-                    label="Id"
+                show-overflow-tooltip
+                prop="admin_id"
+                label="Id"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="admin_name"
-                    label="管理员"
-                    align="center"
+                show-overflow-tooltip
+                prop="admin_name"
+                label="管理员"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="admin_email"
-                    label="邮箱"
-                    align="center"
+                show-overflow-tooltip
+                prop="admin_email"
+                label="邮箱"
+                align="center"
             />
             <el-table-column align="center" prop="admin_head" label="头像">
                 <template slot-scope="{row}">
@@ -90,27 +90,29 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
-                    fixed="right"
-                    label="操作"
-                    width="200"
-                    align="center"
+                show-overflow-tooltip
+                fixed="right"
+                label="操作"
+                width="200"
+                align="center"
             >
                 <template v-slot="scope">
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.admin_id != 1" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.admin_id != 1"
+                               @click="handleDelete(scope.row)">删除
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
         <!-- 分页 -->
         <el-pagination
-                background
-                :current-page="listQuery.page"
-                :page-size="listQuery.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
         <!-- 详情 -->
         <edit ref="edit" @fetchData="getList"/>
@@ -145,12 +147,12 @@
                 const statusMap = {
                     1: 'success',
                     0: 'danger'
-                }
-                return statusMap[status]
+                };
+                return statusMap[status];
             },
             checkFilter(type) {
-                return calendarCheckKeyValue[type] || ''
-            }
+                return calendarCheckKeyValue[type] || '';
+            },
         },
         data() {
             return {
@@ -262,7 +264,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({admin_id: ids, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({admin_id: ids, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
new file mode 100644
index 0000000..430756e
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
@@ -0,0 +1,109 @@
+<template>
+    <el-dialog
+        :title="title"
+        :visible.sync="dialogFormVisible"
+        @close="close"
+    >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="父级菜单" prop="parent_id">
+                <el-input v-model="form.parent_id" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="菜单名称" prop="menu_name">
+                <el-input v-model="form.menu_name" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="Vue路由路径" prop="vue_path">
+                <el-input v-model="form.vue_path" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="Vue的redirect" prop="vue_redirect">
+                <el-input v-model="form.vue_redirect" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="图标" prop="vue_icon">
+                <el-input v-model="form.vue_icon" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="Vue文件路径" prop="vue_component">
+                <el-input v-model="form.vue_component" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="Vue的meta" prop="vue_meta">
+                <el-input v-model="form.vue_meta" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="外链" prop="external_links">
+                <el-input v-model="form.external_links" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="接口路由" prop="api_url">
+                <el-input v-model="form.api_url" autocomplete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="排序" prop="menu_sort">
+                <el-input v-model="form.menu_sort" autocomplete="off" value="0"></el-input>
+            </el-form-item>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+            <el-button @click="close">取 消</el-button>
+            <el-button type="primary" @click="save">确 定</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+    import {create, update} from "@/api/admin_menus";
+
+    export default {
+        name: "",
+        data() {
+            return {
+                form: {},
+                rules: {
+                    id: [{required: true, trigger: "blur", message: "请输入路径"}],
+                },
+                title: "",
+                dialogFormVisible: false,
+            };
+        },
+        created() {
+        },
+        methods: {
+            showEdit(row) {
+                console.log(row);
+                if (!row) {
+                    this.title = "添加";
+                } else {
+                    this.title = "编辑";
+                    this.form = Object.assign({}, row);
+                }
+                console.log(this.form);
+                this.dialogFormVisible = true;
+            },
+            close() {
+                this.$refs["form"].resetFields();
+                this.form = this.$options.data().form;
+                this.dialogFormVisible = false;
+            },
+            save() {
+                this.$refs["form"].validate(async (valid) => {
+                    if (valid) {
+                        const {msg, status} = this.form.category_id ? await update(this.form) : await create(this.form);
+
+                        switch (status) {
+                            case 1:
+                                this.$message({
+                                    message: msg,
+                                    type: 'success'
+                                });
+
+                                this.$emit("fetchData");
+                                this.close();
+                                break;
+                            default:
+                                this.$message({
+                                    message: msg,
+                                    type: 'error'
+                                });
+                                break;
+                        }
+                    } else {
+                        return false;
+                    }
+                });
+            },
+        },
+    };
+</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
new file mode 100644
index 0000000..56ee301
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -0,0 +1,155 @@
+<template>
+    <div class="app-container">
+        <div class="filter-container">
+            <el-button
+                class="filter-item"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleEdit"
+            >
+                {{ $t('table.add') }}
+            </el-button>
+        </div>
+
+        <el-table
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            row-key="category_id"
+            border
+            :tree-props="{ children: '_child', hasChildren: true }"
+        >
+            <el-table-column
+                show-overflow-tooltip
+                prop="category_name"
+                label="分类名称"
+            ></el-table-column>
+            <el-table-column align="center" prop="is_check" label="启用状态">
+                <template slot-scope="scope">
+                    <el-tag :type="scope.row.is_check | statusFilter">
+                        {{ scope.row.is_check | checkFilter }}
+                    </el-tag>
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }">
+                  <span>
+                    {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                  </span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="category_sort"
+                label="排序"
+                align="center"
+            ></el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                align="center"
+                label="操作"
+                width="200"
+            >
+                <template v-slot="scope">
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <edit ref="edit" @fetchData="getMenus"></edit>
+    </div>
+</template>
+
+<script>
+    import {getList as getMenus, setDel} from "@/api/article_categories";
+    import Edit from "./components/detail";
+    import {parseTime} from "@/utils";
+
+    const calendarCheckOptions = [
+        {key: '-1', display_name: '全部'},
+        {key: '1', display_name: '启用'},
+        {key: '0', display_name: '禁用'}
+    ]
+
+    const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
+        acc[cur.key] = cur.display_name
+        return acc
+    }, {})
+
+    export default {
+        name: "MenuManagement",
+        components: {Edit},
+        filters: {
+            statusFilter(status) {
+                const statusMap = {
+                    1: 'success',
+                    0: 'danger'
+                };
+                return statusMap[status];
+            },
+            checkFilter(type) {
+                return calendarCheckKeyValue[type] || '';
+            },
+        },
+        data() {
+            return {
+                defaultProps: {
+                    children: "children",
+                    label: "label",
+                },
+                list: [],
+                listLoading: true,
+                elementLoadingText: "正在加载...",
+            };
+        },
+        async created() {
+            this.getMenus();
+        },
+        methods: {
+            handleEdit(row) {
+                if (row.category_id) {
+                    this.$refs["edit"].showEdit(row);
+                } else {
+                    this.$refs["edit"].showEdit();
+                }
+            },
+            handleDelete(row) {
+                if (row.category_id) {
+                    this.$confirm(
+                        '你确定要删除操作吗？删除之后将无法恢复，请谨慎操作',
+                        'Warning',
+                        {
+                            confirmButtonText: 'Confirm',
+                            cancelButtonText: 'Cancel',
+                            type: 'warning'
+                        })
+                        .then(async () => {
+                            const {msg} = await setDel({category_id: row.category_id});
+                            this.$message({
+                                message: msg,
+                                type: 'success'
+                            });
+                            this.getMenus();
+                        })
+                        .catch(err => {
+                            console.error(err);
+                        });
+                }
+            },
+            async getMenus() {
+                this.listLoading = true;
+                const {data} = await getMenus();
+                console.log(data);
+
+                this.list = data;
+                setTimeout(() => {
+                    this.listLoading = false;
+                }, 300);
+            },
+            handleNodeClick(data) {
+                this.getMenus();
+            },
+        },
+    };
+</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dnd-list.vue b/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dnd-list.vue
deleted file mode 100644
index e299fa6..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/views/components-demo/dnd-list.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <div class="components-container">
-    <aside>drag-list base on
-      <a href="https://github.com/SortableJS/Vue.Draggable" target="_blank">Vue.Draggable</a>
-    </aside>
-    <div class="editor-container">
-      <dnd-list :list1="list1" :list2="list2" list1-title="List" list2-title="Article pool" />
-    </div>
-  </div>
-</template>
-
-<script>
-import DndList from '@/components/DndList'
-import { fetchList } from '@/api/article'
-
-export default {
-  name: 'DndListDemo',
-  components: { DndList },
-  data() {
-    return {
-      list1: [],
-      list2: []
-    }
-  },
-  created() {
-    this.getData()
-  },
-  methods: {
-    getData() {
-      this.listLoading = true
-      fetchList().then(response => {
-        this.list1 = response.data.items.splice(0, 5)
-        this.list2 = response.data.items
-      })
-    }
-  }
-}
-</script>
-
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
index 8ae1b51..97b727b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/index.vue
@@ -81,8 +81,8 @@
             async statistics() {
                 this.listLoading = true;
                 const {data} = await statistics();
+                // console.log(data);
 
-                console.log(data);
                 // 管理员数量
                 this.admins_count = data.admins_count;
                 // 技能
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index c9b9a62..c0c6218 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -111,5 +111,14 @@ Route::prefix('admin')->group(function() {
             Route::get('/', 'Log\AdminLoginLogController@index');
             Route::delete('/', 'Log\AdminLoginLogController@delete');
         });
+
+        // 文章分类
+        Route::prefix('article_categorys')->group(function() {
+            Route::get('/', 'Article\ArticleCategoryController@index');
+            Route::post('/', 'Article\ArticleCategoryController@create');
+            Route::put('/', 'Article\ArticleCategoryController@update');
+            Route::delete('/', 'Article\ArticleCategoryController@delete');
+            Route::get('/getSelectLists', 'Article\ArticleCategoryController@getSelectLists');
+        });
     });
 });
diff --git a/app/Modules/Admin/Services/ArticleCategoryService.php b/app/Modules/Admin/Services/ArticleCategoryService.php
new file mode 100644
index 0000000..b5e6e98
--- /dev/null
+++ b/app/Modules/Admin/Services/ArticleCategoryService.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Article\ArticleCategory;
+
+class ArticleCategoryService extends BaseService
+{
+    public function __construct(ArticleCategory $article)
+    {
+        $this->model = $article;
+    }
+
+    public function lists(array $params): array
+    {
+        $lists = $this->model->orderBy('category_sort', 'ASC')->get();
+
+        return list_to_tree($lists->toArray(), 'category_id');
+    }
+}
-- 
Gitee


From 115b7b9bfba150a697ea5c474cecfb14aea41b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 15:49:29 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=9A=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/article_categories.js                 |  8 +++
 .../views/admin_menus/index.vue               |  3 -
 .../vue-element-admin/views/admins/index.vue  |  8 +--
 .../views/article_categories/index.vue        | 55 ++++++++++++++-----
 .../views/dashboard/index.vue                 |  6 +-
 app/Modules/Admin/Routes/web.php              |  1 +
 6 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
index c68ef8f..22d94ce 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
@@ -38,3 +38,11 @@ export function setDel(data) {
         data
     })
 }
+
+export function changeFiledStatus(data) {
+    return request({
+        url: `/article_categorys/changeFiledStatus`,
+        method: 'put',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index 733054c..c6d8bd4 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
@@ -146,9 +146,6 @@
                     this.listLoading = false;
                 }, 300);
             },
-            handleNodeClick(data) {
-                this.getMenus();
-            },
         },
     };
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 1462151..5ad25b5 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -129,12 +129,12 @@
         {key: '-1', display_name: '全部'},
         {key: '1', display_name: '启用'},
         {key: '0', display_name: '禁用'}
-    ]
+    ];
 
     const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
-        acc[cur.key] = cur.display_name
-        return acc
-    }, {})
+        acc[cur.key] = cur.display_name;
+        return acc;
+    }, {});
 
     export default {
         name: 'UserManagement',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index 56ee301..fe43241 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -24,6 +24,12 @@
                 prop="category_name"
                 label="分类名称"
             ></el-table-column>
+            <el-table-column
+                show-overflow-tooltip
+                prop="category_sort"
+                label="排序"
+                align="center"
+            ></el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
                 <template slot-scope="scope">
                     <el-tag :type="scope.row.is_check | statusFilter">
@@ -38,19 +44,28 @@
                   </span>
                 </template>
             </el-table-column>
-            <el-table-column
-                show-overflow-tooltip
-                prop="category_sort"
-                label="排序"
-                align="center"
-            ></el-table-column>
             <el-table-column
                 show-overflow-tooltip
                 align="center"
                 label="操作"
-                width="200"
+                width="300"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -62,7 +77,7 @@
 </template>
 
 <script>
-    import {getList as getMenus, setDel} from "@/api/article_categories";
+    import {getList as getMenus, changeFiledStatus, setDel} from "@/api/article_categories";
     import Edit from "./components/detail";
     import {parseTime} from "@/utils";
 
@@ -70,11 +85,11 @@
         {key: '-1', display_name: '全部'},
         {key: '1', display_name: '启用'},
         {key: '0', display_name: '禁用'}
-    ]
+    ];
 
     const calendarCheckKeyValue = calendarCheckOptions.reduce((acc, cur) => {
-        acc[cur.key] = cur.display_name
-        return acc
+        acc[cur.key] = cur.display_name;
+        return acc;
     }, {})
 
     export default {
@@ -147,8 +162,22 @@
                     this.listLoading = false;
                 }, 300);
             },
-            handleNodeClick(data) {
-                this.getMenus();
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    category_id: row.category_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                console.log(data, msg, status);
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
             },
         },
     };
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/index.vue
index 826edac..2a99a97 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/index.vue
@@ -5,15 +5,15 @@
 </template>
 
 <script>
-    import {mapGetters} from 'vuex'
-    import adminDashboard from './admin'
+    import {mapGetters} from 'vuex';
+    import adminDashboard from './admin';
 
     export default {
         name: 'Dashboard',
         components: {adminDashboard},
         data() {
             return {
-                currentRole: 'adminDashboard'
+                currentRole: 'adminDashboard',
             }
         },
         computed: {
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index c0c6218..a9c53af 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -119,6 +119,7 @@ Route::prefix('admin')->group(function() {
             Route::put('/', 'Article\ArticleCategoryController@update');
             Route::delete('/', 'Article\ArticleCategoryController@delete');
             Route::get('/getSelectLists', 'Article\ArticleCategoryController@getSelectLists');
+            Route::put('/changeFiledStatus', 'Article\ArticleCategoryController@changeFiledStatus');
         });
     });
 });
-- 
Gitee


From b622fe849ef9aab0595d11546038a4c62ab7d8a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 16:33:46 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=8E=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entities/Article/ArticleCategory.php      |  5 ++
 .../Article/ArticleCategoryController.php     |  6 +-
 .../Article/ArticleCategoryRequest.php        |  3 +-
 .../api/article_categories.js                 |  2 +-
 .../views/admins/components/detail.vue        |  1 -
 .../article_categories/components/detail.vue  | 71 +++++++++++--------
 .../Admin/Services/ArticleCategoryService.php |  5 ++
 7 files changed, 55 insertions(+), 38 deletions(-)

diff --git a/app/Modules/Admin/Entities/Article/ArticleCategory.php b/app/Modules/Admin/Entities/Article/ArticleCategory.php
index 905c9c5..e9ea8c3 100644
--- a/app/Modules/Admin/Entities/Article/ArticleCategory.php
+++ b/app/Modules/Admin/Entities/Article/ArticleCategory.php
@@ -8,4 +8,9 @@ class ArticleCategory extends Model
 {
     protected $primaryKey = 'category_id';
     protected $is_delete = 0;
+
+    public function getSelectLists()
+    {
+        return list_to_tree($this->orderBy('category_sort', 'ASC')->get()->toArray(), $this->getKeyName());
+    }
 }
diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
index 7f0df6b..923d061 100644
--- a/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
+++ b/app/Modules/Admin/Http/Controllers/Article/ArticleCategoryController.php
@@ -3,7 +3,7 @@
 namespace App\Modules\Admin\Http\Controllers\Article;
 
 use App\Modules\Admin\Http\Controllers\BaseController;
-use App\Modules\Admin\Http\Requests\Article\ArticleRequest;
+use App\Modules\Admin\Http\Requests\Article\ArticleCategoryRequest;
 use App\Modules\Admin\Services\ArticleCategoryService;
 
 class ArticleCategoryController extends BaseController
@@ -13,12 +13,12 @@ class ArticleCategoryController extends BaseController
         $this->service = $articleCategoryService;
     }
 
-    public function create(ArticleRequest $request)
+    public function create(ArticleCategoryRequest $request)
     {
         return $this->createService($request);
     }
 
-    public function update(ArticleRequest $request)
+    public function update(ArticleCategoryRequest $request)
     {
         return $this->updateService($request);
     }
diff --git a/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php b/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
index f42431a..e18508b 100644
--- a/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
+++ b/app/Modules/Admin/Http/Requests/Article/ArticleCategoryRequest.php
@@ -33,8 +33,7 @@ class ArticleCategoryRequest extends BaseRequest
     public function messages()
     {
         return [
-            'article_title.required' => '请输入标题！',
-            'article_cover.required'   => '请上传封面！',
+            'category_name.required' => '请输入名称！',
         ];
     }
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
index 22d94ce..b3914ff 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/article_categories.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-export function getMenusSelect() {
+export function getCategorySelect() {
     return request({
         url: '/article_categorys/getSelectLists',
         method: 'get'
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
index ab5782d..be91fa7 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/components/detail.vue
@@ -214,7 +214,6 @@
             },
             save() {
                 this.$refs['form'].validate(async (valid) => {
-                    console.log(valid);
                     if (valid) {
                         const {msg} = this.form.admin_id ? await update(this.form) : await create(this.form);
                         this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
index 430756e..7af9bea 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/components/detail.vue
@@ -6,34 +6,33 @@
     >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="父级菜单" prop="parent_id">
-                <el-input v-model="form.parent_id" autocomplete="off"></el-input>
+                <el-select v-model="form.parent_id" placeholder="请选择父级" autocomplete="off">
+                    <el-option
+                        key="0"
+                        :checked="0 == form.parent_id"
+                        label="默认顶级"
+                        value="0"
+                    />
+                    <el-option
+                        v-for="item in category"
+                        :key="item.category_id"
+                        :checked="item.category_id == form.parent_id"
+                        :label="item.category_name"
+                        :value="item.category_id"
+                    />
+                </el-select>
             </el-form-item>
-            <el-form-item label="菜单名称" prop="menu_name">
-                <el-input v-model="form.menu_name" autocomplete="off"></el-input>
+            <el-form-item label="分类名称" prop="category_name">
+                <el-input v-model="form.category_name" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="Vue路由路径" prop="vue_path">
-                <el-input v-model="form.vue_path" autocomplete="off"></el-input>
+            <el-form-item label="排序" prop="category_sort">
+                <el-input v-model="form.category_sort" autocomplete="off" value="99"></el-input>
             </el-form-item>
-            <el-form-item label="Vue的redirect" prop="vue_redirect">
-                <el-input v-model="form.vue_redirect" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="图标" prop="vue_icon">
-                <el-input v-model="form.vue_icon" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="Vue文件路径" prop="vue_component">
-                <el-input v-model="form.vue_component" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="Vue的meta" prop="vue_meta">
-                <el-input v-model="form.vue_meta" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="外链" prop="external_links">
-                <el-input v-model="form.external_links" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="接口路由" prop="api_url">
-                <el-input v-model="form.api_url" autocomplete="off"></el-input>
-            </el-form-item>
-            <el-form-item label="排序" prop="menu_sort">
-                <el-input v-model="form.menu_sort" autocomplete="off" value="0"></el-input>
+            <el-form-item label="是否启用：" prop="is_check">
+                <el-radio-group v-model="form.is_check">
+                    <el-radio :label="0" :checked="form.is_check == 0 ? 'checked' : ''">禁用</el-radio>
+                    <el-radio :label="1" :checked="form.is_check == 1 ? 'checked' : ''">启用</el-radio>
+                </el-radio-group>
             </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -44,32 +43,42 @@
 </template>
 
 <script>
-    import {create, update} from "@/api/admin_menus";
+    import {create, update, getCategorySelect} from "@/api/article_categories";
 
     export default {
         name: "",
         data() {
             return {
-                form: {},
+                title: '',
+                category:[], // 分类组
+                form: {
+                    parent_id: 0,
+                    category_name:'',
+                    category_sort:99,
+                    is_check:1,
+                },
                 rules: {
-                    id: [{required: true, trigger: "blur", message: "请输入路径"}],
+                    category_name: [{required: true, trigger: "blur", message: "请输入分类名称"}],
                 },
-                title: "",
                 dialogFormVisible: false,
             };
         },
         created() {
+            this.getCategorySelect();
         },
         methods: {
+            // 获取菜单列表
+            async getCategorySelect() {
+                const res = await getCategorySelect();
+                this.category = res.data;
+            },
             showEdit(row) {
-                console.log(row);
                 if (!row) {
                     this.title = "添加";
                 } else {
                     this.title = "编辑";
                     this.form = Object.assign({}, row);
                 }
-                console.log(this.form);
                 this.dialogFormVisible = true;
             },
             close() {
diff --git a/app/Modules/Admin/Services/ArticleCategoryService.php b/app/Modules/Admin/Services/ArticleCategoryService.php
index b5e6e98..02f00d8 100644
--- a/app/Modules/Admin/Services/ArticleCategoryService.php
+++ b/app/Modules/Admin/Services/ArticleCategoryService.php
@@ -17,4 +17,9 @@ class ArticleCategoryService extends BaseService
 
         return list_to_tree($lists->toArray(), 'category_id');
     }
+
+    public function getSelectLists($request)
+    {
+        return $this->model->getSelectLists();
+    }
 }
-- 
Gitee


From 76957e4b94ea7e2dc2b08540f8f24ede5cb074e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 16:40:26 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E7=88=B6=E7=BA=A7?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin_menus/components/detail.vue   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
index 739994e..8fd2f42 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/components/detail.vue
@@ -6,7 +6,21 @@
     >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
             <el-form-item label="父级菜单" prop="parent_id">
-                <el-input v-model="form.parent_id" autocomplete="off"></el-input>
+                <el-select v-model="form.parent_id" placeholder="请选择父级" autocomplete="off">
+                    <el-option
+                        key="0"
+                        :checked="0 == form.parent_id"
+                        label="默认顶级"
+                        value="0"
+                    />
+                    <el-option
+                        v-for="item in menus"
+                        :key="item.menu_id"
+                        :checked="item.menu_id == form.parent_id"
+                        :label="item.menu_name"
+                        :value="item.menu_id"
+                    />
+                </el-select>
             </el-form-item>
             <el-form-item label="菜单名称" prop="menu_name">
                 <el-input v-model="form.menu_name" autocomplete="off"></el-input>
@@ -44,13 +58,14 @@
 </template>
 
 <script>
-    import {create, update} from "@/api/admin_menus";
+    import {create, update, getMenusSelect} from "@/api/admin_menus";
 
     export default {
         name: "",
         data() {
             return {
                 form: {},
+                menus:[], // 父级
                 rules: {
                     id: [{required: true, trigger: "blur", message: "请输入路径"}],
                 },
@@ -59,8 +74,14 @@
             };
         },
         created() {
+            this.getMenusSelect();
         },
         methods: {
+            // 获取菜单列表
+            async getMenusSelect() {
+                const res = await getMenusSelect();
+                this.menus = res.data;
+            },
             showEdit(row) {
                 console.log(row);
                 if (!row) {
-- 
Gitee


From 1aab76b5a00c88a58643af1f8b7af63a67c41e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 18:03:47 +0800
Subject: [PATCH 6/7] =?UTF-8?q?1.=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=9A?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E5=8A=A8=E8=AE=BE=E7=BD=AE=EF=BC=9B?=
 =?UTF-8?q?=202.=E9=A6=96=E9=A1=B5=EF=BC=9A=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=AE=A1=E7=90=86=E9=A1=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vue-element-admin/api/admin_roles.js      |   8 ++
 .../Resources/vue-element-admin/api/admins.js |   8 ++
 .../vue-element-admin/api/articles.js         |   8 ++
 .../vue-element-admin/api/banners.js          |   6 +-
 .../vue-element-admin/api/configs.js          |  49 ++++----
 .../vue-element-admin/api/friendlinks.js      |   4 +-
 .../views/admin_roles/index.vue               |  36 +++++-
 .../vue-element-admin/views/admins/index.vue  |  36 +++++-
 .../views/article_categories/index.vue        |   7 +-
 .../views/articles/category.vue               | 113 ------------------
 .../vue-element-admin/views/articles/edit.vue |  12 --
 .../dashboard/admin/components/PanelGroup.vue |  20 ++--
 .../views/setting/banners/index.vue           |  35 +++++-
 .../views/setting/configs/index.vue           |  35 +++++-
 .../views/setting/friendlinks/index.vue       |  35 +++++-
 app/Modules/Admin/Routes/web.php              |   7 ++
 .../Admin/Services/AdminMenuService.php       |   2 +-
 .../Admin/Services/ArticleCategoryService.php |   2 +-
 18 files changed, 241 insertions(+), 182 deletions(-)
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/articles/category.vue
 delete mode 100644 app/Modules/Admin/Resources/vue-element-admin/views/articles/edit.vue

diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js b/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
index ab16a24..a73024e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admin_roles.js
@@ -38,3 +38,11 @@ export function setDel(data) {
         data
     })
 }
+
+export function changeFiledStatus(data) {
+    return request({
+        url: `/admin_roles/changeFiledStatus`,
+        method: 'put',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/admins.js b/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
index 0609060..f13e762 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/admins.js
@@ -46,3 +46,11 @@ export function setDel(data) {
         data
     })
 }
+
+export function changeFiledStatus(data) {
+    return request({
+        url: `/admins/changeFiledStatus`,
+        method: 'put',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/articles.js b/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
index 0ddabf4..0b9c41d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/articles.js
@@ -38,3 +38,11 @@ export function setDel(data) {
         data
     })
 }
+
+export function changeFiledStatus(data) {
+    return request({
+        url: '/articles/changeFiledStatus',
+        method: 'put',
+        data
+    })
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/banners.js b/app/Modules/Admin/Resources/vue-element-admin/api/banners.js
index 4f42286..6804acb 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/banners.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/banners.js
@@ -32,10 +32,10 @@ export function setDel(data) {
     });
 }
 
-export function changeFiled(data) {
+export function changeFiledStatus(data) {
     return request({
         url: '/banners/changeFiledStatus',
-        method: 'post',
+        method: 'put',
         data
-    });
+    })
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/configs.js b/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
index fa21657..6b1452a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
@@ -1,34 +1,41 @@
 import request from '@/utils/request'
 
 export function getList(query) {
-  return request({
-    url: '/configs',
-    method: 'get',
-    params: query
-  })
+    return request({
+        url: '/configs',
+        method: 'get',
+        params: query
+    })
 }
 
 export function create(data) {
-  return request({
-    url: '/friendlinks/create',
-    method: 'post',
-    data
-  })
+    return request({
+        url: '/configs',
+        method: 'post',
+        data
+    })
 }
 
 export function update(data) {
-  console.log(data)
-  return request({
-    url: '/friendlinks/update',
-    method: 'post',
-    parmas: data
-  })
+    return request({
+        url: '/configs',
+        method: 'put',
+        parmas: data
+    })
 }
 
 export function setDel(data) {
-  return request({
-    url: '/friendlinks/delete',
-    method: 'delete',
-    data
-  })
+    return request({
+        url: '/configs',
+        method: 'delete',
+        data
+    })
+}
+
+export function changeFiledStatus(data) {
+    return request({
+        url: '/configs/changeFiledStatus',
+        method: 'put',
+        data
+    })
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js b/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js
index 0f347f7..e06be8a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js
@@ -33,10 +33,10 @@ export function setDel(data) {
     })
 }
 
-export function changeFiled(data) {
+export function changeFiledStatus(data) {
     return request({
         url: '/friendlinks/changeFiledStatus',
-        method: 'post',
+        method: 'put',
         data
     })
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 728cd21..43597bc 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -57,6 +57,7 @@
                 show-overflow-tooltip
                 prop="role_id"
                 label="Id"
+                align="center"
             />
             <el-table-column
                 show-overflow-tooltip
@@ -82,12 +83,26 @@
                 show-overflow-tooltip
                 fixed="right"
                 label="操作"
-                width="200"
+                width="230"
                 align="center"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.role_id > 1 && scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.role_id > 1 && scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.role_id != 1" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="text" icon="el-icon-delete" v-if="scope.row.role_id > 1" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -139,7 +154,7 @@
 </template>
 
 <script>
-    import {getList, create, update, setDel, changeFiled} from '@/api/admin_roles';
+    import {getList, create, update, setDel, changeFiledStatus} from '@/api/admin_roles';
     import waves from '@/directive/waves' // waves directive
     import {parseTime, getFormatDate, deepClone} from '@/utils/index';
     import {getMenusSelect} from '@/api/admin_menus';
@@ -427,6 +442,21 @@
                     }
                 });
             },
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'role_id': row.role_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         },
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 5ad25b5..49c37fc 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -57,6 +57,7 @@
                 show-overflow-tooltip
                 prop="admin_id"
                 label="Id"
+                align="center"
             />
             <el-table-column
                 show-overflow-tooltip
@@ -93,10 +94,24 @@
                 show-overflow-tooltip
                 fixed="right"
                 label="操作"
-                width="200"
+                width="230"
                 align="center"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.admin_id > 1 && scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.admin_id > 1 && scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" v-if="scope.row.admin_id != 1"
                                @click="handleDelete(scope.row)">删除
@@ -120,7 +135,7 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiled} from '@/api/admins';
+    import {getList, setDel, changeFiledStatus} from '@/api/admins';
     import waves from '@/directive/waves' // waves directive
     import Edit from './components/detail'
     import {parseTime, getFormatDate} from '@/utils/index';
@@ -310,7 +325,22 @@
                 setTimeout(() => {
                     this.listLoading = false
                 }, 300)
-            }
+            },
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'admin_id': row.admin_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index fe43241..8f9fb19 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -48,7 +48,7 @@
                 show-overflow-tooltip
                 align="center"
                 label="操作"
-                width="300"
+                width="230"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
@@ -64,7 +64,6 @@
                             禁用
                         </el-tag>
                     </el-button>
-
                     <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
@@ -165,13 +164,11 @@
             // 状态变更
             async changeStatus(row, value) {
                 const {data, msg, status} = await changeFiledStatus({
-                    category_id: row.category_id,
+                    'category_id': row.category_id,
                     'change_field': 'is_check',
                     'change_value': value
                 });
 
-                console.log(data, msg, status);
-
                 // 设置成功之后，同步到当前列表数据
                 if (status == 1) row.is_check = value;
                 this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/category.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/category.vue
deleted file mode 100644
index fc02bbf..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/category.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
-      <el-table-column align="center" label="Id" width="80">
-        <template slot-scope="scope">
-          <span>{{ scope.row.id }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column min-width="300px" label="分类名称">
-        <template slot-scope="{row}">
-          <router-link :to="'/example/edit/'+row.id" class="link-type">
-            <span>{{ row.title }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="180px" align="center" label="Date">
-        <template slot-scope="scope">
-          <span>{{ scope.row.timestamp | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column width="120px" align="center" label="排序">
-        <template slot-scope="scope">
-          <span>{{ scope.row.author }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column class-name="status-col" label="Status" width="110">
-        <template slot-scope="{row}">
-          <el-tag :type="row.status | statusFilter">
-            {{ row.status }}
-          </el-tag>
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" label="Actions" width="120">
-        <template slot-scope="scope">
-          <router-link :to="'/example/edit/'+scope.row.id">
-            <el-button type="primary" size="small" icon="el-icon-edit">
-              Edit
-            </el-button>
-          </router-link>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="listQuery.page"
-      :limit.sync="listQuery.limit"
-      @pagination="getList"
-    />
-  </div>
-</template>
-
-<script>
-import { getList } from '@/api/articles'
-import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
-
-export default {
-  name: 'ArticleList',
-  components: { Pagination },
-  filters: {
-    statusFilter(status) {
-      const statusMap = {
-        published: 'success',
-        draft: 'info',
-        deleted: 'danger'
-      }
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      list: null,
-      total: 0,
-      listLoading: true,
-      listQuery: {
-        page: 1,
-        limit: 20
-      }
-    }
-  },
-  created() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.listLoading = true
-      getList(this.listQuery).then(response => {
-        this.list = response.data.items
-        this.total = response.data.total
-        this.listLoading = false
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-    .edit-input {
-        padding-right: 100px;
-    }
-
-    .cancel-btn {
-        position: absolute;
-        right: 15px;
-        top: 10px;
-    }
-</style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/edit.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/edit.vue
deleted file mode 100644
index 8b9c9b8..0000000
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/edit.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-	<article-detail :is-edit="true" />
-</template>
-
-<script>
-// import ArticleDetail from './components/ArticleDetail'
-
-// export default {
-//   name: 'EditForm',
-//   components: { ArticleDetail }
-// }
-</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
index 0ef29f2..8e82873 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PanelGroup.vue
@@ -1,17 +1,19 @@
 <template>
     <el-row :gutter="40" class="panel-group">
         <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
-            <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
-                <div class="card-panel-icon-wrapper icon-people">
-                    <svg-icon icon-class="peoples" class-name="card-panel-icon"/>
-                </div>
-                <div class="card-panel-description">
-                    <div class="card-panel-text">
-                        管理员数量
+            <router-link :to="'/rabc/admins'">
+                <div class="card-panel" @click="handleSetLineChartData('newVisitis')">
+                    <div class="card-panel-icon-wrapper icon-people">
+                        <svg-icon icon-class="peoples" class-name="card-panel-icon"/>
+                    </div>
+                    <div class="card-panel-description">
+                        <div class="card-panel-text">
+                            管理员数量
+                        </div>
+                        <count-to :start-val="0" :end-val="admins_count" :duration="2600" class="card-panel-num"/>
                     </div>
-                    <count-to :start-val="0" :end-val="admins_count" :duration="2600" class="card-panel-num"/>
                 </div>
-            </div>
+            </router-link>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
             <div class="card-panel" @click="handleSetLineChartData('messages')">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
index f82e717..1d6b57a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
@@ -98,10 +98,24 @@
                     show-overflow-tooltip
                     fixed="right"
                     label="操作"
-                    width="200"
+                    width="230"
                     align="center"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -123,7 +137,7 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiled} from '@/api/banners';
+    import {getList, setDel, changeFiledStatus} from '@/api/banners';
     import waves from '@/directive/waves' // waves directive
     import Edit from './components/detail'
     import {parseTime, getFormatDate} from '@/utils/index';
@@ -311,7 +325,22 @@
                 setTimeout(() => {
                     this.listLoading = false
                 }, 300)
-            }
+            },
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'banner_id': row.banner_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
index 33e6fda..f671c95 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
@@ -116,10 +116,24 @@
                     show-overflow-tooltip
                     fixed="right"
                     label="操作"
-                    width="200"
+                    width="230"
                     align="center"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -139,7 +153,7 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiled} from '@/api/configs'
+    import {getList, setDel, changeFiledStatus} from '@/api/configs'
     import waves from '@/directive/waves' // waves directive
     import Edit from './components/detail'
     import {parseTime} from '@/utils/index'
@@ -351,7 +365,22 @@
                 setTimeout(() => {
                     this.listLoading = false
                 }, 300)
-            }
+            },
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'config_id': row.config_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
index e6aeef6..4cd5e4a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
@@ -98,10 +98,24 @@
                     show-overflow-tooltip
                     fixed="right"
                     label="操作"
-                    width="200"
+                    width="230"
                     align="center"
             >
                 <template v-slot="scope">
+                    <!-- 状态变更 -->
+                    <el-button v-if="scope.row.is_check == 0" type="text" icon="el-icon-unlock"
+                               @click="changeStatus(scope.row, 1)">
+                        <el-tag :type="1 | statusFilter">
+                            启用
+                        </el-tag>
+                    </el-button>
+                    <el-button v-else-if="scope.row.is_check == 1" type="text" icon="el-icon-lock"
+                               @click="changeStatus(scope.row, 0)">
+                        <el-tag :type="0 | statusFilter">
+                            禁用
+                        </el-tag>
+                    </el-button>
+                    <!-- 编辑与删除 -->
                     <el-button type="text" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
@@ -121,7 +135,7 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiled} from '@/api/friendlinks';
+    import {getList, setDel, changeFiledStatus} from '@/api/friendlinks';
     import waves from '@/directive/waves'; // waves directive
     import Edit from './components/detail';
     import {parseTime, getFormatDate} from '@/utils/index';
@@ -312,7 +326,22 @@
                 setTimeout(() => {
                     this.listLoading = false;
                 }, 300);
-            }
+            },
+            // 状态变更
+            async changeStatus(row, value) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'link_id': row.link_id,
+                    'change_field': 'is_check',
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1) row.is_check = value;
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index a9c53af..335a23c 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -44,6 +44,7 @@ Route::prefix('admin')->group(function() {
             Route::post('/', 'System\BannerController@create');
             Route::put('/', 'System\BannerController@update');
             Route::delete('/', 'System\BannerController@delete');
+            Route::put('/changeFiledStatus', 'System\BannerController@changeFiledStatus');
         });
 
         // 配置管理
@@ -52,6 +53,7 @@ Route::prefix('admin')->group(function() {
             Route::post('/', 'System\ConfigController@create');
             Route::put('/', 'System\ConfigController@update');
             Route::delete('/', 'System\ConfigController@delete');
+            Route::put('/changeFiledStatus', 'System\ConfigController@changeFiledStatus');
         });
 
         // 友情链接
@@ -60,6 +62,7 @@ Route::prefix('admin')->group(function() {
             Route::post('/', 'System\FriendlinkController@create');
             Route::put('/', 'System\FriendlinkController@update');
             Route::delete('/', 'System\FriendlinkController@delete');
+            Route::put('/changeFiledStatus', 'System\FriendlinkController@changeFiledStatus');
         });
 
         Route::prefix('protocols')->group(function() {
@@ -74,6 +77,7 @@ Route::prefix('admin')->group(function() {
             Route::post('/', 'System\VersionController@create');
             Route::put('/', 'System\VersionController@update');
             Route::delete('/', 'System\VersionController@delete');
+            Route::put('/changeFiledStatus', 'System\VersionController@changeFiledStatus');
         });
 
         Route::prefix('admins')->group(function() {
@@ -82,6 +86,7 @@ Route::prefix('admin')->group(function() {
             Route::put('/', 'Rabc\AdminController@update');
             Route::delete('/', 'Rabc\AdminController@delete');
             Route::get('/getSelectLists', 'Rabc\AdminController@getSelectLists');
+            Route::put('/changeFiledStatus', 'Rabc\AdminController@changeFiledStatus');
         });
 
         Route::prefix('admin_roles')->group(function() {
@@ -90,6 +95,7 @@ Route::prefix('admin')->group(function() {
             Route::put('/', 'Rabc\AdminRoleController@update');
             Route::delete('/', 'Rabc\AdminRoleController@delete');
             Route::get('/getSelectLists', 'Rabc\AdminRoleController@getSelectLists');
+            Route::put('/changeFiledStatus', 'Rabc\AdminRoleController@changeFiledStatus');
         });
 
         Route::prefix('admin_menus')->group(function() {
@@ -98,6 +104,7 @@ Route::prefix('admin')->group(function() {
             Route::put('/', 'Rabc\AdminMenuController@update');
             Route::delete('/', 'Rabc\AdminMenuController@delete');
             Route::get('/getSelectLists', 'Rabc\AdminMenuController@getSelectLists');
+            Route::put('/changeFiledStatus', 'Rabc\AdminMenuController@changeFiledStatus');
         });
 
         // 管理员日志
diff --git a/app/Modules/Admin/Services/AdminMenuService.php b/app/Modules/Admin/Services/AdminMenuService.php
index f4530f0..15c9c7a 100644
--- a/app/Modules/Admin/Services/AdminMenuService.php
+++ b/app/Modules/Admin/Services/AdminMenuService.php
@@ -17,7 +17,7 @@ class AdminMenuService extends BaseService
      * @param array $params
      * @return array
      */
-    public function lists(array $params): array
+    public function lists(array $params) : array
     {
         $lists = $this->model->with($this->with)->orderBy('menu_sort', 'ASC')->get();
 
diff --git a/app/Modules/Admin/Services/ArticleCategoryService.php b/app/Modules/Admin/Services/ArticleCategoryService.php
index 02f00d8..b37514d 100644
--- a/app/Modules/Admin/Services/ArticleCategoryService.php
+++ b/app/Modules/Admin/Services/ArticleCategoryService.php
@@ -11,7 +11,7 @@ class ArticleCategoryService extends BaseService
         $this->model = $article;
     }
 
-    public function lists(array $params): array
+    public function lists(array $params) : array
     {
         $lists = $this->model->orderBy('category_sort', 'ASC')->get();
 
-- 
Gitee


From 9a25d5281ed007c29f838ccb8c6b662b50649454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E4=B8=91=E8=B7=AF=E4=BA=BA?= <2278757482@qq.com>
Date: Wed, 30 Dec 2020 18:26:20 +0800
Subject: [PATCH 7/7] =?UTF-8?q?1.Demo=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=9B?=
 =?UTF-8?q?=202.=E5=88=97=E8=A1=A8=E9=A1=B5=EF=BC=9A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E4=B8=8E=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/admin_roles/index.vue               |   2 -
 .../views/adminloginlogs/index.vue            |  56 ++-
 .../views/adminlogs/index.vue                 |   2 -
 .../vue-element-admin/views/admins/index.vue  |   2 -
 .../views/article_categories/index.vue        |   2 -
 .../views/articles/index.vue                  |   2 +-
 .../views/setting/banners/index.vue           |   4 +-
 .../views/setting/configs/index.vue           | 133 +++----
 .../views/setting/friendlinks/index.vue       |   4 +-
 app/Modules/Admin/Routes/web.php              |   8 +
 .../Admin/Services/AdminRoleService.php       |  17 +
 app/Modules/Admin/Services/AdminService.php   |  17 +
 app/Modules/Admin/Services/BannerService.php  |  19 +
 app/Modules/Admin/Services/BaseService.php    |   5 +-
 app/Modules/Admin/Services/ConfigService.php  |  20 +
 .../Admin/Services/FriendlinkService.php      |  19 +
 .../Admin/Services/ProtocolService.php        |  17 +
 app/Modules/Admin/Services/VersionService.php |  13 +
 laravel-vue-admin.sql                         | 368 +++++++++++-------
 19 files changed, 447 insertions(+), 263 deletions(-)

diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
index 43597bc..19afaec 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admin_roles/index.vue
@@ -67,9 +67,7 @@
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                  <span>
                     {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                  </span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
index 7183c6c..9c45145 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminloginlogs/index.vue
@@ -2,10 +2,10 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入管理员账户/Id"
-                    class="filter-item width-200-px"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入管理员账户/Id"
+                class="filter-item width-200-px"
+                @keyup.enter.native="handleFilter"
             />
             <el-select v-model="listQuery.log_status" placeholder="请选择登录状态" clearable class="filter-item">
                 <el-option
@@ -34,19 +34,19 @@
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="log_id"
-                    label="Id"
-                    align="center"
+                show-overflow-tooltip
+                prop="log_id"
+                label="Id"
+                align="center"
             />
             <el-table-column align="center" prop="admin" label="管理员">
                 <template slot-scope="{ row }">
@@ -100,15 +100,13 @@
             />
             <el-table-column label="登录时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                  <span>
                     {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                  </span>
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
-                    label="操作"
-                    align="center"
+                show-overflow-tooltip
+                label="操作"
+                align="center"
             >
                 <template v-slot="scope">
                     <el-button type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
@@ -117,13 +115,13 @@
         </el-table>
         <!-- 分页 -->
         <el-pagination
-                background
-                :current-page="listQuery.page"
-                :page-size="listQuery.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="listQuery.page"
+            :page-size="listQuery.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
     </div>
 </template>
@@ -166,7 +164,7 @@
             return {
                 is_batch: 0, // 默认不开启批量删除
                 list: [],
-                month_lists:[],
+                month_lists: [],
                 listLoading: true,
                 layout: 'total, sizes, prev, pager, next, jumper',
                 total: 0,
@@ -177,7 +175,7 @@
                     limit: 10,
                     search: '',
                     log_status: -1,
-                    search_month:'',
+                    search_month: '',
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
@@ -222,7 +220,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({log_id: ids, 'month' : month, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({log_id: ids, 'month': month, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
index 3a3813b..a23058c 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/adminlogs/index.vue
@@ -94,9 +94,7 @@
             </el-table-column>
             <el-table-column label="登录时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                  <span>
                     {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                  </span>
                 </template>
             </el-table-column>
             <el-table-column
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
index 49c37fc..67319a1 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/admins/index.vue
@@ -78,9 +78,7 @@
             </el-table-column>
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                  <span>
                     {{ row.admin_info.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                  </span>
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
index 8f9fb19..bb4cd7e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_categories/index.vue
@@ -39,9 +39,7 @@
             </el-table-column>
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                  <span>
                     {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                  </span>
                 </template>
             </el-table-column>
             <el-table-column
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
index fe85f1e..5b07404 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/index.vue
@@ -35,7 +35,7 @@
 
             <el-table-column align="center" label="创建时间" width="150px">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.created_time | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+                    {{ scope.row.created_time | parseTime('{y}-{m}-{d} {h}:{i}') }}
                 </template>
             </el-table-column>
 
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
index 1d6b57a..036a9f2 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/banners/index.vue
@@ -82,9 +82,7 @@
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-          <span>
-            {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-          </span>
+                    {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
index f671c95..402851c 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/configs/index.vue
@@ -2,24 +2,21 @@
     <div class="app-container">
         <div class="filter-container">
             <el-input
-                    v-model="listQuery.search"
-                    placeholder="请输入配置标题/名称"
-                    style="width: 200px;"
-                    class="filter-item"
-                    @keyup.enter.native="handleFilter"
+                v-model="listQuery.search"
+                placeholder="请输入配置标题/名称"
+                style="width: 200px;"
+                class="filter-item"
+                @keyup.enter.native="handleFilter"
             />
             <el-select v-model="listQuery.is_check" placeholder="请选择启用状态" clearable class="filter-item">
                 <el-option
-                        v-for="item in calendarCheckOptions"
-                        :key="item.key"
-                        :checked="item.key == listQuery.is_check"
-                        :label="item.display_name+'('+item.key+')'"
-                        :value="item.key"
+                    v-for="item in calendarCheckOptions"
+                    :key="item.key"
+                    :checked="item.key == listQuery.is_check"
+                    :label="item.display_name+'('+item.key+')'"
+                    :value="item.key"
                 />
             </el-select>
-            <el-select v-model="listQuery.sort" style="width: 140px" class="filter-item" @change="handleFilter">
-                <el-option v-for="item in sortOptions" :key="item.key" :label="item.label" :value="item.key"/>
-            </el-select>
             <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
                 {{ $t('table.search') }}
             </el-button>
@@ -27,50 +24,50 @@
                 批量删除
             </el-button>
             <el-button
-                    class="filter-item"
-                    style="margin-left: 10px;"
-                    type="primary"
-                    icon="el-icon-plus"
-                    @click="handleCreate"
+                class="filter-item"
+                style="margin-left: 10px;"
+                type="primary"
+                icon="el-icon-plus"
+                @click="handleCreate"
             >
                 {{ $t('table.add') }}
             </el-button>
             <el-button
-                    v-waves
-                    :loading="downloadLoading"
-                    class="filter-item"
-                    type="primary"
-                    icon="el-icon-download"
-                    @click="handleDownload"
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="primary"
+                icon="el-icon-download"
+                @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
         </div>
 
         <el-table
-                v-loading="listLoading"
-                :data="list"
-                :element-loading-text="elementLoadingText"
-                @selection-change="setSelectRows"
-                border
-                class="margin-buttom-10"
+            v-loading="listLoading"
+            :data="list"
+            :element-loading-text="elementLoadingText"
+            @selection-change="setSelectRows"
+            border
+            class="margin-buttom-10"
         >
             <el-table-column show-overflow-tooltip type="selection"/>
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_id"
-                    label="Id"
+                show-overflow-tooltip
+                prop="config_id"
+                label="Id"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_title"
-                    label="配置标题"
-                    align="center"
+                show-overflow-tooltip
+                prop="config_title"
+                label="配置标题"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_name"
-                    label="配置名称"
+                show-overflow-tooltip
+                prop="config_name"
+                label="配置名称"
             />
 
             <el-table-column align="center" prop="config_value" label="配置值">
@@ -81,28 +78,26 @@
             </el-table-column>
 
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_group"
-                    label="配置分组"
-                    align="center"
+                show-overflow-tooltip
+                prop="config_group"
+                label="配置分组"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_type"
-                    label="配置类型"
-                    align="center"
+                show-overflow-tooltip
+                prop="config_type"
+                label="配置类型"
+                align="center"
             />
             <el-table-column
-                    show-overflow-tooltip
-                    prop="config_sort"
-                    label="排序"
-                    align="center"
+                show-overflow-tooltip
+                prop="config_sort"
+                label="排序"
+                align="center"
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-          <span>
-            {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-          </span>
+                    {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
@@ -113,11 +108,11 @@
                 </template>
             </el-table-column>
             <el-table-column
-                    show-overflow-tooltip
-                    fixed="right"
-                    label="操作"
-                    width="230"
-                    align="center"
+                show-overflow-tooltip
+                fixed="right"
+                label="操作"
+                width="230"
+                align="center"
             >
                 <template v-slot="scope">
                     <!-- 状态变更 -->
@@ -140,13 +135,13 @@
             </el-table-column>
         </el-table>
         <el-pagination
-                background
-                :current-page="queryForm.page"
-                :page-size="queryForm.limit"
-                :layout="layout"
-                :total="total"
-                @size-change="handleSizeChange"
-                @current-change="handleCurrentChange"
+            background
+            :current-page="queryForm.page"
+            :page-size="queryForm.limit"
+            :layout="layout"
+            :total="total"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
         />
         <edit ref="edit" @fetchData="getList"/>
     </div>
@@ -207,11 +202,9 @@
                 listQuery: {
                     page: 1,
                     limit: 20,
-                    sort: '+id',
                     is_check: ''
                 },
                 importanceOptions: [1, 2, 3],
-                sortOptions: [{label: 'ID Ascending', key: '+id'}, {label: 'ID Descending', key: '-id'}],
                 statusOptions: ['published', 'draft', 'deleted'],
                 temp: {
                     id: undefined,
@@ -319,7 +312,7 @@
                         type: 'warning'
                     })
                     .then(async () => {
-                        const {status, msg} = await setDel({config_id: ids, 'is_batch' : this.is_batch});
+                        const {status, msg} = await setDel({config_id: ids, 'is_batch': this.is_batch});
 
                         switch (status) {
                             case 1:
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
index 4cd5e4a..c161d69 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/setting/friendlinks/index.vue
@@ -82,9 +82,7 @@
             />
             <el-table-column label="创建时间" show-overflow-tooltip align="center">
                 <template slot-scope="{ row }">
-                    <span>
-                        {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
-                    </span>
+                    {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
                 </template>
             </el-table-column>
             <el-table-column align="center" prop="is_check" label="启用状态">
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index 335a23c..32c719c 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -128,5 +128,13 @@ Route::prefix('admin')->group(function() {
             Route::get('/getSelectLists', 'Article\ArticleCategoryController@getSelectLists');
             Route::put('/changeFiledStatus', 'Article\ArticleCategoryController@changeFiledStatus');
         });
+
+        // 文章管理
+        Route::prefix('articles')->group(function() {
+            Route::get('/', 'Article\ArticleController@index');
+            Route::post('/', 'Article\ArticleController@create');
+            Route::put('/', 'Article\ArticleController@update');
+            Route::delete('/', 'Article\ArticleController@delete');
+        });
     });
 });
diff --git a/app/Modules/Admin/Services/AdminRoleService.php b/app/Modules/Admin/Services/AdminRoleService.php
index 54ad962..46e3bd9 100644
--- a/app/Modules/Admin/Services/AdminRoleService.php
+++ b/app/Modules/Admin/Services/AdminRoleService.php
@@ -14,6 +14,23 @@ class AdminRoleService extends BaseService
         $this->model = $adminRole;
     }
 
+    public function lists(array $params) : array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('role_name', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
+
     public function getSelectLists($request)
     {
         return $this->model->where(function($query) use ($request){
diff --git a/app/Modules/Admin/Services/AdminService.php b/app/Modules/Admin/Services/AdminService.php
index 9df7998..2f04d71 100644
--- a/app/Modules/Admin/Services/AdminService.php
+++ b/app/Modules/Admin/Services/AdminService.php
@@ -15,6 +15,23 @@ class AdminService extends BaseService
         $this->with = ['adminInfo', 'roles'];
     }
 
+    public function lists(array $params) : array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('admin_name', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
+
     public function getSelectLists($request)
     {
         return $this->model->where(function($query) use ($request){
diff --git a/app/Modules/Admin/Services/BannerService.php b/app/Modules/Admin/Services/BannerService.php
index 3a363f6..84fbd0c 100644
--- a/app/Modules/Admin/Services/BannerService.php
+++ b/app/Modules/Admin/Services/BannerService.php
@@ -10,4 +10,23 @@ class BannerService extends BaseService
     {
         $this->model = $banner;
     }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('banner_title', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        $params['order'] = 'banner_sort';
+        $params['order_sort'] = 'ASC';
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
index 7dfd70b..d9a36f8 100644
--- a/app/Modules/Admin/Services/BaseService.php
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -24,7 +24,10 @@ class BaseService extends Service
         if ($this->model instanceof MonthModel){
             $this->model = $this->model->setMonthTable($this->getSearchMonth());
         }
-        $lists = $this->model->with($this->with)->orderBy($this->model->getKeyName(), 'DESC')->paginate($this->getLimit($params['limit'] ?? 10));
+        $lists = $this->model->where($params['where_callback'] ?? [])
+            ->with($this->with)
+            ->orderBy(empty($params['order']) ? $this->model->getKeyName() : $params['order'], empty($params['order_sort']) ? 'DESC' : $params['order_sort'])
+            ->paginate($this->getLimit($params['limit'] ?? 10));
 
         return [
             'current_page' => $lists->currentPage(),
diff --git a/app/Modules/Admin/Services/ConfigService.php b/app/Modules/Admin/Services/ConfigService.php
index 3230b38..316975e 100644
--- a/app/Modules/Admin/Services/ConfigService.php
+++ b/app/Modules/Admin/Services/ConfigService.php
@@ -10,4 +10,24 @@ class ConfigService extends BaseService
     {
         $this->model = $config;
     }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('config_title', 'LIKE', '%' . trim($search) . '%')
+                    ->whereOr('config_name', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        $params['order'] = 'config_sort';
+        $params['order_sort'] = 'ASC';
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/app/Modules/Admin/Services/FriendlinkService.php b/app/Modules/Admin/Services/FriendlinkService.php
index 492418a..e5f72c5 100644
--- a/app/Modules/Admin/Services/FriendlinkService.php
+++ b/app/Modules/Admin/Services/FriendlinkService.php
@@ -10,4 +10,23 @@ class FriendlinkService extends BaseService
     {
         $this->model = $friendlink;
     }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('link_name', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        $params['order'] = 'link_sort';
+        $params['order_sort'] = 'ASC';
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/app/Modules/Admin/Services/ProtocolService.php b/app/Modules/Admin/Services/ProtocolService.php
index 9e97a38..83364ac 100644
--- a/app/Modules/Admin/Services/ProtocolService.php
+++ b/app/Modules/Admin/Services/ProtocolService.php
@@ -10,4 +10,21 @@ class ProtocolService extends BaseService
     {
         $this->model = $protocol;
     }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('protocol_title', 'LIKE', '%' . trim($search) . '%');
+            }
+            // 状态
+            $is_check = $request->input('is_check', -1);
+            if ($is_check > -1){
+                $query->where('is_check', '=', $is_check);
+            }
+        };
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/app/Modules/Admin/Services/VersionService.php b/app/Modules/Admin/Services/VersionService.php
index 1472806..1858dcc 100644
--- a/app/Modules/Admin/Services/VersionService.php
+++ b/app/Modules/Admin/Services/VersionService.php
@@ -10,4 +10,17 @@ class VersionService extends BaseService
     {
         $this->model = $version;
     }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('version_name', 'LIKE', '%' . trim($search) . '%')
+                    ->whereOr('version_number', 'LIKE', '%' . trim($search) . '%');
+            }
+        };
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/laravel-vue-admin.sql b/laravel-vue-admin.sql
index 10e0cdd..ee97522 100644
--- a/laravel-vue-admin.sql
+++ b/laravel-vue-admin.sql
@@ -11,12 +11,44 @@
  Target Server Version : 50728
  File Encoding         : 65001
 
- Date: 28/12/2020 18:00:15
+ Date: 30/12/2020 18:25:18
 */
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
 
+-- ----------------------------
+-- Table structure for blog_protocol_categories
+-- ----------------------------
+DROP TABLE IF EXISTS `blog_protocol_categories`;
+CREATE TABLE `blog_protocol_categories`  (
+  `category_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '项目分类表',
+  `category_name` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '分类名',
+  `category_sort` smallint(5) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序',
+  `created_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `updated_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `is_delete` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除',
+  PRIMARY KEY (`category_id`) USING BTREE,
+  INDEX `blog_protocol_categories_is_delete_index`(`is_delete`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for blog_protocols
+-- ----------------------------
+DROP TABLE IF EXISTS `blog_protocols`;
+CREATE TABLE `blog_protocols`  (
+  `protocol_id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '协议表',
+  `protocol_title` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '协议标题',
+  `protocol_category` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '协议类型',
+  `protocol_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '协议内容',
+  `created_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `updated_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间',
+  `is_delete` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否删除（0.未删除；1.已删除）',
+  PRIMARY KEY (`protocol_id`) USING BTREE,
+  INDEX `blog_protocols_protocol_category_index`(`protocol_category`) USING BTREE,
+  INDEX `blog_protocols_is_delete_index`(`is_delete`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+
 -- ----------------------------
 -- Table structure for cnpscy_admin_infos
 -- ----------------------------
@@ -122,7 +154,7 @@ CREATE TABLE `cnpscy_admin_login_logs_2020_12`  (
   INDEX `admin_id`(`admin_id`) USING BTREE,
   INDEX `log_status`(`log_status`) USING BTREE,
   INDEX `is_delete`(`is_delete`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 33 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '管理员登录日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 45 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '管理员登录日志表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of cnpscy_admin_login_logs_2020_12
@@ -159,6 +191,18 @@ INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (29, 1, '127.0.0.1', 'Mozil
 INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (30, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 1, 1609140895, 1609142803, 0.643220901489);
 INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (31, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609147105, 1609147105, 1.643863201141);
 INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (32, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609147117, 1609147117, 1.335547924042);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (33, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609213570, 1609213570, 3.152280807495);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (34, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609220104, 1609220104, 1.432440996170);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (35, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609220199, 1609220199, 0.811316967011);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (36, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609307165, 1609307165, 2.198140144348);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (37, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609310884, 1609310884, 0.391155958176);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (38, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609310888, 1609310888, 0.535741090775);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (39, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609314989, 1609314989, 0.935332059860);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (40, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609315061, 1609315061, 0.581519126892);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (41, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609318667, 1609318667, 0.386734962463);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (42, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609318675, 1609318675, 0.585108995438);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (43, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 0, '认证失败！', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@me', 'POST', '[]', 0, 1609322779, 1609322779, 0.629410982132);
+INSERT INTO `cnpscy_admin_login_logs_2020_12` VALUES (44, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '登录成功', 'App\\Modules\\Admin\\Http\\Controllers\\AuthController@login', 'POST', '{\"admin_name\":\"admin\",\"password\":\"123456\"}', 0, 1609322800, 1609322800, 0.643496990204);
 
 -- ----------------------------
 -- Table structure for cnpscy_admin_login_logs_2021_01
@@ -232,7 +276,7 @@ CREATE TABLE `cnpscy_admin_logs_2020_12`  (
   INDEX `admin_id`(`admin_id`) USING BTREE,
   INDEX `log_status`(`log_status`) USING BTREE,
   INDEX `is_delete`(`is_delete`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 136 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '管理员操作日志表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 185 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '管理员操作日志表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of cnpscy_admin_logs_2020_12
@@ -359,6 +403,55 @@ INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (132, 1, '127.0.0.1', 'Mozilla/5.
 INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (133, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@delete', 'DELETE', '{\"role_id\":\"11,10,7,3,2,1\",\"is_batch\":1}', 0, 1609143610, 1609143610, 00000000.412393093109, 'http://laravel-admin.cnpscy.com/admin/admin_roles');
 INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (134, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@delete', 'DELETE', '{\"banner_id\":\",,,,,,,,,\",\"is_batch\":1}', 0, 1609143619, 1609143619, 00000000.284049987793, 'http://laravel-admin.cnpscy.com/admin/admins');
 INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (135, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@update', 'PUT', '{\"role_id\":1,\"role_name\":\"\\u8d85\\u7ea7\\u7ba1\\u7406\\u5458\",\"role_remarks\":\"\\u6743\\u9650\\u6700\\u5927\\u7684\\u4eba\",\"is_check\":1,\"is_delete\":0,\"created_time\":1577671704,\"updated_time\":1601293601,\"menu_ids\":[1,2,3,9,29,10,11,4,12,13,54]}', 0, 1609149447, 1609149447, 00000000.508941888809, 'http://laravel-admin.cnpscy.com/admin/admin_roles');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (136, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609313879, 1609313879, 00000000.404098987579, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (137, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609313888, 1609313888, 00000000.310947895050, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (138, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609313974, 1609313974, 00000000.295243024826, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (139, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314113, 1609314113, 00000000.353321075439, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (140, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314127, 1609314127, 00000000.217620134354, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (141, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314129, 1609314129, 00000000.238934993744, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (142, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314130, 1609314130, 00000000.240715980530, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (143, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609314271, 1609314271, 00000000.323241949081, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (144, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314276, 1609314276, 00000000.318849086761, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (145, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609314375, 1609314375, 00000000.210047960281, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (146, 0, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"category_id\":2,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609314498, 1609314498, 00000000.228885173798, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (147, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315079, 1609315079, 00000000.273267030716, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (148, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315083, 1609315083, 00000000.250209808350, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (149, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315117, 1609315117, 00000000.338511943817, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (150, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315137, 1609315137, 00000000.310262918472, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (151, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315253, 1609315253, 00000000.335081100464, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (152, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@update', 'PUT', '{\"category_id\":2,\"category_name\":\"Prof. Aurore Toy II\",\"parent_id\":0,\"category_sort\":\"3\",\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1609314498,\"_child\":[{\"category_id\":1,\"category_name\":\"Taryn Halvorson\",\"parent_id\":2,\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586846349}]}', 0, 1609315310, 1609315310, 00000000.758821010590, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (153, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@delete', 'DELETE', '{\"category_id\":3}', 0, 1609315384, 1609315384, 00000000.389843940735, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (154, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@delete', 'DELETE', '{\"category_id\":4}', 0, 1609315393, 1609315393, 00000000.329531908035, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (155, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"menu_id\":1,\"parent_id\":0,\"menu_name\":\"\\u9996\\u9875\",\"vue_name\":\"Dashboard\",\"vue_path\":\"\\/\",\"vue_redirect\":\"\\/dashboard\",\"vue_icon\":\"dashboard\",\"vue_component\":\"Layout\",\"vue_meta\":null,\"external_links\":null,\"api_url\":null,\"api_method\":null,\"menu_sort\":1,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1601434917,\"updated_time\":1601437649}', 0, 1609316357, 1609316357, 00000000.569468021393, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (156, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@update', 'PUT', '{\"category_id\":5,\"category_name\":\"Rosa King\",\"parent_id\":\"0\",\"category_sort\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":1586760137,\"updated_time\":1586760137}', 0, 1609317141, 1609317141, 00000000.520314931870, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (157, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@create', 'POST', '{\"parent_id\":\"0\",\"category_name\":\"\\u6d4b\\u8bd5\",\"category_sort\":99,\"is_check\":1}', 0, 1609317234, 1609317234, 00000000.337893962860, 'http://laravel-admin.cnpscy.com/admin/article_categorys');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (158, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"menu_id\":13,\"parent_id\":\"0\",\"menu_name\":\"\\u6587\\u7ae0\\u5217\\u8868\",\"vue_name\":null,\"vue_path\":\"index\",\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":\"articles\\/index\",\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\",\"api_method\":\"GET\",\"menu_sort\":2,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0,\"_child\":[{\"menu_id\":49,\"parent_id\":13,\"menu_name\":\"\\u65b0\\u589e\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/create\",\"api_method\":\"POST\",\"menu_sort\":1,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":50,\"parent_id\":13,\"menu_name\":\"\\u8be6\\u60c5\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/detail\",\"api_method\":\"PUT\",\"menu_sort\":2,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":51,\"parent_id\":13,\"menu_name\":\"\\u66f4\\u65b0\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/update\",\"api_method\":\"DELETE\",\"menu_sort\":3,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":52,\"parent_id\":13,\"menu_name\":\"\\u5220\\u9664\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/delete\",\"api_method\":\"GET\",\"menu_sort\":4,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":53,\"parent_id\":13,\"menu_name\":\"\\u4e0b\\u62c9\\u5217\\u8868\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/getSelectLists\",\"api_method\":\"GET\",\"menu_sort\":5,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0}]}', 0, 1609317408, 1609317408, 00000000.473762989044, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (159, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminMenuController@update', 'PUT', '{\"menu_id\":13,\"parent_id\":4,\"menu_name\":\"\\u6587\\u7ae0\\u5217\\u8868\",\"vue_name\":null,\"vue_path\":\"index\",\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":\"articles\\/index\",\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\",\"api_method\":\"GET\",\"menu_sort\":2,\"is_hidden\":0,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":1609317408,\"_child\":[{\"menu_id\":49,\"parent_id\":13,\"menu_name\":\"\\u65b0\\u589e\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/create\",\"api_method\":\"POST\",\"menu_sort\":1,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":50,\"parent_id\":13,\"menu_name\":\"\\u8be6\\u60c5\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/detail\",\"api_method\":\"PUT\",\"menu_sort\":2,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":51,\"parent_id\":13,\"menu_name\":\"\\u66f4\\u65b0\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/update\",\"api_method\":\"DELETE\",\"menu_sort\":3,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":52,\"parent_id\":13,\"menu_name\":\"\\u5220\\u9664\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/delete\",\"api_method\":\"GET\",\"menu_sort\":4,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0},{\"menu_id\":53,\"parent_id\":13,\"menu_name\":\"\\u4e0b\\u62c9\\u5217\\u8868\",\"vue_name\":null,\"vue_path\":null,\"vue_redirect\":null,\"vue_icon\":null,\"vue_component\":null,\"vue_meta\":null,\"external_links\":null,\"api_url\":\"admin\\/articles\\/getSelectLists\",\"api_method\":\"GET\",\"menu_sort\":5,\"is_hidden\":1,\"is_check\":1,\"is_delete\":0,\"created_time\":0,\"updated_time\":0}]}', 0, 1609317418, 1609317418, 00000000.318741083145, 'http://laravel-admin.cnpscy.com/admin/admin_menus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (160, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609318036, 1609318036, 00000000.274433851242, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (161, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609318142, 1609318142, 00000000.411091089249, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (162, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"admin_id\":119,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609318327, 1609318327, 00000000.288300991058, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (163, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"admin_id\":119,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609318428, 1609318428, 00000000.210793018341, 'http://laravel-admin.cnpscy.com/admin/admins/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (164, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@changeFiledStatus', 'PUT', '{\"admin_id\":119,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609318473, 1609318473, 00000000.291239023209, 'http://laravel-admin.cnpscy.com/admin/admins/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (165, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminController@changeFiledStatus', 'PUT', '{\"admin_id\":118,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609318475, 1609318475, 00000000.370466947556, 'http://laravel-admin.cnpscy.com/admin/admins/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (166, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@changeFiledStatus', 'PUT', '{\"role_id\":2,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609318750, 1609318750, 00000000.277080059052, 'http://laravel-admin.cnpscy.com/admin/admin_roles/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (167, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Rabc\\AdminRoleController@changeFiledStatus', 'PUT', '{\"role_id\":3,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609318751, 1609318751, 00000000.268268823624, 'http://laravel-admin.cnpscy.com/admin/admin_roles/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (168, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"config_id\":62,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319026, 1609319026, 00000000.205852031708, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (169, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\Article\\ArticleCategoryController@changeFiledStatus', 'PUT', '{\"config_id\":62,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319041, 1609319041, 00000000.220329999924, 'http://laravel-admin.cnpscy.com/admin/article_categorys/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (170, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\ConfigController@changeFiledStatus', 'PUT', '{\"config_id\":62,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319139, 1609319139, 00000000.322815895081, 'http://laravel-admin.cnpscy.com/admin/configs/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (171, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\ConfigController@changeFiledStatus', 'PUT', '{\"config_id\":61,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319142, 1609319142, 00000000.230886936188, 'http://laravel-admin.cnpscy.com/admin/configs/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (172, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\ConfigController@changeFiledStatus', 'PUT', '{\"config_id\":62,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609319142, 1609319142, 00000000.263698816299, 'http://laravel-admin.cnpscy.com/admin/configs/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (173, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\ConfigController@changeFiledStatus', 'PUT', '{\"config_id\":61,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609319143, 1609319143, 00000000.233527898788, 'http://laravel-admin.cnpscy.com/admin/configs/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (174, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":11,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319149, 1609319149, 00000000.285525083542, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (175, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":10,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319153, 1609319153, 00000000.235098838806, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (176, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\BannerController@changeFiledStatus', 'PUT', '{\"banner_id\":1,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609319159, 1609319159, 00000000.267416954041, 'http://laravel-admin.cnpscy.com/admin/banners/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (177, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":10,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609319165, 1609319165, 00000000.300708055496, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (178, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":11,\"change_field\":\"is_check\",\"change_value\":1}', 0, 1609319165, 1609319165, 00000000.326706171036, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (179, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":11,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319168, 1609319168, 00000000.256284952164, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (180, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":10,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319168, 1609319168, 00000000.309671163559, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (181, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":9,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319169, 1609319169, 00000000.408949136734, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (182, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":8,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319169, 1609319169, 00000000.377221822739, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (183, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":7,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319170, 1609319170, 00000000.351484060287, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
+INSERT INTO `cnpscy_admin_logs_2020_12` VALUES (184, 1, '127.0.0.1', 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.193 Safari/537.36', 1, '', 'App\\Modules\\Admin\\Http\\Controllers\\System\\FriendlinkController@changeFiledStatus', 'PUT', '{\"link_id\":5,\"change_field\":\"is_check\",\"change_value\":0}', 0, 1609319170, 1609319170, 00000000.280616998672, 'http://laravel-admin.cnpscy.com/admin/friendlinks/changeFiledStatus');
 
 -- ----------------------------
 -- Table structure for cnpscy_admin_logs_2021_01
@@ -428,8 +521,8 @@ INSERT INTO `cnpscy_admin_menus` VALUES (8, 2, '管理员管理', 'AdminPermissi
 INSERT INTO `cnpscy_admin_menus` VALUES (9, 3, '配置管理', 'configs', 'configs', '', '', 'setting/configs/index', '', '', 'admin/configs', 'GET', 1, 0, 1, 0, 0, 1609126826);
 INSERT INTO `cnpscy_admin_menus` VALUES (10, 3, '友情链接', 'friendlinks', 'friendlinks', '', '', 'setting/friendlinks/index', '', '', 'admin/friendlinks', 'GET', 2, 0, 1, 0, 0, 0);
 INSERT INTO `cnpscy_admin_menus` VALUES (11, 3, 'Banner管理', 'banners', 'banners', '', '', 'setting/banners/index', '', '', 'admin/banners', 'GET', 3, 0, 1, 0, 0, 0);
-INSERT INTO `cnpscy_admin_menus` VALUES (12, 4, '文章分类', '', 'categorys', '', '', 'articles/category', '', '', 'admin/articlecategories', 'GET', 1, 0, 1, 1, 0, 0);
-INSERT INTO `cnpscy_admin_menus` VALUES (13, 4, '文章列表', '', 'index', '', '', 'articles/index', '', '', 'admin/articles', 'GET', 2, 0, 1, 1, 0, 0);
+INSERT INTO `cnpscy_admin_menus` VALUES (12, 4, '文章分类', '', 'categorys', '', '', 'article_categories/index', '', '', 'admin/articlecategories', 'GET', 1, 0, 1, 0, 0, 0);
+INSERT INTO `cnpscy_admin_menus` VALUES (13, 4, '文章列表', '', 'index', '', '', 'articles/index', '', '', 'admin/articles', 'GET', 2, 0, 1, 0, 0, 1609317417);
 INSERT INTO `cnpscy_admin_menus` VALUES (14, 6, '下拉列表', '', '', '', '', '', '', '', 'admin/admin_menus/getSelectLists', 'GET', 5, 1, 1, 0, 0, 0);
 INSERT INTO `cnpscy_admin_menus` VALUES (15, 6, '新增', '', '', '', '', '', '', '', 'admin/admin_menus/create', 'POST', 1, 1, 1, 0, 0, 0);
 INSERT INTO `cnpscy_admin_menus` VALUES (16, 6, '更新', '', '', '', '', '', '', '', 'admin/admin_menus/update', 'PUT', 3, 1, 1, 0, 0, 0);
@@ -872,11 +965,11 @@ CREATE TABLE `cnpscy_admin_roles`  (
 -- Records of cnpscy_admin_roles
 -- ----------------------------
 INSERT INTO `cnpscy_admin_roles` VALUES (1, '超级管理员', '权限最大的人', 1, 0, 1577671704, 1601293601);
-INSERT INTO `cnpscy_admin_roles` VALUES (2, 'test', '备注信息', 1, 1, 1598348975, 1609143610);
-INSERT INTO `cnpscy_admin_roles` VALUES (3, '111', '2121', 1, 1, 1608795030, 1609143610);
-INSERT INTO `cnpscy_admin_roles` VALUES (7, '31232', '12321', 1, 1, 1608795106, 1609143610);
-INSERT INTO `cnpscy_admin_roles` VALUES (10, '42342432', '42423', 1, 1, 1608795181, 1609143610);
-INSERT INTO `cnpscy_admin_roles` VALUES (11, '3123213', '2132321', 1, 1, 1608796971, 1609143610);
+INSERT INTO `cnpscy_admin_roles` VALUES (2, 'test', '备注信息', 0, 0, 1598348975, 1609318749);
+INSERT INTO `cnpscy_admin_roles` VALUES (3, '111', '2121', 0, 0, 1608795030, 1609318750);
+INSERT INTO `cnpscy_admin_roles` VALUES (7, '31232', '12321', 1, 0, 1608795106, 1609143610);
+INSERT INTO `cnpscy_admin_roles` VALUES (10, '42342432', '42423', 1, 0, 1608795181, 1609143610);
+INSERT INTO `cnpscy_admin_roles` VALUES (11, '3123213', '2132321', 1, 0, 1608796971, 1609143610);
 
 -- ----------------------------
 -- Table structure for cnpscy_admin_with_roles
@@ -943,8 +1036,8 @@ INSERT INTO `cnpscy_admins` VALUES (112, 'test1', '$2y$10$t6rC29.BfNtQc.s8DB8Uke
 INSERT INTO `cnpscy_admins` VALUES (113, 'test', 'test1', '86', 'test@qq.com', '', 0, 2, 0, 1);
 INSERT INTO `cnpscy_admins` VALUES (114, 'test1', '$2y$10$AeU9vwBx0d4KttM6yKcdWu8mgy2qgcTVK/v.I4MJuEzNlqz.Li9GG', '86', '123@qq.com', '', 0, 2, 0, 0);
 INSERT INTO `cnpscy_admins` VALUES (117, 'test123', '$2y$10$lvVejUPm/lypn8Xr1YNHdOYdy7rrjqiv6DWsYlYAR4R4yidnLBg8e', '1', '123@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (118, 'test123', '$2y$10$5hSULbXycOJGQgU2p9ZGaepyIW9qG5DvG1BvyipESM.8WUf3rNKvy', '1', '123@qq.com', '', 0, 2, 0, 0);
-INSERT INTO `cnpscy_admins` VALUES (119, 'test1232', '$2y$10$tnqyaBCn7HMwuellMuaH2OQq9ax1S1Wmnp7MAtBQ5Tf.dQ6a1fyeu', '1', '123@qq.com', '', 0, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (118, 'test123', '$2y$10$5hSULbXycOJGQgU2p9ZGaepyIW9qG5DvG1BvyipESM.8WUf3rNKvy', '1', '123@qq.com', '', 1, 2, 0, 0);
+INSERT INTO `cnpscy_admins` VALUES (119, 'test1232', '$2y$10$tnqyaBCn7HMwuellMuaH2OQq9ax1S1Wmnp7MAtBQ5Tf.dQ6a1fyeu', '1', '123@qq.com', '', 1, 2, 0, 0);
 INSERT INTO `cnpscy_admins` VALUES (123, '342432', '$2y$10$ngPK3KlzqnI7fLmcNUFgIOsDQSnUKpjSHTnBkYq.bSkDJkrKQIh22', '202012/3yNDfZMiAV0rmOR0mhqkbmk3GWUgSOySgB6OCGVw.png', '43243242@qq.com', '', 1, 2, 0, 0);
 
 -- ----------------------------
@@ -968,17 +1061,6 @@ CREATE TABLE `cnpscy_adverts`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `cnpscy_article_categories`;
 CREATE TABLE `cnpscy_article_categories`  (
-  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `created_at` timestamp(0) NULL DEFAULT NULL,
-  `updated_at` timestamp(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-
--- ----------------------------
--- Table structure for cnpscy_article_categorys
--- ----------------------------
-DROP TABLE IF EXISTS `cnpscy_article_categorys`;
-CREATE TABLE `cnpscy_article_categorys`  (
   `category_id` int(11) NOT NULL AUTO_INCREMENT,
   `category_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '分类名称',
   `parent_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父级Id',
@@ -991,112 +1073,113 @@ CREATE TABLE `cnpscy_article_categorys`  (
   INDEX `parent_id`(`parent_id`) USING BTREE,
   INDEX `is_check`(`is_check`) USING BTREE,
   INDEX `is_delete`(`is_delete`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 102 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文章分类表' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 103 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文章分类表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
--- Records of cnpscy_article_categorys
--- ----------------------------
-INSERT INTO `cnpscy_article_categorys` VALUES (1, 'Taryn Halvorson', 2, 0, 1, 0, 1586760137, 1586846349);
-INSERT INTO `cnpscy_article_categorys` VALUES (2, 'Prof. Aurore Toy II', 0, 0, 0, 0, 1586760137, 1586916236);
-INSERT INTO `cnpscy_article_categorys` VALUES (3, 'Cleo Larson I', 0, 0, 0, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (4, 'Dr. Favian Bergstrom', 0, 0, 0, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (5, 'Rosa King', 0, 0, 0, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (6, 'Mr. Dave Hegmann DVM', 0, 0, 0, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (7, 'Penelope Kozey', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (8, 'Martin Bogisich', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (9, 'Meta Goldner', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (10, 'Dr. Donavon Volkman', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (11, 'Alexander Barrows', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (12, 'Alisha Will IV', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (13, 'Willow Haley', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (14, 'Miss Berniece Wiza DDS', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (15, 'Luna Rolfson DDS', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (16, 'Doyle Botsford', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (17, 'Prof. Adam Medhurst MD', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (18, 'Dr. David Kessler I', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (19, 'Dortha Hartmann', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (20, 'Marisa Rempel', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (21, 'Andy Schiller', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (22, 'Donato Langworth', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (23, 'Cheyenne Herman', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (24, 'Stevie Hermiston', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (25, 'Prof. Ayla Kuvalis', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (26, 'Mr. Irwin Zulauf', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (27, 'Danielle Deckow', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (28, 'Sandy Schimmel', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (29, 'Prof. Cameron Hill', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (30, 'Alanis Flatley', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (31, 'Dr. Orpha Kohler', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (32, 'Magali Marquardt', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (33, 'Kameron Mills', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (34, 'Susan White', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (35, 'Telly Ward', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (36, 'Ms. Albina Schmeler', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (37, 'Prof. Cathryn Swaniawski V', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (38, 'Valentin Leannon III', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (39, 'Hermina Bruen', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (40, 'Andy Fadel', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (41, 'Houston Connelly', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (42, 'Lysanne Hauck', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (43, 'Marta Becker', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (44, 'Mr. Reagan Nader DVM', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (45, 'Carlo Schmitt', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (46, 'Mr. Reyes Heaney', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (47, 'Zena Leffler', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (48, 'Dr. Gerhard Erdman', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (49, 'Melvin Feil', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (50, 'Mr. Maximilian Stracke DVM', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (51, 'Sophie Schultz IV', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (52, 'Heather Dietrich', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (53, 'Adriel Jacobs', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (54, 'Mrs. Margarett Kihn Jr.', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (55, 'Ms. Shanelle Lesch V', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (56, 'Nikita Weber', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (57, 'Sallie Cormier', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (58, 'Easter Smitham', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (59, 'Aron Dooley', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (60, 'Ariane Aufderhar', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (61, 'Dr. Martin Greenfelder', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (62, 'Dr. Darion Sanford DDS', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (63, 'Margret Smitham', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (64, 'Clinton McDermott MD', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (65, 'Raymond Weimann V', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (66, 'Alicia Volkman', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (67, 'Camren Rolfson', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (68, 'Lenore Ledner', 0, 0, 1, 0, 1586760137, 1586760137);
-INSERT INTO `cnpscy_article_categorys` VALUES (69, 'Shyann Wyman', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (70, 'Verlie Osinski V', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (71, 'Agnes Haag', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (72, 'Dr. Clint Reilly', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (73, 'Zelda Runolfsdottir DVM', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (74, 'Minerva Murazik', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (75, 'Prof. Courtney Hoppe', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (76, 'Barry Price', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (77, 'Brenda Schmidt', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (78, 'Emmanuel Greenfelder III', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (79, 'Bridget Stanton', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (80, 'Kory Rolfson', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (81, 'Ophelia Carter', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (82, 'Joanne Trantow V', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (83, 'Jerel Mann', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (84, 'Dr. Johnson Bruen', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (85, 'Beverly Johns DVM', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (86, 'Jarrett Oberbrunner', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (87, 'Miss Loma Carroll V', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (88, 'Miss Sandra Boehm Jr.', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (89, 'Miracle Nolan DVM', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (90, 'Helene Boyle', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (91, 'Denis Zieme', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (92, 'Hortense Dicki', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (93, 'Keon Gislason DDS', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (94, 'Keshawn Friesen', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (95, 'Patricia Volkman', 0, 0, 0, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (96, 'Trace Lang PhD', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (97, 'Mr. Brennan Tremblay MD', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (98, 'Kristian Nolan', 0, 0, 0, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (99, 'Amara Glover', 0, 0, 1, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (100, 'Mrs. Odie Brekke IV', 0, 0, 0, 0, 1586760138, 1586760138);
-INSERT INTO `cnpscy_article_categorys` VALUES (101, '二级分类', 100, 0, 1, 0, 1586763466, 1586763466);
+-- Records of cnpscy_article_categories
+-- ----------------------------
+INSERT INTO `cnpscy_article_categories` VALUES (1, 'Taryn Halvorson', 2, 0, 1, 0, 1586760137, 1586846349);
+INSERT INTO `cnpscy_article_categories` VALUES (2, 'Prof. Aurore Toy II', 0, 3, 1, 0, 1586760137, 1609315310);
+INSERT INTO `cnpscy_article_categories` VALUES (3, 'Cleo Larson I', 0, 0, 0, 1, 1586760137, 1609315384);
+INSERT INTO `cnpscy_article_categories` VALUES (4, 'Dr. Favian Bergstrom', 0, 0, 0, 1, 1586760137, 1609315393);
+INSERT INTO `cnpscy_article_categories` VALUES (5, 'Rosa King', 0, 0, 1, 0, 1586760137, 1609317141);
+INSERT INTO `cnpscy_article_categories` VALUES (6, 'Mr. Dave Hegmann DVM', 0, 0, 0, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (7, 'Penelope Kozey', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (8, 'Martin Bogisich', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (9, 'Meta Goldner', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (10, 'Dr. Donavon Volkman', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (11, 'Alexander Barrows', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (12, 'Alisha Will IV', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (13, 'Willow Haley', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (14, 'Miss Berniece Wiza DDS', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (15, 'Luna Rolfson DDS', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (16, 'Doyle Botsford', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (17, 'Prof. Adam Medhurst MD', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (18, 'Dr. David Kessler I', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (19, 'Dortha Hartmann', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (20, 'Marisa Rempel', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (21, 'Andy Schiller', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (22, 'Donato Langworth', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (23, 'Cheyenne Herman', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (24, 'Stevie Hermiston', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (25, 'Prof. Ayla Kuvalis', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (26, 'Mr. Irwin Zulauf', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (27, 'Danielle Deckow', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (28, 'Sandy Schimmel', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (29, 'Prof. Cameron Hill', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (30, 'Alanis Flatley', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (31, 'Dr. Orpha Kohler', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (32, 'Magali Marquardt', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (33, 'Kameron Mills', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (34, 'Susan White', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (35, 'Telly Ward', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (36, 'Ms. Albina Schmeler', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (37, 'Prof. Cathryn Swaniawski V', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (38, 'Valentin Leannon III', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (39, 'Hermina Bruen', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (40, 'Andy Fadel', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (41, 'Houston Connelly', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (42, 'Lysanne Hauck', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (43, 'Marta Becker', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (44, 'Mr. Reagan Nader DVM', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (45, 'Carlo Schmitt', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (46, 'Mr. Reyes Heaney', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (47, 'Zena Leffler', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (48, 'Dr. Gerhard Erdman', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (49, 'Melvin Feil', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (50, 'Mr. Maximilian Stracke DVM', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (51, 'Sophie Schultz IV', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (52, 'Heather Dietrich', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (53, 'Adriel Jacobs', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (54, 'Mrs. Margarett Kihn Jr.', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (55, 'Ms. Shanelle Lesch V', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (56, 'Nikita Weber', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (57, 'Sallie Cormier', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (58, 'Easter Smitham', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (59, 'Aron Dooley', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (60, 'Ariane Aufderhar', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (61, 'Dr. Martin Greenfelder', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (62, 'Dr. Darion Sanford DDS', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (63, 'Margret Smitham', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (64, 'Clinton McDermott MD', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (65, 'Raymond Weimann V', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (66, 'Alicia Volkman', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (67, 'Camren Rolfson', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (68, 'Lenore Ledner', 0, 0, 1, 0, 1586760137, 1586760137);
+INSERT INTO `cnpscy_article_categories` VALUES (69, 'Shyann Wyman', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (70, 'Verlie Osinski V', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (71, 'Agnes Haag', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (72, 'Dr. Clint Reilly', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (73, 'Zelda Runolfsdottir DVM', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (74, 'Minerva Murazik', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (75, 'Prof. Courtney Hoppe', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (76, 'Barry Price', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (77, 'Brenda Schmidt', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (78, 'Emmanuel Greenfelder III', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (79, 'Bridget Stanton', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (80, 'Kory Rolfson', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (81, 'Ophelia Carter', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (82, 'Joanne Trantow V', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (83, 'Jerel Mann', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (84, 'Dr. Johnson Bruen', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (85, 'Beverly Johns DVM', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (86, 'Jarrett Oberbrunner', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (87, 'Miss Loma Carroll V', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (88, 'Miss Sandra Boehm Jr.', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (89, 'Miracle Nolan DVM', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (90, 'Helene Boyle', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (91, 'Denis Zieme', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (92, 'Hortense Dicki', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (93, 'Keon Gislason DDS', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (94, 'Keshawn Friesen', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (95, 'Patricia Volkman', 0, 0, 0, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (96, 'Trace Lang PhD', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (97, 'Mr. Brennan Tremblay MD', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (98, 'Kristian Nolan', 0, 0, 0, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (99, 'Amara Glover', 0, 0, 1, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (100, 'Mrs. Odie Brekke IV', 0, 0, 0, 0, 1586760138, 1586760138);
+INSERT INTO `cnpscy_article_categories` VALUES (101, '二级分类', 100, 0, 1, 0, 1586763466, 1586763466);
+INSERT INTO `cnpscy_article_categories` VALUES (102, '测试', 0, 99, 1, 0, 1609317234, 1609317234);
 
 -- ----------------------------
 -- Table structure for cnpscy_article_contents
@@ -1399,7 +1482,7 @@ CREATE TABLE `cnpscy_banners`  (
 -- ----------------------------
 -- Records of cnpscy_banners
 -- ----------------------------
-INSERT INTO `cnpscy_banners` VALUES (1, '111', 0, '202012/yX3WxMA9iTUtJd8sIG8IITcA2YIehdDyC9CZUpAv.png', 'http://www.cnpscy.cn', '', 1, 0, 0, 1586485719, 1609142850);
+INSERT INTO `cnpscy_banners` VALUES (1, '111', 0, '202012/yX3WxMA9iTUtJd8sIG8IITcA2YIehdDyC9CZUpAv.png', 'http://www.cnpscy.cn', '', 1, 0, 1, 1586485719, 1609319159);
 
 -- ----------------------------
 -- Table structure for cnpscy_configs
@@ -1474,8 +1557,8 @@ INSERT INTO `cnpscy_configs` VALUES (57, 'SMTP[密码]', 'mail_smtp_pass', '', 0
 INSERT INTO `cnpscy_configs` VALUES (58, 'SMTP验证方式', 'mail_verify_type', '0:无1:TLS2:SSL', 0, '', 0, 0, '', 1, 1586483569, 1586483569, 1);
 INSERT INTO `cnpscy_configs` VALUES (59, '发件人邮箱', 'mail_from_email', '2278757482@qq.com', 0, '', 0, 0, '', 1, 1586483569, 1586483569, 1);
 INSERT INTO `cnpscy_configs` VALUES (60, '权限缓存key', 'admin_menu_session_unique', 'rabc_menus_list', 6, '', 0, 0, '', 1, 1586483569, 1586483569, 0);
-INSERT INTO `cnpscy_configs` VALUES (61, '管理员session-key', 'admin_info_session_unique', 'admin_info', 6, '', 0, 0, '', 1, 1586483569, 1586483569, 0);
-INSERT INTO `cnpscy_configs` VALUES (62, '管理员权限session-key', 'admin_rabc_session_unique', 'admin_rabc', 6, '', 0, 0, '111', 1, 1586483569, 1586914904, 0);
+INSERT INTO `cnpscy_configs` VALUES (61, '管理员session-key', 'admin_info_session_unique', 'admin_info', 6, '', 0, 0, '', 1, 1586483569, 1609319143, 0);
+INSERT INTO `cnpscy_configs` VALUES (62, '管理员权限session-key', 'admin_rabc_session_unique', 'admin_rabc', 6, '', 0, 0, '111', 1, 1586483569, 1609319142, 0);
 
 -- ----------------------------
 -- Table structure for cnpscy_friendlinks
@@ -1500,13 +1583,13 @@ CREATE TABLE `cnpscy_friendlinks`  (
 -- ----------------------------
 -- Records of cnpscy_friendlinks
 -- ----------------------------
-INSERT INTO `cnpscy_friendlinks` VALUES (5, 'dsaas', 'javascript:;', '', 0, 1, 0, 0, 1598610507, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (6, 'dasf', 'https://github.com', '202012/YGfkfSZ0aNdczHlXAiXDWmUX4rSl2fGb9eSk2lKf.png', 3, 1, 0, 0, 1609142834, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (7, 'sfds', 'javascript:;', '', 0, 1, 0, 0, 1598611741, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (8, 'fg', 'javascript:;', '', 0, 1, 0, 0, 1598611419, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (9, '', 'javascript:;', '', 0, 1, 0, 0, 1598610804, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (10, 'd', 'javascript:;', '', 0, 1, 0, 0, 1598610804, 0);
-INSERT INTO `cnpscy_friendlinks` VALUES (11, 'sda', 'javascript:;', '', 0, 1, 0, 0, 1598610804, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (5, 'dsaas', 'javascript:;', '', 0, 0, 0, 1609319170, 1609319170, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (6, 'dasf', 'https://github.com', '202012/YGfkfSZ0aNdczHlXAiXDWmUX4rSl2fGb9eSk2lKf.png', 3, 1, 0, 1609142834, 1609142834, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (7, 'sfds', 'javascript:;', '', 0, 0, 0, 1609319170, 1609319170, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (8, 'fg', 'javascript:;', '', 0, 0, 0, 1609319169, 1609319169, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (9, '', 'javascript:;', '', 0, 0, 0, 1609319169, 1609319169, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (10, 'd', 'javascript:;', '', 0, 0, 0, 1609319168, 1609319168, 0);
+INSERT INTO `cnpscy_friendlinks` VALUES (11, 'sda', 'javascript:;', '', 0, 0, 0, 1609319168, 1609319168, 0);
 
 -- ----------------------------
 -- Table structure for cnpscy_galleries
@@ -11797,17 +11880,6 @@ CREATE TABLE `cnpscy_notifies`  (
   INDEX `notifies_notify_type_index`(`notify_type`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
 
--- ----------------------------
--- Table structure for cnpscy_protocols
--- ----------------------------
-DROP TABLE IF EXISTS `cnpscy_protocols`;
-CREATE TABLE `cnpscy_protocols`  (
-  `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `created_at` timestamp(0) NULL DEFAULT NULL,
-  `updated_at` timestamp(0) NULL DEFAULT NULL,
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci ROW_FORMAT = Dynamic;
-
 -- ----------------------------
 -- Table structure for cnpscy_system_notify_users
 -- ----------------------------
-- 
Gitee