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

2
app/admin/controller/system/AdminGroup.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/AdminRules.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/Attachment.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/Company.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/Department.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

3
app/admin/controller/system/Dictionary.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------
@@ -17,7 +17,6 @@ use support\Response;
use think\db\exception\DataNotFoundException;
use think\db\exception\DbException;
use think\db\exception\ModelNotFoundException;
use Webman\Http\Request;
/**
* 字典管理

2
app/admin/controller/system/Jobs.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/LoginLog.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
namespace app\admin\controller\system;
use app\AdminController;

12
app/admin/controller/system/Plugin.php
View File

@@ -81,7 +81,7 @@ class Plugin extends AdminController
return $this->error('请勿重复安装插件');
}
try {
// try {
$pluginZip = self::downLoad($name, ['name' => $name, 'token' => input('token')]);
ZipArchives::unzip($pluginZip, plugin_path(), '', true);
@@ -95,10 +95,10 @@ class Plugin extends AdminController
self::pluginMenu($name);
self::executeSql($name);
self::enabled($name);
} catch (\Throwable $th) {
recursive_delete($pluginPath);
return $this->error($th->getMessage(), null, self::$ServerBody, $th->getCode());
}
// } catch (\Throwable $th) {
// recursive_delete($pluginPath);
// return $this->error($th->getMessage(), null, self::$ServerBody, $th->getCode());
// }
return $this->success('插件安装成功', null, get_plugin_config($name, true));
}
@@ -125,7 +125,7 @@ class Plugin extends AdminController
$pluginPath = plugin_path($name);
$pluginClass = get_plugin_instance($name);
$pluginClass->uninstall();
if (getenv('APP_DEBUG') && Auth::instance()->SuperAdmin()) {
if (get_env('APP_DEBUG') && Auth::instance()->SuperAdmin()) {
self::executeSql($name, 'uninstall');
}

2
app/admin/controller/system/SystemLog.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------

2
app/admin/controller/system/UserGroup.php
View File

@@ -1,5 +1,5 @@
<?php
declare (strict_types = 1);
// +----------------------------------------------------------------------
// | swiftAdmin 极速开发框架 [基于WebMan开发]
// +----------------------------------------------------------------------