HDK/hyperf-admin
1
0
Fork 0
mirror of http://124.126.16.154:8888/singularity/hyperf-admin.git synced 2026-01-15 07:15:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf: add db prefix env

Browse Source
This commit is contained in:
daodao97
2020-07-06 17:07:32 +08:00
parent 7710942b6a
commit a61f2c9316
7 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
composer.json
View File

@@ -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",

1
src/admin/src/config/config.php
View File

@@ -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' => [

2
src/base-utils/src/ConfigProvider.php
View File

@@ -25,7 +25,7 @@ class ConfigProvider
'class' => StreamHandler::class,
'constructor' => [
'stream' => 'php://stdout',
'level' => Logger::DEBUG,
'level' => Logger::INFO,
],
],
'formatter' => [

4
src/base-utils/src/Scaffold/Controller/AbstractController.php
View File

@@ -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' => '全部',

1
src/config-center/src/ConfigProvider.php
View File

@@ -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' => [

2
src/cron-center/src/ConfigProvider.php
View File

@@ -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' => [

2
src/data-focus/src/ConfigProvider.php
View File

@@ -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' => [