From 546f293aa720dfb1c6a1de9133317a49d1d3a919 Mon Sep 17 00:00:00 2001 From: tao Date: Fri, 10 Dec 2021 19:22:23 +0800 Subject: [PATCH] update --- app/admin/controller/Addons.php | 2 -- app/common/model/User.php | 1 + composer.lock | 12 ++++++------ vendor/composer/installed.json | 14 +++++++------- vendor/composer/installed.php | 10 +++++----- .../flysystem/src/Adapter/AbstractAdapter.php | 2 +- vendor/services.php | 2 +- 7 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/admin/controller/Addons.php b/app/admin/controller/Addons.php index 7ad06e6..fb4140e 100644 --- a/app/admin/controller/Addons.php +++ b/app/admin/controller/Addons.php @@ -289,7 +289,6 @@ class Addons extends AdminController $name = input('name'); $arr = ['status' => 0]; $res = set_addons_info($name,$arr); - var_dump($res); return json(['code'=>-1,'msg'=>$name.'插件已禁用']); } @@ -298,7 +297,6 @@ class Addons extends AdminController public function config($name) { $name = input('name'); - //var_dump($name); $config = get_addons_config($name); if(empty($config)) return json(['code'=>-1,'msg'=>'无配置项！']); if(Request::isAjax()){ diff --git a/app/common/model/User.php b/app/common/model/User.php index 737a03d..4e1584e 100644 --- a/app/common/model/User.php +++ b/app/common/model/User.php @@ -68,6 +68,7 @@ class User extends Model //将用户数据写入Session Session::set('user_id',$user['id']); Session::set('user_name',$user['name']); + //记住密码 if(isset($data['remember'])){ $salt = Config::get('taoler.salt'); //加密auth存入cookie diff --git a/composer.lock b/composer.lock index a175578..d37c43a 100644 --- a/composer.lock +++ b/composer.lock @@ -71,16 +71,16 @@ }, { "name": "league/flysystem", - "version": "1.1.8", + "version": "1.1.9", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "c995bb0c23c58c9813d081f9523c9b7bb496698e" + "reference": "094defdb4a7001845300334e7c1ee2335925ef99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c995bb0c23c58c9813d081f9523c9b7bb496698e", - "reference": "c995bb0c23c58c9813d081f9523c9b7bb496698e", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99", + "reference": "094defdb4a7001845300334e7c1ee2335925ef99", "shasum": "", "mirrors": [ { @@ -159,7 +159,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.8" + "source": "https://github.com/thephpleague/flysystem/tree/1.1.9" }, "funding": [ { @@ -167,7 +167,7 @@ "type": "other" } ], - "time": "2021-11-28T21:50:23+00:00" + "time": "2021-12-09T09:40:50+00:00" }, { "name": "league/flysystem-cached-adapter", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 62fe0d8..30ebe8d 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -68,17 +68,17 @@ }, { "name": "league/flysystem", - "version": "1.1.8", - "version_normalized": "1.1.8.0", + "version": "1.1.9", + "version_normalized": "1.1.9.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "c995bb0c23c58c9813d081f9523c9b7bb496698e" + "reference": "094defdb4a7001845300334e7c1ee2335925ef99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c995bb0c23c58c9813d081f9523c9b7bb496698e", - "reference": "c995bb0c23c58c9813d081f9523c9b7bb496698e", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/094defdb4a7001845300334e7c1ee2335925ef99", + "reference": "094defdb4a7001845300334e7c1ee2335925ef99", "shasum": "", "mirrors": [ { @@ -114,7 +114,7 @@ "spatie/flysystem-dropbox": "Allows you to use Dropbox storage", "srmklive/flysystem-dropbox-v2": "Allows you to use Dropbox storage for PHP 5 applications" }, - "time": "2021-11-28T21:50:23+00:00", + "time": "2021-12-09T09:40:50+00:00", "type": "library", "extra": { "branch-alias": { @@ -159,7 +159,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.1.8" + "source": "https://github.com/thephpleague/flysystem/tree/1.1.9" }, "funding": [ { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index ccc2841..eb7bff8 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '5f43c95f699af5570f9aa0fdbf279d069607cdc8', + 'reference' => 'b6eb893a4cc88c8d03d8d6fdcbf1663ccc8b1cc6', 'name' => 'taoser/taoler', 'dev' => true, ), @@ -20,12 +20,12 @@ 'dev_requirement' => false, ), 'league/flysystem' => array( - 'pretty_version' => '1.1.8', - 'version' => '1.1.8.0', + 'pretty_version' => '1.1.9', + 'version' => '1.1.9.0', 'type' => 'library', 'install_path' => __DIR__ . '/../league/flysystem', 'aliases' => array(), - 'reference' => 'c995bb0c23c58c9813d081f9523c9b7bb496698e', + 'reference' => '094defdb4a7001845300334e7c1ee2335925ef99', 'dev_requirement' => false, ), 'league/flysystem-cached-adapter' => array( @@ -142,7 +142,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => '5f43c95f699af5570f9aa0fdbf279d069607cdc8', + 'reference' => 'b6eb893a4cc88c8d03d8d6fdcbf1663ccc8b1cc6', 'dev_requirement' => false, ), 'taoser/think-addons' => array( diff --git a/vendor/league/flysystem/src/Adapter/AbstractAdapter.php b/vendor/league/flysystem/src/Adapter/AbstractAdapter.php index e577ac4..a6a8ed0 100644 --- a/vendor/league/flysystem/src/Adapter/AbstractAdapter.php +++ b/vendor/league/flysystem/src/Adapter/AbstractAdapter.php @@ -67,6 +67,6 @@ abstract class AbstractAdapter implements AdapterInterface */ public function removePathPrefix($path) { - return substr($path, strlen($this->getPathPrefix())); + return substr($path, strlen((string) $this->getPathPrefix())); } } diff --git a/vendor/services.php b/vendor/services.php index 30002cb..5e74b66 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'taoser\\addons\\Service',