diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 21a8754b0d1dde0de9c9daa26e4f3b36a0fe84e9..6c5659d131413afdb0e586adb79046852e207eaf 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\ConvertEmptyStringsToNull;
 use Illuminate\Foundation\Http\Kernel as HttpKernel;
 
 class Kernel extends HttpKernel
@@ -20,7 +21,12 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\PreventRequestsDuringMaintenance::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
-        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+
+        // 空字符串自动转换为null的中间件
+        // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+
+        // 自定义的：空字符串自动转换为null的中间件
+        ConvertEmptyStringsToNull::class,
     ];
 
     /**
diff --git a/app/Http/Middleware/ConvertEmptyStringsToNull.php b/app/Http/Middleware/ConvertEmptyStringsToNull.php
new file mode 100644
index 0000000000000000000000000000000000000000..386c627cefbe52a9b0b37813c14ce682d7f2b59a
--- /dev/null
+++ b/app/Http/Middleware/ConvertEmptyStringsToNull.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class ConvertEmptyStringsToNull
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $method = strtoupper($request->getMethod());
+        if (
+            $method == 'POST'
+            ||
+            $method == 'PUT'
+        ){
+            // 希望在POST、PUT时，新增与更新数据时，移除[空字符串自动转换为null的中间件]效果。
+        }else{
+            (new \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull)->handle($request, $next);
+        }
+
+        return $next($request);
+    }
+}
diff --git a/app/Modules/Admin/Entities/Article/Article.php b/app/Modules/Admin/Entities/Article/Article.php
index f8c9daaff7e4c502e0091bdb66bd9d4c563f4895..cda0eeea82bc5fd240c9c2eda6991dcd52373ad3 100644
--- a/app/Modules/Admin/Entities/Article/Article.php
+++ b/app/Modules/Admin/Entities/Article/Article.php
@@ -27,4 +27,9 @@ class Article extends Model
     {
         return $this->hasOne(ArticleCategory::class, 'category_id', 'category_id');
     }
+
+    public function labels()
+    {
+        return $this->belongsToMany(ArticleLabel::class, ArticleWithLabel::class, 'article_id' , 'label_id' , 'article_id', 'label_id')->withPivot(['article_id', 'label_id']);
+    }
 }
diff --git a/app/Modules/Admin/Entities/Article/ArticleCategory.php b/app/Modules/Admin/Entities/Article/ArticleCategory.php
index e9ea8c333451548ea708f3ecf319a9034dd3f516..82ef61fcd7b55d7a22cb868358e45419c32b67bc 100644
--- a/app/Modules/Admin/Entities/Article/ArticleCategory.php
+++ b/app/Modules/Admin/Entities/Article/ArticleCategory.php
@@ -3,14 +3,85 @@
 namespace App\Modules\Admin\Entities\Article;
 
 use App\Models\Model;
+use Illuminate\Support\Facades\Cache;
 
 class ArticleCategory extends Model
 {
     protected $primaryKey = 'category_id';
-    protected $is_delete = 0;
+    protected $is_delete  = 0;
+    protected $cache_key  = 'article_categories';
 
     public function getSelectLists()
     {
-        return list_to_tree($this->orderBy('category_sort', 'ASC')->get()->toArray(), $this->getKeyName());
+        return $this->getCacheTree();
+    }
+
+    /**
+     * 删除缓存
+     *
+     * @return bool
+     */
+    public function delCache()
+    {
+        Cache::forget($this->cache_key);
+        return true;
+    }
+
+    /**
+     * 获取文章分类的数据缓存
+     *
+     * @param  string  $get_type
+     *
+     * @return mixed
+     */
+    private function getCache(string $get_type = '')
+    {
+        return Cache::remember($this->cache_key, 3600, function() use ($get_type) {
+            $all = $this->orderBy('category_sort', 'ASC')->get()->toArray();
+            $tree = list_to_tree($all, $this->getKeyName());
+            return compact('all', 'tree');
+        });
+    }
+
+    /**
+     * 获取Tree格式化数据
+     *
+     * @return array|mixed
+     */
+    public function getCacheTree()
+    {
+        return $this->getCache()['tree'] ?? [];
+    }
+
+    /**
+     * 获取所有文章数据
+     *
+     * @return array|mixed
+     */
+    public function getCacheAll()
+    {
+        return $this->getCache()['all'] ?? [];
+    }
+
+    /**
+     * 获取所有子集的Id集合（包含自己）
+     *
+     * @param  int    $parent_id
+     * @param  array  $all
+     *
+     * @return array|int[]
+     */
+    public function getChildIds(int $parent_id, array $all = [])
+    {
+        $ids = [$parent_id];
+        empty($all) && $all = $this->getCacheAll();
+        foreach ($all as $key => $value) {
+            if ( $value['parent_id'] == $parent_id ) {
+                unset($all[$key]);
+                $child_ids = $this->getChildIds((int)$value['category_id'], $all);
+                !empty($child_ids) && $ids = array_merge($ids, $child_ids);
+            }
+        }
+        return $ids;
     }
 }
diff --git a/app/Modules/Admin/Entities/Article/ArticleWithLabel.php b/app/Modules/Admin/Entities/Article/ArticleWithLabel.php
index f92e920e7ca46584153854a4937bb89ade34a43e..2894fcd49c60f1d855b1339564ff3e395d5ebcaf 100644
--- a/app/Modules/Admin/Entities/Article/ArticleWithLabel.php
+++ b/app/Modules/Admin/Entities/Article/ArticleWithLabel.php
@@ -7,4 +7,5 @@ use App\Models\Model;
 class ArticleWithLabel extends Model
 {
     protected $primaryKey = 'with_id';
+    public $timestamps = false;
 }
diff --git a/app/Modules/Admin/Entities/System/Config.php b/app/Modules/Admin/Entities/System/Config.php
index 5d3f328f7ddd970a9f05895597b49db31da57c03..91b85bf5631c58a7b960b957c6e5c75d984fc1e0 100644
--- a/app/Modules/Admin/Entities/System/Config.php
+++ b/app/Modules/Admin/Entities/System/Config.php
@@ -8,4 +8,85 @@ class Config extends Model
 {
     protected $primaryKey = 'config_id';
     protected $is_delete = 0;
+
+    /**
+     * 配置同步到config文件中
+     *
+     * @return false|int
+     */
+    public function pushRefreshConfig()
+    {
+        $config_data = $this->where('is_check', 1)
+            ->select('config_value', 'config_name', 'config_type')
+            ->get()
+            ->toArray();//字段进行过滤
+        $_data = $data_list = [];
+        array_walk($config_data, function ($value) use (&$data_list) {
+            /**
+             * 对于数组格式的处理
+             *
+             * in_array(strtoupper($value['config_name']), ['CONFIG_GROUP_LIST', 'CONFIG_TYPE_LIST', 'MENU_TYPE_LIST']) ||
+             */
+            if ($value['config_type'] == 3) {
+                $value_ary = array_filter(explode('|', str_replace(["\r", "\r\n", "\n"], '|', $value['config_value'])));
+                foreach ($value_ary as $k => $v) {
+                    if (empty($value['config_name'])) continue;
+                    $array = explode(':', str_replace(["'", '"', "\r", "\r\n", "\n"], '', $v));
+                    $_data[$array[0]] = $array[1];
+                }
+                $data_list[$value['config_name']] = $_data;
+            }else{
+                /**
+                 * 配置项的值，对于不同字符类型的格式进行处理
+                 */
+                switch ($value['config_type']){
+                    case 2: // 数字
+                        $config_value = floatval($value['config_value']);
+                        break;
+                    default:
+                        $config_value = $value['config_value'];
+                        break;
+                }
+                /**
+                 * 如果存在某一类的设置项：
+                 *  如：user.login_days、user.pass 这一类，自动设置为数据格式数据，便于使用config的 . 找到数组下坐标
+                 */
+                if (strstr($value['config_name'], '.')){
+                    $ary = explode('.', $value['config_name']);
+                    if (count($ary) > 2){
+                        list($key, $val, $third) = $ary;
+                        $data_list[$key][$val][$third] = $config_value;
+                    }else{
+                        list($key, $val) = $ary;
+                        $data_list[$key][$val] = $config_value;
+                    }
+                }else{
+                    $data_list[$value['config_name']] = $config_value;
+                }
+            }
+        });
+        // 文件写入
+        $res = file_put_contents( config_path() . '/cnpscy.php', '<?php return ' . var_export($data_list, true) . ';');
+        unset($config_data, $_data, $data_list, $array, $value_ary, $data_list);
+        return $res;
+    }
+
+    /**
+     * 后端分组排序列表
+     * @return array
+     */
+    public static function getAdminGroupList()
+    {
+        $configs = self::where('is_check', 1)->select()->toArray();
+        if (!empty($configs)) {
+            foreach ($configs as &$v) {
+                if (in_array($v['config_type'], [4])){
+                    if (!empty($v['config_extra'])) $v['config_extra'] = config_array_analysis($v['config_extra']);
+                }
+            }
+        }
+        $configs = array_field_group($configs, 'config_group');//按照配置进行分组
+        if (empty($configs[0])) $configs[0] = [];
+        return $configs;
+    }
 }
diff --git a/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php b/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.php
new file mode 100644
index 0000000000000000000000000000000000000000..7aaf19da1c109545dd37e2061f1e22365281e806
--- /dev/null
+++ b/app/Modules/Admin/Http/Controllers/Article/ArticleLabelController.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\ArticleLabelRequest;
+use App\Modules\Admin\Services\ArticleLabelService;
+
+class ArticleLabelController extends BaseController
+{
+    public function __construct(ArticleLabelService $articleLabelService)
+    {
+        $this->service = $articleLabelService;
+    }
+
+    public function create(ArticleLabelRequest $request)
+    {
+        return $this->createService($request);
+    }
+
+    public function update(ArticleLabelRequest $request)
+    {
+        return $this->updateService($request);
+    }
+}
diff --git a/app/Modules/Admin/Http/Controllers/BaseController.php b/app/Modules/Admin/Http/Controllers/BaseController.php
index c7209c26f28e7345c0de5370314ce3fff921687b..6006d7ceed566951c17129216cf020d4c7493251 100644
--- a/app/Modules/Admin/Http/Controllers/BaseController.php
+++ b/app/Modules/Admin/Http/Controllers/BaseController.php
@@ -40,7 +40,11 @@ class BaseController extends Controller
         if (!isset($this->service)){
             return $this->successJson([], '请先设置Service或者重写方法！');
         }
