diff --git a/application/project/controller/Organization.php b/application/project/controller/Organization.php index a6c8a70..1364b65 100644 --- a/application/project/controller/Organization.php +++ b/application/project/controller/Organization.php @@ -30,7 +30,7 @@ class Organization extends BasicApi $organizationList = []; if ($list) { foreach ($list as $item) { - $organization = $this->model->where(['code' => $item['organization_code']])->field('id', true)->find()->toArray(); + $organization = $this->model->where(['code' => $item['organization_code']])->field('id', true)->find(); if ($organization) { $organizationList[] = $organization; } diff --git a/application/project/middleware/Auth.php b/application/project/middleware/Auth.php index eb831c8..06b1717 100644 --- a/application/project/middleware/Auth.php +++ b/application/project/middleware/Auth.php @@ -71,17 +71,19 @@ class Auth if (!empty($access['is_auth']) && !auth($node, 'project')) { return json(['code' => 403, 'msg' => '无权限操作资源,访问被拒绝']); } - //第三资源初始化 $storageConfig = config('storage.'); - if ($storageConfig) { - foreach ($storageConfig as $key => $config) { - if ($key == 'qiniu' || $key == 'oss') { - foreach ($config as $itemKey => $item) { - sysconf($itemKey, $item); + if ($storageConfig['init']) { + unset($storageConfig['init']); + if ($storageConfig) { + foreach ($storageConfig as $key => $config) { + if ($key == 'qiniu' || $key == 'oss') { + foreach ($config as $itemKey => $item) { + sysconf($itemKey, $item); + } + } else { + sysconf($key, $config); } - } else { - sysconf($key, $config); } } } diff --git a/config/storage.php b/config/storage.php index 4a53295..73a71a5 100644 --- a/config/storage.php +++ b/config/storage.php @@ -1,6 +1,7 @@ false, 'storage_type' => 'local', //local:本地,qiniu:七牛,oss:阿里云oss 'storage_local_exts' => 'png,jpg,rar,doc,icon,mp4,zip,gif,jpeg,bmp,webp,mp4,m3u8,rmvb,avi,swf,3gp,mkv,flv,txt,docx,pages,epub,pdf,numbers,csv,xls,xlsx,keynote,ppt,pptx,mp3,wav,wma,ogg,aac,flac;', //支持上传的文件格式 // 可用的第三方资源配置