diff --git a/plugins/addon/theme_configurator/ThemeConfigurator.php b/plugins/addon/theme_configurator/ThemeConfigurator.php index 5d0f1ca..fe93f27 100644 --- a/plugins/addon/theme_configurator/ThemeConfigurator.php +++ b/plugins/addon/theme_configurator/ThemeConfigurator.php @@ -27,8 +27,9 @@ class ThemeConfigurator public function install() { try { + $table = ThemeConfigModel::tableName(); Db::execute( - "CREATE TABLE IF NOT EXISTS `addon_theme_configurator`( + "CREATE TABLE IF NOT EXISTS `{$table}`( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `config` longtext NOT NULL, `update_time` int(11) DEFAULT 0, @@ -56,7 +57,8 @@ class ThemeConfigurator public function uninstall() { try { - Db::execute("DROP TABLE IF EXISTS `addon_theme_configurator`;"); + $table = ThemeConfigModel::tableName(); + Db::execute("DROP TABLE IF EXISTS `{$table}`;"); } catch (\Throwable $throwable) { return [ 'status' => 400, diff --git a/plugins/addon/theme_configurator/model/ThemeConfigModel.php b/plugins/addon/theme_configurator/model/ThemeConfigModel.php index 8afb156..a384b1a 100644 --- a/plugins/addon/theme_configurator/model/ThemeConfigModel.php +++ b/plugins/addon/theme_configurator/model/ThemeConfigModel.php @@ -1,6 +1,7 @@ table)->order('id', 'asc')->find(); + $row = $this->query()->order('id', 'asc')->find(); if (!$row) { return $this->defaultConfig(); } @@ -34,11 +48,11 @@ class ThemeConfigModel 'update_time' => time(), ]; - $exists = Db::name($this->table)->order('id', 'asc')->find(); + $exists = $this->query()->order('id', 'asc')->find(); if ($exists) { - Db::name($this->table)->where('id', $exists['id'])->update($payload); + $this->query()->where('id', $exists['id'])->update($payload); } else { - Db::name($this->table)->insert($payload); + $this->query()->insert($payload); } return $config; @@ -49,7 +63,7 @@ class ThemeConfigModel */ public function initConfig(): void { - $exists = Db::name($this->table)->order('id', 'asc')->find(); + $exists = $this->query()->order('id', 'asc')->find(); if (!$exists) { $this->saveConfig($this->defaultConfig()); }