From 5612e23d54265e137635ab22040575a1eda2fd3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=91=E6=9E=97?= Date: Thu, 3 Aug 2023 14:02:07 +0800 Subject: [PATCH] qqq --- Gii.php | 4 ++-- GiiBase.php | 4 ++-- GiiController.php | 36 ++++++++++++++++++------------------ GiiJsonRpc.php | 2 +- GiiRpcService.php | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Gii.php b/Gii.php index 8f8815a..c7ab917 100644 --- a/Gii.php +++ b/Gii.php @@ -31,8 +31,8 @@ class Gii public string $modelPath = APP_PATH . 'app/Model/'; public string $modelNamespace = 'App\Model\\'; - public string $controllerPath = APP_PATH . 'app/Controller/'; - public string $controllerNamespace = 'App\\Controller\\'; + public string $controllerPath = APP_PATH . 'app/AutoController/'; + public string $controllerNamespace = 'App\\AutoController\\'; public static array $createSqls = []; diff --git a/GiiBase.php b/GiiBase.php index d1110f8..704767d 100644 --- a/GiiBase.php +++ b/GiiBase.php @@ -28,8 +28,8 @@ abstract class GiiBase public string $modelPath = APP_PATH . 'app/Model/'; public string $modelNamespace = 'App\Model\\'; - public string $controllerPath = APP_PATH . 'app/Controller/'; - public string $controllerNamespace = 'App\\Controller\\'; + public string $controllerPath = APP_PATH . 'app/AutoController/'; + public string $controllerNamespace = 'App\\AutoController\\'; public ?string $module = null; diff --git a/GiiController.php b/GiiController.php index 159b631..b3c0d59 100644 --- a/GiiController.php +++ b/GiiController.php @@ -49,24 +49,24 @@ class GiiController extends GiiBase $model_namespace = rtrim($modelPath['namespace'], '\\'); $class = ''; - $controller = str_replace('\\\\', '\\', "$namespace\\{$managerName}Controller"); + $controller = str_replace('\\\\', '\\', "$namespace\\{$managerName}AutoController"); $html = "getImports($path['path'] . '/' . $managerName . 'Controller.php', $class); + $import = $this->getImports($path['path'] . '/' . $managerName . 'AutoController.php', $class); } catch (\Throwable $Exception) { error($Exception); exit(); } } else { $import = "use Exception; -use " . (str_replace('Controller', 'Form', $namespace)) . "\\{$managerName}Form; +use " . (str_replace('AutoController', 'Form', $namespace)) . "\\{$managerName}Form; use Kiri\Core\Str; use Kiri\Core\Json; use Kiri\Router\Base\Controller; @@ -92,11 +92,11 @@ use Kiri\Router\Annotate\AutoController; $html .= " /** - * Class {$controllerName}Controller + * Class {$controllerName}AutoController * * @package controller */ -#[AutoController] class {$controllerName}Controller extends Controller +#[AutoController] class {$controllerName}AutoController extends AutoController { "; @@ -135,27 +135,27 @@ use Kiri\Router\Annotate\AutoController; $tableName = str_replace('_', '-', $tableName); $addRouter = 'Router::group([\'prefix\' => \'' . $tableName . '\',\'namespace\' => \'' . $namespace . '\'], function () { - Router::post(\'add\', \'' . $controllerName . 'Controller@actionAdd\'); - Router::get(\'list\', \'' . $controllerName . 'Controller@actionList\'); - Router::post(\'update\', \'' . $controllerName . 'Controller@actionUpdate\'); - Router::post(\'auditing\', \'' . $controllerName . 'Controller@actionAuditing\'); - Router::post(\'batch-auditing\', \'' . $controllerName . 'Controller@actionBatchAuditing\'); - Router::post(\'batch-delete\', \'' . $controllerName . 'Controller@actionBatchDelete\'); - Router::post(\'delete\', \'' . $controllerName . 'Controller@actionDelete\'); - Router::get(\'detail\', \'' . $controllerName . 'Controller@actionDetail\'); + Router::post(\'add\', \'' . $controllerName . 'AutoController@actionAdd\'); + Router::get(\'list\', \'' . $controllerName . 'AutoController@actionList\'); + Router::post(\'update\', \'' . $controllerName . 'AutoController@actionUpdate\'); + Router::post(\'auditing\', \'' . $controllerName . 'AutoController@actionAuditing\'); + Router::post(\'batch-auditing\', \'' . $controllerName . 'AutoController@actionBatchAuditing\'); + Router::post(\'batch-delete\', \'' . $controllerName . 'AutoController@actionBatchDelete\'); + Router::post(\'delete\', \'' . $controllerName . 'AutoController@actionDelete\'); + Router::get(\'detail\', \'' . $controllerName . 'AutoController@actionDetail\'); }); '; if (!str_contains($this->clearBlank(file_get_contents($file)), $this->clearBlank($addRouter))) { file_put_contents($file, $addRouter, FILE_APPEND); } - $file = $path['path'] . '/' . $controllerName . 'Controller.php'; + $file = $path['path'] . '/' . $controllerName . 'AutoController.php'; if (file_exists($file)) { unlink($file); } Kiri::writeFile($file, $html); - return $controllerName . 'Controller.php'; + return $controllerName . 'AutoController.php'; } @@ -589,8 +589,8 @@ use Kiri\Router\Annotate\AutoController; $this->rules[$val['Field']] = $_field; } - $namespace = str_replace('Controller', 'Form', $path['namespace']); - $path = str_replace('Controller', 'Form', $path['path']); + $namespace = str_replace('AutoController', 'Form', $path['namespace']); + $path = str_replace('AutoController', 'Form', $path['path']); if (!is_dir($_SERVER['PWD'] . '/app/Form/')) { mkdir($_SERVER['PWD'] . '/app/Form/'); } diff --git a/GiiJsonRpc.php b/GiiJsonRpc.php index ff718c8..4d38174 100644 --- a/GiiJsonRpc.php +++ b/GiiJsonRpc.php @@ -90,7 +90,7 @@ use Rpc\\' . ucfirst($name) . 'RpcInterface; #[JsonRpc(service: \'' . $name . '\', version: \'2.0\')] -class ' . ucfirst($name) . 'RpcConsumer extends Controller implements ' . ucfirst($name) . 'RpcInterface +class ' . ucfirst($name) . 'RpcConsumer extends AutoController implements ' . ucfirst($name) . 'RpcInterface { diff --git a/GiiRpcService.php b/GiiRpcService.php index a9a80d0..6b1c9a2 100644 --- a/GiiRpcService.php +++ b/GiiRpcService.php @@ -47,7 +47,7 @@ use Kiri\Core\Json; * Class ' . $managerName . 'Consumer * @package App\Client\Rpc */ -class ' . $managerName . 'Producer extends Controller +class ' . $managerName . 'Producer extends AutoController {