diff --git a/kiri-engine/Kiri.php b/kiri-engine/Kiri.php index 937cb0eb..124a6ed3 100644 --- a/kiri-engine/Kiri.php +++ b/kiri-engine/Kiri.php @@ -31,7 +31,7 @@ defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/'); defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/'); defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/'); defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/'); -defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Models/'); +defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/'); /** diff --git a/kiri-gii/Gii.php b/kiri-gii/Gii.php index aff57853..9775337c 100644 --- a/kiri-gii/Gii.php +++ b/kiri-gii/Gii.php @@ -30,11 +30,11 @@ class Gii private InputInterface $input; - public string $modelPath = APP_PATH . 'app/Models/'; - public string $modelNamespace = 'App\\Models\\'; + public string $modelPath = APP_PATH . 'app/Model/'; + public string $modelNamespace = 'App\\Model\\'; - public string $controllerPath = APP_PATH . 'app/Http/Controllers/'; - public string $controllerNamespace = 'App\\Controllers\\'; + public string $controllerPath = APP_PATH . 'app/Http/Controller/'; + public string $controllerNamespace = 'App\\Controller\\'; public static array $createSqls = []; diff --git a/kiri-gii/GiiBase.php b/kiri-gii/GiiBase.php index 7cd24acd..c0f7c930 100644 --- a/kiri-gii/GiiBase.php +++ b/kiri-gii/GiiBase.php @@ -24,11 +24,11 @@ abstract class GiiBase protected InputInterface $input; - public string $modelPath = APP_PATH . 'app/Models/'; - public string $modelNamespace = 'App\Models\\'; + public string $modelPath = APP_PATH . 'app/Model/'; + public string $modelNamespace = 'App\Model\\'; - public string $controllerPath = APP_PATH . 'app/Http/Controllers/'; - public string $controllerNamespace = 'App\\Controllers\\'; + public string $controllerPath = APP_PATH . 'app/Http/Controller/'; + public string $controllerNamespace = 'App\\Controller\\'; public ?string $module = null;