panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复BUG/升级1.1.6版本

Browse Source
This commit is contained in:
Ying
2023-04-25 20:11:49 +08:00
parent 445e5f9662
commit 6a6866bbaf
2357 changed files with 456920 additions and 140567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.php
View File

@@ -16,7 +16,7 @@ use support\Request;
return [
'debug' => getenv('APP_DEBUG') ?: false,
'debug' => get_env('APP_DEBUG') ?: false,
'support_php_files' => false,
'controller_reuse' => true,
'default_timezone' => 'Asia/Shanghai',
@@ -38,7 +38,7 @@ return [
'dispatch_success' => app_path() . '/admin/view/public/jumptpl.html',
'exception_tpl' => app_path() . '/admin/view/error/500.html',
'error_message' => '页面错误！请稍后再试～',
'version' => 'v1.1.5',
'version' => 'v1.1.6',
'cors_domain' => ['*', '127.0.0.1'],
'api_url' => 'https://api.swiftadmin.net/',
'show_error_msg' => false,

4
config/exception.php
View File

@@ -12,6 +12,8 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
use app\common\exception\ExceptionHandle;
return [
'' => \app\common\exception\ExceptionHandle::class,
'' => ExceptionHandle::class,
];

2
config/redis.php
View File

@@ -15,7 +15,7 @@
return [
'default' => [
'host' => '127.0.0.1',
'password' => getenv('REDIS_PASSWORD'),
'password' => get_env('REDIS_PASSWORD'),
'port' => 6379,
'database' => 1,
],

7
config/route.php
View File

@@ -59,14 +59,21 @@ Route::any('/static/system/js/plugin.js', function () {
* @var array $response
*/
Route::fallback(function ($request) {
$pathInfo = parse_url(request()->url());
if (!isset($pathInfo['path'])) {
$parseApp = ['index'];
} elseif ($pathInfo['path'] == '/') {
// 默认应用路由
return redirect('/index');
} else {
$parseApp = explode('/', ltrim($pathInfo['path'], '/'));
}
// 判断是否为API接口
if ($request->expectsJson()) {
return json(['code' => 404, 'msg' => '404 not found']);
}
return response(request_error(current($parseApp)), 404);
});

12
config/session.php
View File

@@ -13,17 +13,17 @@
*/
return [
'type' => getenv('CACHE_DRIVER') ?: 'file', // or redis or redis_cluster
'handler' => getenv('CACHE_DRIVER') == 'redis' ? Webman\Session\RedisSessionHandler::class : Webman\Session\FileSessionHandler::class,
'type' => get_env('CACHE_DRIVER') ?: 'file', // or redis or redis_cluster
'handler' => get_env('CACHE_DRIVER') == 'redis' ? Webman\Session\RedisSessionHandler::class : Webman\Session\FileSessionHandler::class,
'config' => [
'file' => [
'save_path' => runtime_path() . '/sessions',
],
'redis' => [
'host' => getenv('CACHE_HOSTNAME') ?: '127.0.0.1',
'port' => getenv('CACHE_HOSTPORT') ?: 6379,
'database' => getenv('CACHE_SELECT') ?: 0,
'auth' => getenv('CACHE_PASSWORD') ?: '',
'host' => get_env('CACHE_HOSTNAME') ?: '127.0.0.1',
'port' => get_env('CACHE_HOSTPORT') ?: 6379,
'database' => get_env('CACHE_SELECT') ?: 0,
'auth' => get_env('CACHE_PASSWORD') ?: '',
'prefix' => '', // session key prefix
],
'redis_cluster' => [

10
config/thinkcache.php
View File

@@ -1,6 +1,6 @@
<?php
return [
'default' => getenv('CACHE_DRIVER') ?: 'file',
'default' => get_env('CACHE_DRIVER') ?: 'file',
'stores' => [
'file' => [
'type' => 'File',
@@ -13,10 +13,10 @@ return [
],
'redis' => [
'type' => 'redis',
'host' => getenv('CACHE_HOSTNAME') ?: '127.0.0.1',
'port' => getenv('CACHE_HOSTPORT') ?: 6379,
'select' => getenv('CACHE_SELECT') ?: 0,
'password' => getenv('CACHE_PASSWORD') ?: '',
'host' => get_env('CACHE_HOSTNAME') ?: '127.0.0.1',
'port' => get_env('CACHE_HOSTPORT') ?: 6379,
'select' => get_env('CACHE_SELECT') ?: 0,
'password' => get_env('CACHE_PASSWORD') ?: '',
'prefix' => 'redis_',
'expire' => 0,
],

14
config/thinkorm.php
View File

@@ -7,21 +7,21 @@ return [
// 数据库类型
'type' => 'mysql',
// 服务器地址
'hostname' => getenv('DATABASE_HOSTNAME') ?: '127.0.0.1',
'hostname' => get_env('DATABASE_HOSTNAME') ?: '127.0.0.1',
// 数据库名
'database' => getenv('DATABASE_DATABASE') ?: 'swiftadmin',
'database' => get_env('DATABASE_DATABASE') ?: 'swiftadmin',
// 数据库用户名
'username' => getenv('DATABASE_USERNAME') ?: 'root',
'username' => get_env('DATABASE_USERNAME') ?: 'root',
// 数据库密码
'password' => getenv('DATABASE_PASSWORD') ?: '123456',
'password' => get_env('DATABASE_PASSWORD') ?: '123456',
// 数据库连接端口
'hostport' => getenv('DATABASE_HOSTPORT') ?: '3306',
'hostport' => get_env('DATABASE_HOSTPORT') ?: '3306',
// 数据库连接参数
'params' => [],
// 数据库编码默认采用utf8
'charset' => getenv('DATABASE_CHARSET') ?: 'utf8mb4',
'charset' => get_env('DATABASE_CHARSET') ?: 'utf8mb4',
// 数据库表前缀
'prefix' => getenv('DATABASE_PREFIX') ?: 'sa_',
'prefix' => get_env('DATABASE_PREFIX') ?: 'sa_',
// 断线重连
'break_reconnect' => true,
// 关闭SQL监听日志

2
config/translation.php
View File

@@ -17,7 +17,7 @@
*/
return [
// Default language
'locale' => getenv('LANG_DEFAULT_LANG') ?? 'zh-CN',
'locale' => get_env('LANG_DEFAULT_LANG') ?? 'zh-CN',
// Fallback language
'fallback_locale' => ['zh-CN', 'en-US'],
// Folder where language files are stored