From 5153cfe3c4241ad10182376b28c4d107baf695b5 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 18 Mar 2019 13:31:30 +0800
Subject: [PATCH] 优化峰驼控制器的CRUD生成
---
application/admin/command/Crud.php | 5 ++---
application/common/controller/Frontend.php | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 8850631..8eed578 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -366,13 +366,12 @@ class Crud extends Command
//验证器
list($validateNamespace, $validateName, $validateFile, $validateArr) = $this->getValidateData($validateModuleName, $validate, $table);
- $controllerUrl = strtolower(implode('/', $controllerArr));
-
//处理基础文件名，取消所有下划线并转换为小写
$baseNameArr = $controllerArr;
- $baseFileName = Loader::parseName(array_pop($baseNameArr), 1);
+ $baseFileName = Loader::parseName(array_pop($baseNameArr), 0);
array_push($baseNameArr, $baseFileName);
$controllerBaseName = strtolower(implode(DS, $baseNameArr));
+ $controllerUrl = strtolower(implode('/', $baseNameArr));
//视图文件
$viewArr = $controllerArr;
diff --git a/application/common/controller/Frontend.php b/application/common/controller/Frontend.php
index a85c81f..9925080 100644
--- a/application/common/controller/Frontend.php
+++ b/application/common/controller/Frontend.php
@@ -7,6 +7,7 @@ use think\Config;
use think\Controller;
use think\Hook;
use think\Lang;
+use think\Loader;
/**
* 前台控制器基类
@@ -43,7 +44,7 @@ class Frontend extends Controller
//移除HTML标签
$this->request->filter('strip_tags');
$modulename = $this->request->module();
- $controllername = strtolower($this->request->controller());
+ $controllername = Loader::parseName($this->request->controller());
$actionname = strtolower($this->request->action());
// 如果有使用模板布局
--
libgit2 0.24.0