mirror of
https://gitee.com/fastadminnet/framework.git
synced 2026-07-06 23:02:48 +08:00
修复几处notice报错
This commit is contained in:
@@ -56,6 +56,14 @@ return [
|
|||||||
'show_error_msg' => false,
|
'show_error_msg' => false,
|
||||||
//默认输出类型
|
//默认输出类型
|
||||||
'default_return_type' => 'html',
|
'default_return_type' => 'html',
|
||||||
|
//默认语言
|
||||||
|
'default_lang' => 'zh-cn',
|
||||||
|
//是否使用session
|
||||||
|
'use_session' => true,
|
||||||
|
//url地址的后缀
|
||||||
|
'url_deny_suffix' => '',
|
||||||
|
//是否必须使用路由
|
||||||
|
'url_route_must' => false,
|
||||||
|
|
||||||
'log' => [
|
'log' => [
|
||||||
'type' => 'File',
|
'type' => 'File',
|
||||||
|
|||||||
@@ -53,6 +53,9 @@ class Lang
|
|||||||
$range = $range ? $range : self::$range;
|
$range = $range ? $range : self::$range;
|
||||||
$lang = is_file($file) ? include $file : [];
|
$lang = is_file($file) ? include $file : [];
|
||||||
// 批量定义
|
// 批量定义
|
||||||
|
if(!isset(self::$lang[$range])) {
|
||||||
|
self::$lang[$range] = [];
|
||||||
|
}
|
||||||
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
|
return self::$lang[$range] = array_merge(self::$lang[$range], array_change_key_case($lang));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -327,7 +327,7 @@ class Route
|
|||||||
/**
|
/**
|
||||||
* 检查正则路由
|
* 检查正则路由
|
||||||
*/
|
*/
|
||||||
private function checkRegex($route, $url, $matches)
|
private static function checkRegex($route, $url, $matches)
|
||||||
{
|
{
|
||||||
// 正则路由
|
// 正则路由
|
||||||
if ($route instanceof \Closure) {
|
if ($route instanceof \Closure) {
|
||||||
@@ -341,7 +341,7 @@ class Route
|
|||||||
/**
|
/**
|
||||||
* 检查规则路由
|
* 检查规则路由
|
||||||
*/
|
*/
|
||||||
private function checkRule($rule, $route, $url, $pattern)
|
private static function checkRule($rule, $route, $url, $pattern)
|
||||||
{
|
{
|
||||||
$len1 = substr_count($url, '/');
|
$len1 = substr_count($url, '/');
|
||||||
$len2 = substr_count($rule, '/');
|
$len2 = substr_count($rule, '/');
|
||||||
|
|||||||
Reference in New Issue
Block a user