Skip to content

Commit 2886018

Browse files
committed
修正表前缀配置无效问题
1 parent a832e8b commit 2886018

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/parses/ParseModel.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,12 @@ public static function getTableDocument($model,array $propertys):array
193193
if (empty($config['database_query_function'])){
194194
throw new ErrorException("not datatable_query_function config");
195195
}
196-
$tableColumns = $config['database_query_function']("SHOW FULL COLUMNS FROM " . $model->getTable());
196+
$tableName = $model->getTable();
197+
$configTablePrefix = !empty($config['database']) && !empty($config['database']['prefix'])?$config['database']['prefix']:"";
198+
if (!empty($configTablePrefix) && strpos($tableName, $configTablePrefix) === false){
199+
$tableName = $configTablePrefix.$model->getTable();
200+
}
201+
$tableColumns = $config['database_query_function']("SHOW FULL COLUMNS FROM " . $tableName);
197202
foreach ($tableColumns as $columns) {
198203
$columns = Helper::objectToArray($columns);
199204
$name = $columns['Field'];

src/providers/WebmanService.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use hg\apidoc\utils\ConfigProvider;
66
use hg\apidoc\utils\Helper;
7-
use support\Log;
87
use Webman\Route;
98
use hg\apidoc\middleware\WebmanMiddleware;
109

@@ -21,7 +20,6 @@ static function register(){
2120

2221
// 自动注册路由
2322
CommonService::autoRegisterRoutes(function ($routeData){
24-
Log::info("【aaa】".json_encode($routeData));
2523
foreach ($routeData as $controller) {
2624
if (count($controller['methods'])){
2725
$methods= $controller['methods'];

0 commit comments

Comments
 (0)