From 11370fbb7a63e2e0f4817b0eb5e91b577763403a Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Mon, 26 Dec 2022 11:33:56 +0800
Subject: [PATCH] save

---
 src/plugin/admin/app/common/Util.php              | 13 +++++++++++++
 .../admin/app/controller/TableController.php      | 15 ++++++++++-----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/plugin/admin/app/common/Util.php b/src/plugin/admin/app/common/Util.php
index 933bb84..846cd08 100644
--- a/src/plugin/admin/app/common/Util.php
+++ b/src/plugin/admin/app/common/Util.php
@@ -123,6 +123,15 @@ class Util
         return $table;
     }
 
+    /**
+     * 获取表前缀
+     * @return string
+     */
+    public static function getTablePrefix(): string
+    {
+        return config('plugin.admin.database.connections.mysql.prefix', '');
+    }
+
     /**
      * 变量或数组中的元素只能是字母数字下划线组合
      * @param $var
@@ -369,6 +378,10 @@ class Util
     public static function getSchema($table, $section = null)
     {
         Util::checkTableName($table);
+        $table_prefix = Util::getTablePrefix();
+        if (strpos($table, $table_prefix) !== 0) {
+            $table = "$table_prefix{$table}";
+        }
         $database = config('database.connections')['plugin.admin.mysql']['database'];
         $schema_raw = $section !== 'table' ? Util::db()->select("select * from information_schema.COLUMNS where TABLE_SCHEMA = '$database' and table_name = '$table'") : [];
         $forms = [];
diff --git a/src/plugin/admin/app/controller/TableController.php b/src/plugin/admin/app/controller/TableController.php
index 3775b38..62f9628 100644
--- a/src/plugin/admin/app/controller/TableController.php
+++ b/src/plugin/admin/app/controller/TableController.php
@@ -96,6 +96,10 @@ class TableController extends Base
         }
         $data = $request->post();
         $table_name = Util::filterAlphaNum($data['table']);
+        $table_prefix = Util::getTablePrefix();
+        if (strpos($table_name, $table_prefix) !== 0) {
+            return $this->json(1, "表名必须以{$table_prefix}开头");
+        }
         $table_comment = Util::pdoQuote($data['table_comment']);
         $columns = $data['columns'];
         $forms = $data['forms'];
@@ -141,7 +145,7 @@ class TableController extends Base
             }
         }
 
-        Util::schema()->create($table_name, function (Blueprint $table) use ($columns) {
+        Util::schema()->create($this->getTableName($table_name), function (Blueprint $table) use ($columns) {
             $type_method_map = Util::methodControlMap();
             foreach ($columns as $column) {
                 if (!isset($column['type'])) {
@@ -385,7 +389,7 @@ class TableController extends Base
     {
         $table_name = $request->input('table');
         Util::checkTableName($table_name);
-        $prefix = config('plugin.admin.database.connections.mysql.prefix');
+        $prefix = Util::getTablePrefix();
         $table_basename = strpos($table_name, $prefix) === 0 ? substr($table_name, strlen($prefix)) : $table_name;
         $inflector = InflectorFactory::create()->build();
         $model_class = $inflector->classify($inflector->singularize($table_basename));
@@ -1354,13 +1358,13 @@ EOF;
         if (!$tables) {
             return $this->json(0, 'not found');
         }
-        $prefix = config('plugin.admin.database.connections.mysql.prefix');
+        $prefix = Util::getTablePrefix();
         $table_not_allow_drop = ["{$prefix}admins", "{$prefix}users", "{$prefix}options", "{$prefix}roles", "{$prefix}rules", "{$prefix}admin_roles", "{$prefix}uploads"];
         if ($found = array_intersect($tables, $table_not_allow_drop)) {
             return $this->json(400, implode(',', $found) . '不允许删除');
         }
         foreach ($tables as $table) {
-            Util::schema()->drop($table);
+            Util::schema()->drop($this->getTableName($table));
             // 删除schema
             Util::db()->table('options')->where('name', "table_form_schema_$table")->delete();
         }
@@ -1594,12 +1598,13 @@ EOF;
     }
 
     /**
+     * 获取表名(不带前缀)
      * @param string $table_name
      * @return false|string
      */
     protected function getTableName(string $table_name)
     {
-        $prefix = config('plugin.admin.database.connections.mysql.prefix');
+        $prefix = Util::getTablePrefix();
         if (strpos($table_name, $prefix) === 0) {
             return substr($table_name, strlen($prefix));
         }