-        return $this->successJson($this->service->detail($request));
+        if ($detail = $this->service->detail($request)){
+            return $this->successJson($detail);
+        }else{
+            return $this->errorJson('数据不存在！');
+        }
     }
 
     /**
diff --git a/app/Modules/Admin/Http/Controllers/System/ConfigController.php b/app/Modules/Admin/Http/Controllers/System/ConfigController.php
index 78b6ce9b26819738a74b403c16430fe8922c250b..3ab6f3097d634a227194b8f3f49cb08b276030df 100644
--- a/app/Modules/Admin/Http/Controllers/System/ConfigController.php
+++ b/app/Modules/Admin/Http/Controllers/System/ConfigController.php
@@ -22,4 +22,38 @@ class ConfigController extends BaseController
     {
         return $this->updateService($request);
     }
+
+    public function getConfigGroupType()
+    {
+        $config_type_list = $config_group_list = [];
+        $config_group = cnpscy_config('config_group_list');
+        foreach ($config_group as $key => $value){
+            $config_group_list[] = [
+                'value' =>  $key,
+                'name' =>  $value,
+            ];
+        }
+        $config_type = cnpscy_config('config_type_list');
+        foreach ($config_type as $key => $value){
+            $config_type_list[] = [
+                'value' =>  $key,
+                'name' =>  $value,
+            ];
+        }
+        return $this->successJson([
+            'config_group_list' => $config_group_list,
+            'config_type_list' => $config_type_list,
+        ]);
+    }
+
+    /**
+     * 同步配置
+     *
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function pushRefreshConfig()
+    {
+        $this->service->pushRefreshConfig();
+        return $this->successJson([], '配置文件已同步成功！');
+    }
 }
diff --git a/app/Modules/Admin/Http/Requests/Article/ArticleLabelRequest.php b/app/Modules/Admin/Http/Requests/Article/ArticleLabelRequest.php
new file mode 100644
index 0000000000000000000000000000000000000000..cc7dd143fe68ae64de3b717658d045c0480ea250
--- /dev/null
+++ b/app/Modules/Admin/Http/Requests/Article/ArticleLabelRequest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Modules\Admin\Http\Requests\Article;
+
+use App\Modules\Admin\Entities\Article\ArticleLabel;
+use App\Modules\Admin\Http\Requests\BaseRequest;
+
+class ArticleLabelRequest extends BaseRequest
+{
+    public function setInstance()
+    {
+        $this->instance = ArticleLabel::getInstance();
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'label_name' => [
+                'required',
+                'max:256',
+                'unique:' . $this->instance->getTable() . ',label_name' . $this->validate_id
+            ],
+        ];
+    }
+
+    public function messages()
+    {
+        return [
+            'label_name.required' => '请输入标签名称！',
+            'label_name.max'      => '标签名称字数不可超过 256！',
+            'label_name.unique'   => '标签名称已存在，请更换！',
+        ];
+    }
+}
diff --git a/app/Modules/Admin/Resources/vue-element-admin/api/article_labels.js b/app/Modules/Admin/Resources/vue-element-admin/api/article_labels.js
new file mode 100644
index 0000000000000000000000000000000000000000..ebc012661ce2950d43e8bbc45000299467ee964d
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/article_labels.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function getArticleLabelSelect(params) {
+    return request({
+        url: '/article_labels/getSelectLists',
+        method: 'get',
+        params
+    });
+}
+
+export function getList(params) {
+    return request({
+        url: '/article_labels',
+        method: 'get',
+        params
+    });
+}
+
+export function create(data) {
+    return request({
+        url: '/article_labels/create',
+        method: 'post',
+        data
+    });
+}
+
+export function update(data) {
+    return request({
+        url: '/article_labels/update',
+        method: 'put',
+        data
+    });
+}
+
+export function setDel(data) {
+    return request({
+        url: '/article_labels/delete',
+        method: 'delete',
+        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 13371c1c16a7f87fa02d8a0c2bbd9c809f87c10c..4a9b2fa72b387da34999ff24cbcffc0fe0221629 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/configs.js
@@ -8,6 +8,14 @@ export function getList(query) {
     })
 }
 
+// 获取配置分组与配置类型
+export function getConfigGroupType() {
+    return request({
+        url: '/configs/getConfigGroupType',
+        method: 'get',
+    })
+}
+
 export function detail(id) {
     return request({
         url: '/configs/detail',
@@ -47,3 +55,11 @@ export function changeFiledStatus(data) {
         data
     })
 }
+
+// 同步配置文件
+export function pushRefreshConfig() {
+    return request({
+        url: '/configs/pushRefreshConfig',
+        method: 'put',
+    })
+}
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 d4804eeea2af2255d2f2984b7453c82e178ca9ce..7635f0979f31f71060e0b9c3ec9cba04de9cf014 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/api/friendlinks.js
@@ -17,7 +17,6 @@ export function create(data) {
 }
 
 export function update(data) {
-    console.log(data)
     return request({
         url: '/friendlinks/update',
         method: 'put',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
index eca3910c0e38abe79e1f16e70b1231ecc6cb4b8f..16b18fa7773c483359ed0e3f9786690c79f36b7a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/PanThumb/index.vue
@@ -1,146 +1,146 @@
 <template>
-  <div :style="{zIndex:zIndex,height:height,width:width,borderRadius:borderRadius}" class="pan-item">
-    <div class="pan-info" :style="{borderRadius:borderRadius}">
-      <div class="pan-info-roles-container">
-        <slot />
-      </div>
+    <div :style="{zIndex:zIndex,height:height,width:width,borderRadius:borderRadius}" class="pan-item">
+        <div class="pan-info" :style="{borderRadius:borderRadius}">
+            <div class="pan-info-roles-container">
+                <slot/>
+            </div>
+        </div>
+        <!-- eslint-disable-next-line -->
+        <div :style="{backgroundImage: `url(${image})`, borderRadius:borderRadius}" class="pan-thumb"></div>
     </div>
-    <!-- eslint-disable-next-line -->
-    <div :style="{backgroundImage: `url(${image})`}" class="pan-thumb"></div>
-  </div>
 </template>
 
 <script>
-export default {
-  name: 'PanThumb',
-  props: {
-    image: {
-      type: String,
-      required: true
-    },
-    zIndex: {
-      type: Number,
-      default: 1
-    },
-    width: {
-      type: String,
-      default: '150px'
-    },
-    height: {
-      type: String,
-      default: '150px'
-    },
-    borderRadius: {
-      type: String,
-      default: '50%'
+    export default {
+        name: 'PanThumb',
+        props: {
+            image: {
+                type: String,
+                required: true
+            },
+            zIndex: {
+                type: Number,
+                default: 1
+            },
+            width: {
+                type: String,
+                default: '150px'
+            },
+            height: {
+                type: String,
+                default: '150px'
+            },
+            borderRadius: {
+                type: String,
+                default: '50%'
+            }
+        }
     }
-  }
-}
 </script>
 
 <style scoped>
-.pan-item {
-  width: 200px;
-  height: 200px;
-  border-radius: 50%;
-  display: inline-block;
-  position: relative;
-  cursor: default;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
-}
+    .pan-item {
+        width: 200px;
+        height: 200px;
+        border-radius: 50%;
+        display: inline-block;
+        position: relative;
+        cursor: default;
+        box-shadow: 0 1px 3px rgba(0, 0, 0, 0.2);
+    }
 
-.pan-info-roles-container {
-  padding: 20px;
-  text-align: center;
-}
+    .pan-info-roles-container {
+        padding: 20px;
+        text-align: center;
+    }
 
-.pan-thumb {
-  width: 100%;
-  height: 100%;
-  background-position: center center;
-  background-size: cover;
-  border-radius: 50%;
-  overflow: hidden;
-  position: absolute;
-  transform-origin: 95% 40%;
-  transition: all 0.3s ease-in-out;
-}
+    .pan-thumb {
+        width: 100%;
+        height: 100%;
+        background-position: center center;
+        background-size: cover;
+        border-radius: 50%;
+        overflow: hidden;
+        position: absolute;
+        transform-origin: 95% 40%;
+        transition: all 0.3s ease-in-out;
+    }
 
-/* .pan-thumb:after {
-  content: '';
-  width: 8px;
-  height: 8px;
-  position: absolute;
-  border-radius: 50%;
-  top: 40%;
-  left: 95%;
-  margin: -4px 0 0 -4px;
-  background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
-  box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
-} */
+    /* .pan-thumb:after {
+      content: '';
+      width: 8px;
+      height: 8px;
+      position: absolute;
+      border-radius: 50%;
+      top: 40%;
+      left: 95%;
+      margin: -4px 0 0 -4px;
+      background: radial-gradient(ellipse at center, rgba(14, 14, 14, 1) 0%, rgba(125, 126, 125, 1) 100%);
+      box-shadow: 0 0 1px rgba(255, 255, 255, 0.9);
+    } */
 
-.pan-info {
-  position: absolute;
-  width: inherit;
-  height: inherit;
-  border-radius: 50%;
-  overflow: hidden;
-  box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
-}
+    .pan-info {
+        position: absolute;
+        width: inherit;
+        height: inherit;
+        border-radius: 50%;
+        overflow: hidden;
+        box-shadow: inset 0 0 0 5px rgba(0, 0, 0, 0.05);
+    }
 
-.pan-info h3 {
-  color: #fff;
-  text-transform: uppercase;
-  position: relative;
-  letter-spacing: 2px;
-  font-size: 18px;
-  margin: 0 60px;
-  padding: 22px 0 0 0;
-  height: 85px;
-  font-family: 'Open Sans', Arial, sans-serif;
-  text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
-}
+    .pan-info h3 {
+        color: #fff;
+        text-transform: uppercase;
+        position: relative;
+        letter-spacing: 2px;
+        font-size: 18px;
+        margin: 0 60px;
+        padding: 22px 0 0 0;
+        height: 85px;
+        font-family: 'Open Sans', Arial, sans-serif;
+        text-shadow: 0 0 1px #fff, 0 1px 2px rgba(0, 0, 0, 0.3);
+    }
 
-.pan-info p {
-  color: #fff;
-  padding: 10px 5px;
-  font-style: italic;
-  margin: 0 30px;
-  font-size: 12px;
-  border-top: 1px solid rgba(255, 255, 255, 0.5);
-}
+    .pan-info p {
+        color: #fff;
+        padding: 10px 5px;
+        font-style: italic;
+        margin: 0 30px;
+        font-size: 12px;
+        border-top: 1px solid rgba(255, 255, 255, 0.5);
+    }
 
-.pan-info p a {
-  display: block;
-  color: #333;
-  width: 80px;
-  height: 80px;
-  background: rgba(255, 255, 255, 0.3);
-  border-radius: 50%;
-  color: #fff;
-  font-style: normal;
-  font-weight: 700;
-  text-transform: uppercase;
-  font-size: 9px;
-  letter-spacing: 1px;
-  padding-top: 24px;
-  margin: 7px auto 0;
-  font-family: 'Open Sans', Arial, sans-serif;
-  opacity: 0;
-  transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
-  transform: translateX(60px) rotate(90deg);
-}
+    .pan-info p a {
+        display: block;
+        color: #333;
+        width: 80px;
+        height: 80px;
+        background: rgba(255, 255, 255, 0.3);
+        border-radius: 50%;
+        color: #fff;
+        font-style: normal;
+        font-weight: 700;
+        text-transform: uppercase;
+        font-size: 9px;
+        letter-spacing: 1px;
+        padding-top: 24px;
+        margin: 7px auto 0;
+        font-family: 'Open Sans', Arial, sans-serif;
+        opacity: 0;
+        transition: transform 0.3s ease-in-out 0.2s, opacity 0.3s ease-in-out 0.2s, background 0.2s linear 0s;
+        transform: translateX(60px) rotate(90deg);
+    }
 
-.pan-info p a:hover {
-  background: rgba(255, 255, 255, 0.5);
-}
+    .pan-info p a:hover {
+        background: rgba(255, 255, 255, 0.5);
+    }
 
-.pan-item:hover .pan-thumb {
-  transform: rotate(-110deg);
-}
+    .pan-item:hover .pan-thumb {
+        transform: rotate(-110deg);
+    }
 
-.pan-item:hover .pan-info p a {
-  opacity: 1;
-  transform: translateX(0px) rotate(0deg);
-}
+    .pan-item:hover .pan-info p a {
+        opacity: 1;
+        transform: translateX(0px) rotate(0deg);
+    }
 </style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/ThemePicker/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/ThemePicker/index.vue
