From 5eaf05e0de6b477cd59f19ef940a6c1b18e62772 Mon Sep 17 00:00:00 2001 From: Ying Date: Sat, 5 Aug 2023 16:23:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmysql=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E8=BF=87=E6=BB=A4=E5=AF=BC=E8=87=B4=E5=AE=89=E8=A3=85?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/system/Plugin.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/system/Plugin.php b/app/admin/controller/system/Plugin.php index c7f029d..c435897 100644 --- a/app/admin/controller/system/Plugin.php +++ b/app/admin/controller/system/Plugin.php @@ -388,15 +388,20 @@ class Plugin extends AdminController $pluginPath = plugin_path($name); $sqlFile = $pluginPath . $type . '.sql'; $sql = file_get_contents($sqlFile); - $queries = explode(';', $sql); + $queries = str_ireplace("\r", "\n", $sql); + $queries = explode(";\n", $queries); $queries = str_replace("__PREFIX__", get_env('DATABASE_PREFIX'), $queries); foreach ($queries as $query) { $query = trim($query); if (empty($query)) { continue; } - // 执行SQL语句 - Db::execute($query); + try { + // 执行SQL语句 + Db::execute($query); + } catch (\Exception $e) { + throw new \Exception($e->getMessage(). $query); + } } }