From aa7913419817d985451cb8c3e0bc3e74c75624f3 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 21 Oct 2020 17:44:57 +0800
Subject: [PATCH] ComposerUpdate

---
 app/admin/controller/api/Plugs.php | 1 -
 app/data/service/NewsService.php   | 2 +-
 vendor/composer/ClassLoader.php    | 2 +-
 vendor/services.php                | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/api/Plugs.php b/app/admin/controller/api/Plugs.php
index a01a66266..23502da44 100644
--- a/app/admin/controller/api/Plugs.php
+++ b/app/admin/controller/api/Plugs.php
@@ -17,7 +17,6 @@ namespace app\admin\controller\api;
 
 use think\admin\Controller;
 use think\admin\service\AdminService;
-use think\admin\service\ProcessService;
 use think\admin\service\SystemService;
 use think\exception\HttpResponseException;
 
diff --git a/app/data/service/NewsService.php b/app/data/service/NewsService.php
index 9e3154d12..8e1d9e013 100644
--- a/app/data/service/NewsService.php
+++ b/app/data/service/NewsService.php
@@ -42,7 +42,7 @@ class NewsService extends Service
             $cols = 'id,name,cover,mark,status,deleted,create_at,num_like,num_read,num_comment,num_collect';
             $items = $this->app->db->name('DataNewsItem')->whereIn('id', $cids)->column($cols, 'id');
             $marks = $this->app->db->name('DataNewsMark')->where(['status' => 1])->column('name');
-            foreach ($items as &$vo) $vo['mark'] = mark_str_2_arr($vo['mark'] ?: '', ',', $marks);
+            foreach ($items as &$vo) $vo['mark'] = mark_string_array($vo['mark'] ?: '', ',', $marks);
             /*! 绑定会员数据 */
             $mids = array_unique(array_column($list, 'mid'));
             $cols = 'id,phone,nickname,username,headimg,status';
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index fce8549f0..03b9bb9c4 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', $this->prefixesPsr0);
+            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
         }
 
         return array();
diff --git a/vendor/services.php b/vendor/services.php
index b0ab7d9be..a4454d1bf 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-10-21 09:38:54
+// This file is automatically generated at:2020-10-21 17:44:27
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',