index 3879c5ad027dbb259063410ecde826529d26b43b..b0df471ca48ccdbff699589ba864532eb9e819fc 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/ThemePicker/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/ThemePicker/index.vue
@@ -35,7 +35,6 @@ export default {
       if (typeof val !== 'string') return
       const themeCluster = this.getThemeCluster(val.replace('#', ''))
       const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
 
       const $message = this.$message({
         message: '  Compiling the theme',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/components/Uploads/image/index.vue b/app/Modules/Admin/Resources/vue-element-admin/components/Uploads/image/index.vue
index aef2da5bfa52010e4985792459acf9fa697cbb27..c9c339d17a498751abb010a883bc406f5c5fea94 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/components/Uploads/image/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/components/Uploads/image/index.vue
@@ -872,8 +872,6 @@
                         }
                     }
                     client.upload.addEventListener('progress', uploadProgress, false) // 监听进度
-                    // console.log(headers)
-                    // console.log(getToken())
                     // 设置header
                     if (typeof headers === 'object' && headers) {
                         Object.keys(headers).forEach((k) => {
@@ -881,7 +879,6 @@
                         })
                     }
                     headers['Authorization'] = getToken();
-                    // console.log(headers)
                     client.send(fmData)
                 }).then(
                     // 上传成功
diff --git a/app/Modules/Admin/Resources/vue-element-admin/lang/en.js b/app/Modules/Admin/Resources/vue-element-admin/lang/en.js
index 9598bf95d7b9b243c26d52cb866b64c6442121ba..1273e0b2094df00357767a51952b3db03c04248b 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/lang/en.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/lang/en.js
@@ -3,8 +3,11 @@ export default {
     admin: 'Admin',
     banner: 'Banner',
     article: 'Article',
+    friendlinks: 'Friendly link',
     number: 'Number',
     route: {
+        articleLabels: '文章标签',
+        articleLabelDetail: '标签详情',
         systemSettings: 'System settings',
         bannerManage: 'Banner Manage',
         permissionManage: 'Permission Manage',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/lang/es.js b/app/Modules/Admin/Resources/vue-element-admin/lang/es.js
index cab54ec4829638fdffa586909912b83cb28ccf81..3532a333a147684f7575465e5dc4fabe57957e2a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/lang/es.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/lang/es.js
@@ -3,8 +3,11 @@ export default {
     admin: 'Administrador',
     banner: 'Banner',
     article: 'Artículo',
+    friendlinks: '友情链接',
     number: 'Cantidad',
     route: {
+        articleLabels: '文章标签',
+        articleLabelDetail: '标签详情',
         systemSettings: 'Configuración del sistema',
         bannerManage: 'Gestión de Banner',
         permissionManage: 'Gestión de permisos',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/lang/ja.js b/app/Modules/Admin/Resources/vue-element-admin/lang/ja.js
index bbd4fb4d4c33181bb5269c42f9daff2b1b173d87..7629bc632a60008fe59db88beaaebe3069722609 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/lang/ja.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/lang/ja.js
@@ -3,8 +3,11 @@ export default {
     admin: '管理者',
     banner: 'Banner',
     article: '文章',
+    friendlinks: '友情链接',
     number: '数',
     route: {
+        articleLabels: '文章标签',
+        articleLabelDetail: '标签详情',
         systemSettings: 'システム設定',
         bannerManage: 'Banner管理',
         permissionManage: '権限管理',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/lang/zh.js b/app/Modules/Admin/Resources/vue-element-admin/lang/zh.js
index afbb5830e64f046dd718fd6ab4f6d96a9aac4a63..99d2ecb19a51e61f5197044570e08e2a1b55c894 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/lang/zh.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/lang/zh.js
@@ -2,8 +2,11 @@ export default {
     admin: '管理员',
     banner: 'Banner',
     article: '文章',
+    friendlinks: '友情链接',
     number: '数量',
     route: {
+        articleLabels: '文章标签',
+        articleLabelDetail: '标签详情',
         systemSettings: '系统设置',
         bannerManage: 'Banner管理',
         permissionManage: '权限管理',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/layout/components/Navbar.vue b/app/Modules/Admin/Resources/vue-element-admin/layout/components/Navbar.vue
index 0ec8f525c77757f3d69ee4f851863c35074bee77..f90cac1e652e080b1e8e40183f86bac5c5cc44dd 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/layout/components/Navbar.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/layout/components/Navbar.vue
@@ -7,7 +7,6 @@
 
         <div class="right-menu">
             <template v-if="device!=='mobile'">
-                <search id="header-search" class="right-menu-item"/>
 
                 <error-log class="errLog-container right-menu-item hover-effect"/>
 
@@ -54,7 +53,6 @@
     import Screenfull from '@/components/Screenfull'
     import SizeSelect from '@/components/SizeSelect'
     import LangSelect from '@/components/LangSelect'
-    import Search from '@/components/HeaderSearch'
 
     export default {
         components: {
@@ -64,7 +62,6 @@
             Screenfull,
             SizeSelect,
             LangSelect,
-            Search
         },
         computed: {
             ...mapGetters([
diff --git a/app/Modules/Admin/Resources/vue-element-admin/layout/components/Sidebar/Logo.vue b/app/Modules/Admin/Resources/vue-element-admin/layout/components/Sidebar/Logo.vue
index ac0c8d8fa9c43c32e55d0b198421ecaf1b9c3895..7c5c83f48b48e1c80f6c55ff6bdd399294ac830a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/layout/components/Sidebar/Logo.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/layout/components/Sidebar/Logo.vue
@@ -1,82 +1,83 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}">
-    <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 v-else class="sidebar-title">{{ title }} </h1>
-      </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo">
-        <h1 class="sidebar-title">{{ title }} </h1>
-      </router-link>
-    </transition>
-  </div>
+    <div class="sidebar-logo-container" :class="{'collapse':collapse}">
+        <transition name="sidebarLogoFade">
+            <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+                <img v-if="logo" :src="logo" class="sidebar-logo">
+                <h1 v-else class="sidebar-title">{{ title }} </h1>
+            </router-link>
+            <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+                <img v-if="logo" :src="logo" class="sidebar-logo">
+                <h1 class="sidebar-title">{{ title }} </h1>
+            </router-link>
+        </transition>
+    </div>
 </template>
 
 <script>
-export default {
-  name: 'SidebarLogo',
-  props: {
-    collapse: {
-      type: Boolean,
-      required: true
+    export default {
+        name: 'SidebarLogo',
+        props: {
+            collapse: {
+                type: Boolean,
+                required: true
+            }
+        },
+        data() {
+            // 可以从接口读取
+            return {
+                title: '小丑路人',
+                logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
+            }
+        }
     }
-  },
-  data() {
-    return {
-      title: 'Vue Element Admin',
-      logo: 'https://wpimg.wallstcn.com/69a1c46c-eb1c-4b46-8bd4-e9e686ef5251.png'
-    }
-  }
-}
 </script>
 
 <style lang="scss" scoped>
-.sidebarLogoFade-enter-active {
-  transition: opacity 1.5s;
-}
+    .sidebarLogoFade-enter-active {
+        transition: opacity 1.5s;
+    }
 
-.sidebarLogoFade-enter,
-.sidebarLogoFade-leave-to {
-  opacity: 0;
-}
+    .sidebarLogoFade-enter,
+    .sidebarLogoFade-leave-to {
+        opacity: 0;
+    }
 
-.sidebar-logo-container {
-  position: relative;
-  width: 100%;
-  height: 50px;
-  line-height: 50px;
-  background: #2b2f3a;
-  text-align: center;
-  overflow: hidden;
+    .sidebar-logo-container {
+        position: relative;
+        width: 100%;
+        height: 50px;
+        line-height: 50px;
+        background: #2b2f3a;
+        text-align: center;
+        overflow: hidden;
 
-  & .sidebar-logo-link {
-    height: 100%;
-    width: 100%;
+        & .sidebar-logo-link {
+            height: 100%;
+            width: 100%;
 
-    & .sidebar-logo {
-      width: 32px;
-      height: 32px;
-      vertical-align: middle;
-      margin-right: 12px;
-    }
+            & .sidebar-logo {
+                width: 32px;
+                height: 32px;
+                vertical-align: middle;
+                margin-right: 12px;
+            }
 
-    & .sidebar-title {
-      display: inline-block;
-      margin: 0;
-      color: #fff;
-      font-weight: 600;
-      line-height: 50px;
-      font-size: 14px;
-      font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
-      vertical-align: middle;
-    }
-  }
+            & .sidebar-title {
+                display: inline-block;
+                margin: 0;
+                color: #fff;
+                font-weight: 600;
+                line-height: 50px;
+                font-size: 14px;
+                font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
+                vertical-align: middle;
+            }
+        }
 
-  &.collapse {
-    .sidebar-logo {
-      margin-right: 0px;
+        &.collapse {
+            .sidebar-logo {
+                margin-right: 0px;
+            }
+        }
     }
-  }
-}
 </style>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/permission.js b/app/Modules/Admin/Resources/vue-element-admin/permission.js
index a43b9a6b7a6f74acf28977a3e8105d9a8f34e6fd..63d661215ec8cdf18d1343e337edf50bef6d1c6d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/permission.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/permission.js
@@ -49,7 +49,7 @@ router.beforeEach(async(to, from, next) => {
           // remove token and go to login page to re-login
           await store.dispatch('user/resetToken')
           Message.error(error || 'Has Error')
-          next(`/login?redirect=${to.path}`)
+          next(`/login?redirect=${to.fullPath}`)
           NProgress.done()
         }
       }
@@ -62,7 +62,7 @@ router.beforeEach(async(to, from, next) => {
       next()
     } else {
       // other pages that do not have permission to access are redirected to the login page.
-      next(`/login?redirect=${to.path}`)
+      next(`/login?redirect=${to.fullPath}`)
       NProgress.done()
     }
   }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js b/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
index cb8714b10d85630633025592c6af27b1918a2acb..5c371c905e90a107b5f45e02131d898fe9f0bf5a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/store/modules/permission.js
@@ -48,7 +48,6 @@ export function filterAsyncRoutes(routes, roles) {
  * @param routes
  */
 export function generaMenu(routes, data) {
-    // console.log('generaMenu');
     data.forEach(item => {
         // 如果不存在路由页面，那么不追究到路由中
         if (item.vue_component.length <= 0) return;
@@ -57,10 +56,9 @@ export function generaMenu(routes, data) {
             path: item.vue_path,
             component: (item.vue_component === 'Layout') ? Layout : (resolve) => require([`@/views/${item.vue_component}`], resolve),
             children: [],
-            // name: item.vue_name,
+            name: item.vue_name,
         };
 
-        // console.log(item);
         if (item.vue_path != '/') menu.meta = {
             icon: item.vue_icon,
             title: item.vue_name,
@@ -104,13 +102,9 @@ const actions = {
                 const {
                     data
                 } = response;
-                // console.log(data);
 
                 var pushRouter = [];
                 generaMenu(pushRouter, data);
-                // console.log('---pushRouter---');
-                // console.log(pushRouter);
-                // console.log('---pushRouter---');
                 commit('SET_ROUTES', pushRouter);
                 resolve(pushRouter);
             }).catch(error => {
diff --git a/app/Modules/Admin/Resources/vue-element-admin/utils/request.js b/app/Modules/Admin/Resources/vue-element-admin/utils/request.js
index 62ad6a420bcddbe2cc5a29b06dbafe2122a23562..7a9bd15e4eacc22e174d5c38bfe6629147f474d1 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/utils/request.js
+++ b/app/Modules/Admin/Resources/vue-element-admin/utils/request.js
@@ -8,19 +8,19 @@ import {
     getToken
 } from '@/utils/auth';
 
-console.log(process);
-console.log(process.env);
-console.log(process.env.VUE_APP_BASE_API);
+// console.log(process);
+// console.log(process.env);
+// console.log(process.env.VUE_APP_BASE_API);
 
 // process失效了，默认为当前URL为请求地址
 process.env.VUE_APP_BASE_API = window.location.origin + window.location.pathname;
-console.log(process.env.VUE_APP_BASE_API);
+// console.log(process.env.VUE_APP_BASE_API);
 
 // create an axios instance
 const service = axios.create({
     baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
     // withCredentials: true, // send cookies when cross-domain requests
-    timeout: 5000, // request timeout
+    timeout: 10000, // request timeout
     headers: {
         // 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8',
         "Content-Type": "application/json;charset=utf-8",
@@ -97,8 +97,6 @@ service.interceptors.response.use(
     },
     error => {
         console.log('err' + error); // for debug
-        console.log(error);
-        console.log(error.response); // for debug
         let msg = error.msg;
         if (error.response == undefined){
             msg = '超时 5000ms，请刷新！';
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 da8ef19baeb72edb1a9be9255eaa34db46039316..00fa56a3962c2e70b3138ebe149880823980f8c0 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
@@ -83,14 +83,12 @@
                 this.menus = 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/Resources/vue-element-admin/views/admin_menus/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/admin_menus/index.vue
index c4391c6ae02329638159a5ef6c9870b2299bc93f..014c730d4969f6d1be6c02d12f7f42ce3203fec4 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
@@ -171,7 +171,6 @@
             async getMenus() {
                 this.listLoading = true;
                 const {data} = await getMenus();
-                console.log(data);
 
                 this.list = data;
                 setTimeout(() => {
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 b822b23d4bad5bc715a89e2cadcfb3cd7940cbe1..c58e13a4b758e6f9b89fc36c29778408b2f56d9e 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
@@ -269,7 +269,6 @@
                 this.listLoading = true
                 const {data} = await getList(this.listQuery)
                 this.list = data.data
-                console.log(data)
                 this.total = data.total
                 setTimeout(() => {
                     this.listLoading = false
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 1ca1df0881ce3544130f29e8a71764b0574ebef7..4a4ecb8e62dfabc56da0a846ebebc356ac2903cd 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
@@ -316,14 +316,13 @@
                 this.getList()
             },
             async getList() {
-                this.listLoading = true
-                const {data} = await getList(this.listQuery)
-                this.list = data.data
-                console.log(data)
-                this.total = data.total
+                this.listLoading = true;
+                const {data} = await getList(this.listQuery);
+                this.list = data.data;
+                this.total = data.total;
                 setTimeout(() => {
-                    this.listLoading = false
-                }, 300)
+                    this.listLoading = false;
+                }, 300);
             },
             // 状态变更
             async changeStatus(row, value) {
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 beffdbe9a8c8b2103f880531f761022786ebc7f3..c4d3664b38da2f27044b0d43049da85d4ec5cdff 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
@@ -153,7 +153,6 @@
             async getMenus() {
                 this.listLoading = true;
                 const {data} = await getMenus();
-                console.log(data);
 
                 this.list = data;
                 setTimeout(() => {
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..b6431e1604ef42948629365f222b891b3c702331
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/components/detail.vue
@@ -0,0 +1,87 @@
+<template>
+    <el-dialog
+            :title="title"
+            :visible.sync="dialogFormVisible"
+            width="500px"
+            @close="close"
+    >
+        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form-item label="标签名称">
+                <el-input v-model.trim="form.label_name" autocomplete="off"/>
+            </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/article_labels';
+
+    export default {
+        name: 'articleLabelDetail',
+        components: {},
+        data() {
+            return {
+                form: {
+                    label_id: 0,
+                    label_name: '',
+                },
+                rules: {
+                    label_name: [
+                        {required: true, trigger: 'blur', message: '请输入标签名称'},
+                        {
+                            min: 2,
+                            max: 200,
+                            message: '长度在 2 到 200 个字符',
+                            trigger: 'blur'
+                        }
+                    ],
+                },
+                title: '',
+                dialogFormVisible: false,
+            }
+        },
+        created() {
+
+        },
+        methods: {
+            toggleShow() {
+                this.show = !this.show
+            },
+            showEdit(row) {
+                const detail = Object.assign({}, row);
+                if (!detail) {
+                    this.title = '添加';
+                } else {
+                    this.title = '编辑';
+                    this.form = Object.assign(this.form, detail);
+                }
+                this.dialogFormVisible = true;
+            },
+            close() {
+                this.$refs['form'].resetFields();
+                this.form = this.$options.data().form;
+                this.dialogFormVisible = false;
+            },
+            save() {
+                this.$refs['form'].validate(async (valid) => {
+                    console.log(valid);
+                    if (valid) {
+                        const {msg, status} = this.form.label_id ? await update(this.form) : await create(this.form);
+                        this.$message({
+                            message: msg,
+                            type: status == 1 ? 'success' : 'error',
+                        });
+                        this.$emit('fetchData');
+                        this.close();
+                    } else {
+                        return false;
+                    }
+                })
+            }
+        }
+    }
+</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6955db15c9a31ff8bc9cb4402ed977fd4d56c8bc
--- /dev/null
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/article_labels/index.vue
@@ -0,0 +1,198 @@
+<template>
+    <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"
+            />
+            <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="handleFilter">
+                {{ $t('table.search') }}
+            </el-button>
+            <el-button v-waves class="filter-item" type="danger" icon="el-icon-delete" @click="handleDelete">
+                {{ $t('table.batchDelete') }}
+            </el-button>
+            <el-button
+                    class="filter-item"
+                    style="margin-left: 10px;"
+                    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"
+                @selection-change="setSelectRows"
+                border
+                class="margin-buttom-10"
+        >
+            <el-table-column show-overflow-tooltip type="selection"/>
+            <el-table-column
+                    show-overflow-tooltip
+                    prop="label_id"
+                    label="Id"
+                    align="center"
+            />
+            <el-table-column
+                    show-overflow-tooltip
+                    prop="label_name"
+                    label="标签名称"
+                    align="center"
+            />
+            <el-table-column label="创建时间" show-overflow-tooltip align="center">
+                <template slot-scope="{ row }">
+                    {{ row.created_time | parseTime("{y}-{m}-{d} {h}:{i}") }}
+                </template>
+            </el-table-column>
+            <el-table-column
+                    fixed="right"
+                    label="操作"
+                    align="center"
+            >
+                <template v-slot="{row}">
+                    <!-- 编辑与删除 -->
+                    <el-button type="text" icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+                    <el-button type="text" icon="el-icon-delete" @click="handleDelete(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"
+        />
+        <!-- 详情 -->
+        <edit ref="edit" @fetchData="getList"/>
+    </div>
+</template>
+
+<script>
+    import {getList, setDel} from '@/api/article_labels';
+    import waves from '@/directive/waves' // waves directive
+    import Edit from './components/detail'
+    import {parseTime, getFormatDate} from '@/utils/index';
+
+    export default {
+        name: 'articleLabels',
+        components: {Edit},
+        directives: {waves},
+        filters: {
+            parseTime: parseTime,
+            getFormatDate: getFormatDate,
+        },
+        data() {
+            return {
+                is_batch: 0, // 默认不开启批量删除
+                list: [],
+                listLoading: true,
+                layout: 'total, sizes, prev, pager, next, jumper',
+                total: 0,
+                selectRows: '',
+                elementLoadingText: '正在加载...',
+                listQuery: {
+                    page: 1,
+                    limit: 10,
+                    search: '',
+                    is_check: ''
+                },
+                downloadLoading: false,
+            }
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+            setSelectRows(val) {
+                this.selectRows = val;
+                this.is_batch = 1;
+            },
+            handleEdit(row) {
+                if (row) {
+                    this.$refs['edit'].showEdit(row);
+                } else {
+                    this.$refs['edit'].showEdit({});
+                }
+            },
+            handleDelete(row) {
+                var ids = '';
+                if (row.label_id) {
+                    ids = row.label_id;
+                } else {
+                    if (this.selectRows.length > 0) {
+                        ids = this.selectRows.map((item) => item.label_id).join();
+                    } else {
+                        this.$message('未选中任何行', 'error');
+                        return false
+                    }
+                }
+
+                // 删除流程
+                this.$confirm(
+                    '你确定要删除操作吗？删除之后将无法恢复，请谨慎操作',
+                    'Warning',
+                    {
+                        confirmButtonText: 'Confirm',
+                        cancelButtonText: 'Cancel',
+                        type: 'warning'
+                    })
+                    .then(async () => {
+                        const {status, msg} = await setDel({label_id: ids, 'is_batch' : this.is_batch});
+
+                        switch (status) {
+                            case 1:
+                                this.getList();
+
+                                this.$message({
+                                    type: 'success',
+                                    message: msg
+                                });
+                                break;
+                            default:
+                                this.$message({
+                                    type: 'error',
+                                    message: msg
+                                });
+                                break;
+                        }
+
+                    })
+                    .catch(err => {
+                        console.error(err);
+                    })
+            },
+            handleSizeChange(val) {
+                this.listQuery.limit = val;
+                this.getList();
+            },
+            handleCurrentChange(val) {
+                this.listQuery.page = val
+                this.getList()
+            },
+            handleFilter() {
+                this.listQuery.page = 1
+                this.getList()
+            },
+            async getList() {
+                this.listLoading = true;
+                const {data} = await getList(this.listQuery);
+                this.list = data.data;
+                this.total = data.total;
+                setTimeout(() => {
+                    this.listLoading = false;
+                }, 300);
+            },
+        }
+    }
+</script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
index a0f5918cf8c30cf2bb3b27287daf662925796f57..039d3b7095cd1ea41c0a7a912813c848df63804d 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/articles/components/ArticleDetail.vue
@@ -10,19 +10,39 @@
 
             <div class="createPost-main-container">
                 <el-form-item prop="article_title" label="文章标题">
-                    <MDinput v-model="postForm.article_title" :maxlength="100" name="name" required>
+                    <MDinput v-model="postForm.article_title" :maxlength="100" required>
                         Title
                     </MDinput>
                 </el-form-item>
 
-                <el-form-item label="父级菜单">
-                    <el-select v-model="postForm.category_id" placeholder="请选择文章分类" autocomplete="off" class="article-textarea">
+                <el-form-item label="文章分类">
+                    <el-select
+                        v-model="postForm.category_id"
+                        clearable
+                        :placeholder="select_category_name"
+                        @clear="handleClear"
+                        ref="selectUpCategoryId"
+                    >
+                        <el-option hidden key="CategoryId" :value="postForm.category_id" :label="select_category_name"></el-option>
+                        <!-- show-checkbox -->
+                        <el-tree
+                            node-key="category_id"
+                            :default-checked-keys="[postForm.category_id]"
+                            :data="category"
+                            :props="defaultProps"
+                            @node-click="handleNodeClick"
+                        >
+                        </el-tree>
+                    </el-select>
+                </el-form-item>
+
+                <el-form-item label="文章标签">
+                    <el-select v-model="postForm.label_ids" placeholder="请选择文章标签" multiple>
                         <el-option
-                            v-for="item in category"
-                            :key="item.category_id"
-                            :checked="item.category_id == postForm.category_id"
-                            :label="item.category_name"
-                            :value="item.category_id"
+                            v-for="item in labels"
+                            :key="item.label_id"
+                            :label="item.label_name"
+                            :value="item.label_id"
                         />
                     </el-select>
                 </el-form-item>
@@ -123,6 +143,7 @@
 
     import {detail, create, update} from '@/api/articles'
     import {getCategorySelect} from "@/api/article_categories";
+    import {getArticleLabelSelect} from "@/api/article_labels";
 
     const defaultForm = {
         article_id: 0,
@@ -139,6 +160,7 @@
         is_public:0, // 是否公开
         article_origin:'', // 文章来源
         article_author:'', // 文章作者
+        label_ids: [], // 文章标签
     };
 
     export default {
@@ -203,7 +225,16 @@
                 image_url: '',
                 borderRadius:'initial',
 
+                labels: [], // 标签
+
+                checkCategories:[], // 默认选中的分类
+                default_select_category_name : '请选择文章分类',
+                select_category_name: '请选择文章分类',
                 category:[], // 分类
+                defaultProps: {
+                    children: '_child',
+                    label: 'category_name'
+                },
             }
         },
         computed: {
@@ -215,11 +246,28 @@
             },
         },
         created() {
-            console.log('Article-detail');
-            console.log(this.$route);
+            let _this = this;
+            // 因为下拉tree是需要先获取数据，进行数据对比，拿到当前选中的值，所以需要：获取文章详情之后，再去获取文章分类。
             if (this.isEdit) {
                 const article_id = this.$route.query && this.$route.query.article_id;
-                if (article_id > 0) this.getDetail(article_id);
+                if (article_id > 0) this.getDetail(article_id, function () {
+                    // 文章分类列表
+                    _this.getCategorySelect(function () {
+                        try{
+                            _this.category.forEach(item => {
+                                if(item.category_id == _this.postForm.category_id){
+                                    _this.select_category_name = item.category_name;
+                                    throw new Error("end……对比成功");//报错，就跳出循环
+                                }
+                            });
+                        }catch (e) {
+                            // console.log(e);
+                        }
+                    });
+                });
+            }else{
+                // 文章分类列表
+                this.getCategorySelect();
             }
 
             // Why need to make a copy of this.$route here?
@@ -229,30 +277,62 @@
 
             // 图片上传路径
             this.upload_url = getUploadUrl();
-            // 文章分类列表
-            this.getCategorySelect();
+            // 文章标签列表
+            this.getArticleLabelSelect();
         },
         methods: {
-            // 获取菜单列表
-            async getCategorySelect() {
-                const res = await getCategorySelect();
-                this.category = res.data;
+            // 获取文章标签列表
+            async getArticleLabelSelect(){
+                const res = await getArticleLabelSelect();
+                this.labels = res.data;
             },
             // 获取文章详情
-            getDetail(article_id) {
+            getDetail(article_id, callback) {
                 detail(article_id).then(response => {
-                    console.log(response);
+                    this.postForm = Object.assign(this.postForm, response.data);
+
+                    if (callback) callback();
 
-                    this.postForm = response.data;
                     // 默认展示的封面图
                     this.image_url = this.postForm.article_cover;
 
+                    if (this.postForm.labels){
+                        this.postForm.label_ids = [];
+                        for (const key in this.postForm.labels) {
+                            this.postForm.label_ids.push(this.postForm.labels[key].label_id);
+                        }
+                    }
+
+                    // 选中的分类
+                    this.checkCategories.push(this.postForm.category_id);
+
                     // set page title
                     this.setPageTitle();
                 }).catch(err => {
-                    console.log(err);
+                    // console.log(err);
                 })
             },
+            // 获取文章分类列表
+            async getCategorySelect(callback) {
+                const res = await getCategorySelect();
+                this.category = res.data;
+                if (callback) callback();
+            },
+            // 节点点击事件
+            handleNodeClick(data) {
+                // 这里主要配置树形组件点击节点后，设置选择器的值；自己配置的数据，仅供参考
+                this.select_category_name = data.category_name;
+                this.postForm.category_id = data.category_id;
+
+                // 选择器执行完成后，使其失去焦点隐藏下拉框的效果
+                this.$refs.selectUpCategoryId.blur();
+            },
+            // 选择器配置可以清空选项，用户点击清空按钮时触发
+            handleClear() {
+                // 将选择器的值置空
+                this.select_category_name = this.default_select_category_name;
+                this.listQuery.category_id = -1;
+            },
             setTagsViewTitle() {
                 const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article';
                 const route = Object.assign({}, this.tempRoute, {title: `${title}-${this.postForm.article_id}`});
@@ -263,7 +343,6 @@
                 document.title = `${title} - ${this.postForm.article_id}`;
             },
             submitForm() {
-                // console.log(this.postForm);
                 this.$refs.postForm.validate(async valid => {
                     if (valid) {
                         this.loading = true;
@@ -294,7 +373,7 @@
                 })
             },
             cropSuccess(imgDataUrl, field) {
-                console.log('-------- crop success --------', imgDataUrl, field);
+                // console.log('-------- crop success --------', imgDataUrl, field);
             },
             // 上传成功回调
             cropUploadSuccess(result, field) {
@@ -303,8 +382,8 @@
             },
             // 上传失败回调
             cropUploadFail(status, field) {
-                console.log('上传失败状态' + status);
-                console.log('field: ' + field);
+                // console.log('上传失败状态' + status);
+                // console.log('field: ' + field);
             },
         }
     }
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 69489e26e17487646bc3058459503e97d66f3ab6..f243969aeb6896dc836bb3738d38195d60caea4c 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
@@ -8,6 +8,26 @@
                 class="filter-item"
                 @keyup.enter.native="handleFilter"
             />
+
+            <el-select
+                class="filter-item"
+                v-model="listQuery.category_id"
+                clearable
+                :placeholder="select_category_name"
+                @clear="handleClear"
+                ref="selectUpCategoryId"
+            >
+                <el-option hidden key="CategoryId" :value="listQuery.category_id" :label="select_category_name"></el-option>
+                <el-tree
+                    :data="category"
+                    :props="defaultProps"
+                    :expand-on-click-node="false"
+                    :check-on-click-node="true"
+                    @node-click="handleNodeClick"
+                >
+                </el-tree>
+            </el-select>
+
             <el-select v-model="listQuery.is_check" placeholder="请选择启用状态" clearable class="filter-item">
                 <el-option
                     v-for="item in calendarCheckOptions"
@@ -17,6 +37,7 @@
                     :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>
@@ -25,7 +46,6 @@
             </el-button>
             <el-button
                 class="filter-item"
-                style="margin-left: 10px;"
                 type="primary"
                 icon="el-icon-plus"
                 @click="handleEdit"
@@ -44,14 +64,14 @@
             </el-button>
         </div>
 
-        <el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%">
+        <el-table v-loading="listLoading" :data="list" border fit highlight-current-row>
             <el-table-column align="center" label="Id">
                 <template slot-scope="{row}">
                     <span>{{ row.article_id }}</span>
                 </template>
             </el-table-column>
 
-            <el-table-column label="标题" min-width="150px" max-width="300px">
+            <el-table-column label="标题" align="center" min-width="150px" max-width="300px">
                 <template slot-scope="{row}">
                     <router-link :to="'./edit/'+row.article_id" class="link-type">
                         <span>{{ row.article_title }}</span>
@@ -177,9 +197,10 @@
 
 <script>
     import {getList, setDel, changeFiledStatus} from '@/api/articles';
+    import {getCategorySelect} from "@/api/article_categories"; // waves directive
     import Pagination from '@/components/Pagination'; // Secondary package based on el-pagination
     import waves from '@/directive/waves';
-    import {getFormatDate, parseTime} from "@/utils"; // waves directive
+    import {getFormatDate, parseTime} from "@/utils";
 
     const calendarCheckOptions = [
         {key: '-1', display_name: '全部'},
@@ -215,26 +236,39 @@
                 total: 0,
                 listLoading: true,
                 listQuery: {
+                    search: '',
+                    is_check: -1,
+                    category_id: -1,
                     page: 1,
                     limit: 20,
                 },
                 downloadLoading: false,
                 calendarCheckOptions,
+
+                category:[], // 分类
+                select_category_name: '请选择文章分类',
+                defaultProps: {
+                    children: '_child',
+                    label: 'category_name'
+                },
             }
         },
         created() {
+            // 文章列表
             this.getList();
+            // 文章分类列表
+            this.getCategorySelect();
         },
         methods: {
             handleFilter() {
                 this.listQuery.page = 1;
                 this.getList();
             },
+            // 文章列表
             async getList() {
                 this.listLoading = true;
                 const {data} = await getList(this.listQuery);
                 this.list = data.data;
-                console.log(data)
                 this.total = data.total;
                 this.listQuery.page = parseInt(data.current_page) + 1;
                 this.listQuery.limit = data.per_page || 10;
@@ -242,6 +276,26 @@
                     this.listLoading = false;
                 }, 300);
             },
+            // 获取文章分类列表
+            async getCategorySelect() {
+                const res = await getCategorySelect();
+                this.category = res.data;
+            },
+            // 节点点击事件
+            handleNodeClick(data) {
+                // 这里主要配置树形组件点击节点后，设置选择器的值；自己配置的数据，仅供参考
+                this.select_category_name = data.category_name;
+                this.listQuery.category_id = data.category_id;
+
+                // 选择器执行完成后，使其失去焦点隐藏下拉框的效果
+                this.$refs.selectUpCategoryId.blur();
+            },
+            // 选择器配置可以清空选项，用户点击清空按钮时触发
+            handleClear() {
+                // 将选择器的值置空
+                this.select_category_name = '请选择文章分类';
+                this.listQuery.category_id = -1;
+            },
             handleDelete(row) {
                 var ids = '';
                 if (row.article_id) {
@@ -279,12 +333,28 @@
             handleEdit(row) {
                 var query = {};
                 if (row.article_id) query.article_id = row.article_id;
-                console.log(query);
                 this.$router.push({
                     'path':`/articles/detail`,
                     'query': query,
                 });
             },
+            // 状态变更
+            async changeStatus(row, value, filed) {
+                const {data, msg, status} = await changeFiledStatus({
+                    'article_id': row.article_id,
+                    'change_field': filed,
+                    'change_value': value
+                });
+
+                // 设置成功之后，同步到当前列表数据
+                if (status == 1){
+                    row[filed] = value;
+                }
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+            },
             // 下载
             handleDownload() {
                 this.downloadLoading = true
@@ -327,23 +397,6 @@
                     })
                 )
             },
-            // 状态变更
-            async changeStatus(row, value, filed) {
-                const {data, msg, status} = await changeFiledStatus({
-                    'article_id': row.article_id,
-                    'change_field': filed,
-                    'change_value': value
-                });
-
-                // 设置成功之后，同步到当前列表数据
-                if (status == 1){
-                    row[filed] = value;
-                }
-                this.$message({
-                    message: msg,
-                    type: status == 1 ? 'success' : 'error',
-                });
-            },
         }
     }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
index c8d72769ea3abb6e12c3b340bef2436e66a65cb9..b5d31e764213daa5e21d3a287cb9929c77979863 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/components/detail.vue
@@ -123,11 +123,10 @@
                 this.show = !this.show
             },
             cropSuccess(imgDataUrl, field) {
-                console.log('-------- crop success --------', imgDataUrl, field)
+                // console.log('-------- crop success --------', imgDataUrl, field)
             },
             // 上传成功回调
             cropUploadSuccess(result, field) {
-                console.log(result);
                 this.image_url = result.path_url;
                 this.form.banner_cover = result.data;
             },
@@ -147,7 +146,6 @@
                     // 设置展示的图标
                     this.image_url = this.form.banner_cover;
                 }
-                console.log(this.form);
                 this.dialogFormVisible = true
             },
             close() {
@@ -157,7 +155,6 @@
             },
             save() {
                 this.$refs['form'].validate(async (valid) => {
-                    console.log(valid);
                     if (valid) {
                         const {msg, status} = this.form.banner_id ? await update(this.form) : await create(this.form);
                         this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
index 9b87b1b39ab5b12bfb0f9dc1e209beb67b07ede4..8eb4a6349439ac74b44ade83e6010a6166df89a4 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/banners/index.vue
@@ -57,6 +57,7 @@
                     show-overflow-tooltip
                     prop="banner_id"
                     label="Id"
+                    align="center"
             />
             <el-table-column
                     show-overflow-tooltip
@@ -319,7 +320,6 @@
                 this.listLoading = true
                 const {data} = await getList(this.listQuery)
                 this.list = data.data
-                console.log(data)
                 this.total = data.total
                 setTimeout(() => {
                     this.listLoading = false
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
index 29d740bbbd378bea060c4d059c37f8c099b1fa3a..a4a1908b09dc4ccb39bdfb08e8982188cf8504ff 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/components/ConfigDetail.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="createPost-container">
-        <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container">
+        <el-form ref="postForm" :model="postForm" :rules="rules" class="form-container" label-width="90px">
             <sticky :z-index="10" :class-name="'sub-navbar publish'">
                 <el-button v-loading="loading" style="margin-left: 10px;" type="success" @click="submitForm">
                     Publish
@@ -8,26 +8,55 @@
             </sticky>
 
             <div class="createPost-main-container">
-                <el-form-item prop="article_title" label-width="70px" label="文章标题:">
-                    <MDinput v-model="postForm.article_title" :maxlength="100" name="name" required>
+                <el-form-item label="配置标题:">
+                    <MDinput v-model="postForm.config_title" :maxlength="100" required>
                         Title
                     </MDinput>
+                    <span><i class="el-icon-info" />唯一标识</span>
                 </el-form-item>
 
-                <el-form-item label="父级菜单">
-                    <el-select v-model="postForm.category_id" placeholder="请选择文章分类" autocomplete="off" class="article-textarea">
+                <el-form-item label="配置名称:">
+                    <el-input v-model="postForm.config_name" required placeholder="Please enter the 关键字搜索"/>
+                    <span><i class="el-icon-info" />英文字符串</span>
+                </el-form-item>
+
+                <el-form-item label="配置分组：">
+                    <el-select
+                        v-model="postForm.config_group"
+                        placeholder="请选择配置分组">
+                        <el-option
+                            v-for="(item, key) in config_group_list"
+                            :key="item.value"
+                            :checked="item.value == postForm.config_group"
+                            :label="item.name+'('+item.value+')'"
+                            :value="item.value"
+                        />
+                    </el-select>
+                    <span><i class="el-icon-info" /> 用于区分展示列表</span>
+                </el-form-item>
+
+                <el-form-item label="配置类型：">
+                    <el-select
+                        v-model="postForm.config_type"
+                        placeholder="请选择配置类型">
                         <el-option
-                            v-for="item in category"
-                            :key="item.category_id"
-                            :checked="item.category_id == postForm.category_id"
-                            :label="item.category_name"
-                            :value="item.category_id"
+                            v-for="(item, key) in config_type_list"
+                            :key="item.value"
+                            :checked="item.value == postForm.config_type"
+                            :label="item.name+'('+item.value+')'"
+                            :value="item.value"
                         />
                     </el-select>
+                    <span><i class="el-icon-info" /> 系统会根据不同类型解析配置值</span>
+                </el-form-item>
+
+                <el-form-item label="配置值（数字）:" v-if="postForm.config_type == 2">
+                    <el-input v-model="config_value_number" :rows="1" type="number"
+                              autosize placeholder="Please enter the 配置值"/>
                 </el-form-item>
 
-                <el-form-item prop="article_cover" label="文章封面">
-                    <pan-thumb :image="image_url" @click="show=true"/>
+                <el-form-item label="配置值（图片）" v-else-if="postForm.config_type == 5">
+                    <pan-thumb :image="config_value_image" @click="show=true"/>
 
                     <el-button
                         id="img-btn"
@@ -35,7 +64,7 @@
                         icon="el-icon-upload"
                         @click="show=true"
                     >
-                        文章封面
+                        图片
                     </el-button>
 
                     <my-upload
@@ -54,26 +83,40 @@
                     />
                 </el-form-item>
 
-                <el-form-item label-width="70px" label="关键字:">
-                    <el-input v-model="postForm.article_keywords" :rows="1" type="textarea" class="article-textarea"
-                              autosize placeholder="Please enter the 关键字搜索"/>
+                <el-form-item label="配置值（富文本）:" v-else-if="postForm.config_type == 6">
+                    <markdown-editor v-model="config_value_markdown" height="400px" />
+                </el-form-item>
+
+                <el-form-item label="配置值（文本）:" v-else>
+                    <el-input v-model="config_value_text" :rows="1" type="textarea"
+                              autosize placeholder="Please enter the 配置值"/>
+                </el-form-item>
+
+                <el-form-item label="配置项:">
+                    <el-input v-model="postForm.config_extra" :rows="1" type="textarea"
+                              autosize placeholder="Please enter the 配置项"/>
+                    <span><i class="el-icon-info" /> 如果是枚举型，需要配置该项！</span>
                 </el-form-item>
 
-                <el-form-item label-width="70px" label="描述:">
-                    <el-input v-model="postForm.article_description" :rows="1" type="textarea" class="article-textarea"
-                              autosize placeholder="Please enter the 文章描述"/>
-                    <span v-show="contentShortLength" class="word-counter">{{ contentShortLength }}words</span>
+                <el-form-item label="排序">
+                    <el-input v-model.trim="postForm.config_sort" type="number" autocomplete="off"/>
+                    <span><i class="el-icon-info" /> 从小到大，升序 </span>
                 </el-form-item>
 
-                <el-form-item prop="article_content">
-                    <el-tag class="tag-title">
-                        文章内容:
-                    </el-tag>
-                    <markdown-editor v-model="postForm.article_content" height="400px" />
+                <el-form-item label="说明/备注">
+                    <el-input
+                        v-model="postForm.config_remark"
+                        :autosize="{maxRows: 200}"
+                        type="textarea"
+                        placeholder="备注"/>
+                    <span><i class="el-icon-info" /> 配置项的具体说明详情！</span>
                 </el-form-item>
 
-                <el-form-item label="排序" prop="article_sort">
-                    <el-input v-model.trim="postForm.article_sort" autocomplete="off"/>
+                <el-form-item label="是否启用：">
+                    <el-radio-group v-model="postForm.is_check">
+                        <el-radio :label="0" :checked="postForm.is_check == 0 ? 'checked' : ''">禁用</el-radio>
+                        <el-radio :label="1" :checked="postForm.is_check == 1 ? 'checked' : ''">启用</el-radio>
+                    </el-radio-group>
                 </el-form-item>
             </div>
         </el-form>
@@ -86,24 +129,24 @@
     import PanThumb from '@/components/PanThumb';
     import MDinput from '@/components/MDinput'
     import Sticky from '@/components/Sticky' // 粘性header组件
-    import {validURL} from '@/utils/validate'
     import {getUploadUrl} from '@/api/common';
-    import {detail, create, update} from '@/api/configs';
+    import {detail, create, update, getConfigGroupType} from '@/api/configs';
 
     const defaultForm = {
-        article_id: 0,
-        article_title: '', // 文章题目
-        category_id: 0, // 分类
-        article_content: '', // 文章内容
-        article_keywords: '', // 关键字
-        article_description: '', // 文章摘要
-        article_cover: '', // 封面图
-        article_link: '', // 文章外链
-        article_sort: 99, // 排序
+        config_id: 0,
+        config_title: '', // 配置标题
+        config_name: '', // 配置名称（英文）
+        config_group: 0, // 配置分组
+        config_type: 0, // 配置类型
+        config_value: '', // 配置值
+        config_extra: '', // 配置项
+        config_sort: 99, // 排序
+        config_remark: '', // 备注，说明
+        is_check: 0, // 是否弃用
     };
 
     export default {
-        name: 'ArticleDetail',
+        name: 'ConfigDetail',
         components: {MDinput, Sticky,
             'my-upload': myUpload,
             PanThumb,
@@ -127,32 +170,15 @@
                     callback();
                 }
                 return;
-            }
-            const validateSourceUri = (rule, value, callback) => {
-                if (value) {
-                    if (validURL(value)) {
-                        callback()
-                    } else {
-                        this.$message({
-                            message: '外链url填写不正确',
-                            type: 'error'
-                        })
-                        callback(new Error('外链url填写不正确'))
-                    }
-                } else {
-                    callback()
-                }
-            }
+            };
             return {
                 postForm: Object.assign({}, defaultForm),
                 loading: false,
                 userListOptions: [],
                 rules: {
-                    article_title: [{validator: validateRequire}],
-                    category_id: [{validator: validateRequire}],
-                    article_cover: [{validator: validateRequire}],
-                    article_content: [{validator: validateRequire}],
-                    article_link: [{validator: validateSourceUri, trigger: 'blur'}]
+                    config_title: [{validator: validateRequire}],
+                    config_name: [{validator: validateRequire}],
+                    config_value: [{validator: validateRequire}],
                 },
                 tempRoute: {},
                 // 图片上传
@@ -161,51 +187,55 @@
 
                 // 图片上传
                 upload_url: '',
-                image_url: '',
 
-                category:[], // 分类
+                // 分组与类型
+                config_group_list: [],
+                config_type_list:[],
+
+                // 配置值的几种情况
+                config_value_text: '',
+                config_value_number: '',
+                config_value_image: '',
+                config_value_markdown: '',
             }
         },
         computed: {
-            contentShortLength() {
-                return this.postForm.article_description.length;
-            },
             lang() {
                 return this.$store.getters.language;
             },
         },
         created() {
-            console.log('Article-detail');
-            console.log(this.$route);
             if (this.isEdit) {
-                const article_id = this.$route.query && this.$route.query.article_id;
-                if (article_id > 0) this.getDetail(article_id);
+                const config_id = this.$route.query && this.$route.query.config_id;
+                if (config_id > 0) this.getDetail(config_id);
             }
 
             // Why need to make a copy of this.$route here?
-            // Because if you enter this page and quickly switch tag, may be in the execution of the setTagsViewTitle function, this.$route is no longer pointing to the current page
             // https://github.com/PanJiaChen/vue-element-admin/issues/1221
             this.tempRoute = Object.assign({}, this.$route);
 
             // 图片上传路径
             this.upload_url = getUploadUrl();
-            // 文章分类列表
-            this.getCategorySelect();
+            // 获取分组与类型
+            this.getConfigGroupType();
         },
         methods: {
-            // 获取菜单列表
-            async getCategorySelect() {
-                const res = await getCategorySelect();
-                this.category = res.data;
+            // 获取 配置分组与类型
+            async getConfigGroupType(){
+                const {data} = await getConfigGroupType();
+                this.config_group_list = data.config_group_list;
+                this.config_type_list = data.config_type_list;
             },
             // 获取文章详情
-            getDetail(article_id) {
-                detail(article_id).then(response => {
-                    console.log(response);
+            getDetail(config_id) {
+                detail(config_id).then(response => {
 
                     this.postForm = response.data;
-                    // 默认展示的封面图
-                    this.image_url = this.postForm.article_cover;
+                    // 默认展示的封面图、文本、数字、富文本
+                    this.config_value_text =
+                    this.config_value_number =
+                    this.config_value_markdown =
+                    this.config_value_image = this.postForm.config_value;
 
                     // set page title
                     this.setPageTitle();
@@ -213,32 +243,42 @@
                     console.log(err);
                 })
             },
-            setTagsViewTitle() {
-                const title = this.lang === 'zh' ? '编辑文章' : 'Edit Article';
-                const route = Object.assign({}, this.tempRoute, {title: `${title}-${this.postForm.article_id}`});
-                this.$store.dispatch('tagsView/updateVisitedView', route);
-            },
             setPageTitle() {
-                const title = 'Edit Article';
-                document.title = `${title} - ${this.postForm.article_id}`;
+                const title = 'Edit Config';
+                document.title = `${title} - ${this.postForm.config_id}`;
             },
             submitForm() {
-                // console.log(this.postForm);
                 this.$refs.postForm.validate(async valid => {
                     if (valid) {
                         this.loading = true;
 
-                        const {msg, status} = this.postForm.article_id > 0 ? await update(this.postForm) : await create(this.postForm);
+                        // 按照对应的配置类型对配置值进行赋值
+                        switch (this.postForm.config_type) {
+                            case 2: // 数字
+                                this.postForm.config_value = this.config_value_number;
+                                break;
+                            case 5: // 图片
+                                this.postForm.config_value = this.config_value_image;
+                                break;
+                            case 6: // 富文本
+                                this.postForm.config_value = this.config_value_markdown;
+                                break;
+                            default:
+                                this.postForm.config_value = this.config_value_text;
+                                break;
+                        }
+
+                        const {msg, status} = this.postForm.config_id > 0 ? await update(this.postForm) : await create(this.postForm);
                         if (status == 1){
                             this.$notify({
-                                title: '成功',
-                                message: this.postForm.article_id > 0 ? '编辑文章成功' : '发布文章成功',
+                                title: this.postForm.config_id > 0 ? '编辑配置成功' : '新增配置成功',
+                                message: this.postForm.config_id > 0 ? '编辑配置成功' : '新增配置成功',
                                 type: 'success',
                                 duration: 2000,
                             });
 
                             // 返回文章列表
-                            this.$router.push(`/articles`);
+                            this.$router.push(`/configs`);
                         }else{
                             this.$message({
                                 message: msg,
@@ -254,12 +294,11 @@
                 })
             },
             cropSuccess(imgDataUrl, field) {
-                console.log('-------- crop success --------', imgDataUrl, field);
+                // console.log('-------- crop success --------', imgDataUrl, field);
             },
             // 上传成功回调
             cropUploadSuccess(result, field) {
-                this.image_url = result.path_url;
-                this.postForm.article_cover = result.data;
+                this.config_value_image = result.path_url;
             },
             // 上传失败回调
             cropUploadFail(status, field) {
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
index 24513cbbb11ea8851a9cad280ca05c203de83eac..c13527b868ccd18662e30d9cf65cf7da5c7c9cd6 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/detail.vue
@@ -9,7 +9,7 @@ export default {
   name: 'EditForm',
   components: { ConfigDetail },
     created() {
-        console.log('config-detail');
+
     },
 }
 </script>
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
index 50c78595e5c7bfdb6f9d3b7f77252f43e5bf695c..f52072c4be7162a18eda6193278b4dba0124b40c 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/configs/index.vue
@@ -36,12 +36,22 @@
                 v-waves
                 :loading="downloadLoading"
                 class="filter-item"
-                type="primary"
+                type="success"
                 icon="el-icon-download"
                 @click="handleDownload"
             >
                 {{ $t('table.export') }}
             </el-button>
+            <el-button
+                v-waves
+                :loading="downloadLoading"
+                class="filter-item"
+                type="warning"
+                icon="el-icon-refresh"
+                @click="pushRefresh"
+            >
+                同步配置文件
+            </el-button>
         </div>
 
         <el-table
@@ -58,6 +68,7 @@
                 show-overflow-tooltip
                 prop="config_id"
                 label="Id"
+                align="center"
             />
 
             <el-table-column
@@ -153,7 +164,7 @@
 </template>
 
 <script>
-    import {getList, setDel, changeFiledStatus} from '@/api/configs'
+    import {getList, setDel, changeFiledStatus, pushRefreshConfig} from '@/api/configs'
     import waves from '@/directive/waves' // waves directive
     import {parseTime} from '@/utils/index';
 
@@ -286,7 +297,6 @@
             handleEdit(row) {
                 var query = {};
                 if (row.config_id) query.config_id = row.config_id;
-                console.log(query);
                 this.$router.push({
                     'path':`/configs/detail`,
                     'query': query,
@@ -356,7 +366,6 @@
                 this.listLoading = true
                 const {data} = await getList(this.queryForm)
                 this.list = data.data
-                console.log(data)
                 this.total = data.total
                 setTimeout(() => {
                     this.listLoading = false
@@ -377,6 +386,20 @@
                     type: status == 1 ? 'success' : 'error',
                 });
             },
+            // 同步配置到文件中
+            async pushRefresh() {
+                this.listLoading = true;
+                const {msg, status} = await pushRefreshConfig();
+
+                this.$message({
+                    message: msg,
+                    type: status == 1 ? 'success' : 'error',
+                });
+
+                setTimeout(() => {
+                    this.listLoading = false;
+                }, 300);
+            },
         }
     }
 </script>
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 a0c819d7bd1cfa62b0aa900aac6a0a822651716f..aedc29713c19df74275e40d0e110662e3db233f6 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
@@ -55,7 +55,7 @@
             }
         },
         created() {
-            console.log(this.skill);
+
         },
         computed: {
             ...mapGetters([
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
index 45b8110fe5a16c629536ff5822e5ebb4b359630e..36e4a851008d57c1af7d005d5297180ca7dfd81e 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/LineMarker.vue
@@ -44,7 +44,6 @@
         },
         methods: {
             initChart(){
-                console.log('initChart');
                 this.logsStatistics();
 
                 // 定时多少秒触发一次：默认3分钟
@@ -53,14 +52,8 @@
                 }, 1000 * 60 * 3);
             },
             async logsStatistics() {
-                console.log('load - logsStatistics');
                 const {data} = await logsStatistics();
 
-                // console.log(data);
-                // console.log('data.list_name' + data.list_name);
-                // console.log('data.xAxis.data' + data.xAxis.data);
-                // console.log('data.data_lists' + data.data_lists);
-
                 this.chart = echarts.init(document.getElementById(this.id));
                 this.chart.setOption({
                     backgroundColor: '#394056',
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PieChart.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PieChart.vue
index 3865f8e3d846c4e8616a47e38335f93b3e3fad35..e43bc985e030e5b817ddd927f431e96db1fba5c4 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PieChart.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/PieChart.vue
@@ -44,9 +44,6 @@
             //当 skill 属性的值发生改变时会执行下面的代码
             server_data: function (newValue, oldValue) {
                 this.server_data = newValue;
-                console.log('watch - server_data');
-                console.log(this.server_data);
-                console.log(this.server_data[this.select_type]);
 
                 this.changeData();
             },
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/Timeline.vue b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/Timeline.vue
index 3586d8c26b46f855898b46dc844991e4c323a31e..f5589a6179a600d1486be3b31645491230671221 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/Timeline.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/dashboard/admin/components/Timeline.vue
@@ -45,7 +45,7 @@
             }
         },
         created() {
-            console.log(this.logs);
+
         },
     }
 </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 f2821edab1ef18ab08c40cb80ba3cff1d3688e1c..9b748403f31abaa2a054af511cea0592e3026327 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
@@ -148,8 +148,6 @@
             }
         },
         created() {
-            console.log('index-created');
-
             // 首页 - 统计信息
             this.statistics();
 
@@ -169,9 +167,6 @@
                 const {data} = await statistics();
                 this.data = data;
 
-                // console.log(data);
-                // console.log(this.data);
-
                 // 技能
                 this.skill = data.skill;
 
@@ -188,7 +183,6 @@
             async getServerStatus(){
                 const {data} = await getServerStatus();
                 this.server_data = data;
-                console.log(this.server_data);
             },
             // 定时：服务器状态信息
             timedRequestServerStatus(){
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
index cdfc71b18bca0023845122197775aeea6ec4ed64..940df5c510560540cbcacf10faa848fc24582fec 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/dropzone.vue
@@ -18,11 +18,9 @@ export default {
   components: { Dropzone },
   methods: {
     dropzoneS(file) {
-      console.log(file)
       this.$message({ message: 'Upload success', type: 'success' })
     },
     dropzoneR(file) {
-      console.log(file)
       this.$message({ message: 'Delete success', type: 'success' })
     }
   }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
index 876db002162140792dbd6d7bc40a66e4f829e72a..f2195032e4d25f70aa5089b3b1d199bdd4f728ba 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/demo/components-demo/markdown.vue
@@ -85,7 +85,6 @@ export default {
   methods: {
     getHtml() {
       this.html = this.$refs.markdownEditor.getHtml()
-      console.log(this.html)
     }
   }
 }
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
index 21f9f17ef82d512ef221a7d97e8ab36195edd098..4538416e82fb02cd1e1a0d3eb03c4b6e3aecf95a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/components/detail.vue
@@ -123,11 +123,10 @@
                 this.show = !this.show
             },
             cropSuccess(imgDataUrl, field) {
-                console.log('-------- crop success --------', imgDataUrl, field)
+                // console.log('-------- crop success --------', imgDataUrl, field)
             },
             // 上传成功回调
             cropUploadSuccess(result, field) {
-                console.log(result);
                 this.image_url = result.path_url;
                 this.form.link_cover = result.data;
             },
@@ -148,7 +147,6 @@
                     // 设置展示的图标
                     this.image_url = this.form.link_cover;
                 }
-                console.log(this.form);
                 this.dialogFormVisible = true
             },
             close() {
@@ -158,7 +156,6 @@
             },
             save() {
                 this.$refs['form'].validate(async (valid) => {
-                    console.log(valid);
                     if (valid) {
                         const {msg, status} = this.form.link_id ? await update(this.form) : await create(this.form);
                         this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
index cacf1d33788192beb0cc53884a7b5470a8c4faf6..4f8d736ee0536e3ff718c14c2f627f944e8e538a 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/friendlinks/index.vue
@@ -57,6 +57,7 @@
                     show-overflow-tooltip
                     prop="link_id"
                     label="Id"
+                    align="center"
             />
             <el-table-column
                     show-overflow-tooltip
@@ -193,7 +194,6 @@
         },
         methods: {
             handleDownload() {
-                console.log(getFormatDate());
                 this.downloadLoading = true;
                 import('@/vendor/Export2Excel').then((excel) => {
                     const tHeader = [
@@ -232,7 +232,6 @@
                                 return this.checkFilter(v[j]);
                                 break;
                             case 'link_cover':
-                                console.log(v.cover);
                                 return v.cover.file_path;
                                 break;
                             default:
@@ -320,7 +319,6 @@
                 this.listLoading = true;
                 const {data} = await getList(this.listQuery);
                 this.list = data.data;
-                console.log(data);
                 this.total = data.total;
                 setTimeout(() => {
                     this.listLoading = false;
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/versions/components/detail.vue b/app/Modules/Admin/Resources/vue-element-admin/views/versions/components/detail.vue
index 2962e6f2c4e8fd12e5816faeaeb3380a6455ffc7..28725e8cae02e014158d9d4c97e3c3d64d30db68 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/versions/components/detail.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/versions/components/detail.vue
@@ -2,7 +2,7 @@
     <el-dialog
             :title="title"
             :visible.sync="dialogFormVisible"
-            width="500px"
+            width="800px"
             @close="close"
     >
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -93,7 +93,6 @@
                     this.title = '编辑';
                     this.form = Object.assign(this.form, detail);
                 }
-                console.log(this.form);
                 this.dialogFormVisible = true
             },
             close() {
@@ -103,7 +102,6 @@
             },
             save() {
                 this.$refs['form'].validate(async (valid) => {
-                    console.log(valid);
                     if (valid) {
                         const {msg, status} = this.form.version_id ? await update(this.form) : await create(this.form);
                         this.$message({
diff --git a/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue b/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
index 9666dd2bc8438cf0299a76e9bd976cb77b277111..c0a8e57c82a3d0d7ad128defcda5bb75e2c3a423 100644
--- a/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
+++ b/app/Modules/Admin/Resources/vue-element-admin/views/versions/index.vue
@@ -48,6 +48,7 @@
                     show-overflow-tooltip
                     prop="version_id"
                     label="Id"
+                    align="center"
             />
 
             <el-table-column
@@ -256,7 +257,6 @@
                 this.listLoading = true;
                 const {data} = await getList(this.listQuery);
                 this.list = data.data;
-                // console.log(data);
                 this.total = data.total;
                 setTimeout(() => {
                     this.listLoading = false;
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index e3ebfbfe72c90b06171d20ecbccf4210c48ee07c..e4a3e264b912ee110d215d5a03cfed8dbada3dcd 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -16,7 +16,8 @@ use App\Modules\Admin\Http\Middleware\CheckAuth;
 use App\Modules\Admin\Http\Middleware\CheckRabc;
 use App\Modules\Admin\Http\Middleware\AdminLog;
 
-Route::prefix('admin')->group(function() {
+Route::prefix('admin')
+    ->group(function() {
 //    Route::get('/', 'AdminController@index');
     //后台管理路由
     Route::get('/', function(){
@@ -60,10 +61,13 @@ Route::prefix('admin')->group(function() {
             // 配置管理
             Route::prefix('configs')->group(function() {
                 Route::get('/', 'System\ConfigController@index');
+                Route::get('/detail', 'System\ConfigController@detail');
                 Route::post('/create', 'System\ConfigController@create');
                 Route::put('/update', 'System\ConfigController@update');
                 Route::delete('/delete', 'System\ConfigController@delete');
                 Route::put('/changeFiledStatus', 'System\ConfigController@changeFiledStatus');
+                Route::get('/getConfigGroupType', 'System\ConfigController@getConfigGroupType')->withoutMiddleware([CheckRabc::class]);
+                Route::put('/pushRefreshConfig', 'System\ConfigController@pushRefreshConfig');
             });
 
             // 友情链接
@@ -139,6 +143,15 @@ Route::prefix('admin')->group(function() {
                 Route::put('/changeFiledStatus', 'Article\ArticleCategoryController@changeFiledStatus');
             });
 
+            // 文章标签
+            Route::prefix('article_labels')->group(function() {
+                Route::get('/', 'Article\ArticleLabelController@index');
+                Route::post('/create', 'Article\ArticleLabelController@create');
+                Route::put('/update', 'Article\ArticleLabelController@update');
+                Route::delete('/delete', 'Article\ArticleLabelController@delete');
+                Route::get('/getSelectLists', 'Article\ArticleLabelController@getSelectLists');
+            });
+
             // 文章管理
             Route::prefix('articles')->group(function() {
                 Route::get('/', 'Article\ArticleController@index');
diff --git a/app/Modules/Admin/Services/ArticleCategoryService.php b/app/Modules/Admin/Services/ArticleCategoryService.php
index b37514db5f51ecfb21b06d7fef7d690ad842f03d..eeab371d811edcb4afc752b30db3c9d6f5f51daf 100644
--- a/app/Modules/Admin/Services/ArticleCategoryService.php
+++ b/app/Modules/Admin/Services/ArticleCategoryService.php
@@ -13,13 +13,47 @@ class ArticleCategoryService extends BaseService
 
     public function lists(array $params) : array
     {
-        $lists = $this->model->orderBy('category_sort', 'ASC')->get();
-
-        return list_to_tree($lists->toArray(), 'category_id');
+        return $this->model->getSelectLists();
     }
 
     public function getSelectLists($request)
     {
         return $this->model->getSelectLists();
     }
+
+    public function create(array $params)
+    {
+        $result = parent::create($params); // TODO: Change the autogenerated stub;
+
+        $this->model->delCache();
+
+        return $result;
+    }
+
+    public function update(array $params)
+    {
+        $result = parent::update($params); // TODO: Change the autogenerated stub;
+
+        $this->model->delCache();
+
+        return $result;
+    }
+
+    public function delete(array $params)
+    {
+        parent::delete($params); // TODO: Change the autogenerated stub;
+
+        $this->model->delCache();
+
+        return true;
+    }
+
+    public function changeFiledStatus(array $params)
+    {
+        $result = parent::changeFiledStatus($params); // TODO: Change the autogenerated stub;
+
+        $this->model->delCache();
+
+        return $result;
+    }
 }
diff --git a/app/Modules/Admin/Services/ArticleLabelService.php b/app/Modules/Admin/Services/ArticleLabelService.php
new file mode 100644
index 0000000000000000000000000000000000000000..7bc7fec7fdb72d40f0a6f55e79a7f197cf0204db
--- /dev/null
+++ b/app/Modules/Admin/Services/ArticleLabelService.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Modules\Admin\Services;
+
+use App\Modules\Admin\Entities\Article\ArticleLabel;
+
+class ArticleLabelService extends BaseService
+{
+    public function __construct(ArticleLabel $article)
+    {
+        $this->model = $article;
+    }
+
+    public function lists(array $params): array
+    {
+        $params['where_callback'] = function($query) use ($params){
+            $request = request();
+            // 按照名称进行搜索
+            if (!empty($search = $request->input('search', ''))){
+                $query->where('label_name', 'LIKE', '%' . trim($search) . '%');
+            }
+        };
+        return parent::lists($params); // TODO: Change the autogenerated stub
+    }
+
+    public function getSelectLists($request)
+    {
+        return $this->model->where(function($query) use ($request){
+            $search = $request->input('search', '');
+            // 可以按照名称进行搜索
+            if (!empty($search)){
+                $query->where('label_name', 'LIKE', '%' . trim($search) . '%');
+            }
+        })->orderBy($this->model->getKeyName(), 'ASC')->limit(100)->get();
+    }
+}
diff --git a/app/Modules/Admin/Services/ArticleService.php b/app/Modules/Admin/Services/ArticleService.php
index 9de692489cd3f1f34b301dedd088b282ed2bf5b0..f0420f88f51572e3b63bc0eeacbb02d14924509d 100644
--- a/app/Modules/Admin/Services/ArticleService.php
+++ b/app/Modules/Admin/Services/ArticleService.php
@@ -2,7 +2,11 @@
 
 namespace App\Modules\Admin\Services;
 
+use App\Exceptions\Exception;
 use App\Modules\Admin\Entities\Article\Article;
+use App\Modules\Admin\Entities\Article\ArticleCategory;
+use App\Modules\Admin\Entities\Article\ArticleWithLabel;
+use Illuminate\Support\Facades\DB;
 
 class ArticleService extends BaseService
 {
@@ -10,6 +14,7 @@ class ArticleService extends BaseService
     {
         $this->model = $article;
         $this->with = ['category'];
+        $this->detailWith = ['labels'];
     }
 
     public function lists(array $params) : array
@@ -23,10 +28,11 @@ class ArticleService extends BaseService
                     ->whereOr('article_keywords', 'LIKE', $search . '%')
                     ->whereOr('article_description', 'LIKE', $search . '%');
             }
-            // 文章分类
+            // 文章分类：包含所有子集的分类筛选
             $category_id = $request->input('category_id', -1);
             if ($category_id > -1){
-                $query->where('category_id', '=', $category_id);
+                $category_ids = ArticleCategory::getInstance()->getChildIds((int)$category_id);
+                $query->whereIn('category_id', $category_ids);
             }
             // 置顶
             $set_top = $request->input('set_top', -1);
@@ -46,4 +52,53 @@ class ArticleService extends BaseService
         };
         return parent::lists($params); // TODO: Change the autogenerated stub
     }
+
+    public function create(array $params)
+    {
+        DB::beginTransaction();
+        try{
+            parent::create($params); // TODO: Change the autogenerated stub
+
+            $this->setArticleLabels($params);
+
+            DB::commit();
+            return true;
+        }catch (Exception $exception){
+            DB::rollBack();
+            return false;
+        }
+    }
+
+    public function update(array $params)
+    {
+        DB::beginTransaction();
+        try{
+            parent::update($params); // TODO: Change the autogenerated stub
+
+            $this->setArticleLabels($params);
+
+            DB::commit();
+            return true;
+        }catch (Exception $exception){
+            DB::rollBack();
+            return false;
+        }
+    }
+
+    private function setArticleLabels($params)
+    {
+        if (isset($params['label_ids'])){
+            $articleWithLabel = ArticleWithLabel::getInstance();
+            $article_id = $this->detail->{$this->model->getKeyName()};
+            // 先删除全部的标签
+            $articleWithLabel->where('article_id', $article_id)->delete();
+            // 关联标签录入
+            foreach ($params['label_ids'] as $label){
+                $articleWithLabel->create([
+                    'label_id' => $label,
+                    'article_id' => $article_id,
+                ]);
+            }
+        }
+    }
 }
diff --git a/app/Modules/Admin/Services/BaseService.php b/app/Modules/Admin/Services/BaseService.php
index f1c8dc6be7989054580d8aef6a30d15da130147f..1e97e167492dc581567863c64af5bec499a08d3a 100644
--- a/app/Modules/Admin/Services/BaseService.php
+++ b/app/Modules/Admin/Services/BaseService.php
@@ -10,6 +10,7 @@ class BaseService extends Service
     protected $model;
     protected $with = [];
     protected $detail;
+    protected $detailWith = [];
 
     /**
      * 列表分页数据
@@ -48,7 +49,7 @@ class BaseService extends Service
     public function detail($request)
     {
         $id = $request->input($this->model->getKeyName(), 0);
-        return $this->model->detail($id);
+        return $this->model->detail($id, '*', false, $this->detailWith);
     }
 
     /**
diff --git a/app/Modules/Admin/Services/ConfigService.php b/app/Modules/Admin/Services/ConfigService.php
index 316975e4c15e731cdf4071b22d914c6c9fe4bca7..20f27f145e535f990e3e3253ee0f898826962c55 100644
--- a/app/Modules/Admin/Services/ConfigService.php
+++ b/app/Modules/Admin/Services/ConfigService.php
@@ -30,4 +30,14 @@ class ConfigService extends BaseService
         $params['order_sort'] = 'ASC';
         return parent::lists($params); // TODO: Change the autogenerated stub
     }
+
+    /**
+     * 同步配置
+     *
+     * @return mixed
+     */
+    public function pushRefreshConfig()
+    {
+        return $this->model->pushRefreshConfig();
+    }
 }
diff --git a/config/cnpscy.php b/config/cnpscy.php
new file mode 100644
index 0000000000000000000000000000000000000000..610f427c4033b0fa7ab7277dd7643960e31612b4
--- /dev/null
+++ b/config/cnpscy.php
@@ -0,0 +1,67 @@
+<?php return array (
+  'site_web_title' => '小丑路人博客',
+  'site_web_author' => '小丑路人',
+  'site_web_keywords' => '小丑路人,小丑,路人,小丑疯狂吧,小丑博客,博客,laravel,yii,mysql',
+  'site_web_description' => '小丑路人,小丑,路人,小丑疯狂吧,小丑博客,博客,laravel,yii,mysql',
+  'site_web_site_icp' => '晋ICP备18007574号-1',
+  'site_web_logo' => '/static/blog.jpg',
+  'START_API_LOGS' => '1',
+  'ARTICLE_CACHE_TIME' => '60',
+  'WEB_SITE_CLOSE' => '1',
+  'config_group_list' => 
+  array (
+    0 => '不分组',
+    1 => '基本',
+    2 => '内容',
+    3 => '用户',
+    4 => '系统',
+    5 => '博主',
+    6 => '开发者',
+    7 => '网站后台',
+    8 => 'JWT',
+    9 => '小丑社区配置',
+    10 => '数据库',
+  ),
+  'config_type_list' => 
+  array (
+    0 => '字符串',
+    1 => '文本',
+    2 => '数字',
+    3 => '数组',
+    4 => '枚举',
+    5 => '图片',
+  ),
+  'web_detault_show_img' => '/static/blog.jpg',
+  'web_url' => '',
+  'api_admin_prefix' => 'admin',
+  'web_admin_title' => '小丑路人博客后台管理',
+  'web_admin_keywords' => '小丑路人博客后台',
+  'web_admin_description' => '小丑路人博客后台',
+  'menu_type_list' => 
+  array (
+    0 => '作为频道页，不可作为栏目发布文章',
+    1 => '不直接发布内容，用于跳转页面',
+    2 => '作为发布栏目，文章列表模式',
+    3 => '单页面模式，例如企业简介',
+  ),
+  'admin_prefix' => 'cnpscy_blog_admin',
+  'ADMIN_VIEWS' => '/_admin/',
+  'privateKey' => '&lt;&lt;&lt;EOD-----BEGIN RSA PRIVATE KEY-----MIICXAIBAAKBgQC8kGa1pSjbSYZVebtTRBLxBz5H4i2p/llLCrEeQhta5kaQu/RnvuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t0tyazyZ8JXw+KgXTxldMPEL95+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4ehde/zUxo6UvS7UrBQIDAQABAoGAb/MXV46XxCFRx',
+  'publicKey' => '&lt;&lt;&lt;EOD-----BEGIN PUBLIC KEY-----MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC8kGa1pSjbSYZVebtTRBLxBz5H4i2p/llLCrEeQhta5kaQu/RnvuER4W8oDH3+3iuIYW4VQAzyqFpwuzjkDI+17t5t0tyazyZ8JXw+KgXTxldMPEL95+qVhgXvwtihXC1c5oGbRlEDvDF6Sa53rcFVsYJ4ehde/zUxo6UvS7UrBQIDAQ',
+  'jwt_leeway' => '60',
+  'jwt_token_name' => 'cnpscy-token',
+  'return_jwt_token_name' => 'jwt_token',
+  'server_user_unqiue' => 'login-user-id',
+  'start_api_logs' => '1',
+  'start_admin_operation_logs' => '1',
+  'resource_version_number' => '20200410',
+  'admin_default_pass' => '123456',
+  'web_cdn_address' => '',
+  'cnpscy_version_number' => 'v1.0',
+  'system_timezone' => 'Asia/Shanghai',
+  'forbiddenip' => '',
+  'languages' => '',
+  'admin_menu_session_unique' => 'rabc_menus_list',
+  'admin_info_session_unique' => 'admin_info',
+  'admin_rabc_session_unique' => 'admin_rabc',
+);
\ No newline at end of file