0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bugs

Browse Source
This commit is contained in:
yanwenwu 2020-01-25 20:03:18 +08:00
parent 3001ba26b1
commit 6b0eb5f849
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
catch/CatchAdminService.php
View File

@ -86,7 +86,7 @@ class CatchAdminService extends Service
protected function registerMiddleWares(): void protected function registerMiddleWares(): void
{ {
$this->app->middleware->import([ $this->app->middleware->import([
'catch_check_permission' => PermissionsMiddleware::class, 'catch_check_permission' => PermissionsMiddleware::class,
], 'route'); ], 'route');
} }

8
catch/login/controller/Index.php
View File

@ -1,14 +1,15 @@
<?php <?php
namespace catchAdmin\login\controller; namespace catchAdmin\login\controller;
use catchAdmin\user\Auth;
use catchAdmin\login\request\LoginRequest; use catchAdmin\login\request\LoginRequest;
use catchAdmin\user\model\Users; use catchAdmin\user\model\Users;
use catcher\base\CatchController; use catcher\base\CatchController;
use catcher\CatchAuth; use catcher\CatchAuth;
use catcher\CatchResponse; use catcher\CatchResponse;
use catcher\CatchUpload;
use catcher\exceptions\LoginFailedException; use catcher\exceptions\LoginFailedException;
use think\captcha\Captcha; use jaguarjack\filesystem\cloud\adapters\QiniuAdapter;
use think\facade\Filesystem;
class Index extends CatchController class Index extends CatchController
{ {
@ -20,8 +21,9 @@ class Index extends CatchController
* @param CatchAuth $auth * @param CatchAuth $auth
* @return bool|string * @return bool|string
*/ */
public function login(LoginRequest $request, CatchAuth $auth) public function login(LoginRequest $request, CatchAuth $auth, CatchUpload $upload)
{ {
// dd(Filesystem::disk('qcloud')->putFile('ok', $file));
$params = $request->param(); $params = $request->param();
$token = $auth->attempt($params); $token = $auth->attempt($params);