diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php index 0416467..4fc80c1 100644 --- a/application/admin/command/Menu.php +++ b/application/admin/command/Menu.php @@ -31,7 +31,6 @@ class Menu extends Command { $this->model = new AuthRule(); $adminPath = dirname(__DIR__) . DS; - $moduleName = 'admin'; //控制器名 $controller = $input->getOption('controller') ?: ''; if (!$controller) @@ -47,7 +46,7 @@ class Menu extends Command throw new Exception("could not delete all menu"); } $ids = []; - $list = $this->model->where('name', 'like', "/{$moduleName}/" . strtolower($controller) . "%")->select(); + $list = $this->model->where('name', 'like', strtolower($controller) . "%")->select(); foreach ($list as $k => $v) { $output->warning($v->name); diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index 52277ff..7c5b56d 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -135,7 +135,7 @@ class Backend extends Controller } // 语言检测 - $lang = Lang::detect(); + $lang = strip_tags(Lang::detect()); $site = Config::get("site"); diff --git a/application/common/controller/Frontend.php b/application/common/controller/Frontend.php index 01ef1c6..13d44e9 100644 --- a/application/common/controller/Frontend.php +++ b/application/common/controller/Frontend.php @@ -30,7 +30,7 @@ class Frontend extends Controller } // 语言检测 - $lang = Lang::detect(); + $lang = strip_tags(Lang::detect()); $site = Config::get("site"); diff --git a/application/route.php b/application/route.php index a3a190d..8011fca 100755 --- a/application/route.php +++ b/application/route.php @@ -11,7 +11,7 @@ // +---------------------------------------------------------------------- //如果有定义绑定后台模块则禁用路由规则 -if (defined('BIND_MODULE') && BIND_MODULE == 'admin') +if (\think\Route::getBind('module') == 'admin') return []; return [