From a6032b8e1c62bd80c69c26e15f990739011c8010 Mon Sep 17 00:00:00 2001
From: acegikmo <776527249@qq.com>
Date: Thu, 14 Dec 2023 03:52:35 +0000
Subject: [PATCH] =?UTF-8?q?mac=20os=E4=B8=8B=E7=94=9F=E6=88=90=E6=97=B6?=
 =?UTF-8?q?=EF=BC=9B=20=E7=9B=AE=E5=BD=95=E4=BC=9A=E5=8F=98=E6=88=90:"Mode?=
 =?UTF-8?q?ls\{tableName}"=20"Controllers\{tableName}"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: acegikmo <776527249@qq.com>
---
 app/Http/Controllers/Admin/Tool/GenController.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/Tool/GenController.php b/app/Http/Controllers/Admin/Tool/GenController.php
index 0a5d927..220f06d 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;
-- 
Gitee