修改权限

.gitignore

@@ -1,29 +1,7 @@
 /.idea
 /.vscode
 /vendor
-
+/package
 *.log
 .env
-# view
-/view/catch-admin/.DS_Store
-/view/catch-admin/node_modules
-/view/catch-admin/dist
-
-# local env files
-/view/catch-admin/.env.local
-/view/catch-admin/.env.*.local
-
-# Log files
-/view/catch-admin/npm-debug.log*
-/view/catch-admin/yarn-debug.log*
-/view/catch-admin/yarn-error.log*
-
-# Editor directories and files
-/view/catch-admin/.idea
-/view/catch-admin/.vscode
-/view/catch-admin/*.suo
-/view/catch-admin/*.ntvs*
-/view/catch-admin/*.njsproj
-/view/catch-admin/*.sln
-/view/catch-admin/*.sw*
 

app/BaseController.php

@@ -3,11 +3,8 @@ declare (strict_types = 1);
 
 namespace app;
 
-use catcher\CatchAdmin;
 use think\App;
 use think\exception\ValidateException;
-use think\facade\View;
-use think\helper\Str;
 use think\Validate;
 
 /**

catch/CatchAdminService.php

@@ -17,6 +17,7 @@ use catcher\command\MigrateRunCommand;
 use catcher\command\ModelGeneratorCommand;
 use catcher\command\ModuleCacheCommand;
 use catcher\command\SeedRunCommand;
+use catcher\command\worker\WsWorkerCommand;
 use catcher\event\LoadModuleRoutes;
 use catcher\validates\Sometimes;
 use think\facade\Validate;
@@ -57,6 +58,7 @@ class CatchAdminService extends Service
             CreateModuleCommand::class,
             MigrateRollbackCommand::class,
             MigrateCreateCommand::class,
+            WsWorkerCommand::class,
         ]);
     }
     /**
@@ -84,7 +86,7 @@ class CatchAdminService extends Service
     protected function registerMiddleWares(): void
     {
         $this->app->middleware->import([
-            'catch_check_permission' => PermissionsMiddleware::class,
+           'catch_check_permission' => PermissionsMiddleware::class,
         ], 'route');
     }
 

catch/login/controller/Index.php

@@ -1,14 +1,15 @@
 <?php
 namespace catchAdmin\login\controller;
 
-use catchAdmin\user\Auth;
 use catchAdmin\login\request\LoginRequest;
 use catchAdmin\user\model\Users;
 use catcher\base\CatchController;
 use catcher\CatchAuth;
 use catcher\CatchResponse;
+use catcher\CatchUpload;
 use catcher\exceptions\LoginFailedException;
-use think\captcha\Captcha;
+use jaguarjack\filesystem\cloud\adapters\QiniuAdapter;
+use think\facade\Filesystem;
 
 class Index extends CatchController
 {
@@ -20,8 +21,9 @@ class Index extends CatchController
    * @param CatchAuth $auth
    * @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();
 
         $token = $auth->attempt($params);

catch/permissions/PermissionsMiddleware.php

@@ -24,26 +24,29 @@ class PermissionsMiddleware
      */
     public function handle(Request $request, \Closure $next)
     {
-        if ($request->isGet() && config('catch.is_allow_get')) {
-          return $next($request);
-        }
         $rule = $request->rule()->getName();
 
         if (!$rule) {
             return $next($request);
         }
-
+        // 模块忽略
         [$module, $controller, $action] = $this->parseRule($rule);
-
         if (in_array($module, $this->ignoreModule())) {
             return $next($request);
         }
-
+        // 用户未登录
         $user = $request->user();
         if (!$user) {
             throw new PermissionForbiddenException('Login is invalid', Code::LOST_LOGIN);
         }
-
+        // 超级管理员
+        if ($request->user()->id === config('catch.permissions.super_admin_id')) {
+            return $next($request);
+        }
+        // Get 请求
+        if ($request->isGet() && config('catch.permissions.is_allow_get')) {
+            return $next($request);
+        }
         // toad
         $permission = $this->getPermission($module, $controller, $action);
         if (!$permission || !in_array($permission->id, Cache::get(CatchCacheKeys::USER_PERMISSIONS . $user->id))) {

composer.json

@@ -21,7 +21,9 @@
         "topthink/framework": "^6.0.0",
         "topthink/think-orm": "^2.0",
         "topthink/think-migration": "^3.0",
-        "thans/tp-jwt-auth": "^1.0"
+        "thans/tp-jwt-auth": "^1.0",
+        "workerman/workerman": "^3.5",
+        "jaguarjack/think-filesystem-cloud": "dev-master"
     },
     "require-dev": {
         "symfony/var-dumper": "^4.2",

config/catch.php

@@ -6,16 +6,26 @@ return [
      */
     'domain' => '',
 
-  /**
+    /**
-   * 权限不验证 get 请求
+     * 权限配置
-   *
+     *
-   */
+     */
-    'is_allow_get' => true,
+    'permissions' => [
-
+        /**
-  /**
+         * get 请求不验证
-   * auth 认证
+         */
-   *
+        'is_allow_get' => true,
-   */
+        
+        /**
+         * 超级管理员 ID
+         *
+         */
+        'super_admin_id' => 1,
+     ],
+    /**
+     *  auth 认证
+     *
+     */
   'auth' => [
       // 默认
       'default' => [

config/filesystem.php

@@ -22,5 +22,38 @@ return [
             'visibility' => 'public',
         ],
         // 更多的磁盘配置信息
-    ],
+        'qiniu' => [
+            'type'       => 'qiniu',
+            'access_key' => 'iLOE193LsBtlY4LZSN6cMIec9FTmMDRXPoFnBAec',
+            'secret_key' => '2w7bQ6dw_HA2mfZHxXyzROxXach_9-6kavgJ9aHl',
+            'bucket'     => 'assets',
+            'domain'     => 'assets.njphper.com',
+        ],
+        'oss' => [
+            'type'   => 'oss',
+            'prefix' => '',
+            'access_key' => 'XbBP7l7B8ZrXOkDk',
+            'secret_key' => 'EhNxzuIMZJsvpjWXSyvsSgcCML5In2',
+            'end_point'  => 'https://oss-cn-beijing.aliyuncs.com', // ssl：https://iidestiny.com
+            'bucket'     => 'jaguarjack-test',
+            'is_cname'   =>  false
+        ],
+        // 腾讯云配置
+        'qcloud' => [
+            'type'        => 'qcloud',
+            'region'      => 'ap-chengdu',
+            'credentials' => [
+                'appId'      => '1252879105', // 域名中数字部分
+                'secretId'   => 'AKIDVpqhjprOp0BNL2EhhRurb7QZjspWmoiN',
+                'secretKey'  => 'ojV3OuEKCohjWq0yhBPZWEoFTTYN5c5w',
+            ],
+            'bucket'          => 'jaguarjack-1252879105',
+            'timeout'         => 60,
+            'connect_timeout' => 60,
+            'cdn'             => '',
+            'scheme'          => 'https',
+            'read_from_cdn'   => false,
+        ]
+    ]
+
 ];

extend/catcher/CatchUpload.php

@@ -0,0 +1,117 @@
+<?php
+namespace catcher;
+
+use think\facade\Filesystem;
+use think\file\UploadedFile;
+
+class CatchUpload
+{
+    /**
+     * 阿里云
+     */
+    public const OSS = 'oss';
+
+    /**
+     * 腾讯云
+     */
+    public const QCLOUD = 'qcloud';
+
+    /**
+     * 七牛
+     */
+    public const QIQNIU = 'qiniu';
+
+    /**
+     * 本地
+     *
+     * @var string
+     */
+    protected $driver = 'local';
+
+    /**
+     * 本地
+     */
+    public const LOCAL = 'local';
+
+    /**
+     * path
+     *
+     * @var string
+     */
+    protected $path = '';
+
+    /**
+     * upload files
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     * @param UploadedFile $file
+     * @return mixed
+     */
+    public function upload(UploadedFile $file)
+    {
+        return Filesystem::disk($this->getDriver())->putFile($this->getPath(), $file);
+    }
+
+    /**
+     * get upload driver
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     * @return string
+     */
+    protected function getDriver()
+    {
+        return $this->driver;
+    }
+
+    /**
+     * set driver
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     * @param $driver
+     * @throws \Exception
+     * @return $this
+     */
+    public function setDriver($driver)
+    {
+        if (!in_array($driver, [self::OSS, self::QCLOUD, self::QIQNIU, self::LOCAL])) {
+            throw new \Exception(sprintf('Upload Driver [%s] Not Supported', $driver));
+        }
+
+        $this->driver = $driver;
+
+        return $this;
+    }
+
+    /**
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     * @return string
+     */
+    protected function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     * @param string $path
+     * @return $this
+     */
+    public function setPath(string $path)
+    {
+        $this->path = $path;
+
+        return $this;
+    }
+}

extend/catcher/base/CatchController.php

@@ -2,8 +2,6 @@
 namespace catcher\base;
 
 use catcher\CatchAdmin;
-use catcher\CatchResponse;
-use think\facade\View;
 
 abstract class CatchController
 {

extend/catcher/command/worker/WsWorkerCommand.php

@@ -0,0 +1,103 @@
+<?php
+declare (strict_types = 1);
+
+namespace catcher\command\worker;
+
+use catcher\CatchAdmin;
+use think\Config;
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\Db;
+use Workerman\Worker;
+
+class WsWorkerCommand extends Command
+{
+    protected $address = '127.0.0.1:10001';
+
+    protected function configure()
+    {
+        // 指令配置
+        $this->setName('ws:server')
+            ->addArgument('option', Argument::OPTIONAL, '[start|reload|stop|restart|reload|status|connections]', 'start')
+            ->addOption('mode', '-m', Option::VALUE_REQUIRED, 'worker start mode')
+            ->addOption('number', '-n', Option::VALUE_REQUIRED, 'worker number')
+            ->addOption('address', '-a',Option::VALUE_REQUIRED, 'listen address, like \'127.0.0.1:9090\'')
+            ->setDescription('start websocket server, default listen 127.0.0.1 port 10001');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $this->setWokrermanCommnd();
+
+        $this->start();
+    }
+
+    /**
+     * worker start
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/23
+     * @return void
+     */
+    protected function start()
+    {
+        $ws = new Worker(sprintf('websocket://%s', $this->getAddress()));
+
+        $ws->count = $this->getWorkerNumber();
+
+        $ws->runAll();
+    }
+
+    /**
+     * @return string
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/23
+     */
+    protected function getAddress()
+    {
+        return $this->input->getOption('address') ? : $this->address;
+    }
+
+    /**
+     * worker number
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/23
+     * @return mixed
+     */
+    protected function getWorkerNumber()
+    {
+        return $this->input->getOption('number') ? : 3;
+    }
+
+    /**
+     * set workerman command
+     *
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/23
+     * @return void
+     */
+    protected function setWokrermanCommnd()
+    {
+        global $argv;
+
+        $option = $this->input->getArgument('option');
+
+        $mode = $this->input->getOption('mode');
+
+        if ($option) {
+            array_unshift($argv, $mode);
+        }
+
+        array_unshift($argv, $option);
+
+        array_unshift($argv, 'catchWorker');
+    }
+}

package/filesystem-cloud/README.md

@@ -0,0 +1,58 @@
+## Think-Filesystem-cloud
+
+### 要求
+   - php 7.1
+   - topthink/framework 6.0.0
+   
+### 使用
+```php
+composer require jaguarjack/think-filesystem-cloud
+```   
+
+### 配置
+config/filesystem.php
+```php
+"disks" => [
+    // oss 配置
+    'oss' => [
+        'type'   => 'oss',
+        'prefix' => '',
+        'access_key' => '';
+        'secret_key' => '';
+        'end_point'  => ''; // ssl：https://iidestiny.com
+        'bucket'     => '';
+        'is_cname'   => true
+    ],
+    // 七牛配置
+    'qiniu' => [
+        'type'       => 'qiniu',
+        'access_key' => '',
+        'secret_key' => '',
+        'bucket'     => '',
+        'domain'     => '',
+    ],
+    // 腾讯云配置
+    'qcloud' => [
+        'type'        => 'qcloud',
+        'region'      => '',
+            'credentials' => [
+                'appId'      => , // 域名中数字部分
+                'secretId'   => '',
+                'secretKey'  => '',
+            ],
+            'bucket'          => 'test',
+            'timeout'         => 60,
+            'connect_timeout' => 60,
+            'cdn'             => '您的 CDN 域名',
+            'scheme'          => 'https',
+            'read_from_cdn'   => false,
+    ]
+```
+
+### 感谢
+   - [iiDestiny/flysystem-oss](https://github.com/iiDestiny/flysystem-oss)
+   - [overtrue/flysystem-qiniu](https://github.com/overtrue/flysystem-qiniu)
+   - [overtrue/flysystem-cos](https://github.com/overtrue/flysystem-cos)
+
+### 协议
+ MIT

package/filesystem-cloud/composer.json

@@ -0,0 +1,32 @@
+{
+    "name": "jaguarjack/think-filesystem-cloud",
+    "description": "cloud filesystem for thinkphp6.0",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "jaguarjack",
+            "email": "njphper@gmail.com"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {
+        "guzzlehttp/guzzle": "^6.3",
+        "overtrue/flysystem-qiniu": "^1.0",
+        "overtrue/flysystem-cos": "^2.0",
+        "iidestiny/flysystem-oss": "^1.3",
+        "jaguarjack/think-filesystem-cloud": "dev-master"
+    },
+    "autoload": {
+        "psr-4": {
+            "jaguarjack\\filesystem\\cloud\\": "src"
+        }
+    },
+    "extra": {
+        "think": {
+            "services": [
+                "jaguarjack\\filesystem\\cloud\\Service"
+            ]
+        }
+    }
+}

package/filesystem-cloud/src/Filesystem.php

@@ -0,0 +1,86 @@
+<?php
+namespace jaguarjack\filesystem\cloud;
+
+use think\exception\InvalidArgumentException;
+use think\filesystem\Driver;
+use think\helper\Arr;
+use think\helper\Str;
+use think\Manager;
+
+class Filesystem extends Manager
+{
+    protected $namespace = __NAMESPACE__ . '\\drivers\\';
+
+    /**
+     * @param null|string $name
+     * @return Driver
+     */
+    public function disk(string $name = null): Driver
+    {
+        return $this->driver($name);
+    }
+
+    protected function resolveType(string $name)
+    {
+        return $this->getDiskConfig($name, 'type', 'local');
+    }
+
+    protected function resolveConfig(string $name)
+    {
+        return $this->getDiskConfig($name);
+    }
+
+    /**
+     * 获取缓存配置
+     * @access public
+     * @param null|string $name    名称
+     * @param mixed       $default 默认值
+     * @return mixed
+     */
+    public function getConfig(string $name = null, $default = null)
+    {
+        if (!is_null($name)) {
+            return $this->app->config->get('filesystem.' . $name, $default);
+        }
+
+        return $this->app->config->get('filesystem');
+    }
+
+    public function resolveClass(string $type): string
+    {
+        if ($this->namespace || false !== strpos($type, '\\')) {
+            $class = false !== strpos($type, '\\') ? $type : $this->namespace . Str::studly($type) . 'Driver';
+
+            if (class_exists($class)) {
+                return $class;
+            }
+        }
+
+        throw new InvalidArgumentException("Driver [$type] not supported.");
+    }
+
+    /**
+     * 获取磁盘配置
+     * @param string $disk
+     * @param null   $name
+     * @param null   $default
+     * @return array
+     */
+    public function getDiskConfig($disk, $name = null, $default = null)
+    {
+        if ($config = $this->getConfig("disks.{$disk}")) {
+            return Arr::get($config, $name, $default);
+        }
+
+        throw new InvalidArgumentException("Disk [$disk] not found.");
+    }
+
+    /**
+     * 默认驱动
+     * @return string|null
+     */
+    public function getDefaultDriver()
+    {
+        return $this->getConfig('default');
+    }
+}

package/filesystem-cloud/src/Service.php

@@ -0,0 +1,10 @@
+<?php
+namespace jaguarjack\filesystem\cloud;
+
+class Service extends \think\Service
+{
+    public function register()
+    {
+        $this->app->bind('filesystem', Filesystem::class);
+    }
+}

package/filesystem-cloud/src/drivers/Local.php

@@ -0,0 +1,7 @@
+<?php
+namespace jaguarjack\filesystem\cloud\drivers;
+
+class Local extends \think\filesystem\driver\Local
+{
+
+}

package/filesystem-cloud/src/drivers/OssDriver.php

@@ -0,0 +1,34 @@
+<?php
+namespace jaguarjack\filesystem\cloud\drivers;
+
+use Iidestiny\Flysystem\Oss\OssAdapter;
+use League\Flysystem\AdapterInterface;
+use OSS\Core\OssException;
+use think\filesystem\Driver;
+
+class OssDriver extends Driver
+{
+    /**
+     *
+     * @return AdapterInterface
+     * @throws OssException
+     * @author JaguarJack
+     * @email njphper@gmail.com
+     * @time 2020/1/25
+     */
+    protected function createAdapter(): AdapterInterface
+    {
+        // TODO: Implement createAdapter() method.
+        $ossConfig = \config('filesystem.disks.oss');
+
+        return new OssAdapter(
+            $ossConfig['access_key'],
+            $ossConfig['assess_secret'],
+            $ossConfig['end_point'],
+            $ossConfig['bucket'],
+            $ossConfig['is_cname'],
+            $ossConfig['prefix']
+        );
+    }
+
+}

package/filesystem-cloud/src/drivers/QcloudDriver.php

@@ -0,0 +1,16 @@
+<?php
+namespace jaguarjack\filesystem\cloud\drivers;
+
+use League\Flysystem\AdapterInterface;
+use Overtrue\Flysystem\Cos\CosAdapter;
+use think\filesystem\Driver;
+
+class QcloudDriver extends Driver
+{
+
+    protected function createAdapter(): AdapterInterface
+    {
+        // TODO: Implement createAdapter() method.
+        return new CosAdapter(\config('filesystem.disks.qcloud'));
+    }
+}

package/filesystem-cloud/src/drivers/QiniuDriver.php

@@ -0,0 +1,18 @@
+<?php
+namespace jaguarjack\filesystem\cloud\drivers;
+
+use League\Flysystem\AdapterInterface;
+use Overtrue\Flysystem\Qiniu\QiniuAdapter;
+use think\filesystem\Driver;
+
+class QiniuDriver extends Driver
+{
+
+    protected function createAdapter(): AdapterInterface
+    {
+        // TODO: Implement createAdapter() method.
+        $qiniuConfig = \config('filesystem.disks.qiniu');
+
+        return new QiniuAdapter($qiniuConfig['access_key'], $qiniuConfig['secret_key'], $qiniuConfig['bucket'], $qiniuConfig['domain']);
+    }
+}