This commit is contained in:
JaguarJack 2020-11-29 09:29:14 +08:00
parent 97efb82971
commit 94c430f491
60 changed files with 140 additions and 22 deletions

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use think\helper\Arr; use think\helper\Arr;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catcher\event\LoadModuleRoutes; use catcher\event\LoadModuleRoutes;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catchAdmin\permissions\model\Users; use catchAdmin\permissions\model\Users;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename CacheKeys.php * @filename CacheKeys.php
* @createdAt 2020/1/17 * @createdAt 2020/1/17

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
@ -12,6 +14,7 @@ namespace catcher;
use catcher\library\Composer; use catcher\library\Composer;
use catcher\facade\FileSystem; use catcher\facade\FileSystem;
use Symfony\Component\Finder\SplFileInfo;
use think\App; use think\App;
use think\console\Command; use think\console\Command;
@ -43,9 +46,9 @@ class CatchConsole
/* \Symfony\Component\Finder\SplFileInfo $command */ /* \Symfony\Component\Finder\SplFileInfo $command */
foreach ($commandFiles as $command) { foreach ($commandFiles as $command) {
if ($command->getExtension() === 'php') { if ($command->getExtension() === 'php') {
$lastPath = str_replace($this->parseNamespace(), '',pathinfo($command, PATHINFO_DIRNAME)); $lastPath = str_replace($this->parseNamespace(), '', pathinfo($command->getPathname(), PATHINFO_DIRNAME));
$namespace = $this->namespace . str_replace(DIRECTORY_SEPARATOR, '\\', $lastPath) . '\\'; $namespace = $this->namespace . str_replace(DIRECTORY_SEPARATOR, '\\', $lastPath) . '\\';
$commandClass = $namespace . pathinfo($command, PATHINFO_FILENAME); $commandClass = $namespace . pathinfo($command->getPathname(), PATHINFO_FILENAME);
$commands[] = $commandClass; $commands[] = $commandClass;
} }
} }

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use app\ExceptionHandle; use app\ExceptionHandle;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catcher\library\excel\Excel; use catcher\library\excel\Excel;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catcher\base\CatchModel; use catcher\base\CatchModel;

View File

@ -1,9 +1,9 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use think\Paginator; use think\Paginator;
use think\Response;
use think\response\Json; use think\response\Json;
class CatchResponse class CatchResponse

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catchAdmin\system\model\Attachments; use catchAdmin\system\model\Attachments;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
class Code class Code

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
class Tree class Tree

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher; namespace catcher;
use catchAdmin\system\model\Config; use catchAdmin\system\model\Config;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\base; namespace catcher\base;
abstract class CatchController abstract class CatchController

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\base; namespace catcher\base;
use catcher\CatchQuery; use catcher\CatchQuery;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename CatchRepository.php * @filename CatchRepository.php
* @createdAt 2020/6/21 * @createdAt 2020/6/21

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\base; namespace catcher\base;
use app\Request; use app\Request;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\base; namespace catcher\base;
use think\Validate; use think\Validate;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;
use Exception; use Exception;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;
use catcher\Code; use catcher\Code;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;
use catcher\Code; use catcher\Code;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;
use catcher\Code; use catcher\Code;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\exceptions; namespace catcher\exceptions;
use catcher\Code; use catcher\Code;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename WechatResponseException.php * @filename WechatResponseException.php
* @createdAt 2020/6/21 * @createdAt 2020/6/21

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\facade; namespace catcher\facade;
use think\Facade; use think\Facade;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\facade; namespace catcher\facade;
use think\Facade; use think\Facade;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library; namespace catcher\library;
use catcher\CatchAdmin; use catcher\CatchAdmin;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename Errors.php * @filename Errors.php
* @createdAt 2020/6/21 * @createdAt 2020/6/21

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,6 +1,8 @@
<?php <?php
namespace catcher\library;
declare(strict_types=1);
namespace catcher\library;
use think\exception\ClassNotFoundException; use think\exception\ClassNotFoundException;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename ProgressBar.php * @filename ProgressBar.php
* @createdAt 2020/6/20 * @createdAt 2020/6/20

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library; namespace catcher\library;
use catcher\CatchCacheKeys; use catcher\CatchCacheKeys;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename WeChat.php * @filename WeChat.php
* @date 2020/6/7 * @date 2020/6/7

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\client; namespace catcher\library\client;
use catcher\exceptions\FailedException; use catcher\exceptions\FailedException;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\client; namespace catcher\library\client;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\excel; namespace catcher\library\excel;
use catcher\CatchUpload; use catcher\CatchUpload;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\excel; namespace catcher\library\excel;
interface ExcelContract interface ExcelContract

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\excel; namespace catcher\library\excel;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\excel; namespace catcher\library\excel;
trait MacroExcel trait MacroExcel

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\library\excel; namespace catcher\library\excel;
interface ShouldTaskContract interface ShouldTaskContract

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | CatchAdmin [Just Like ] // | CatchAdmin [Just Like ]
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------

View File

@ -1,4 +1,5 @@
<?php <?php
declare(strict_types=1);
namespace catcher\traits\db; namespace catcher\traits\db;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
/** /**
* @filename ScopeTrait.php * @filename ScopeTrait.php
* @createdAt 2020/6/21 * @createdAt 2020/6/21

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\traits\db; namespace catcher\traits\db;
use think\facade\Db; use think\facade\Db;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\validates; namespace catcher\validates;
use catcher\library\Trie; use catcher\library\Trie;

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\validates; namespace catcher\validates;
class Sometimes implements ValidateInterface class Sometimes implements ValidateInterface

View File

@ -1,4 +1,6 @@
<?php <?php
declare(strict_types=1);
namespace catcher\validates; namespace catcher\validates;
interface ValidateInterface interface ValidateInterface