From a61f2c9316efe132bfd1120a64f2604ae0140fc9 Mon Sep 17 00:00:00 2001
From: daodao97 <daodao97@foxmail.com>
Date: Mon, 6 Jul 2020 17:07:32 +0800
Subject: [PATCH] perf: add db prefix env

---
 composer.json                                         | 11 ++++++-----
 src/admin/src/config/config.php                       |  1 +
 src/base-utils/src/ConfigProvider.php                 |  2 +-
 .../src/Scaffold/Controller/AbstractController.php    |  4 ++--
 src/config-center/src/ConfigProvider.php              |  1 +
 src/cron-center/src/ConfigProvider.php                |  2 ++
 src/data-focus/src/ConfigProvider.php                 |  2 ++
 7 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 50ab1e7..2fa0bbf 100644
--- a/composer.json
+++ b/composer.json
@@ -12,13 +12,15 @@
         "ext-json": "*",
         "ext-pdo": "*",
         "ext-swoole": ">=4.4",
-        "hyperf/constants": "~2.0.0",
         "aliyuncs/oss-sdk-php": "^2.3",
         "box/spout": "^3.1",
         "hyperf/amqp": "~2.0.0",
+        "hyperf/async-queue": "~2.0.0",
         "hyperf/cache": "~2.0.0",
         "hyperf/command": "~2.0.0",
         "hyperf/config": "~2.0.0",
+        "hyperf/constants": "~2.0.0",
+        "hyperf/crontab": "~2.0.0",
         "hyperf/database": "~2.0.0",
         "hyperf/db-connection": "~2.0.0",
         "hyperf/filesystem": "~2.0.0",
@@ -32,11 +34,10 @@
         "hyperf/process": "~2.0.0",
         "hyperf/redis": "~2.0.0",
         "hyperf/snowflake": "~2.0.0",
+        "hyperf/validation": "~2.0.0",
+        "nette/php-generator": "^3.4",
         "yadakhov/insert-on-duplicate-key": "^1.2",
-        "hyperf/async-queue": "~2.0.0",
-        "hyperf/crontab": "~2.0.0",
-        "zoujingli/ip2region": "^1.0",
-        "hyperf/validation": "~2.0.0"
+        "zoujingli/ip2region": "^1.0"
     },
     "replace": {
         "hyperf-admin/base-utils": "self.version",
diff --git a/src/admin/src/config/config.php b/src/admin/src/config/config.php
index 6e5da18..37f52dd 100644
--- a/src/admin/src/config/config.php
+++ b/src/admin/src/config/config.php
@@ -7,6 +7,7 @@ return [
             'database' => env('HYPERF_ADMIN_DB_NAME', 'hyperf_admin'),
             'username' => env('HYPERF_ADMIN_DB_USER'),
             'password' => env('HYPERF_ADMIN_DB_PWD'),
+            'prefix' => env('HYPERF_ADMIN_DB_PREFIX'),
         ]),
     ],
     'init_routes' => [
diff --git a/src/base-utils/src/ConfigProvider.php b/src/base-utils/src/ConfigProvider.php
index 83fdfb2..ac67a77 100644
--- a/src/base-utils/src/ConfigProvider.php
+++ b/src/base-utils/src/ConfigProvider.php
@@ -25,7 +25,7 @@ class ConfigProvider
                     'class' => StreamHandler::class,
                     'constructor' => [
                         'stream' => 'php://stdout',
-                        'level' => Logger::DEBUG,
+                        'level' => Logger::INFO,
                     ],
                 ],
                 'formatter' => [
diff --git a/src/base-utils/src/Scaffold/Controller/AbstractController.php b/src/base-utils/src/Scaffold/Controller/AbstractController.php
index 35812f6..fc38c6b 100644
--- a/src/base-utils/src/Scaffold/Controller/AbstractController.php
+++ b/src/base-utils/src/Scaffold/Controller/AbstractController.php
@@ -893,8 +893,8 @@ abstract class AbstractController extends Controller
                 && isset($_form['options'])) {
                 $_form['type'] = 'select';
                 unset($_form['value']);
-                $options_lables = array_column($_form['options'], 'label');
-                if (!isset($_form['props']['selectApi']) && !in_array('全部', $options_lables)) {
+                $options_labels = array_column($_form['options'], 'label');
+                if (!isset($_form['props']['selectApi']) && !in_array('全部', $options_labels)) {
                     array_unshift($_form['options'], [
                         'value' => '',
                         'label' => '全部',
diff --git a/src/config-center/src/ConfigProvider.php b/src/config-center/src/ConfigProvider.php
index 6592804..f9fba21 100644
--- a/src/config-center/src/ConfigProvider.php
+++ b/src/config-center/src/ConfigProvider.php
@@ -14,6 +14,7 @@ class ConfigProvider
                     'database' => env('CONFIG_CENTER_DB_NAME', env('HYPERF_ADMIN_DB_NAME')),
                     'username' => env('CONFIG_CENTER_DB_USER', env('HYPERF_ADMIN_DB_USER')),
                     'password' => env('CONFIG_CENTER_DB_PWD', env('HYPERF_ADMIN_DB_PWD')),
+                    'prefix' => env('CONFIG_CENTER_DB_PREFIX', env('HYPERF_ADMIN_DB_PREFIX')),
                 ]),
             ],
             'commands' => [
diff --git a/src/cron-center/src/ConfigProvider.php b/src/cron-center/src/ConfigProvider.php
index 7c890d9..b8af13f 100644
--- a/src/cron-center/src/ConfigProvider.php
+++ b/src/cron-center/src/ConfigProvider.php
@@ -19,6 +19,8 @@ class ConfigProvider
                     'database' => env('CRON_CENTER_DB_NAME', env('HYPERF_ADMIN_DB_NAME')),
                     'username' => env('CRON_CENTER_DB_USER', env('HYPERF_ADMIN_DB_USER')),
                     'password' => env('CRON_CENTER_DB_PWD', env('HYPERF_ADMIN_DB_PWD')),
+                    'prefix' => env('CRON_CENTER_DB_PREFIX', env('HYPERF_ADMIN_DB_PREFIX')),
+
                 ]),
             ],
             'commands' => [
diff --git a/src/data-focus/src/ConfigProvider.php b/src/data-focus/src/ConfigProvider.php
index ee5d82b..802b4b6 100644
--- a/src/data-focus/src/ConfigProvider.php
+++ b/src/data-focus/src/ConfigProvider.php
@@ -16,6 +16,8 @@ class ConfigProvider
                     'database' => env('DATA_FOCUS_DB_NAME', env('HYPERF_ADMIN_DB_NAME')),
                     'username' => env('DATA_FOCUS_DB_USER', env('HYPERF_ADMIN_DB_USER')),
                     'password' => env('DATA_FOCUS_DB_PWD', env('HYPERF_ADMIN_DB_PWD')),
+                    'prefix' => env('DATA_FOCUS_DB_PREFIX', env('HYPERF_ADMIN_DB_PREFIX')),
+
                 ]),
             ],
             'commands' => [