diff --git a/app/Http/Controllers/Admin/Tool/GenController.php b/app/Http/Controllers/Admin/Tool/GenController.php index 0a5d9272271fce928ef2f727ded68e1e05c64cee..220f06d804e5d5256665d67d9a19c8d79ff8f618 100644 --- a/app/Http/Controllers/Admin/Tool/GenController.php +++ b/app/Http/Controllers/Admin/Tool/GenController.php @@ -106,9 +106,11 @@ private function createModel($fields, $table, $model_name, $dir) { $root = base_path();//根地址 $model_path_name = $model_name; + $nsDir = $dir; if ($dir) { $model_path_name = $dir . '/' . $model_name; - $dir = '\\' . $dir; + $nsDir = '\\' . $dir; + $dir = '/' . $dir; } //模型路径并创建 @@ -128,7 +130,7 @@ private function createModel($fields, $table, $model_name, $dir) $gen_path = str_replace('/', DIRECTORY_SEPARATOR, $root . "/app/Models/" . $model_path_name . ".php");//生成的模型地址 $tem_f = fopen($temp_path, "r"); $temp_str = fread($tem_f, filesize($temp_path)); - $temp_str = str_replace(['{$model}', '{$table}', '{$dir}', '{$fields}'], [$model_name, $table, $dir, $fieldArr], $temp_str); + $temp_str = str_replace(['{$model}', '{$table}', '{$dir}', '{$fields}'], [$model_name, $table, $nsDir, $fieldArr], $temp_str); $gen_model = fopen($gen_path, 'w'); fwrite($gen_model, $temp_str); return true; @@ -140,11 +142,12 @@ private function createController($model_name, $dir) $root = base_path();//根地址 $controller_name = ucfirst(strtolower($model_name));//生成控制器名称 $base = $dir; - + $nsDir = $dir; $model_use = $model_name; if ($dir) { $model_use = $dir . '\\' . $model_name; - $dir = '\\' . $dir; + $nsDir = '\\' . $dir; + $dir = '/' . $dir; } //路径并创建 @@ -160,7 +163,7 @@ private function createController($model_name, $dir) $base_temp_path = str_replace('/', DIRECTORY_SEPARATOR, $root . '/resources/views/admin/tool/gen/create/base.tpl'); $tem_f = fopen($base_temp_path, "r"); $temp_str = fread($tem_f, filesize($base_temp_path)); - $temp_str = str_replace(['{$base}', '{$dir}', '{$group}'], [$base, $dir, $group], $temp_str); + $temp_str = str_replace(['{$base}', '{$dir}', '{$group}'], [$base, $nsDir, $group], $temp_str); $gen_model = fopen($base_path, 'w'); fwrite($gen_model, $temp_str); } @@ -173,7 +176,7 @@ private function createController($model_name, $dir) $temp_str = fread($tem_f, filesize($temp_path)); $base = $base ?: 'Backend'; - $temp_str = str_replace(['{$dir}', '{$model_use}', '{$controller}', '{$model}', '{$base}'], [$dir, $model_use, $controller_name, $model_name, $base], $temp_str); + $temp_str = str_replace(['{$dir}', '{$model_use}', '{$controller}', '{$model}', '{$base}'], [$nsDir, $model_use, $controller_name, $model_name, $base], $temp_str); $gen_model = fopen($gen_model_path, 'w'); fwrite($gen_model, $temp_str); return true;