panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: plugin install error

Browse Source
This commit is contained in:
Ying
2022-08-20 13:50:27 +08:00
parent 7c55bf1b59
commit 7ceee7533b
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/admin/controller/system/Plugin.php
View File

@@ -13,6 +13,7 @@ declare (strict_types=1);
namespace app\admin\controller\system; namespace app\admin\controller\system;
use GuzzleHttp\Exception\TransferException;
use system\File; use system\File;
use system\Http; use system\Http;
use system\ZipArchives; use system\ZipArchives;
@@ -35,6 +36,12 @@ class Plugin extends AdminController
*/ */
protected $limit = 500; protected $limit = 500;
/**
* 错误信息
* @var array
*/
static $errData = [];
/** /**
* 获取本地插件列表 * 获取本地插件列表
* @return \support\Response * @return \support\Response
@@ -82,7 +89,7 @@ class Plugin extends AdminController
self::enabled($name); self::enabled($name);
} catch (\Throwable $th) { } catch (\Throwable $th) {
recursive_delete($pluginPath); recursive_delete($pluginPath);
return $this->error($th->getMessage()); return $this->error($th->getMessage(), null, self::$errData, $th->getCode());
} }
return $this->success('插件安装成功', null, get_plugin_config($name, true)); return $this->success('插件安装成功', null, get_plugin_config($name, true));
@@ -176,7 +183,7 @@ class Plugin extends AdminController
self::executeSql($name); self::executeSql($name);
self::enabled($name); self::enabled($name);
} catch (\Throwable $th) { } catch (\Throwable $th) {
return $this->error($th->getMessage(), null, null, $th->getCode()); return $this->error($th->getMessage(), null, self::$errData, $th->getCode());
} }
return $this->success('插件更新成功', null, $data); return $this->success('插件更新成功', null, $data);
@@ -319,16 +326,20 @@ class Plugin extends AdminController
$query = get_plugin_query(); $query = get_plugin_query();
$response = Http::get($query, $extends); $response = Http::get($query, $extends);
$body = json_decode($response, true); $body = json_decode($response, true);
$url = $body['data']['url'] ?: ''; $url = '';
if (isset($body['data']['url'])) {
$url = $body['data']['url'];
}
if (!empty($url) && stristr($url, 'download')) { if (!empty($url) && stristr($url, 'download')) {
$content = Http::get($url); $content = Http::get($url);
$filePath = plugin_path() . $name . '.zip'; $filePath = plugin_path() . $name . '.zip';
write_file($filePath, $content); write_file($filePath, $content);
} else { } else {
throw new \Exception($body['msg'], $body['code'], $body['data']); self::$errData = $body['data'];
throw new \Exception($body['msg'], $body['code']);
} }
} catch (\Throwable $th) { } catch (TransferException $th) {
throw new \Exception(__("安装包下载失败"), -111); throw new \Exception(__("安装包下载失败"), -111);
} }
@@ -383,5 +394,4 @@ class Plugin extends AdminController
} }
return $pluginList; return $pluginList;
} }
} }