blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2020-10-21 17:44:57 +08:00
parent dbcf19263b
commit aa79134198
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/admin/controller/api/Plugs.php
View File

@ -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;

2
app/data/service/NewsService.php
View File

@ -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';

2
vendor/composer/ClassLoader.php vendored
View File

@ -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();

2
vendor/services.php vendored
View File

@ -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',