From 160dc08cc078616f43e86cd09eba99d7b7537dfc Mon Sep 17 00:00:00 2001 From: tao Date: Wed, 12 Jan 2022 16:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=92=E4=BB=B6=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=92=8C=E6=A3=80=E6=B5=8B=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Addons.php | 4 ++-- app/install/controller/Index.php | 5 ++--- app/middleware/Auth.php | 2 +- config/taoler.php | 2 +- extend/taoler/com/Files.php | 2 +- vendor/composer/installed.php | 4 ++-- vendor/services.php | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/admin/controller/Addons.php b/app/admin/controller/Addons.php index 1a672d7..72fa9b2 100644 --- a/app/admin/controller/Addons.php +++ b/app/admin/controller/Addons.php @@ -12,7 +12,7 @@ use taoler\com\Files; use taoler\com\Api; use app\common\lib\SetConf; use think\App; -use app\common\lib\ZipFile; +use app\common\lib\Zip; class Addons extends AdminController { @@ -214,7 +214,7 @@ class Addons extends AdminController return json(['code'=>-1,'msg'=>'下载升级文件失败']); } - $uzip = new ZipFile(); + $uzip = new Zip(); $zipDir = strstr($package_file, '.zip',true); //返回文件名后缀前的字符串 $zipPath = Files::getDirPath($zipDir); //转换为带/的路径 压缩文件解压到的路径 $unzip_res = $uzip->unzip($package_file,$zipPath,true); diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php index 82c99f7..07240c8 100644 --- a/app/install/controller/Index.php +++ b/app/install/controller/Index.php @@ -12,9 +12,8 @@ class Index extends BaseController // 检测是否安装过 protected function initialize(){ if(file_exists('./install.lock')){ - //echo ""; - //die(); - return response(""); + echo ""; + die(); } } diff --git a/app/middleware/Auth.php b/app/middleware/Auth.php index fa2525a..87a841c 100644 --- a/app/middleware/Auth.php +++ b/app/middleware/Auth.php @@ -54,7 +54,7 @@ class Auth } // 排除公共权限 - $not_check = ['admin/','admin/login/index','admin/index/index','admin/index/home','admin/Admin/info','admin/Admin/repass','admin/Admin/logout','admin/Index/news','admin/Index/cunsult','admin/Index/replys','admin/Index/reply','admin/captcha','addons/socail/']; + $not_check = ['admin/','admin/login/index','admin/index/index','admin/index/home','admin/Admin/info','admin/Admin/repass','admin/Admin/logout','admin/Index/news','admin/Index/cunsult','admin/Index/replys','admin/Index/reply','admin/captcha','addons/socail/','admin/addons/social/oauth/login','admin/addons/bacimg/index/getImages']; if (!in_array($path, $not_check)) { $auth = new UserAuth(); diff --git a/config/taoler.php b/config/taoler.php index db3d034..7d76a08 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -7,7 +7,7 @@ return [ //应用名,此项不可更改 'appname' => 'TaoLer', //版本配置 - 'version' => '1.8.20', + 'version' => '1.8.21', //加盐 'salt' => 'taoler', //数据库备份目录 diff --git a/extend/taoler/com/Files.php b/extend/taoler/com/Files.php index 2d384d0..4602607 100644 --- a/extend/taoler/com/Files.php +++ b/extend/taoler/com/Files.php @@ -26,7 +26,7 @@ class Files $arr = array(); $data = scandir($path); foreach ($data as $value){ - if($value !='.' && $value != '..' && !stripos($value,".")){ + if($value !='.' && $value != '..' && !stripos($value,".") && $value != '.gitignore'){ $arr[] = strtolower($value); } } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index b9ddcc9..690ab75 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '83ca563d1c45da13aef6d32918bfb64b5cc2a935', + 'reference' => '3e8741aae6a9a6de29bf9a55d5c22e9cf86f922c', 'name' => 'taoser/taoler', 'dev' => true, ), @@ -151,7 +151,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '83ca563d1c45da13aef6d32918bfb64b5cc2a935', + 'reference' => '3e8741aae6a9a6de29bf9a55d5c22e9cf86f922c', 'dev_requirement' => false, ), 'taoser/think-addons' => array( diff --git a/vendor/services.php b/vendor/services.php index 6909750..bde30f9 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'taoser\\addons\\Service',