diff --git a/app/BaseController.php b/app/BaseController.php index 2258d45..b3fed7a 100755 --- a/app/BaseController.php +++ b/app/BaseController.php @@ -58,29 +58,29 @@ abstract class BaseController */ protected function validate(array $data, $validate, array $message = [], bool $batch = false) { - if (is_array($validate)) { - $v = new Validate(); - $v->rule($validate); - } else { - if (strpos($validate, '.')) { - // 支持场景 - [$validate, $scene] = explode('.', $validate); - } - $class = false !== strpos($validate, '\\') ? $validate : $this->app->parseClass('validate', $validate); - $v = new $class(); - if (!empty($scene)) { - $v->scene($scene); - } - } + // if (is_array($validate)) { + // $v = new Validate(); + // $v->rule($validate); + // } else { + // if (strpos($validate, '.')) { + // // 支持场景 + // [$validate, $scene] = explode('.', $validate); + // } + // $class = false !== strpos($validate, '\\') ? $validate : $this->app->parseClass('validate', $validate); + // $v = new $class(); + // if (!empty($scene)) { + // $v->scene($scene); + // } + // } - $v->message($message); + // $v->message($message); - // 是否批量验证 - if ($batch || $this->batchValidate) { - $v->batch(true); - } + // // 是否批量验证 + // if ($batch || $this->batchValidate) { + // $v->batch(true); + // } - return $v->failException(true)->check($data); + // return $v->failException(true)->check($data); } diff --git a/app/admin/controller/BaseAdminController.php b/app/admin/controller/BaseAdminController.php index 68b663f..3d6122f 100644 --- a/app/admin/controller/BaseAdminController.php +++ b/app/admin/controller/BaseAdminController.php @@ -9,8 +9,6 @@ use app\common\lists\BaseDataLists; class BaseAdminController extends BaseLikeAdminController { - public $notNeedLogin = []; - protected $adminId = 0; protected $adminInfo = []; diff --git a/app/admin/controller/tools/GeneratorController.php b/app/admin/controller/tools/GeneratorController.php new file mode 100644 index 0000000..f46d54e --- /dev/null +++ b/app/admin/controller/tools/GeneratorController.php @@ -0,0 +1,208 @@ +dataLists(new DataTableLists()); + } + + + /** + * @notes 获取已选择的数据表 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/14 10:57 + */ + public function generateTable() + { + return $this->dataLists(new GenerateTableLists()); + } + + + /** + * @notes 选择数据表 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/15 10:09 + */ + public function selectTable() + { + $params = (new GenerateTableValidate())->post()->goCheck('select'); + $result = GeneratorLogic::selectTable($params, $this->adminId); + if (true === $result) { + return $this->success('操作成功', [], 1, 1); + } + return $this->fail(GeneratorLogic::getError()); + } + + + /** + * @notes 生成代码 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/23 19:08 + */ + public function generate() + { + $params = (new GenerateTableValidate())->post()->goCheck('id'); + + $result = GeneratorLogic::generate($params); + if (false === $result) { + return $this->fail(GeneratorLogic::getError()); + } + + return $this->success('操作成功', $result, 1, 1); + } + + + /** + * @notes 下载文件 + * @return \think\response\File|\think\response\Json + * @author 段誉 + * @date 2022/6/24 9:51 + */ + public function download() + { + $params = (new GenerateTableValidate())->goCheck('download'); + $result = GeneratorLogic::download($params['file']); + if (false === $result) { + return $this->fail(GeneratorLogic::getError() ?: '下载失败'); + } + return download($result, 'likeadmin-curd.zip'); + } + + + /** + * @notes 预览代码 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/23 19:07 + */ + public function preview() + { + $params = (new GenerateTableValidate())->post()->goCheck('id'); + $result = GeneratorLogic::preview($params); + if (false === $result) { + return $this->fail(GeneratorLogic::getError()); + } + return $this->data($result); + } + + + /** + * @notes 同步字段 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/17 15:22 + */ + public function syncColumn() + { + $params = (new GenerateTableValidate())->post()->goCheck('id'); + $result = GeneratorLogic::syncColumn($params); + if (true === $result) { + return $this->success('操作成功', [], 1, 1); + } + return $this->fail(GeneratorLogic::getError()); + } + + + /** + * @notes 编辑表信息 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/20 10:44 + */ + public function edit() + { + $params = (new EditTableValidate())->post()->goCheck(); + $result = GeneratorLogic::editTable($params); + if (true === $result) { + return $this->success('操作成功', [], 1, 1); + } + return $this->fail(GeneratorLogic::getError()); + } + + + /** + * @notes 获取已选择的数据表详情 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/15 19:00 + */ + public function detail() + { + $params = (new GenerateTableValidate())->goCheck('id'); + $result = GeneratorLogic::getTableDetail($params); + return $this->success('', $result); + } + + + /** + * @notes 删除已选择的数据表信息 + * @return \think\response\Json + * @author 段誉 + * @date 2022/6/15 19:00 + */ + public function delete() + { + $params = (new GenerateTableValidate())->post()->goCheck('id'); + $result = GeneratorLogic::deleteTable($params); + if (true === $result) { + return $this->success('操作成功', [], 1, 1); + } + return $this->fail(GeneratorLogic::getError()); + } + + + /** + * @notes 获取模型 + * @return \think\response\Json + * @author 段誉 + * @date 2022/12/14 11:07 + */ + public function getModels() + { + $result = GeneratorLogic::getAllModels(); + return $this->success('', $result, 1, 1); + } + +} + diff --git a/app/admin/lists/tools/DataTableLists.php b/app/admin/lists/tools/DataTableLists.php new file mode 100644 index 0000000..406ff66 --- /dev/null +++ b/app/admin/lists/tools/DataTableLists.php @@ -0,0 +1,74 @@ +params['name'])) { + $sql .= "AND name LIKE '%" . $this->params['name'] . "%'"; + } + if (!empty($this->params['comment'])) { + $sql .= "AND comment LIKE '%" . $this->params['comment'] . "%'"; + } + return Db::query($sql); + } + + + /** + * @notes 处理列表 + * @return array + * @author 段誉 + * @date 2022/6/13 18:54 + */ + public function lists(): array + { + $lists = array_map("array_change_key_case", $this->queryResult()); + $offset = max(0, ($this->pageNo - 1) * $this->pageSize); + $lists = array_slice($lists, $offset, $this->pageSize, true); + return array_values($lists); + } + + + /** + * @notes 获取数量 + * @return int + * @author 段誉 + * @date 2022/6/13 18:54 + */ + public function count(): int + { + return count($this->queryResult()); + } + +} \ No newline at end of file diff --git a/app/admin/lists/tools/GenerateTableLists.php b/app/admin/lists/tools/GenerateTableLists.php new file mode 100644 index 0000000..d7fd97b --- /dev/null +++ b/app/admin/lists/tools/GenerateTableLists.php @@ -0,0 +1,75 @@ + ['table_name', 'table_comment'] + ]; + } + + + /** + * @notes 查询列表 + * @return array + * @throws \think\db\exception\DataNotFoundException + * @throws \think\db\exception\DbException + * @throws \think\db\exception\ModelNotFoundException + * @author 段誉 + * @date 2022/6/14 10:55 + */ + public function lists(): array + { + return GenerateTable::where($this->searchWhere) + ->order(['id' => 'desc']) + ->append(['template_type_desc']) + ->limit($this->limitOffset, $this->limitLength) + ->select() + ->toArray(); + } + + + /** + * @notes 获取数量 + * @return int + * @author 段誉 + * @date 2022/6/14 10:55 + */ + public function count(): int + { + return GenerateTable::count(); + } + +} \ No newline at end of file diff --git a/app/admin/logic/LoginLogic.php b/app/admin/logic/LoginLogic.php index d14b8ca..6320957 100755 --- a/app/admin/logic/LoginLogic.php +++ b/app/admin/logic/LoginLogic.php @@ -46,7 +46,6 @@ class LoginLogic extends BaseLogic $admin->login_time = $time; $admin->login_ip = request()->getLocalIp(); $admin->save(); - //设置token $adminInfo = AdminTokenService::setToken($admin->id, $params['terminal'], $admin->multipoint_login); diff --git a/app/admin/logic/tools/GeneratorLogic.php b/app/admin/logic/tools/GeneratorLogic.php index a0e43eb..d88a288 100755 --- a/app/admin/logic/tools/GeneratorLogic.php +++ b/app/admin/logic/tools/GeneratorLogic.php @@ -19,6 +19,8 @@ use app\common\logic\BaseLogic; use app\common\model\tools\GenerateColumn; use app\common\model\tools\GenerateTable; use app\common\service\generator\GenerateService; +use support\Cache; +use support\Container; use think\facade\Db; @@ -205,8 +207,7 @@ class GeneratorLogic extends BaseLogic $tables = GenerateTable::with(['table_column']) ->whereIn('id', $params['id']) ->select()->toArray(); - - $generator = app()->make(GenerateService::class); + $generator= Container::get(GenerateService::class); $generator->delGenerateDirContent(); $flag = array_unique(array_column($tables, 'table_name')); $flag = implode(',', $flag); @@ -224,7 +225,6 @@ class GeneratorLogic extends BaseLogic $generator->delGenerateFlag(); $zipFile = $generator->getDownloadUrl(); } - return ['file' => $zipFile]; } catch (\Exception $e) { @@ -249,7 +249,7 @@ class GeneratorLogic extends BaseLogic ->whereIn('id', $params['id']) ->findOrEmpty()->toArray(); - return app()->make(GenerateService::class)->preview($table); + return Container::get(GenerateService::class)->preview($table); } catch (\Exception $e) { self::$error = $e->getMessage(); @@ -358,19 +358,17 @@ class GeneratorLogic extends BaseLogic */ public static function download(string $fileName) { - $cacheFileName = cache('curd_file_name' . $fileName); + $cacheFileName = Cache::get('curd_file_name' . $fileName); if (empty($cacheFileName)) { self::$error = '请重新生成代码'; return false; } - - $path = root_path() . 'runtime/generate/' . $fileName; + $path = base_path() . '/runtime/generate/' . $fileName; if (!file_exists($path)) { self::$error = '下载失败'; return false; } - - cache('curd_file_name' . $fileName, null); + Cache::delete('curd_file_name' . $fileName); return $path; } diff --git a/app/admin/validate/LoginValidate.php b/app/admin/validate/LoginValidate.php index 6cbba12..a6d7c7d 100644 --- a/app/admin/validate/LoginValidate.php +++ b/app/admin/validate/LoginValidate.php @@ -72,8 +72,8 @@ class LoginValidate extends BaseValidate $adminAccountSafeCache->record(); return '账号不存在'; } - - if (!password_verify($password,$adminInfo['password'])) { + $passwordSalt = Config::get('project.unique_identification'); + if ($adminInfo['password'] !== create_password($password, $passwordSalt)) { $adminAccountSafeCache->record(); return '密码错误'; } diff --git a/app/admin/validate/tools/EditTableValidate.php b/app/admin/validate/tools/EditTableValidate.php new file mode 100644 index 0000000..5878728 --- /dev/null +++ b/app/admin/validate/tools/EditTableValidate.php @@ -0,0 +1,98 @@ + 'require|checkTableData', + 'table_name' => 'require', + 'table_comment' => 'require', + 'template_type' => 'require|in:0,1', + 'generate_type' => 'require|in:0,1', + 'module_name' => 'require', + 'table_column' => 'require|array|checkColumn', + ]; + + protected $message = [ + 'id.require' => '表id缺失', + 'table_name.require' => '请填写表名称', + 'table_comment.require' => '请填写表描述', + 'template_type.require' => '请选择模板类型', + 'template_type.in' => '模板类型参数错误', + 'generate_type.require' => '请选择生成方式', + 'generate_type.in' => '生成方式类型错误', + 'module_name.require' => '请填写模块名称', + 'table_column.require' => '表字段信息缺失', + 'table_column.array' => '表字段信息类型错误', + ]; + + + /** + * @notes 校验当前数据表是否存在 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/6/15 18:58 + */ + protected function checkTableData($value, $rule, $data) + { + $table = GenerateTable::findOrEmpty($value); + if ($table->isEmpty()) { + return '信息不存在'; + } + return true; + } + + + /** + * @notes 校验表字段参数 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/6/20 10:42 + */ + protected function checkColumn($value, $rule, $data) + { + foreach ($value as $item) { + if (!isset($item['id'])) { + return '表字段id参数缺失'; + } + if (!isset($item['query_type'])) { + return '请选择查询方式'; + } + if (!isset($item['view_type'])) { + return '请选择显示类型'; + } + } + return true; + } + +} \ No newline at end of file diff --git a/app/admin/validate/tools/GenerateTableValidate.php b/app/admin/validate/tools/GenerateTableValidate.php new file mode 100644 index 0000000..4773b36 --- /dev/null +++ b/app/admin/validate/tools/GenerateTableValidate.php @@ -0,0 +1,131 @@ + 'require|checkTableData', + 'table' => 'require|array|checkTable', + 'file' => 'require' + ]; + + protected $message = [ + 'id.require' => '参数缺失', + 'table.require' => '参数缺失', + 'table.array' => '参数类型错误', + 'file.require' => '下载失败', + ]; + + + /** + * @notes 选择数据表场景 + * @return GenerateTableValidate + * @author 段誉 + * @date 2022/6/15 18:58 + */ + public function sceneSelect() + { + return $this->only(['table']); + } + + + /** + * @notes 需要校验id的场景 + * @return GenerateTableValidate + * @author 段誉 + * @date 2022/6/15 18:58 + */ + public function sceneId() + { + return $this->only(['id']); + } + + + /** + * @notes 下载场景 + * @return GenerateTableValidate + * @author 段誉 + * @date 2022/6/24 10:02 + */ + public function sceneDownload() + { + return $this->only(['file']); + } + + + /** + * @notes 校验选择的数据表信息 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/6/15 18:58 + */ + protected function checkTable($value, $rule, $data) + { + foreach ($value as $item) { + if (!isset($item['name']) || !isset($item['comment'])) { + return '参数缺失'; + } + $exist = Db::query("SHOW TABLES LIKE'" . $item['name'] . "'"); + if (empty($exist)) { + return '当前数据库不存在' . $item['name'] . '表'; + } + } + return true; + } + + + /** + * @notes 校验当前数据表是否存在 + * @param $value + * @param $rule + * @param $data + * @return bool|string + * @author 段誉 + * @date 2022/6/15 18:58 + */ + protected function checkTableData($value, $rule, $data) + { + if (!is_array($value)) { + $value = [$value]; + } + + foreach ($value as $item) { + $table = GenerateTable::findOrEmpty($item); + if ($table->isEmpty()) { + return '信息不存在'; + } + } + + return true; + } + + +} \ No newline at end of file diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php new file mode 100644 index 0000000..0457c30 --- /dev/null +++ b/app/api/controller/IndexController.php @@ -0,0 +1,12 @@ +key)) { //缓存存在，记录错误次数 - Cache::inc($this->key, 1); + Cache::set($this->key, Cache::get($this->key) + 1); } else { //缓存不存在，第一次设置缓存 Cache::set($this->key, 1, $this->minute * 60); diff --git a/app/common/cache/AdminAuthCache.php b/app/common/cache/AdminAuthCache.php index 74e3630..8dab287 100644 --- a/app/common/cache/AdminAuthCache.php +++ b/app/common/cache/AdminAuthCache.php @@ -5,7 +5,7 @@ namespace app\common\cache; use app\admin\logic\auth\AuthLogic; -use think\facade\Cache; +use support\Cache; class AdminAuthCache extends BaseCache { diff --git a/app/common/cache/AdminTokenCache.php b/app/common/cache/AdminTokenCache.php index 434633c..6a630e1 100644 --- a/app/common/cache/AdminTokenCache.php +++ b/app/common/cache/AdminTokenCache.php @@ -8,7 +8,7 @@ use app\common\model\auth\Admin; use app\common\model\auth\AdminSession; use app\common\model\auth\SystemRole; use app\common\model\BaseModel; -use think\facade\Cache; +use support\Cache; class AdminTokenCache extends BaseCache { @@ -82,7 +82,7 @@ class AdminTokenCache extends BaseCache 'terminal' => $adminSession->terminal, 'expire_time' => $adminSession->expire_time, ]; - Cache::set($this->prefix . $token, $adminInfo, new \DateTime(Date('Y-m-d H:i:s', $adminSession->expire_time))); + Cache::set($this->prefix . $token, $adminInfo); return $this->getAdminInfo($token); } diff --git a/app/common/cache/BaseCache.php b/app/common/cache/BaseCache.php index 5e06677..43e1d02 100644 --- a/app/common/cache/BaseCache.php +++ b/app/common/cache/BaseCache.php @@ -3,7 +3,7 @@ namespace app\common\cache; -use think\facade\Cache; +use support\Cache; class BaseCache { @@ -30,7 +30,7 @@ class BaseCache */ public function set($key, $value, $ttl = null): bool { - return Cache::store()->tag($this->tagName)->set($key, $value, $ttl); + return Cache::set($key, $value, $ttl); } @@ -42,6 +42,6 @@ class BaseCache */ public function deleteTag(): bool { - return Cache::tag($this->tagName)->clear(); + return Cache::delete($this->tagName); } } \ No newline at end of file diff --git a/app/common/cache/ExportCache.php b/app/common/cache/ExportCache.php index 8296edc..9ef56e3 100755 --- a/app/common/cache/ExportCache.php +++ b/app/common/cache/ExportCache.php @@ -14,9 +14,7 @@ namespace app\common\cache; - - -use think\facade\Cache; +use support\Cache; class ExportCache extends BaseCache { diff --git a/app/common/controller/BaseLikeAdminController.php b/app/common/controller/BaseLikeAdminController.php index 4ed303d..0574905 100644 --- a/app/common/controller/BaseLikeAdminController.php +++ b/app/common/controller/BaseLikeAdminController.php @@ -48,7 +48,7 @@ class BaseLikeAdminController extends BaseController protected function dataLists(BaseDataLists $lists = null) { //列表类和控制器一一对应，"app/应用/controller/控制器的方法" =》"app\应用\lists\"目录下 - //（例如："app/adminapi/controller/auth/AdminController.php的lists()方法" =》 "app/adminapi/lists/auth/AminLists.php") + //（例如："app/admin/controller/auth/AdminController.php的lists()方法" =》 "app/admin/lists/auth/AminLists.php") //当对象为空时，自动创建列表对象 if (is_null($lists)) { // $listName = str_replace('.', '\\', App::getNamespace() . '\\lists\\' . $this->request->controller() . ucwords($this->request->action())); diff --git a/app/common/enum/GeneratorEnum.php b/app/common/enum/GeneratorEnum.php new file mode 100755 index 0000000..595b1f0 --- /dev/null +++ b/app/common/enum/GeneratorEnum.php @@ -0,0 +1,63 @@ + '单表(增删改查)', + self::TEMPLATE_TYPE_TREE => '树表(增删改查)', + ]; + if ($value === true) { + return $data; + } + return $data[$value] ?? ''; + } +} \ No newline at end of file diff --git a/app/common/model/tools/GenerateColumn.php b/app/common/model/tools/GenerateColumn.php new file mode 100644 index 0000000..7426cc7 --- /dev/null +++ b/app/common/model/tools/GenerateColumn.php @@ -0,0 +1,39 @@ +belongsTo(GenerateTable::class, 'id', 'table_id'); + } +} \ No newline at end of file diff --git a/app/common/model/tools/GenerateTable.php b/app/common/model/tools/GenerateTable.php new file mode 100644 index 0000000..181bbe4 --- /dev/null +++ b/app/common/model/tools/GenerateTable.php @@ -0,0 +1,59 @@ +hasMany(GenerateColumn::class, 'table_id', 'id'); + } + + /** + * @notes 模板类型描述 + * @param $value + * @param $data + * @return string|string[] + * @author 段誉 + * @date 2022/6/14 11:25 + */ + public function getTemplateTypeDescAttr($value, $data) + { + return GeneratorEnum::getTemplateTypeDesc($data['template_type']); + } + + + +} \ No newline at end of file diff --git a/app/common/service/FileService.php b/app/common/service/FileService.php index a3a55bf..d79995d 100644 --- a/app/common/service/FileService.php +++ b/app/common/service/FileService.php @@ -4,7 +4,7 @@ namespace app\common\service; -use think\facade\Cache; +use support\Cache; class FileService { diff --git a/app/common/service/generator/GenerateService.php b/app/common/service/generator/GenerateService.php new file mode 100644 index 0000000..164eb7f --- /dev/null +++ b/app/common/service/generator/GenerateService.php @@ -0,0 +1,236 @@ +generatePath = base_path() . '/runtime/generate/'; + $this->runtimePath = base_path() . '/runtime/'; + } + + + /** + * @notes 删除生成文件夹内容 + * @author 段誉 + * @date 2022/6/23 18:52 + */ + public function delGenerateDirContent() + { + // 删除runtime目录制定文件夹 + !is_dir($this->generatePath) && mkdir($this->generatePath, 0755, true); + del_target_dir($this->generatePath, false); + } + + + /** + * @notes 设置生成状态 + * @param $name + * @param false $status + * @author 段誉 + * @date 2022/6/23 18:53 + */ + public function setGenerateFlag($name, $status = false) + { + $this->flag = $name; + Cache::set($name, (int)$status, 3600); + } + + + /** + * @notes 获取生成状态标记 + * @return mixed|object|\think\App + * @author 段誉 + * @date 2022/6/23 18:53 + */ + public function getGenerateFlag() + { + return Cache::get($this->flag); + } + + + /** + * @notes 删除标记时间 + * @author 段誉 + * @date 2022/6/23 18:53 + */ + public function delGenerateFlag() + { + Cache::delete($this->flag); + } + + + /** + * @notes 生成器相关类 + * @return string[] + * @author 段誉 + * @date 2022/6/23 17:17 + */ + public function getGeneratorClass() + { + return [ + ControllerGenerator::class, + ListsGenerator::class, + ModelGenerator::class, + ValidateGenerator::class, + LogicGenerator::class, + VueApiGenerator::class, + VueIndexGenerator::class, + VueEditGenerator::class, + SqlGenerator::class, + ]; + } + + + /** + * @notes 生成文件 + * @param array $tableData + * @author 段誉 + * @date 2022/6/23 18:52 + */ + public function generate(array $tableData) + { + foreach ($this->getGeneratorClass() as $item) { + $generator = Container::get($item); + $generator->initGenerateData($tableData); + $generator->generate(); + // 是否为压缩包下载 + if ($generator->isGenerateTypeZip()) { + $this->setGenerateFlag($this->flag, true); + } + // 是否构建菜单 + if ($item == 'app\common\service\generator\core\SqlGenerator') { + $generator->isBuildMenu() && $generator->buildMenuHandle(); + } + } + } + + + /** + * @notes 预览文件 + * @param array $tableData + * @return array + * @author 段誉 + * @date 2022/6/23 18:52 + */ + public function preview(array $tableData) + { + $data = []; + foreach ($this->getGeneratorClass() as $item) { + $generator = Container::get($item); + $generator->initGenerateData($tableData); + $data[] = $generator->fileInfo(); + } + return $data; + } + + + /** + * @notes 压缩文件 + * @author 段誉 + * @date 2022/6/23 19:02 + */ + public function zipFile() + { + $fileName = 'curd-' . date('YmdHis') . '.zip'; + $this->zipTempName = $fileName; + $this->zipTempPath = $this->generatePath . $fileName; + $zip = new \ZipArchive(); + $zip->open($this->zipTempPath, \ZipArchive::CREATE); + $this->addFileZip($this->runtimePath, 'generate', $zip); + $zip->close(); + } + + + /** + * @notes 往压缩包写入文件 + * @param $basePath + * @param $dirName + * @param $zip + * @author 段誉 + * @date 2022/6/23 19:02 + */ + public function addFileZip($basePath, $dirName, $zip) + { + $handler = opendir($basePath . $dirName); + while (($filename = readdir($handler)) !== false) { + if ($filename != '.' && $filename != '..') { + if (is_dir($basePath . $dirName . '/' . $filename)) { + // 当前路径是文件夹 + $this->addFileZip($basePath, $dirName . '/' . $filename, $zip); + } else { + // 写入文件到压缩包 + $zip->addFile($basePath . $dirName . '/' . $filename, $dirName . '/' . $filename); + } + } + } + closedir($handler); + } + + + /** + * @notes 返回压缩包临时路径 + * @return mixed + * @author 段誉 + * @date 2022/6/24 9:41 + */ + public function getDownloadUrl() + { + // $vars = ['file' => $this->zipTempName]; + Cache::set('curd_file_name' . $this->zipTempName, $this->zipTempName, 3600); + return "admin/tools/generator/download?file=".$this->zipTempName; + } + +} \ No newline at end of file diff --git a/app/common/service/generator/core/BaseGenerator.php b/app/common/service/generator/core/BaseGenerator.php new file mode 100644 index 0000000..773f67b --- /dev/null +++ b/app/common/service/generator/core/BaseGenerator.php @@ -0,0 +1,483 @@ +basePath = base_path().'/'; + // $this->rootPath = app_path().'/'; + $this->templateDir = app_path() . '/common/service/generator/stub/'; + $this->generatorDir = $this->basePath . 'runtime/generate/'; + $this->checkDir($this->generatorDir); + } + + + /** + * @notes 初始化表表数据 + * @param array $tableData + * @author 段誉 + * @date 2022/6/22 18:03 + */ + public function initGenerateData(array $tableData) + { + // 设置当前表信息 + $this->setTableData($tableData); + // 设置模块名 + $this->setModuleName($tableData['module_name']); + // 设置类目录 + $this->setClassDir($tableData['class_dir'] ?? ''); + // 替换模板变量 + $this->replaceVariables(); + } + + + /** + * @notes 菜单配置 + * @author 段誉 + * @date 2022/12/13 15:14 + */ + public function setMenuConfig() + { + $this->menuConfig = [ + 'pid' => $this->tableData['menu']['pid'] ?? 0, + 'type' => $this->tableData['menu']['type'] ?? GeneratorEnum::DELETE_TRUE, + 'name' => $this->tableData['menu']['name'] ?? $this->tableData['table_comment'] + ]; + } + + + /** + * @notes 删除配置 + * @return array + * @author 段誉 + * @date 2022/12/13 15:09 + */ + public function setDeleteConfig() + { + $this->deleteConfig = [ + 'type' => $this->tableData['delete']['type'] ?? GeneratorEnum::DELETE_TRUE, + 'name' => $this->tableData['delete']['name'] ?? GeneratorEnum::DELETE_NAME, + ]; + } + + + /** + * @notes 关联模型配置 + * @author 段誉 + * @date 2022/12/14 11:28 + */ + public function setRelationConfig() + { + $this->relationConfig = empty($this->tableData['relations']) ? [] : $this->tableData['relations']; + } + + + /** + * @notes 设置树表配置 + * @author 段誉 + * @date 2022/12/20 14:30 + */ + public function setTreeConfig() + { + $this->treeConfig = [ + 'tree_id' => $this->tableData['tree']['tree_id'] ?? '', + 'tree_pid' => $this->tableData['tree']['tree_pid'] ?? '', + 'tree_name' => $this->tableData['tree']['tree_name'] ?? '', + ]; + } + + + /** + * @notes 生成文件到模块或runtime目录 + * @author 段誉 + * @date 2022/6/22 18:03 + */ + public function generate() + { + //生成方式 0-压缩包下载 1-生成到模块 + if ($this->tableData['generate_type']) { + // 生成路径 + $path = $this->getModuleGenerateDir() . $this->getGenerateName(); + } else { + // 生成到runtime目录 + $path = $this->getRuntimeGenerateDir() . $this->getGenerateName(); + } + // 写入内容 + file_put_contents($path, $this->content); + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return mixed + * @author 段誉 + * @date 2022/6/22 18:05 + */ + abstract public function getModuleGenerateDir(); + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return mixed + * @author 段誉 + * @date 2022/6/22 18:05 + */ + abstract public function getRuntimeGenerateDir(); + + + /** + * @notes 替换模板变量 + * @return mixed + * @author 段誉 + * @date 2022/6/22 18:06 + */ + abstract public function replaceVariables(); + + + /** + * @notes 生成文件名 + * @return mixed + * @author 段誉 + * @date 2022/6/22 18:17 + */ + abstract public function getGenerateName(); + + + /** + * @notes 文件夹不存在则创建 + * @param string $path + * @author 段誉 + * @date 2022/6/22 18:07 + */ + public function checkDir(string $path) + { + !is_dir($path) && mkdir($path, 0755, true); + } + + + /** + * @notes 设置表信息 + * @param $tableData + * @author 段誉 + * @date 2022/6/22 18:07 + */ + public function setTableData($tableData) + { + $this->tableData = !empty($tableData) ? $tableData : []; + $this->tableColumn = $tableData['table_column'] ?? []; + // 菜单配置 + $this->setMenuConfig(); + // 删除配置 + $this->setDeleteConfig(); + // 关联模型配置 + $this->setRelationConfig(); + // 设置树表配置 + $this->setTreeConfig(); + } + + + /** + * @notes 设置模块名 + * @param string $moduleName + * @author 段誉 + * @date 2022/6/22 18:07 + */ + public function setModuleName(string $moduleName): void + { + $this->moduleName = strtolower($moduleName); + } + + + /** + * @notes 设置类目录 + * @param string $classDir + * @author 段誉 + * @date 2022/6/22 18:08 + */ + public function setClassDir(string $classDir): void + { + $this->classDir = $classDir; + } + + + /** + * @notes 设置生成文件内容 + * @param string $content + * @author 段誉 + * @date 2022/6/22 18:08 + */ + public function setContent(string $content): void + { + $this->content = $content; + } + + + /** + * @notes 获取模板路径 + * @param string $templateName + * @return string + * @author 段誉 + * @date 2022/6/22 18:09 + */ + public function getTemplatePath(string $templateName): string + { + return $this->templateDir . $templateName . '.stub'; + } + + + /** + * @notes 小驼峰命名 + * @return string + * @author 段誉 + * @date 2022/6/27 18:44 + */ + public function getLowerCamelName() + { + return Str::camel($this->getTableName()); + } + + + /** + * @notes 大驼峰命名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:09 + */ + public function getUpperCamelName() + { + return Str::studly($this->getTableName()); + } + + + /** + * @notes 表名小写 + * @return string + * @author 段誉 + * @date 2022/7/12 10:41 + */ + public function getLowerTableName() + { + return Str::lower($this->getTableName()); + } + + + /** + * @notes 获取表名 + * @return array|string|string[] + * @author 段誉 + * @date 2022/6/22 18:09 + */ + public function getTableName() + { + return get_no_prefix_table_name($this->tableData['table_name']); + } + + + /** + * @notes 获取表主键 + * @return mixed|string + * @author 段誉 + * @date 2022/6/22 18:09 + */ + public function getPkContent() + { + $pk = 'id'; + if (empty($this->tableColumn)) { + return $pk; + } + + foreach ($this->tableColumn as $item) { + if ($item['is_pk']) { + $pk = $item['column_name']; + } + } + return $pk; + } + + + /** + * @notes 获取作者信息 + * @return mixed|string + * @author 段誉 + * @date 2022/6/24 10:18 + */ + public function getAuthorContent() + { + return empty($this->tableData['author']) ? 'likeadmin' : $this->tableData['author']; + } + + + /** + * @notes 代码生成备注时间 + * @return false|string + * @author 段誉 + * @date 2022/6/24 10:28 + */ + public function getNoteDateContent() + { + return date('Y/m/d H:i'); + } + + + /** + * @notes 设置空额占位符 + * @param $content + * @param $blankpace + * @return string + * @author 段誉 + * @date 2022/6/22 18:09 + */ + public function setBlankSpace($content, $blankpace) + { + $content = explode(PHP_EOL, $content); + foreach ($content as $line => $text) { + $content[$line] = $blankpace . $text; + } + return (implode(PHP_EOL, $content)); + } + + + /** + * @notes 替换内容 + * @param $needReplace + * @param $waitReplace + * @param $template + * @return array|false|string|string[] + * @author 段誉 + * @date 2022/6/23 9:52 + */ + public function replaceFileData($needReplace, $waitReplace, $template) + { + return str_replace($needReplace, $waitReplace, file_get_contents($template)); + } + + + /** + * @notes 生成方式是否为压缩包 + * @return bool + * @author 段誉 + * @date 2022/6/23 17:02 + */ + public function isGenerateTypeZip() + { + return $this->tableData['generate_type'] == GeneratorEnum::GENERATE_TYPE_ZIP; + } + + + /** + * @notes 是否为树表crud + * @return bool + * @author 段誉 + * @date 2022/12/23 11:25 + */ + public function isTreeCrud() + { + return $this->tableData['template_type'] == GeneratorEnum::TEMPLATE_TYPE_TREE; + } + +} \ No newline at end of file diff --git a/app/common/service/generator/core/ControllerGenerator.php b/app/common/service/generator/core/ControllerGenerator.php new file mode 100644 index 0000000..0050743 --- /dev/null +++ b/app/common/service/generator/core/ControllerGenerator.php @@ -0,0 +1,222 @@ +getNameSpaceContent(), + $this->getUseContent(), + $this->getClassCommentContent(), + $this->getUpperCamelName(), + $this->moduleName, + $this->getPackageNameContent(), + $this->getExtendsControllerContent(), + $this->tableData['class_comment'], + $this->getAuthorContent(), + $this->getNoteDateContent(), + ]; + + $templatePath = $this->getTemplatePath('php/controller'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 获取命名空间内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getNameSpaceContent() + { + if (!empty($this->classDir)) { + return "namespace app\\" . $this->moduleName . "\\controller\\" . $this->classDir . ';'; + } + return "namespace app\\" . $this->moduleName . "\\controller;"; + } + + + /** + * @notes 获取use模板内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getUseContent() + { + if ($this->moduleName == 'admin') { + $tpl = "use app\\" . $this->moduleName . "\\controller\\BaseAdminController;" . PHP_EOL; + } else { + $tpl = "use app\\common\\controller\\BaseLikeAdminController;" . PHP_EOL; + } + + if (!empty($this->classDir)) { + $tpl .= "use app\\" . $this->moduleName . "\\lists\\" . $this->classDir . "\\" . $this->getUpperCamelName() . "Lists;" . PHP_EOL . + "use app\\" . $this->moduleName . "\\logic\\" . $this->classDir . "\\" . $this->getUpperCamelName() . "Logic;" . PHP_EOL . + "use app\\" . $this->moduleName . "\\validate\\" . $this->classDir . "\\" . $this->getUpperCamelName() . "Validate;"; + } else { + $tpl .= "use app\\" . $this->moduleName . "\\lists\\" . $this->getUpperCamelName() . "Lists;" . PHP_EOL . + "use app\\" . $this->moduleName . "\\logic\\" . $this->getUpperCamelName() . "Logic;" . PHP_EOL . + "use app\\" . $this->moduleName . "\\validate\\" . $this->getUpperCamelName() . "Validate;"; + } + return $tpl; + } + + + /** + * @notes 获取类描述内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getClassCommentContent() + { + if (!empty($this->tableData['class_comment'])) { + $tpl = $this->tableData['class_comment'] . '控制器'; + } else { + $tpl = $this->getUpperCamelName() . '控制器'; + } + return $tpl; + } + + + /** + * @notes 获取包名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getPackageNameContent() + { + return !empty($this->classDir) ? '\\' . $this->classDir : ''; + } + + + /** + * @notes 获取继承控制器 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getExtendsControllerContent() + { + $tpl = 'BaseAdminController'; + if ($this->moduleName != 'admin') { + $tpl = 'BaseLikeAdminController'; + } + return $tpl; + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:10 + */ + public function getModuleGenerateDir() + { + $dir = $this->basePath . $this->moduleName . '/controller/'; + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:11 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'php/app/' . $this->moduleName . '/controller/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 生成文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:11 + */ + public function getGenerateName() + { + return $this->getUpperCamelName() . 'Controller.php'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'php', + 'content' => $this->content + ]; + } + +} \ No newline at end of file diff --git a/app/common/service/generator/core/GenerateInterface.php b/app/common/service/generator/core/GenerateInterface.php new file mode 100644 index 0000000..74a7ceb --- /dev/null +++ b/app/common/service/generator/core/GenerateInterface.php @@ -0,0 +1,23 @@ +getNameSpaceContent(), + $this->getUseContent(), + $this->getClassCommentContent(), + $this->getUpperCamelName(), + $this->moduleName, + $this->getPackageNameContent(), + $this->getExtendsListsContent(), + $this->getPkContent(), + $this->getQueryConditionContent(), + $this->getFieldDataContent(), + $this->tableData['class_comment'], + $this->getAuthorContent(), + $this->getNoteDateContent(), + ]; + + $templatePath = $this->getTemplatePath('php/lists'); + if ($this->isTreeCrud()) { + // 插入树表相关 + array_push($needReplace, '{TREE_ID}', '{TREE_PID}'); + array_push($waitReplace, $this->treeConfig['tree_id'], $this->treeConfig['tree_pid']); + + $templatePath = $this->getTemplatePath('php/tree_lists'); + } + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 获取命名空间内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getNameSpaceContent() + { + if (!empty($this->classDir)) { + return "namespace app\\" . $this->moduleName . "\\lists\\" . $this->classDir . ';'; + } + return "namespace app\\" . $this->moduleName . "\\lists;"; + } + + + /** + * @notes 获取use内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getUseContent() + { + if ($this->moduleName == 'admin') { + $tpl = "use app\\" . $this->moduleName . "\\lists\\BaseAdminDataLists;" . PHP_EOL; + } else { + $tpl = "use app\\common\\lists\\BaseDataLists;" . PHP_EOL; + } + + if (!empty($this->classDir)) { + $tpl .= "use app\\common\\model\\" . $this->classDir . "\\" . $this->getUpperCamelName() . ';'; + } else { + $tpl .= "use app\\common\\model\\" . $this->getUpperCamelName() . ';'; + } + + return $tpl; + } + + + /** + * @notes 获取类描述 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getClassCommentContent() + { + if (!empty($this->tableData['class_comment'])) { + $tpl = $this->tableData['class_comment'] . '列表'; + } else { + $tpl = $this->getUpperCamelName() . '列表'; + } + return $tpl; + } + + + /** + * @notes 获取包名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getPackageNameContent() + { + return !empty($this->classDir) ? $this->classDir : ''; + } + + + /** + * @notes 获取继承控制器 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getExtendsListsContent() + { + $tpl = 'BaseAdminDataLists'; + if ($this->moduleName != 'admin') { + $tpl = 'BaseDataLists'; + } + return $tpl; + } + + + /** + * @notes 获取查询条件内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:12 + */ + public function getQueryConditionContent() + { + $columnQuery = array_column($this->tableColumn, 'query_type'); + $query = array_unique($columnQuery); + + $conditon = ''; + + $specQueryHandle = ['between', 'like']; + + foreach ($query as $queryName) { + $columnValue = ''; + foreach ($this->tableColumn as $column) { + if (empty($column['query_type']) || $column['is_pk']) { + continue; + } + if ($queryName == $column['query_type'] && $column['is_query'] && !in_array($queryName, $specQueryHandle)) { + $columnValue .= "'" . $column['column_name'] . "', "; + } + } + if (!empty($columnValue)) { + $columnValue = substr($columnValue, 0, -2); + $conditon .= "'$queryName' => [" . trim($columnValue) . "]," . PHP_EOL; + } + } + + $likeColumn = ''; + $betweenColumn = ''; + $betweenTimeColumn = ''; + + // 另外处理between,like 等查询条件 + foreach ($this->tableColumn as $item) { + if (!$item['is_query']) { + continue; + } + // like + if ($item['query_type'] == 'like') { + $likeColumn .= "'" . $item['column_name'] . "', "; + continue; + } + // between + if ($item['query_type'] == 'between') { + if ($item['view_type'] == 'datetime') { + $betweenTimeColumn .= "'" . $item['column_name'] . "', "; + } else { + $betweenColumn .= "'" . $item['column_name'] . "', "; + } + } + } + + if (!empty($likeColumn)) { + $likeColumn = substr($likeColumn, 0, -2); + $conditon .= "'%like%' => " . "[" . trim($likeColumn) . "]," . PHP_EOL; + } + + if (!empty($betweenColumn)) { + $betweenColumn = substr($betweenColumn, 0, -2); + $conditon .= "'between' => " . "[" . trim($betweenColumn) . "]," . PHP_EOL; + } + + if (!empty($betweenTimeColumn)) { + $betweenTimeColumn = substr($betweenTimeColumn, 0, -2); + $conditon .= "'between_time' => " . "[" . trim($betweenTimeColumn) . "]," . PHP_EOL; + } + + $content = substr($conditon, 0, -1); + return $this->setBlankSpace($content, " "); + } + + + /** + * @notes 获取查询字段 + * @return false|string + * @author 段誉 + * @date 2022/6/22 18:13 + */ + public function getFieldDataContent() + { + $content = "'" . $this->getPkContent() . "', "; + $isExist = [$this->getPkContent()]; + foreach ($this->tableColumn as $column) { + if ($column['is_lists'] && !in_array($column['column_name'], $isExist)) { + $content .= "'" . $column['column_name'] . "', "; + $isExist[] = $column['column_name']; + } + + if ($this->isTreeCrud() && !in_array($column['column_name'], $isExist) + && in_array($column['column_name'], [$this->treeConfig['tree_id'], $this->treeConfig['tree_pid']]) + ) { + $content .= "'" . $column['column_name'] . "', "; + } + } + return substr($content, 0, -2); + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:13 + */ + public function getModuleGenerateDir() + { + $dir = $this->basePath . $this->moduleName . '/lists/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:13 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'php/app/' . $this->moduleName . '/lists/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:13 + */ + public function getGenerateName() + { + return $this->getUpperCamelName() . 'Lists.php'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'php', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/LogicGenerator.php b/app/common/service/generator/core/LogicGenerator.php new file mode 100644 index 0000000..c97ec1c --- /dev/null +++ b/app/common/service/generator/core/LogicGenerator.php @@ -0,0 +1,268 @@ +getNameSpaceContent(), + $this->getUseContent(), + $this->getClassCommentContent(), + $this->getUpperCamelName(), + $this->moduleName, + $this->getPackageNameContent(), + $this->getPkContent(), + $this->getCreateDataContent(), + $this->getUpdateDataContent(), + $this->tableData['class_comment'], + $this->getAuthorContent(), + $this->getNoteDateContent(), + ]; + + $templatePath = $this->getTemplatePath('php/logic'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 添加内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getCreateDataContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (!$column['is_insert']) { + continue; + } + $content .= $this->addEditColumn($column); + } + if (empty($content)) { + return $content; + } + $content = substr($content, 0, -2); + return $this->setBlankSpace($content, " "); + } + + + /** + * @notes 编辑内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getUpdateDataContent() + { + $columnContent = ''; + foreach ($this->tableColumn as $column) { + if (!$column['is_update']) { + continue; + } + $columnContent .= $this->addEditColumn($column); + } + + if (empty($columnContent)) { + return $columnContent; + } + + $columnContent = substr($columnContent, 0, -2); + $content = $columnContent; + return $this->setBlankSpace($content, " "); + } + + + /** + * @notes 添加编辑字段内容 + * @param $column + * @return mixed + * @author 段誉 + * @date 2022/6/27 15:37 + */ + public function addEditColumn($column) + { + if ($column['column_type'] == 'int' && $column['view_type'] == 'datetime') { + // 物理类型为int，显示类型选择日期的情况 + $content = "'" . $column['column_name'] . "' => " . 'strtotime($params[' . "'" . $column['column_name'] . "'" . ']),' . PHP_EOL; + } else { + $content = "'" . $column['column_name'] . "' => " . '$params[' . "'" . $column['column_name'] . "'" . '],' . PHP_EOL; + } + return $content; + } + + + /** + * @notes 获取命名空间内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getNameSpaceContent() + { + if (!empty($this->classDir)) { + return "namespace app\\" . $this->moduleName . "\\logic\\" . $this->classDir . ';'; + } + return "namespace app\\" . $this->moduleName . "\\logic;"; + } + + + /** + * @notes 获取use内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getUseContent() + { + $tpl = "use app\\common\\model\\" . $this->getUpperCamelName() . ';'; + if (!empty($this->classDir)) { + $tpl = "use app\\common\\model\\" . $this->classDir . "\\" . $this->getUpperCamelName() . ';'; + } + return $tpl; + } + + + /** + * @notes 获取类描述 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getClassCommentContent() + { + if (!empty($this->tableData['class_comment'])) { + $tpl = $this->tableData['class_comment'] . '逻辑'; + } else { + $tpl = $this->getUpperCamelName() . '逻辑'; + } + return $tpl; + } + + + /** + * @notes 获取包名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:14 + */ + public function getPackageNameContent() + { + return !empty($this->classDir) ? '\\' . $this->classDir : ''; + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:15 + */ + public function getModuleGenerateDir() + { + $dir = $this->basePath . $this->moduleName . '/logic/'; + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:15 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'php/app/' . $this->moduleName . '/logic/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:15 + */ + public function getGenerateName() + { + return $this->getUpperCamelName() . 'Logic.php'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'php', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/ModelGenerator.php b/app/common/service/generator/core/ModelGenerator.php new file mode 100644 index 0000000..3d32ff4 --- /dev/null +++ b/app/common/service/generator/core/ModelGenerator.php @@ -0,0 +1,275 @@ +getNameSpaceContent(), + $this->getClassCommentContent(), + $this->getUpperCamelName(), + $this->getPackageNameContent(), + $this->getTableName(), + $this->getUseContent(), + $this->getDeleteUseContent(), + $this->getDeleteTimeContent(), + $this->getRelationModel(), + ]; + + $templatePath = $this->getTemplatePath('php/model'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 获取命名空间模板内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:16 + */ + public function getNameSpaceContent() + { + if (!empty($this->classDir)) { + return "namespace app\\common\\model\\" . $this->classDir . ';'; + } + return "namespace app\\common\\model;"; + } + + + /** + * @notes 获取类描述 + * @return string + * @author 段誉 + * @date 2022/6/22 18:16 + */ + public function getClassCommentContent() + { + if (!empty($this->tableData['class_comment'])) { + $tpl = $this->tableData['class_comment'] . '模型'; + } else { + $tpl = $this->getUpperCamelName() . '模型'; + } + return $tpl; + } + + + /** + * @notes 获取包名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:16 + */ + public function getPackageNameContent() + { + return !empty($this->classDir) ? '\\' . $this->classDir : ''; + } + + + /** + * @notes 引用内容 + * @return string + * @author 段誉 + * @date 2022/12/12 17:32 + */ + public function getUseContent() + { + $tpl = ""; + if ($this->deleteConfig['type']) { + $tpl = "use think\\model\\concern\\SoftDelete;"; + } + return $tpl; + } + + + /** + * @notes 软删除引用 + * @return string + * @author 段誉 + * @date 2022/12/12 17:34 + */ + public function getDeleteUseContent() + { + $tpl = ""; + if ($this->deleteConfig['type']) { + $tpl = "use SoftDelete;"; + } + return $tpl; + } + + + /** + * @notes 软删除时间字段定义 + * @return string + * @author 段誉 + * @date 2022/12/12 17:38 + */ + public function getDeleteTimeContent() + { + $tpl = ""; + if ($this->deleteConfig['type']) { + $deleteTime = $this->deleteConfig['name']; + $tpl = 'protected $deleteTime = ' . "'". $deleteTime ."';"; + } + return $tpl; + } + + + /** + * @notes 关联模型 + * @return string + * @author 段誉 + * @date 2022/12/14 14:46 + */ + public function getRelationModel() + { + $tpl = ''; + if (empty($this->relationConfig)) { + return $tpl; + } + + // 遍历关联配置 + foreach ($this->relationConfig as $config) { + if (empty($config) || empty($config['name']) || empty($config['model'])) { + continue; + } + + $needReplace = [ + '{RELATION_NAME}', + '{AUTHOR}', + '{DATE}', + '{RELATION_MODEL}', + '{FOREIGN_KEY}', + '{LOCAL_KEY}', + ]; + + $waitReplace = [ + $config['name'], + $this->getAuthorContent(), + $this->getNoteDateContent(), + $config['model'], + $config['foreign_key'], + $config['local_key'], + ]; + + $templatePath = $this->getTemplatePath('php/model/' . $config['type']); + if (!file_exists($templatePath)) { + continue; + } + $tpl .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL; + } + + return $tpl; + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:16 + */ + public function getModuleGenerateDir() + { + $dir = $this->basePath . 'common/model/'; + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:17 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'php/app/common/model/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:17 + */ + public function getGenerateName() + { + return $this->getUpperCamelName() . '.php'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'php', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/SqlGenerator.php b/app/common/service/generator/core/SqlGenerator.php new file mode 100644 index 0000000..442ed3b --- /dev/null +++ b/app/common/service/generator/core/SqlGenerator.php @@ -0,0 +1,191 @@ +getMenuTableNameContent(), + $this->menuConfig['pid'], + $this->menuConfig['name'], + $this->getPermsNameContent(), + $this->getLowerTableName(), + $this->getLowerTableName(), + time(), + time() + ]; + + $templatePath = $this->getTemplatePath('sql/sql'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 路由权限内容 + * @return string + * @author 段誉 + * @date 2022/8/11 17:18 + */ + public function getPermsNameContent() + { + if (!empty($this->classDir)) { + return $this->classDir . '.' . Str::lower($this->getTableName()); + } + return Str::lower($this->getTableName()); + } + + + /** + * @notes 获取菜单表内容 + * @return string + * @author 段誉 + * @date 2022/7/7 15:57 + */ + public function getMenuTableNameContent() + { + $tablePrefix = config('database.connections.mysql.prefix'); + return $tablePrefix . 'system_menu'; + } + + + /** + * @notes 是否构建菜单 + * @return bool + * @author 段誉 + * @date 2022/7/8 14:24 + */ + public function isBuildMenu() + { + return $this->menuConfig['type'] == GeneratorEnum::GEN_AUTO; + } + + + /** + * @notes 构建菜单 + * @return bool + * @author 段誉 + * @date 2022/7/8 15:27 + */ + public function buildMenuHandle() + { + if (empty($this->content)) { + return false; + } + $sqls = explode(';', trim($this->content)); + //执行sql + foreach ($sqls as $sql) { + if (!empty(trim($sql))) { + Db::execute($sql . ';'); + } + } + return true; + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return mixed|void + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getModuleGenerateDir() + { + $dir = $this->generatorDir . 'sql/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'sql/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getGenerateName() + { + return 'menu.sql'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'sql', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/ValidateGenerator.php b/app/common/service/generator/core/ValidateGenerator.php new file mode 100644 index 0000000..5366868 --- /dev/null +++ b/app/common/service/generator/core/ValidateGenerator.php @@ -0,0 +1,278 @@ +getNameSpaceContent(), + $this->getClassCommentContent(), + $this->getUpperCamelName(), + $this->moduleName, + $this->getPackageNameContent(), + $this->getPkContent(), + $this->getRuleContent(), + $this->tableData['class_comment'], + $this->getAuthorContent(), + $this->getNoteDateContent(), + $this->getAddParamsContent(), + $this->getEditParamsContent(), + $this->getFiledContent(), + ]; + + $templatePath = $this->getTemplatePath('php/validate'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 验证规则 + * @return mixed|string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getRuleContent() + { + $content = "'" . $this->getPkContent() . "' => 'require'," . PHP_EOL; + foreach ($this->tableColumn as $column) { + if ($column['is_required'] == 1) { + $content .= "'" . $column['column_name'] . "' => 'require'," . PHP_EOL; + } + } + $content = substr($content, 0, -1); + return $this->setBlankSpace($content, " "); + } + + + /** + * @notes 添加场景验证参数 + * @return string + * @author 段誉 + * @date 2022/12/7 15:26 + */ + public function getAddParamsContent() + { + $content = ""; + foreach ($this->tableColumn as $column) { + if ($column['is_required'] == 1 && $column['column_name'] != $this->getPkContent()) { + $content .= "'" . $column['column_name'] . "',"; + } + } + $content = substr($content, 0, -1); + + // 若无设置添加场景校验字段时, 排除主键 + if (!empty($content)) { + $content = 'return $this->only([' . $content . ']);'; + } else { + $content = 'return $this->remove(' . "'". $this->getPkContent() . "'" . ', true);'; + } + + return $this->setBlankSpace($content, ""); + } + + + /** + * @notes 编辑场景验证参数 + * @return string + * @author 段誉 + * @date 2022/12/7 15:20 + */ + public function getEditParamsContent() + { + $content = "'" . $this->getPkContent() . "'," ; + foreach ($this->tableColumn as $column) { + if ($column['is_required'] == 1) { + $content .= "'" . $column['column_name'] . "',"; + } + } + $content = substr($content, 0, -1); + if (!empty($content)) { + $content = 'return $this->only([' . $content . ']);'; + } + return $this->setBlankSpace($content, ""); + } + + + /** + * @notes 验证字段描述 + * @return string + * @author 段誉 + * @date 2022/12/9 15:09 + */ + public function getFiledContent() + { + $content = "'" . $this->getPkContent() . "' => '" . $this->getPkContent() . "'," . PHP_EOL; + foreach ($this->tableColumn as $column) { + if ($column['is_required'] == 1) { + $columnComment = $column['column_comment']; + if (empty($column['column_comment'])) { + $columnComment = $column['column_name']; + } + $content .= "'" . $column['column_name'] . "' => '" . $columnComment . "'," . PHP_EOL; + } + } + $content = substr($content, 0, -1); + return $this->setBlankSpace($content, " "); + } + + + /** + * @notes 获取命名空间模板内容 + * @return string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getNameSpaceContent() + { + if (!empty($this->classDir)) { + return "namespace app\\" . $this->moduleName . "\\validate\\" . $this->classDir . ';'; + } + return "namespace app\\" . $this->moduleName . "\\validate;"; + } + + + /** + * @notes 获取类描述 + * @return string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getClassCommentContent() + { + if (!empty($this->tableData['class_comment'])) { + $tpl = $this->tableData['class_comment'] . '验证器'; + } else { + $tpl = $this->getUpperCamelName() . '验证器'; + } + return $tpl; + } + + + /** + * @notes 获取包名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getPackageNameContent() + { + return !empty($this->classDir) ? '\\' . $this->classDir : ''; + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getModuleGenerateDir() + { + $dir = $this->basePath . $this->moduleName . '/validate/'; + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:18 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'php/app/' . $this->moduleName . '/validate/'; + $this->checkDir($dir); + if (!empty($this->classDir)) { + $dir .= $this->classDir . '/'; + $this->checkDir($dir); + } + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getGenerateName() + { + return $this->getUpperCamelName() . 'Validate.php'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'php', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/VueApiGenerator.php b/app/common/service/generator/core/VueApiGenerator.php new file mode 100644 index 0000000..aba12d4 --- /dev/null +++ b/app/common/service/generator/core/VueApiGenerator.php @@ -0,0 +1,144 @@ +getCommentContent(), + $this->getUpperCamelName(), + $this->getRouteContent(), + ]; + + $templatePath = $this->getTemplatePath('vue/api'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 描述 + * @return mixed + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getCommentContent() + { + return $this->tableData['table_comment']; + } + + + /** + * @notes 路由名称 + * @return array|string|string[] + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getRouteContent() + { + $content = $this->getTableName(); + if (!empty($this->classDir)) { + $content = $this->classDir . '.' . $this->getTableName(); + } + return Str::lower($content); + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return mixed|void + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getModuleGenerateDir() + { + $dir = dirname(app_path()) . '/admin/src/api/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'vue/src/api/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getGenerateName() + { + return $this->getLowerTableName() . '.ts'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'ts', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/VueEditGenerator.php b/app/common/service/generator/core/VueEditGenerator.php new file mode 100644 index 0000000..43b2e95 --- /dev/null +++ b/app/common/service/generator/core/VueEditGenerator.php @@ -0,0 +1,493 @@ +getFormViewContent(), + $this->getUpperCamelName(), + $this->getDictDataContent(), + $this->getDictDataApiContent(), + $this->getFormDataContent(), + $this->getFormValidateContent(), + $this->tableData['table_comment'], + $this->getPkContent(), + $this->getTableName(), + $this->getCheckBoxJoinContent(), + $this->getCheckBoxSplitContent(), + $this->getFormDateContent(), + $this->getLowerCamelName(), + $this->getImportListsContent(), + $this->getTreeConstContent(), + $this->getTreeListsContent(), + ]; + + $templatePath = $this->getTemplatePath('vue/edit'); + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 复选框处理 + * @return string + * @author 段誉 + * @date 2022/6/24 19:30 + */ + public function getCheckBoxJoinContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (empty($column['view_type']) || $column['is_pk']) { + continue; + } + if ($column['view_type'] != 'checkbox') { + continue; + } + $content .= $column['column_name'] . ': formData.' . $column['column_name'] . '.join(",")' . PHP_EOL; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $content; + } + + + /** + * @notes 复选框处理 + * @return string + * @author 段誉 + * @date 2022/6/24 19:30 + */ + public function getCheckBoxSplitContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (empty($column['view_type']) || $column['is_pk']) { + continue; + } + if ($column['view_type'] != 'checkbox') { + continue; + } + $content .= '//@ts-ignore' . PHP_EOL; + $content .= 'data.' . $column['column_name'] . ' && ' .'(formData.' . $column['column_name'] . ' = String(data.' . $column['column_name'] . ').split(","))' . PHP_EOL; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 树表contst + * @return string + * @author 段誉 + * @date 2022/12/22 18:19 + */ + public function getTreeConstContent() + { + $content = ""; + if ($this->isTreeCrud()) { + $content = file_get_contents($this->getTemplatePath('vue/other_item/editTreeConst')); + } + return $content; + } + + + /** + * @notes 获取树表列表 + * @return string + * @author 段誉 + * @date 2022/12/22 18:26 + */ + public function getTreeListsContent() + { + $content = ''; + if (!$this->isTreeCrud()) { + return $content; + } + + $needReplace = [ + '{TREE_ID}', + '{TREE_NAME}', + '{UPPER_CAMEL_NAME}', + ]; + $waitReplace = [ + $this->treeConfig['tree_id'], + $this->treeConfig['tree_name'], + $this->getUpperCamelName(), + ]; + + $templatePath = $this->getTemplatePath('vue/other_item/editTreeLists'); + if (file_exists($templatePath)) { + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + } + + return $content; + } + + + /** + * @notes 表单日期处理 + * @return string + * @author 段誉 + * @date 2022/6/27 16:45 + */ + public function getFormDateContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (empty($column['view_type']) || $column['is_pk']) { + continue; + } + if ($column['view_type'] != 'datetime' || $column['column_type'] != 'int') { + continue; + } + $content .= '//@ts-ignore' . PHP_EOL; + $content .= 'formData.' . $column['column_name'] . ' = timeFormat(formData.' . $column['column_name'] . ','."'yyyy-mm-dd hh:MM:ss'".') ' . PHP_EOL; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 获取表单内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:57 + */ + public function getFormViewContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (!$column['is_insert'] || !$column['is_update'] || $column['is_pk']) { + continue; + } + $needReplace = [ + '{COLUMN_COMMENT}', + '{COLUMN_NAME}', + '{DICT_TYPE}', + ]; + $waitReplace = [ + $column['column_comment'], + $column['column_name'], + $column['dict_type'], + ]; + + $viewType = $column['view_type']; + // 树表，树状结构下拉框 + if ($this->isTreeCrud() && $column['column_name'] == $this->treeConfig['tree_pid']) { + $viewType = 'treeSelect'; + array_push($needReplace, '{TREE_ID}', '{TREE_NAME}'); + array_push($waitReplace, $this->treeConfig['tree_id'], $this->treeConfig['tree_name']); + } + + $templatePath = $this->getTemplatePath('vue/form_item/' . $viewType); + if (!file_exists($templatePath)) { + continue; + } + + // 单选框值处理 + if ($column['view_type'] == 'radio' || $column['view_type'] == 'select') { + $stubItemValue = 'item.value'; + $intFieldValue = ['tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint']; + if (in_array($column['column_type'], $intFieldValue)) { + $stubItemValue = 'parseInt(item.value)'; + } + array_push($needReplace, '{ITEM_VALUE}'); + array_push($waitReplace, $stubItemValue); + } + + $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL; + } + + if (!empty($content)) { + $content = substr($content, 0, -1); + } + + $content = $this->setBlankSpace($content, ' '); + return $content; + } + + + /** + * @notes 获取字典数据内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:58 + */ + public function getDictDataContent() + { + $content = ''; + $isExist = []; + foreach ($this->tableColumn as $column) { + if (empty($column['dict_type']) || $column['is_pk']) { + continue; + } + if (in_array($column['dict_type'], $isExist)) { + continue; + } + $content .= $column['dict_type'] . ': ' . "[]," . PHP_EOL; + $isExist[] = $column['dict_type']; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 获取字典数据api内容 + * @return false|string + * @author 段誉 + * @date 2022/6/23 11:58 + */ + public function getDictDataApiContent() + { + $content = ''; + $isExist = []; + foreach ($this->tableColumn as $column) { + if (empty($column['dict_type']) || $column['is_pk']) { + continue; + } + if (in_array($column['dict_type'], $isExist)) { + continue; + } + $needReplace = [ + '{UPPER_CAMEL_NAME}', + '{DICT_TYPE}', + ]; + $waitReplace = [ + $this->getUpperCamelName(), + $column['dict_type'], + ]; + $templatePath = $this->getTemplatePath('vue/other_item/dictDataApi'); + if (!file_exists($templatePath)) { + continue; + } + $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . '' . PHP_EOL; + + $isExist[] = $column['dict_type']; + } + $content = substr($content, 0, -1); + return $content; + } + + + /** + * @notes 获取表单默认字段内容 + * @return string + * @author 段誉 + * @date 2022/6/23 15:15 + */ + public function getFormDataContent() + { + $content = ''; + $isExist = []; + foreach ($this->tableColumn as $column) { + if (!$column['is_insert'] || !$column['is_update'] || $column['is_pk']) { + continue; + } + if (in_array($column['column_name'], $isExist)) { + continue; + } + + // 复选框类型返回数组 + if ($column['view_type'] == 'checkbox') { + $content .= $column['column_name'] . ': ' . "[]," . PHP_EOL; + } else { + $content .= $column['column_name'] . ': ' . "''," . PHP_EOL; + } + + $isExist[] = $column['column_name']; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 表单验证内容 + * @return false|string + * @author 段誉 + * @date 2022/6/23 15:16 + */ + public function getFormValidateContent() + { + $content = ''; + $isExist = []; + $specDictType = ['input', 'textarea', 'editor']; + + foreach ($this->tableColumn as $column) { + if (!$column['is_required'] || $column['is_pk']) { + continue; + } + if (in_array($column['column_name'], $isExist)) { + continue; + } + + $validateMsg = in_array($column['view_type'], $specDictType) ? '请输入' : '请选择'; + $validateMsg .= $column['column_comment']; + + $needReplace = [ + '{COLUMN_NAME}', + '{VALIDATE_MSG}', + ]; + $waitReplace = [ + $column['column_name'], + $validateMsg, + ]; + $templatePath = $this->getTemplatePath('vue/other_item/formValidate'); + if (!file_exists($templatePath)) { + continue; + } + + $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . ',' . PHP_EOL; + + $isExist[] = $column['column_name']; + } + $content = substr($content, 0, -2); + return $content; + } + + + /** + * @notes 树表时导入列表 + * @author 段誉 + * @date 2022/12/23 9:56 + */ + public function getImportListsContent() + { + $content = ""; + if ($this->isTreeCrud()) { + $content = "api". $this->getUpperCamelName(). 'Lists,'; + } + + if (empty($content)) { + return $content; + } + + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return mixed|void + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getModuleGenerateDir() + { + $dir = dirname(app_path()) . '/admin/src/views/' . $this->getTableName() . '/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'vue/src/views/' . $this->getTableName() . '/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getGenerateName() + { + return 'edit.vue'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'vue', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/core/VueIndexGenerator.php b/app/common/service/generator/core/VueIndexGenerator.php new file mode 100644 index 0000000..a3c5b4f --- /dev/null +++ b/app/common/service/generator/core/VueIndexGenerator.php @@ -0,0 +1,308 @@ +getSearchViewContent(), + $this->getListsViewContent(), + $this->getUpperCamelName(), + $this->getQueryParamsContent(), + $this->getDictDataContent(), + $this->getPkContent(), + $this->getTableName(), + $this->getPermsContent(), + $this->getPermsContent('edit'), + $this->getPermsContent('delete'), + $this->getLowerCamelName() + ]; + + $templatePath = $this->getTemplatePath('vue/index'); + + if ($this->isTreeCrud()) { + // 插入树表相关 + array_push($needReplace, '{TREE_ID}', '{TREE_PID}'); + array_push($waitReplace, $this->treeConfig['tree_id'], $this->treeConfig['tree_pid']); + $templatePath = $this->getTemplatePath('vue/index-tree'); + } + + // 替换内容 + $content = $this->replaceFileData($needReplace, $waitReplace, $templatePath); + + $this->setContent($content); + } + + + /** + * @notes 获取搜索内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:57 + */ + public function getSearchViewContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (!$column['is_query'] || $column['is_pk']) { + continue; + } + + $needReplace = [ + '{COLUMN_COMMENT}', + '{COLUMN_NAME}', + '{DICT_TYPE}', + ]; + $waitReplace = [ + $column['column_comment'], + $column['column_name'], + $column['dict_type'], + ]; + + $searchStubType = $column['view_type']; + if ($column['view_type'] == 'radio') { + $searchStubType = 'select'; + } + + $templatePath = $this->getTemplatePath('vue/search_item/' . $searchStubType); + if (!file_exists($templatePath)) { + continue; + } + $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL; + } + + if (!empty($content)) { + $content = substr($content, 0, -1); + } + + $content = $this->setBlankSpace($content, ' '); + return $content; + } + + + /** + * @notes 获取列表内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:57 + */ + public function getListsViewContent() + { + $content = ''; + foreach ($this->tableColumn as $column) { + if (!$column['is_lists']) { + continue; + } + + $needReplace = [ + '{COLUMN_COMMENT}', + '{COLUMN_NAME}', + '{DICT_TYPE}', + ]; + $waitReplace = [ + $column['column_comment'], + $column['column_name'], + $column['dict_type'], + ]; + + $templatePath = $this->getTemplatePath('vue/table_item/default'); + if ($column['view_type'] == 'imageSelect') { + $templatePath = $this->getTemplatePath('vue/table_item/image'); + } + if (in_array($column['view_type'], ['select', 'radio', 'checkbox'])) { + $templatePath = $this->getTemplatePath('vue/table_item/options'); + } + if ($column['column_type'] == 'int' && $column['view_type'] == 'datetime') { + $templatePath = $this->getTemplatePath('vue/table_item/datetime'); + } + if (!file_exists($templatePath)) { + continue; + } + + $content .= $this->replaceFileData($needReplace, $waitReplace, $templatePath) . PHP_EOL; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 获取查询条件内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:57 + */ + public function getQueryParamsContent() + { + $content = ''; + $queryDate = false; + foreach ($this->tableColumn as $column) { + if (!$column['is_query'] || $column['is_pk']) { + continue; + } + $content .= $column['column_name'] . ": ''," . PHP_EOL; + if ($column['query_type'] == 'between' && $column['view_type'] == 'datetime') { + $queryDate = true; + } + } + if ($queryDate) { + $content .= "start_time: ''," . PHP_EOL; + $content .= "end_time: ''," . PHP_EOL; + } + $content = substr($content, 0, -2); + return $this->setBlankSpace($content, ' '); + } + + + /** + * @notes 获取字典数据内容 + * @return string + * @author 段誉 + * @date 2022/6/23 11:58 + */ + public function getDictDataContent() + { + $content = ''; + $isExist = []; + foreach ($this->tableColumn as $column) { + if (empty($column['dict_type']) || $column['is_pk']) { + continue; + } + if (in_array($column['dict_type'], $isExist)) { + continue; + } + $content .= $column['dict_type'] .","; + $isExist[] = $column['dict_type']; + } + if (!empty($content)) { + $content = substr($content, 0, -1); + } + return $this->setBlankSpace($content, ''); + } + + + /** + * @notes 权限规则 + * @param string $type + * @return string + * @author 段誉 + * @date 2022/7/7 9:47 + */ + public function getPermsContent($type = 'add') + { + if (!empty($this->classDir)) { + $classDir = $this->classDir . '.'; + } else { + $classDir = ''; + } + return trim($classDir . $this->getLowerTableName() . '/' . $type); + } + + + /** + * @notes 获取文件生成到模块的文件夹路径 + * @return mixed|void + * @author 段誉 + * @date 2022/6/22 18:19 + */ + public function getModuleGenerateDir() + { + $dir = dirname(app()->getRootPath()) . '/admin/src/views/' . $this->getLowerTableName() . '/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 获取文件生成到runtime的文件夹路径 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getRuntimeGenerateDir() + { + $dir = $this->generatorDir . 'vue/src/views/' . $this->getLowerTableName() . '/'; + $this->checkDir($dir); + return $dir; + } + + + /** + * @notes 生成的文件名 + * @return string + * @author 段誉 + * @date 2022/6/22 18:20 + */ + public function getGenerateName() + { + return 'index.vue'; + } + + + /** + * @notes 文件信息 + * @return array + * @author 段誉 + * @date 2022/6/23 15:57 + */ + public function fileInfo(): array + { + return [ + 'name' => $this->getGenerateName(), + 'type' => 'vue', + 'content' => $this->content + ]; + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/stub/php/controller.stub b/app/common/service/generator/stub/php/controller.stub new file mode 100644 index 0000000..44622d2 --- /dev/null +++ b/app/common/service/generator/stub/php/controller.stub @@ -0,0 +1,105 @@ +dataLists(new {UPPER_CAMEL_NAME}Lists()); + } + + + /** + * @notes 添加{NOTES} + * @return \think\response\Json + * @author {AUTHOR} + * @date {DATE} + */ + public function add() + { + $params = (new {UPPER_CAMEL_NAME}Validate())->post()->goCheck('add'); + $result = {UPPER_CAMEL_NAME}Logic::add($params); + if (true === $result) { + return $this->success('添加成功', [], 1, 1); + } + return $this->fail({UPPER_CAMEL_NAME}Logic::getError()); + } + + + /** + * @notes 编辑{NOTES} + * @return \think\response\Json + * @author {AUTHOR} + * @date {DATE} + */ + public function edit() + { + $params = (new {UPPER_CAMEL_NAME}Validate())->post()->goCheck('edit'); + $result = {UPPER_CAMEL_NAME}Logic::edit($params); + if (true === $result) { + return $this->success('编辑成功', [], 1, 1); + } + return $this->fail({UPPER_CAMEL_NAME}Logic::getError()); + } + + + /** + * @notes 删除{NOTES} + * @return \think\response\Json + * @author {AUTHOR} + * @date {DATE} + */ + public function delete() + { + $params = (new {UPPER_CAMEL_NAME}Validate())->post()->goCheck('delete'); + {UPPER_CAMEL_NAME}Logic::delete($params); + return $this->success('删除成功', [], 1, 1); + } + + + /** + * @notes 获取{NOTES}详情 + * @return \think\response\Json + * @author {AUTHOR} + * @date {DATE} + */ + public function detail() + { + $params = (new {UPPER_CAMEL_NAME}Validate())->goCheck('detail'); + $result = {UPPER_CAMEL_NAME}Logic::detail($params); + return $this->data($result); + } + + +} \ No newline at end of file diff --git a/app/common/service/generator/stub/php/lists.stub b/app/common/service/generator/stub/php/lists.stub new file mode 100644 index 0000000..ab69032 --- /dev/null +++ b/app/common/service/generator/stub/php/lists.stub @@ -0,0 +1,76 @@ +searchWhere) + ->field([{FIELD_DATA}]) + ->limit($this->limitOffset, $this->limitLength) + ->order(['{PK}' => 'desc']) + ->select() + ->toArray(); + } + + + /** + * @notes 获取{NOTES}数量 + * @return int + * @author {AUTHOR} + * @date {DATE} + */ + public function count(): int + { + return {UPPER_CAMEL_NAME}::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/common/service/generator/stub/php/logic.stub b/app/common/service/generator/stub/php/logic.stub new file mode 100644 index 0000000..4d4b7a6 --- /dev/null +++ b/app/common/service/generator/stub/php/logic.stub @@ -0,0 +1,106 @@ +getMessage()); + return false; + } + } + + + /** + * @notes 编辑{NOTES} + * @param array $params + * @return bool + * @author {AUTHOR} + * @date {DATE} + */ + public static function edit(array $params): bool + { + Db::startTrans(); + try { + {UPPER_CAMEL_NAME}::where('{PK}', $params['{PK}'])->update([ +{UPDATE_DATA} + ]); + + Db::commit(); + return true; + } catch (\Exception $e) { + Db::rollback(); + self::setError($e->getMessage()); + return false; + } + } + + + /** + * @notes 删除{NOTES} + * @param array $params + * @return bool + * @author {AUTHOR} + * @date {DATE} + */ + public static function delete(array $params): bool + { + return {UPPER_CAMEL_NAME}::destroy($params['{PK}']); + } + + + /** + * @notes 获取{NOTES}详情 + * @param $params + * @return array + * @author {AUTHOR} + * @date {DATE} + */ + public static function detail($params): array + { + return {UPPER_CAMEL_NAME}::findOrEmpty($params['{PK}'])->toArray(); + } +} \ No newline at end of file diff --git a/app/common/service/generator/stub/php/model.stub b/app/common/service/generator/stub/php/model.stub new file mode 100644 index 0000000..61acb2f --- /dev/null +++ b/app/common/service/generator/stub/php/model.stub @@ -0,0 +1,34 @@ +hasMany({RELATION_MODEL}::class, '{FOREIGN_KEY}', '{LOCAL_KEY}'); + } \ No newline at end of file diff --git a/app/common/service/generator/stub/php/model/has_one.stub b/app/common/service/generator/stub/php/model/has_one.stub new file mode 100644 index 0000000..21bd83b --- /dev/null +++ b/app/common/service/generator/stub/php/model/has_one.stub @@ -0,0 +1,11 @@ + + /** + * @notes 关联{RELATION_NAME} + * @return \think\model\relation\HasOne + * @author {AUTHOR} + * @date {DATE} + */ + public function {RELATION_NAME}() + { + return $this->hasOne({RELATION_MODEL}::class, '{FOREIGN_KEY}', '{LOCAL_KEY}'); + } \ No newline at end of file diff --git a/app/common/service/generator/stub/php/tree_lists.stub b/app/common/service/generator/stub/php/tree_lists.stub new file mode 100644 index 0000000..cee3870 --- /dev/null +++ b/app/common/service/generator/stub/php/tree_lists.stub @@ -0,0 +1,77 @@ +searchWhere) + ->field([{FIELD_DATA}]) + ->order(['{PK}' => 'desc']) + ->select() + ->toArray(); + + return linear_to_tree($lists, 'children', '{TREE_ID}', '{TREE_PID}'); + } + + + /** + * @notes 获取{NOTES}数量 + * @return int + * @author {AUTHOR} + * @date {DATE} + */ + public function count(): int + { + return {UPPER_CAMEL_NAME}::where($this->searchWhere)->count(); + } + +} \ No newline at end of file diff --git a/app/common/service/generator/stub/php/validate.stub b/app/common/service/generator/stub/php/validate.stub new file mode 100644 index 0000000..a984d47 --- /dev/null +++ b/app/common/service/generator/stub/php/validate.stub @@ -0,0 +1,94 @@ +only(['{PK}']); + } + + + /** + * @notes 详情场景 + * @return {UPPER_CAMEL_NAME}Validate + * @author {AUTHOR} + * @date {DATE} + */ + public function sceneDetail() + { + return $this->only(['{PK}']); + } + +} \ No newline at end of file diff --git a/app/common/service/generator/stub/sql/sql.stub b/app/common/service/generator/stub/sql/sql.stub new file mode 100644 index 0000000..c7861cb --- /dev/null +++ b/app/common/service/generator/stub/sql/sql.stub @@ -0,0 +1,13 @@ +INSERT INTO `{MENU_TABLE}`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`) + VALUES ({PARTNER_ID}, 'C', '{LISTS_NAME}', '', 1, '{PERMS_NAME}/lists', '{PATHS_NAME}', '{COMPONENT_NAME}/index', '', '', 0, 1, 0, {CREATE_TIME}, {UPDATE_TIME}); + +SELECT @pid := LAST_INSERT_ID(); + +INSERT INTO `{MENU_TABLE}`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`) + VALUES (@pid, 'A', '添加', '', 1, '{PERMS_NAME}/add', '', '', '', '', 0, 1, 0, {CREATE_TIME}, {UPDATE_TIME}); + +INSERT INTO `{MENU_TABLE}`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`) + VALUES (@pid, 'A', '编辑', '', 1, '{PERMS_NAME}/edit', '', '', '', '', 0, 1, 0, {CREATE_TIME}, {UPDATE_TIME}); + +INSERT INTO `{MENU_TABLE}`(`pid`, `type`, `name`, `icon`, `sort`, `perms`, `paths`, `component`, `selected`, `params`, `is_cache`, `is_show`, `is_disable`, `create_time`, `update_time`) + VALUES (@pid, 'A', '删除', '', 1, '{PERMS_NAME}/delete', '', '', '', '', 0, 1, 0, {CREATE_TIME}, {UPDATE_TIME}); diff --git a/app/common/service/generator/stub/vue/api.stub b/app/common/service/generator/stub/vue/api.stub new file mode 100644 index 0000000..1858e9a --- /dev/null +++ b/app/common/service/generator/stub/vue/api.stub @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// {COMMENT}列表 +export function api{UPPER_CAMEL_NAME}Lists(params: any) { + return request.get({ url: '/{ROUTE}/lists', params }) +} + +// 添加{COMMENT} +export function api{UPPER_CAMEL_NAME}Add(params: any) { + return request.post({ url: '/{ROUTE}/add', params }) +} + +// 编辑{COMMENT} +export function api{UPPER_CAMEL_NAME}Edit(params: any) { + return request.post({ url: '/{ROUTE}/edit', params }) +} + +// 删除{COMMENT} +export function api{UPPER_CAMEL_NAME}Delete(params: any) { + return request.post({ url: '/{ROUTE}/delete', params }) +} + +// {COMMENT}详情 +export function api{UPPER_CAMEL_NAME}Detail(params: any) { + return request.get({ url: '/{ROUTE}/detail', params }) +} \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/edit.stub b/app/common/service/generator/stub/vue/edit.stub new file mode 100644 index 0000000..3928bf8 --- /dev/null +++ b/app/common/service/generator/stub/vue/edit.stub @@ -0,0 +1,103 @@ + + + diff --git a/app/common/service/generator/stub/vue/form_item/checkbox.stub b/app/common/service/generator/stub/vue/form_item/checkbox.stub new file mode 100644 index 0000000..98e6329 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/checkbox.stub @@ -0,0 +1,11 @@ + + + + {{ item.name }} + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/datetime.stub b/app/common/service/generator/stub/vue/form_item/datetime.stub new file mode 100644 index 0000000..48d0dfa --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/datetime.stub @@ -0,0 +1,10 @@ + + + + diff --git a/app/common/service/generator/stub/vue/form_item/datetime2.stub b/app/common/service/generator/stub/vue/form_item/datetime2.stub new file mode 100644 index 0000000..b182bd9 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/datetime2.stub @@ -0,0 +1,6 @@ + + + diff --git a/app/common/service/generator/stub/vue/form_item/editor.stub b/app/common/service/generator/stub/vue/form_item/editor.stub new file mode 100644 index 0000000..f150681 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/editor.stub @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/imageSelect.stub b/app/common/service/generator/stub/vue/form_item/imageSelect.stub new file mode 100644 index 0000000..22703fc --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/imageSelect.stub @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/input.stub b/app/common/service/generator/stub/vue/form_item/input.stub new file mode 100644 index 0000000..ffe3884 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/input.stub @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/radio.stub b/app/common/service/generator/stub/vue/form_item/radio.stub new file mode 100644 index 0000000..2768885 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/radio.stub @@ -0,0 +1,11 @@ + + + + {{ item.name }} + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/select.stub b/app/common/service/generator/stub/vue/form_item/select.stub new file mode 100644 index 0000000..5c2fa50 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/select.stub @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/textarea.stub b/app/common/service/generator/stub/vue/form_item/textarea.stub new file mode 100644 index 0000000..6f80318 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/textarea.stub @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/form_item/treeSelect.stub b/app/common/service/generator/stub/vue/form_item/treeSelect.stub new file mode 100644 index 0000000..54c5dd9 --- /dev/null +++ b/app/common/service/generator/stub/vue/form_item/treeSelect.stub @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/index-tree.stub b/app/common/service/generator/stub/vue/index-tree.stub new file mode 100644 index 0000000..1058e7b --- /dev/null +++ b/app/common/service/generator/stub/vue/index-tree.stub @@ -0,0 +1,167 @@ + + + + diff --git a/app/common/service/generator/stub/vue/index.stub b/app/common/service/generator/stub/vue/index.stub new file mode 100644 index 0000000..3c9a71b --- /dev/null +++ b/app/common/service/generator/stub/vue/index.stub @@ -0,0 +1,123 @@ + + + + diff --git a/app/common/service/generator/stub/vue/other_item/dictDataApi.stub b/app/common/service/generator/stub/vue/other_item/dictDataApi.stub new file mode 100644 index 0000000..fb9176a --- /dev/null +++ b/app/common/service/generator/stub/vue/other_item/dictDataApi.stub @@ -0,0 +1,6 @@ + dictDataLists({ + type_value: '{DICT_TYPE}', + page_type: 0 + }).then((res: any) => { + dictData.{DICT_TYPE} = res.lists + }) \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/other_item/editTreeConst.stub b/app/common/service/generator/stub/vue/other_item/editTreeConst.stub new file mode 100644 index 0000000..e98eb7d --- /dev/null +++ b/app/common/service/generator/stub/vue/other_item/editTreeConst.stub @@ -0,0 +1 @@ +const treeList = ref([]) \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/other_item/editTreeLists.stub b/app/common/service/generator/stub/vue/other_item/editTreeLists.stub new file mode 100644 index 0000000..5de63f3 --- /dev/null +++ b/app/common/service/generator/stub/vue/other_item/editTreeLists.stub @@ -0,0 +1,8 @@ +const getLists = async () => { + const data: any = await api{UPPER_CAMEL_NAME}Lists() + const item = { {TREE_ID}: 0, {TREE_NAME}: '顶级', children: [] } + item.children = data.lists + treeList.value.push(item) +} + +getLists() \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/other_item/formValidate.stub b/app/common/service/generator/stub/vue/other_item/formValidate.stub new file mode 100644 index 0000000..336052c --- /dev/null +++ b/app/common/service/generator/stub/vue/other_item/formValidate.stub @@ -0,0 +1,5 @@ + {COLUMN_NAME}: [{ + required: true, + message: '{VALIDATE_MSG}', + trigger: ['blur'] + }] \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/search_item/datetime.stub b/app/common/service/generator/stub/vue/search_item/datetime.stub new file mode 100644 index 0000000..e0e6882 --- /dev/null +++ b/app/common/service/generator/stub/vue/search_item/datetime.stub @@ -0,0 +1,6 @@ + + + diff --git a/app/common/service/generator/stub/vue/search_item/input.stub b/app/common/service/generator/stub/vue/search_item/input.stub new file mode 100644 index 0000000..9c09034 --- /dev/null +++ b/app/common/service/generator/stub/vue/search_item/input.stub @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/search_item/select.stub b/app/common/service/generator/stub/vue/search_item/select.stub new file mode 100644 index 0000000..854152f --- /dev/null +++ b/app/common/service/generator/stub/vue/search_item/select.stub @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/table_item/datetime.stub b/app/common/service/generator/stub/vue/table_item/datetime.stub new file mode 100644 index 0000000..2cbbc6d --- /dev/null +++ b/app/common/service/generator/stub/vue/table_item/datetime.stub @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/table_item/default.stub b/app/common/service/generator/stub/vue/table_item/default.stub new file mode 100644 index 0000000..54ae4c7 --- /dev/null +++ b/app/common/service/generator/stub/vue/table_item/default.stub @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/table_item/image.stub b/app/common/service/generator/stub/vue/table_item/image.stub new file mode 100644 index 0000000..8ce9342 --- /dev/null +++ b/app/common/service/generator/stub/vue/table_item/image.stub @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/common/service/generator/stub/vue/table_item/options.stub b/app/common/service/generator/stub/vue/table_item/options.stub new file mode 100644 index 0000000..8820cd8 --- /dev/null +++ b/app/common/service/generator/stub/vue/table_item/options.stub @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/functions.php b/app/functions.php index 5ae1494..53126ae 100644 --- a/app/functions.php +++ b/app/functions.php @@ -2,6 +2,10 @@ /** * Here is your custom functions. */ + +use support\Response; +use support\Request; + if(!function_exists('substr_symbol_behind')){ /** * @notes 截取某字符字符串 @@ -59,6 +63,19 @@ function create_token(string $extra = '') : string return md5($extra . time()); } +/** + * @notes 生成密码加密密钥 + * @param string $plaintext + * @param string $salt + * @return string + * @author 段誉 + * @date 2021/12/28 18:24 + */ +function create_password(string $plaintext, string $salt) : string +{ + return md5($salt . md5($plaintext . $salt)); +} + /** * 多级线性结构排序 * 转换前： @@ -107,3 +124,76 @@ function createDir($path){ } return mkdir($path); } + +if (!function_exists('download')) { + /** + * 获取\think\response\Download对象实例 + * @param string $filename 要下载的文件 + * @param string $name 显示文件名 + * @param bool $content 是否为内容 + * @param int $expire 有效期（秒） + * @return \think\response\File + */ + function download(string $filename, string $name = '', bool $content = false, int $expire = 180) + { + + return response()->download($filename,$name); + } +} + +/** + * @notes 删除目标目录 + * @param $path + * @param $delDir + * @return bool|void + * @author 段誉 + * @date 2022/4/8 16:30 + */ +function del_target_dir($path, $delDir) +{ + //没找到，不处理 + if (!file_exists($path)) { + return false; + } + + //打开目录句柄 + $handle = opendir($path); + if ($handle) { + while (false !== ($item = readdir($handle))) { + if ($item != "." && $item != "..") { + if (is_dir("$path/$item")) { + del_target_dir("$path/$item", $delDir); + } else { + unlink("$path/$item"); + } + } + } + closedir($handle); + if ($delDir) { + return rmdir($path); + } + } else { + if (file_exists($path)) { + return unlink($path); + } + return false; + } +} + +/** + * @notes 获取无前缀数据表名 + * @param $tableName + * @return mixed|string + * @author 段誉 + * @date 2022/12/12 15:23 + */ +function get_no_prefix_table_name($tableName) +{ + $tablePrefix = config('database.connections.mysql.prefix'); + $prefixIndex = strpos($tableName, $tablePrefix); + if ($prefixIndex !== 0 || $prefixIndex === false) { + return $tableName; + } + $tableName = substr_replace($tableName, '', 0, strlen($tablePrefix)); + return trim($tableName); +} \ No newline at end of file diff --git a/composer.json b/composer.json index 25286dd..ab51cde 100644 --- a/composer.json +++ b/composer.json @@ -30,18 +30,22 @@ "webman/think-orm": "^1.0", "vlucas/phpdotenv": "^5.4", "psr/container": "^1.1.1", - "webman/think-cache": "^1.0", "ext-json": "*", "phpoffice/phpspreadsheet": "^1.19", "aliyuncs/oss-sdk-php": "^2.6", - "tencentcloud/tencentcloud-sdk-php": "^3.0", "webman/console": "^1.2.12", "qiniu/php-sdk": "7.4", "qcloud/cos-sdk-v5": "^2.6", "dragonmantank/cron-expression": "^3.3", "tinywan/storage": "^0.3.4", "webman/log": "^1.1", - "taoser/webman-validate": "^1.7" + "taoser/webman-validate": "^1.7", + "php-di/php-di": "^6", + "doctrine/annotations": "^1.14", + "illuminate/redis": "^10.22", + "symfony/cache": "^5.4", + "max/var-dumper": "^0.1.1", + "textalk/websocket": "^1.5" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index fa7d5d1..860c272 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,16 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1c0a10fa91b2df3dbf734900cb4c6fa2", + "content-hash": "180fd50c18ae54063515e2bae5b5e329", "packages": [ { "name": "aliyuncs/oss-sdk-php", "version": "v2.6.0", - "source": { - "type": "git", - "url": "https://github.com/aliyun/aliyun-oss-php-sdk.git", - "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/572d0f8e099e8630ae7139ed3fdedb926c7a760f", + "url": "https://mirrors.cloud.tencent.com/repository/composer/aliyuncs/oss-sdk-php/v2.6.0/aliyuncs-oss-sdk-php-v2.6.0.zip", "reference": "572d0f8e099e8630ae7139ed3fdedb926c7a760f", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3" @@ -39,7 +28,6 @@ "OSS\\": "src/OSS" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -51,42 +39,130 @@ ], "description": "Aliyun OSS SDK for PHP", "homepage": "http://www.aliyun.com/product/oss/", - "support": { - "issues": "https://github.com/aliyun/aliyun-oss-php-sdk/issues", - "source": "https://github.com/aliyun/aliyun-oss-php-sdk/tree/v2.6.0" - }, "time": "2022-08-03T08:06:01+00:00" }, { - "name": "doctrine/inflector", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" - }, + "name": "doctrine/annotations", + "version": "1.14.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/doctrine/annotations/1.14.3/doctrine-annotations-1.14.3.zip", + "reference": "fb0d71a7393298a7b232cbf4c8b1f73f3ec3d5af", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^1 || ^2", + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" + }, + "require-dev": { + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "~1.4.10 || ^1.8.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6", + "vimeo/psalm": "^4.10" + }, + "suggest": { + "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2023-02-01T09:20:38+00:00" + }, + { + "name": "doctrine/deprecations", + "version": "v1.1.1", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/doctrine/deprecations/v1.1.1/doctrine-deprecations-v1.1.1.zip", + "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "time": "2023-06-03T09:27:29+00:00" + }, + { + "name": "doctrine/inflector", + "version": "2.0.8", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/doctrine/inflector/2.0.8/doctrine-inflector-2.0.8.zip", + "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff", + "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^11.0", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25 || ^5.4" }, "type": "library", "autoload": { @@ -94,7 +170,6 @@ "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -134,45 +209,70 @@ "uppercase", "words" ], - "support": { - "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.4" + "time": "2023-06-16T13:40:37+00:00" + }, + { + "name": "doctrine/lexer", + "version": "2.1.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/doctrine/lexer/2.1.0/doctrine-lexer-2.1.0.zip", + "reference": "39ab8fcf5a51ce4b85ca97c7a7d033eb12831124", + "shasum": "" }, - "funding": [ + "require": { + "doctrine/deprecations": "^1.0", + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9 || ^10", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^4.11 || ^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "src" + } + }, + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" }, { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" + "name": "Roman Borschel", + "email": "roman@code-factory.org" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" } ], - "time": "2021-10-22T20:16:43+00:00" + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "keywords": [ + "annotations", + "docblock", + "lexer", + "parser", + "php" + ], + "time": "2022-12-14T08:49:07+00:00" }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.1", - "source": { - "type": "git", - "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa" - }, + "version": "v3.3.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/dragonmantank/cron-expression/v3.3.3/dragonmantank-cron-expression-v3.3.3.zip", + "reference": "adfb1f505deb6384dc8b39804c5065dd3c8c8c0a", + "shasum": "" }, "require": { "php": "^7.2|^8.0", @@ -193,7 +293,6 @@ "Cron\\": "src/Cron/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -209,37 +308,16 @@ "cron", "schedule" ], - "support": { - "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1" - }, - "funding": [ - { - "url": "https://github.com/dragonmantank", - "type": "github" - } - ], - "time": "2022-01-18T15:43:28+00:00" + "time": "2023-08-10T19:36:49+00:00" }, { "name": "ezyang/htmlpurifier", "version": "v4.16.0", - "source": { - "type": "git", - "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "url": "https://mirrors.cloud.tencent.com/repository/composer/ezyang/htmlpurifier/v4.16.0/ezyang-htmlpurifier-v4.16.0.zip", "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" @@ -266,7 +344,6 @@ "/library/HTMLPurifier/Language/" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL-2.1-or-later" ], @@ -282,38 +359,23 @@ "keywords": [ "html" ], - "support": { - "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" - }, "time": "2022-09-18T07:06:19+00:00" }, { "name": "graham-campbell/result-type", - "version": "v1.0.4", - "source": { - "type": "git", - "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "0690bde05318336c7221785f2a932467f98b64ca" - }, + "version": "v1.1.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", - "reference": "0690bde05318336c7221785f2a932467f98b64ca", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/graham-campbell/result-type/v1.1.1/graham-campbell-result-type-v1.1.1.zip", + "reference": "672eff8cf1d6fe1ef09ca0f89c4b287d6a3eb831", + "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "phpoption/phpoption": "^1.8" + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9.1" }, "require-dev": { - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "autoload": { @@ -321,7 +383,6 @@ "GrahamCampbell\\ResultType\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -340,55 +401,32 @@ "Result-Type", "result" ], - "support": { - "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/graham-campbell/result-type", - "type": "tidelift" - } - ], - "time": "2021-11-21T21:41:47+00:00" + "time": "2023-02-25T20:23:15+00:00" }, { "name": "guzzlehttp/command", - "version": "1.2.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/command.git", - "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8" - }, + "version": "1.3.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/command/zipball/7883359e0ecab8a8f7c43aad2fc36360a35d21e8", - "reference": "7883359e0ecab8a8f7c43aad2fc36360a35d21e8", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/guzzlehttp/command/1.3.0/guzzlehttp-command-1.3.0.zip", + "reference": "3372bcfd79d4b357b6871665bf06155515e8d844", + "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^7.4.1", - "guzzlehttp/promises": "^1.5.1", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/guzzle": "^7.5.1", + "guzzlehttp/promises": "^1.5.3 || ^2.0", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^8.5.19" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.19 || ^9.5.8" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.2-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { @@ -396,7 +434,6 @@ "GuzzleHttp\\Command\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -423,50 +460,21 @@ } ], "description": "Provides the foundation for building command-based web service clients", - "support": { - "issues": "https://github.com/guzzle/command/issues", - "source": "https://github.com/guzzle/command/tree/1.2.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/command", - "type": "tidelift" - } - ], - "time": "2022-02-08T10:21:14+00:00" + "time": "2023-05-21T14:15:09+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.5.0", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle.git", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" - }, + "version": "7.8.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/guzzlehttp/guzzle/7.8.0/guzzlehttp-guzzle-7.8.0.zip", + "reference": "1110f66a6530a40fe7aea0378fe608ee2b2248f9", + "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", - "guzzlehttp/psr7": "^1.9 || ^2.4", + "guzzlehttp/promises": "^1.5.3 || ^2.0.1", + "guzzlehttp/psr7": "^1.9.1 || ^2.5.1", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -477,7 +485,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -491,9 +500,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "7.5-dev" } }, "autoload": { @@ -504,7 +510,6 @@ "GuzzleHttp\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -557,54 +562,26 @@ "rest", "web service" ], - "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.5.0" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", - "type": "tidelift" - } - ], - "time": "2022-08-28T15:39:27+00:00" + "time": "2023-08-27T10:20:53+00:00" }, { "name": "guzzlehttp/guzzle-services", - "version": "1.3.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/guzzle-services.git", - "reference": "4989d902dd4e0411b320e851c46f3c94d652d891" - }, + "version": "1.4.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle-services/zipball/4989d902dd4e0411b320e851c46f3c94d652d891", - "reference": "4989d902dd4e0411b320e851c46f3c94d652d891", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/guzzlehttp/guzzle-services/1.4.0/guzzlehttp-guzzle-services-1.4.0.zip", + "reference": "f4bb1c205152a56741624b88753732e01a60565c", + "shasum": "" }, "require": { - "guzzlehttp/command": "^1.2.2", - "guzzlehttp/guzzle": "^7.4.1", - "guzzlehttp/psr7": "^1.8.3 || ^2.1", + "guzzlehttp/command": "^1.3", + "guzzlehttp/guzzle": "^7.7", + "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "guzzlehttp/uri-template": "^1.0.1", "php": "^7.2.5 || ^8.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.1", "phpunit/phpunit": "^8.5.19 || ^9.5.8" }, "suggest": { @@ -612,8 +589,9 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.3-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { @@ -621,7 +599,6 @@ "GuzzleHttp\\Command\\Guzzle\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -648,67 +625,36 @@ } ], "description": "Provides an implementation of the Guzzle Command library that uses Guzzle service descriptions to describe web services, serialize requests, and parse responses into easy to use model structures.", - "support": { - "issues": "https://github.com/guzzle/guzzle-services/issues", - "source": "https://github.com/guzzle/guzzle-services/tree/1.3.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle-services", - "type": "tidelift" - } - ], - "time": "2022-03-03T11:21:34+00:00" + "time": "2023-05-21T14:21:30+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", - "source": { - "type": "git", - "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" - }, + "version": "2.0.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/guzzlehttp/promises/2.0.1/guzzlehttp-promises-2.0.1.zip", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", + "shasum": "" }, "require": { - "php": ">=5.5" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4 || ^5.1" + "bamarni/composer-bin-plugin": "^1.8.1", + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "type": "library", "extra": { - "branch-alias": { - "dev-master": "1.5-dev" + "bamarni-bin": { + "bin-links": true, + "forward-command": false } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\Promise\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -738,50 +684,21 @@ "keywords": [ "promise" ], - "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", - "type": "tidelift" - } - ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.3", - "source": { - "type": "git", - "url": "https://github.com/guzzle/psr7.git", - "reference": "67c26b443f348a51926030c83481b85718457d3d" - }, + "version": "2.6.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/67c26b443f348a51926030c83481b85718457d3d", - "reference": "67c26b443f348a51926030c83481b85718457d3d", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/guzzlehttp/psr7/2.6.1/guzzlehttp-psr7-2.6.1.zip", + "reference": "be45764272e8873c72dbe3d2edcfdfcc3bc9f727", + "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.1 || ^2.0", "ralouphie/getallheaders": "^3.0" }, "provide": { @@ -801,9 +718,6 @@ "bamarni-bin": { "bin-links": true, "forward-command": false - }, - "branch-alias": { - "dev-master": "2.4-dev" } }, "autoload": { @@ -811,7 +725,6 @@ "GuzzleHttp\\Psr7\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -863,66 +776,32 @@ "uri", "url" ], - "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.3" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", - "type": "tidelift" - } - ], - "time": "2022-10-26T14:07:24+00:00" + "time": "2023-08-27T10:13:57+00:00" }, { "name": "guzzlehttp/uri-template", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/guzzle/uri-template.git", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2" - }, + "version": "v1.0.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/uri-template/zipball/b945d74a55a25a949158444f09ec0d3c120d69e2", - "reference": "b945d74a55a25a949158444f09ec0d3c120d69e2", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/guzzlehttp/uri-template/v1.0.2/guzzlehttp-uri-template-v1.0.2.zip", + "reference": "61bf437fc2197f587f6857d3ff903a24f1731b5d", + "shasum": "" }, "require": { "php": "^7.2.5 || ^8.0", "symfony/polyfill-php80": "^1.17" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.8.1", "phpunit/phpunit": "^8.5.19 || ^9.5.8", "uri-template/tests": "1.0.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "GuzzleHttp\\UriTemplate\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -953,57 +832,344 @@ "guzzlehttp", "uri-template" ], - "support": { - "issues": "https://github.com/guzzle/uri-template/issues", - "source": "https://github.com/guzzle/uri-template/tree/v1.0.1" + "time": "2023-08-27T10:19:19+00:00" + }, + { + "name": "illuminate/collections", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/illuminate/collections/v10.22.0/illuminate-collections-v10.22.0.zip", + "reference": "f494398dbaaead9e5ff16a18002d11634e8358e6", + "shasum": "" }, - "funding": [ + "require": { + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "php": "^8.1" + }, + "suggest": { + "symfony/var-dumper": "Required to use the dump method (^6.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://github.com/Nyholm", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/uri-template", - "type": "tidelift" + "name": "Taylor Otwell", + "email": "taylor@laravel.com" } ], - "time": "2021-10-07T12:57:01+00:00" + "description": "The Illuminate Collections package.", + "homepage": "https://laravel.com", + "time": "2023-08-11T14:48:51+00:00" + }, + { + "name": "illuminate/conditionable", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/illuminate/conditionable/v10.22.0/illuminate-conditionable-v10.22.0.zip", + "reference": "d0958e4741fc9d6f516a552060fd1b829a85e009", + "shasum": "" + }, + "require": { + "php": "^8.0.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Conditionable package.", + "homepage": "https://laravel.com", + "time": "2023-02-03T08:06:17+00:00" + }, + { + "name": "illuminate/contracts", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/illuminate/contracts/v10.22.0/illuminate-contracts-v10.22.0.zip", + "reference": "eb1a7e72e159136a832f2c0467de5570bdc208ae", + "shasum": "" + }, + "require": { + "php": "^8.1", + "psr/container": "^1.1.1|^2.0.1", + "psr/simple-cache": "^1.0|^2.0|^3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Contracts\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Contracts package.", + "homepage": "https://laravel.com", + "time": "2023-07-26T21:27:34+00:00" + }, + { + "name": "illuminate/macroable", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/illuminate/macroable/v10.22.0/illuminate-macroable-v10.22.0.zip", + "reference": "dff667a46ac37b634dcf68909d9d41e94dc97c27", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Macroable package.", + "homepage": "https://laravel.com", + "time": "2023-06-05T12:46:42+00:00" + }, + { + "name": "illuminate/redis", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/illuminate/redis/v10.22.0/illuminate-redis-v10.22.0.zip", + "reference": "896a0f1940147417f8ce88cced703691bc5548b0", + "shasum": "" + }, + "require": { + "illuminate/collections": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "illuminate/support": "^10.0", + "php": "^8.1" + }, + "suggest": { + "ext-redis": "Required to use the phpredis connector (^4.0|^5.0).", + "predis/predis": "Required to use the predis connector (^2.0.2)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Redis\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Redis package.", + "homepage": "https://laravel.com", + "time": "2023-08-02T14:11:43+00:00" + }, + { + "name": "illuminate/support", + "version": "v10.22.0", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/illuminate/support/v10.22.0/illuminate-support-v10.22.0.zip", + "reference": "7ff0d0d70a7b8275816398a88870e062a01ebb8b", + "shasum": "" + }, + "require": { + "doctrine/inflector": "^2.0", + "ext-ctype": "*", + "ext-filter": "*", + "ext-mbstring": "*", + "illuminate/collections": "^10.0", + "illuminate/conditionable": "^10.0", + "illuminate/contracts": "^10.0", + "illuminate/macroable": "^10.0", + "nesbot/carbon": "^2.67", + "php": "^8.1", + "voku/portable-ascii": "^2.0" + }, + "conflict": { + "tightenco/collect": "<5.5.33" + }, + "suggest": { + "illuminate/filesystem": "Required to use the composer class (^10.0).", + "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^2.0.2).", + "ramsey/uuid": "Required to use Str::uuid() (^4.7).", + "symfony/process": "Required to use the composer class (^6.2).", + "symfony/uid": "Required to use Str::ulid() (^6.2).", + "symfony/var-dumper": "Required to use the dd function (^6.2).", + "vlucas/phpdotenv": "Required to use the Env class and env helper (^5.4.1)." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + } + }, + "autoload": { + "files": [ + "helpers.php" + ], + "psr-4": { + "Illuminate\\Support\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Support package.", + "homepage": "https://laravel.com", + "time": "2023-09-04T15:58:19+00:00" + }, + { + "name": "laravel/serializable-closure", + "version": "v1.3.1", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/laravel/serializable-closure/v1.3.1/laravel-serializable-closure-v1.3.1.zip", + "reference": "e5a3057a5591e1cfe8183034b0203921abe2c902", + "shasum": "" + }, + "require": { + "php": "^7.3|^8.0" + }, + "require-dev": { + "nesbot/carbon": "^2.61", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\SerializableClosure\\": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Nuno Maduro", + "email": "nuno@laravel.com" + } + ], + "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.", + "keywords": [ + "closure", + "laravel", + "serializable" + ], + "time": "2023-07-14T13:56:28+00:00" }, { "name": "maennchen/zipstream-php", - "version": "2.1.0", - "source": { - "type": "git", - "url": "https://github.com/maennchen/ZipStream-PHP.git", - "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58" - }, + "version": "3.1.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/maennchen/ZipStream-PHP/zipball/c4c5803cc1f93df3d2448478ef79394a5981cc58", - "reference": "c4c5803cc1f93df3d2448478ef79394a5981cc58", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/maennchen/zipstream-php/3.1.0/maennchen-zipstream-php-3.1.0.zip", + "reference": "b8174494eda667f7d13876b4a7bfef0f62a7c0d1", + "shasum": "" }, "require": { - "myclabs/php-enum": "^1.5", - "php": ">= 7.1", - "psr/http-message": "^1.0", - "symfony/polyfill-mbstring": "^1.0" + "ext-mbstring": "*", + "ext-zlib": "*", + "php-64bit": "^8.1" }, "require-dev": { "ext-zip": "*", - "guzzlehttp/guzzle": ">= 6.3", + "friendsofphp/php-cs-fixer": "^3.16", + "guzzlehttp/guzzle": "^7.5", "mikey179/vfsstream": "^1.6", - "phpunit/phpunit": ">= 7.5" + "php-coveralls/php-coveralls": "^2.5", + "phpunit/phpunit": "^10.0", + "vimeo/psalm": "^5.0" + }, + "suggest": { + "guzzlehttp/psr7": "^2.4", + "psr/http-message": "^2.0" }, "type": "library", "autoload": { @@ -1011,7 +1177,6 @@ "ZipStream\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1038,41 +1203,16 @@ "stream", "zip" ], - "support": { - "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0" - }, - "funding": [ - { - "url": "https://github.com/maennchen", - "type": "github" - }, - { - "url": "https://opencollective.com/zipstream", - "type": "open_collective" - } - ], - "time": "2020-05-30T13:11:16+00:00" + "time": "2023-06-21T14:59:35+00:00" }, { "name": "markbaker/complex", "version": "3.0.2", - "source": { - "type": "git", - "url": "https://github.com/MarkBaker/PHPComplex.git", - "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/95c56caa1cf5c766ad6d65b6344b807c1e8405b9", + "url": "https://mirrors.cloud.tencent.com/repository/composer/markbaker/complex/3.0.2/markbaker-complex-3.0.2.zip", "reference": "95c56caa1cf5c766ad6d65b6344b807c1e8405b9", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": "^7.2 || ^8.0" @@ -1089,7 +1229,6 @@ "Complex\\": "classes/src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1105,31 +1244,16 @@ "complex", "mathematics" ], - "support": { - "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/3.0.2" - }, "time": "2022-12-06T16:21:08+00:00" }, { "name": "markbaker/matrix", "version": "3.0.1", - "source": { - "type": "git", - "url": "https://github.com/MarkBaker/PHPMatrix.git", - "reference": "728434227fe21be27ff6d86621a1b13107a2562c" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/MarkBaker/PHPMatrix/zipball/728434227fe21be27ff6d86621a1b13107a2562c", + "url": "https://mirrors.cloud.tencent.com/repository/composer/markbaker/matrix/3.0.1/markbaker-matrix-3.0.1.zip", "reference": "728434227fe21be27ff6d86621a1b13107a2562c", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": "^7.1 || ^8.0" @@ -1150,7 +1274,6 @@ "Matrix\\": "classes/src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1167,31 +1290,55 @@ "matrix", "vector" ], - "support": { - "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/3.0.1" - }, "time": "2022-12-02T22:17:43+00:00" }, { - "name": "monolog/monolog", - "version": "2.8.0", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" - }, + "name": "max/var-dumper", + "version": "0.1.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", - "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/max/var-dumper/0.1.1/max-var-dumper-0.1.1.zip", + "reference": "603bdeb2135b24c9eb91e559df1f9fc6a95b811d", + "shasum": "" + }, + "require": { + "php": ">=7.4", + "symfony/var-dumper": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.1.x-dev" + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Max\\VarDumper\\": "src/" + } + }, + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "chengyao", + "email": "987861463@qq.com" + } + ], + "homepage": "https://github.com/marxphp/var-dumper", + "time": "2023-07-07T12:54:36+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.9.1", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/monolog/monolog/2.9.1/monolog-monolog-2.9.1.zip", + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "shasum": "" }, "require": { "php": ">=7.2", @@ -1205,7 +1352,7 @@ "doctrine/couchdb": "~1.0@dev", "elasticsearch/elasticsearch": "^7 || ^8", "ext-json": "*", - "graylog2/gelf-php": "^1.4.2", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", @@ -1247,7 +1394,6 @@ "Monolog\\": "src/Monolog" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1265,107 +1411,97 @@ "logging", "psr-3" ], - "support": { - "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.8.0" - }, - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], - "time": "2022-07-24T11:55:47+00:00" + "time": "2023-02-06T13:44:46+00:00" }, { - "name": "myclabs/php-enum", - "version": "1.7.7", - "source": { - "type": "git", - "url": "https://github.com/myclabs/php-enum.git", - "reference": "d178027d1e679832db9f38248fcc7200647dc2b7" - }, + "name": "nesbot/carbon", + "version": "2.70.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/php-enum/zipball/d178027d1e679832db9f38248fcc7200647dc2b7", - "reference": "d178027d1e679832db9f38248fcc7200647dc2b7", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/nesbot/carbon/2.70.0/nesbot-carbon-2.70.0.zip", + "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d", + "shasum": "" }, "require": { "ext-json": "*", - "php": ">=7.1" + "php": "^7.1.8 || ^8.0", + "psr/clock": "^1.0", + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.16", + "symfony/translation": "^3.4 || ^4.0 || ^5.0 || ^6.0" + }, + "provide": { + "psr/clock-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "^7", - "squizlabs/php_codesniffer": "1.*", - "vimeo/psalm": "^3.8" + "doctrine/dbal": "^2.0 || ^3.1.4", + "doctrine/orm": "^2.7", + "friendsofphp/php-cs-fixer": "^3.0", + "kylekatarnls/multi-tester": "^2.0", + "ondrejmirtes/better-reflection": "*", + "phpmd/phpmd": "^2.9", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.12.99 || ^1.7.14", + "phpunit/php-file-iterator": "^2.0.5 || ^3.0.6", + "phpunit/phpunit": "^7.5.20 || ^8.5.26 || ^9.5.20", + "squizlabs/php_codesniffer": "^3.4" }, + "bin": [ + "bin/carbon" + ], "type": "library", - "autoload": { - "psr-4": { - "MyCLabs\\Enum\\": "src/" + "extra": { + "branch-alias": { + "dev-3.x": "3.x-dev", + "dev-master": "2.x-dev" + }, + "laravel": { + "providers": [ + "Carbon\\Laravel\\ServiceProvider" + ] + }, + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "Carbon\\": "src/Carbon/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "PHP Enum contributors", - "homepage": "https://github.com/myclabs/php-enum/graphs/contributors" - } - ], - "description": "PHP Enum implementation", - "homepage": "http://github.com/myclabs/php-enum", - "keywords": [ - "enum" - ], - "support": { - "issues": "https://github.com/myclabs/php-enum/issues", - "source": "https://github.com/myclabs/php-enum/tree/1.7.7" - }, - "funding": [ - { - "url": "https://github.com/mnapoli", - "type": "github" + "name": "Brian Nesbitt", + "email": "brian@nesbot.com", + "homepage": "https://markido.com" }, { - "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", - "type": "tidelift" + "name": "kylekatarnls", + "homepage": "https://github.com/kylekatarnls" } ], - "time": "2020-11-14T18:14:52+00:00" + "description": "An API extension for DateTime that supports 281 different languages.", + "homepage": "https://carbon.nesbot.com", + "keywords": [ + "date", + "datetime", + "time" + ], + "time": "2023-09-07T16:43:50+00:00" }, { "name": "nikic/fast-route", "version": "v1.3.0", - "source": { - "type": "git", - "url": "https://github.com/nikic/FastRoute.git", - "reference": "181d480e08d9476e61381e04a71b34dc0432e812" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", + "url": "https://mirrors.cloud.tencent.com/repository/composer/nikic/fast-route/v1.3.0/nikic-fast-route-v1.3.0.zip", "reference": "181d480e08d9476e61381e04a71b34dc0432e812", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.4.0" @@ -1382,7 +1518,6 @@ "FastRoute\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -1397,102 +1532,143 @@ "router", "routing" ], - "support": { - "issues": "https://github.com/nikic/FastRoute/issues", - "source": "https://github.com/nikic/FastRoute/tree/master" - }, "time": "2018-02-13T20:26:39+00:00" }, { - "name": "opis/closure", - "version": "3.6.3", - "source": { - "type": "git", - "url": "https://github.com/opis/closure.git", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad" - }, + "name": "php-di/invoker", + "version": "2.3.4", "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/3d81e4309d2a927abbe66df935f4bb60082805ad", - "reference": "3d81e4309d2a927abbe66df935f4bb60082805ad", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/php-di/invoker/2.3.4/php-di-invoker-2.3.4.zip", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", + "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0" + "php": ">=7.3", + "psr/container": "^1.0|^2.0" }, "require-dev": { - "jeremeamia/superclosure": "^2.0", - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" + "athletic/athletic": "~0.1.8", + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^9.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.6.x-dev" - } - }, "autoload": { - "files": [ - "functions.php" - ], "psr-4": { - "Opis\\Closure\\": "src/" + "Invoker\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Marius Sarca", - "email": "marius.sarca@gmail.com" - }, - { - "name": "Sorin Sarca", - "email": "sarca_sorin@hotmail.com" - } - ], - "description": "A library that can be used to serialize closures (anonymous functions) and arbitrary objects.", - "homepage": "https://opis.io/closure", + "description": "Generic and extensible callable invoker", + "homepage": "https://github.com/PHP-DI/Invoker", "keywords": [ - "anonymous functions", - "closure", - "function", - "serializable", - "serialization", - "serialize" + "callable", + "dependency", + "dependency-injection", + "injection", + "invoke", + "invoker" ], - "support": { - "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.3" + "time": "2023-09-08T09:24:21+00:00" + }, + { + "name": "php-di/php-di", + "version": "6.4.0", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/php-di/php-di/6.4.0/php-di-php-di-6.4.0.zip", + "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "shasum": "" }, - "time": "2022-01-27T09:35:39+00:00" + "require": { + "laravel/serializable-closure": "^1.0", + "php": ">=7.4.0", + "php-di/invoker": "^2.0", + "php-di/phpdoc-reader": "^2.0.1", + "psr/container": "^1.0" + }, + "provide": { + "psr/container-implementation": "^1.0" + }, + "require-dev": { + "doctrine/annotations": "~1.10", + "friendsofphp/php-cs-fixer": "^2.4", + "mnapoli/phpunit-easymock": "^1.2", + "ocramius/proxy-manager": "^2.11.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", + "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "DI\\": "src/" + } + }, + "license": [ + "MIT" + ], + "description": "The dependency injection container for humans", + "homepage": "https://php-di.org/", + "keywords": [ + "PSR-11", + "container", + "container-interop", + "dependency injection", + "di", + "ioc", + "psr11" + ], + "time": "2022-04-09T16:46:38+00:00" + }, + { + "name": "php-di/phpdoc-reader", + "version": "2.2.1", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/php-di/phpdoc-reader/2.2.1/php-di-phpdoc-reader-2.2.1.zip", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "require-dev": { + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^8.5|^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpDocReader\\": "src/PhpDocReader" + } + }, + "license": [ + "MIT" + ], + "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", + "keywords": [ + "phpdoc", + "reflection" + ], + "time": "2020-10-12T12:39:22+00:00" }, { "name": "phpoffice/phpspreadsheet", - "version": "1.19.0", - "source": { - "type": "git", - "url": "https://github.com/PHPOffice/PhpSpreadsheet.git", - "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf" - }, + "version": "1.29.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", - "reference": "a9ab55bfae02eecffb3df669a2e19ba0e2f04bbf", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/phpoffice/phpspreadsheet/1.29.0/phpoffice-phpspreadsheet-1.29.0.zip", + "reference": "fde2ccf55eaef7e86021ff1acce26479160a0fa0", + "shasum": "" }, "require": { "ext-ctype": "*", @@ -1508,33 +1684,34 @@ "ext-xmlwriter": "*", "ext-zip": "*", "ext-zlib": "*", - "ezyang/htmlpurifier": "^4.13", - "maennchen/zipstream-php": "^2.1", + "ezyang/htmlpurifier": "^4.15", + "maennchen/zipstream-php": "^2.1 || ^3.0", "markbaker/complex": "^3.0", "markbaker/matrix": "^3.0", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "psr/simple-cache": "^1.0" + "psr/simple-cache": "^1.0 || ^2.0 || ^3.0" }, "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "dev-master", - "dompdf/dompdf": "^1.0", - "friendsofphp/php-cs-fixer": "^2.18", - "jpgraph/jpgraph": "^4.0", - "mpdf/mpdf": "^8.0", + "dealerdirect/phpcodesniffer-composer-installer": "dev-main", + "dompdf/dompdf": "^1.0 || ^2.0", + "friendsofphp/php-cs-fixer": "^3.2", + "mitoteam/jpgraph": "^10.3", + "mpdf/mpdf": "^8.1.1", "phpcompatibility/php-compatibility": "^9.3", - "phpstan/phpstan": "^0.12.82", - "phpstan/phpstan-phpunit": "^0.12.18", - "phpunit/phpunit": "^8.5", - "squizlabs/php_codesniffer": "^3.5", - "tecnickcom/tcpdf": "^6.3" + "phpstan/phpstan": "^1.1", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^8.5 || ^9.0 || ^10.0", + "squizlabs/php_codesniffer": "^3.7", + "tecnickcom/tcpdf": "^6.5" }, "suggest": { - "dompdf/dompdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)", - "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", + "dompdf/dompdf": "Option for rendering PDF with PDF Writer", + "ext-intl": "PHP Internationalization Functions", + "mitoteam/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers", "mpdf/mpdf": "Option for rendering PDF with PDF Writer", - "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)" + "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer" }, "type": "library", "autoload": { @@ -1542,7 +1719,6 @@ "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1578,43 +1754,32 @@ "xls", "xlsx" ], - "support": { - "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues", - "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.19.0" - }, - "time": "2021-10-31T15:09:20+00:00" + "time": "2023-06-14T22:48:31+00:00" }, { "name": "phpoption/phpoption", - "version": "1.8.1", - "source": { - "type": "git", - "url": "https://github.com/schmittjoh/php-option.git", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" - }, + "version": "1.9.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/phpoption/phpoption/1.9.1/phpoption-phpoption-1.9.1.zip", + "reference": "dd3a383e599f49777d8b628dadbb90cae435b87e", + "shasum": "" }, "require": { - "php": "^7.0 || ^8.0" + "php": "^7.2.5 || ^8.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "bamarni/composer-bin-plugin": "^1.8.2", + "phpunit/phpunit": "^8.5.32 || ^9.6.3 || ^10.0.12" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1622,7 +1787,6 @@ "PhpOption\\": "src/PhpOption/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -1645,41 +1809,16 @@ "php", "type" ], - "support": { - "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", - "type": "tidelift" - } - ], - "time": "2021-12-04T23:24:31+00:00" + "time": "2023-02-25T19:38:58+00:00" }, { "name": "psr/cache", "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/cache.git", - "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8", + "url": "https://mirrors.tencent.com/repository/composer/psr/cache/1.0.1/psr-cache-1.0.1.zip", "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -1695,7 +1834,6 @@ "Psr\\Cache\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1711,33 +1849,57 @@ "psr", "psr-6" ], - "support": { - "source": "https://github.com/php-fig/cache/tree/master" - }, "time": "2016-08-06T20:24:11+00:00" }, { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, + "name": "psr/clock", + "version": "1.0.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/psr/clock/1.0.0/psr-clock-1.0.0.zip", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" }, "require": { - "php": ">=7.2.0" + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "time": "2022-11-25T14:36:26+00:00" + }, + { + "name": "psr/container", + "version": "1.1.2", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/psr/container/1.1.2/psr-container-1.1.2.zip", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" }, "type": "library", "autoload": { @@ -1745,7 +1907,6 @@ "Psr\\Container\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1764,35 +1925,20 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" - }, - "time": "2021-03-05T17:36:06+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "psr/http-client", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-client.git", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" - }, + "version": "1.0.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/psr/http-client/1.0.2/psr-http-client-1.0.2.zip", + "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "shasum": "" }, "require": { "php": "^7.0 || ^8.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1805,14 +1951,13 @@ "Psr\\Http\\Client\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP clients", @@ -1823,34 +1968,20 @@ "psr", "psr-18" ], - "support": { - "source": "https://github.com/php-fig/http-client/tree/master" - }, - "time": "2020-06-29T06:28:15+00:00" + "time": "2023-04-10T20:12:12+00:00" }, { "name": "psr/http-factory", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" - }, + "version": "1.0.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/psr/http-factory/1.0.2/psr-http-factory-1.0.2.zip", + "reference": "e616d01114759c4c489f93b099585439f795fe35", + "shasum": "" }, "require": { "php": ">=7.0.0", - "psr/http-message": "^1.0" + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -1863,14 +1994,13 @@ "Psr\\Http\\Message\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interfaces for PSR-7 HTTP message factories", @@ -1884,38 +2014,24 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" - }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { "name": "psr/http-message", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, + "version": "2.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/psr/http-message/2.0/psr-http-message-2.0.zip", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1923,14 +2039,13 @@ "Psr\\Http\\Message\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -1943,46 +2058,31 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/log", - "version": "1.1.4", - "source": { - "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" - }, + "version": "3.0.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/psr/log/3.0.0/psr-log-3.0.0.zip", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1999,30 +2099,16 @@ "psr", "psr-3" ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" - }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2021-07-14T16:46:02+00:00" }, { "name": "psr/simple-cache", "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "url": "https://mirrors.cloud.tencent.com/repository/composer/psr/simple-cache/1.0.1/psr-simple-cache-1.0.1.zip", "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.0" @@ -2038,7 +2124,6 @@ "Psr\\SimpleCache\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2056,34 +2141,21 @@ "psr-16", "simple-cache" ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - }, "time": "2017-10-23T01:57:42+00:00" }, { "name": "qcloud/cos-sdk-v5", - "version": "v2.6.0", - "source": { - "type": "git", - "url": "https://github.com/tencentyun/cos-php-sdk-v5.git", - "reference": "bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b" - }, + "version": "v2.6.6", "dist": { "type": "zip", - "url": "https://api.github.com/repos/tencentyun/cos-php-sdk-v5/zipball/bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b", - "reference": "bb9f0f1a72922413a3d8eae0f02fd7f78e7d847b", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/qcloud/cos-sdk-v5/v2.6.6/qcloud-cos-sdk-v5-v2.6.6.zip", + "reference": "9d82ccb550fe2dca1adfb53835791d314023a9a8", + "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", + "ext-mbstring": "*", "ext-simplexml": "*", "guzzlehttp/guzzle": "^6.2.1 || ^7.0", "guzzlehttp/guzzle-services": "^1.1", @@ -2104,7 +2176,6 @@ "Qcloud\\Cos\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2128,31 +2199,16 @@ "php", "qcloud" ], - "support": { - "issues": "https://github.com/tencentyun/cos-php-sdk-v5/issues", - "source": "https://github.com/tencentyun/cos-php-sdk-v5/tree/v2.6.0" - }, - "time": "2022-11-14T11:12:33+00:00" + "time": "2023-08-23T08:14:27+00:00" }, { "name": "qiniu/php-sdk", "version": "v7.4.0", - "source": { - "type": "git", - "url": "https://github.com/qiniu/php-sdk.git", - "reference": "1c6bc89166e524a40ee42bf516fb99ffc6401c82" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/1c6bc89166e524a40ee42bf516fb99ffc6401c82", + "url": "https://mirrors.tencent.com/repository/composer/qiniu/php-sdk/v7.4.0/qiniu-php-sdk-v7.4.0.zip", "reference": "1c6bc89166e524a40ee42bf516fb99ffc6401c82", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.3.3" @@ -2170,7 +2226,6 @@ "Qiniu\\": "src/Qiniu" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2189,31 +2244,16 @@ "sdk", "storage" ], - "support": { - "issues": "https://github.com/qiniu/php-sdk/issues", - "source": "https://github.com/qiniu/php-sdk/tree/v7.4.0" - }, "time": "2021-07-19T07:41:36+00:00" }, { "name": "ralouphie/getallheaders", "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "url": "https://mirrors.tencent.com/repository/composer/ralouphie/getallheaders/3.0.3/ralouphie-getallheaders-3.0.3.zip", "reference": "120b605dfeb996808c31b6477290a714d356e822", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=5.6" @@ -2228,7 +2268,6 @@ "src/getallheaders.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2239,66 +2278,172 @@ } ], "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, "time": "2019-03-08T08:55:37+00:00" }, { - "name": "symfony/console", - "version": "v5.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f" - }, + "name": "symfony/cache", + "version": "v5.4.28", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", - "reference": "58422fdcb0e715ed05b385f70d3e8b5ed4bbd45f", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/cache/v5.4.28/symfony-cache-v5.4.28.zip", + "reference": "62b7ae3bccc5b474a30fadc7ef6bbc362007d3f9", + "shasum": "" }, "require": { "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^1.1.7|^2", "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php73": "^1.9", "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.1|^6.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "conflict": { - "psr/log": ">=3", + "doctrine/dbal": "<2.13.1", "symfony/dependency-injection": "<4.4", - "symfony/dotenv": "<5.1", - "symfony/event-dispatcher": "<4.4", - "symfony/lock": "<4.4", - "symfony/process": "<4.4" + "symfony/http-kernel": "<4.4", + "symfony/var-dumper": "<4.4" }, "provide": { - "psr/log-implementation": "1.0|2.0" + "psr/cache-implementation": "1.0|2.0", + "psr/simple-cache-implementation": "1.0|2.0", + "symfony/cache-implementation": "1.0|2.0" }, "require-dev": { - "psr/log": "^1|^2", + "cache/integration-tests": "dev-master", + "doctrine/cache": "^1.6|^2.0", + "doctrine/dbal": "^2.13.1|^3.0", + "predis/predis": "^1.1", + "psr/simple-cache": "^1.0|^2.0", "symfony/config": "^4.4|^5.0|^6.0", "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/event-dispatcher": "^4.4|^5.0|^6.0", - "symfony/lock": "^4.4|^5.0|^6.0", - "symfony/process": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", "symfony/var-dumper": "^4.4|^5.0|^6.0" }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", + "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], + "time": "2023-08-05T08:32:42+00:00" + }, + { + "name": "symfony/cache-contracts", + "version": "v2.5.2", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/cache-contracts/v2.5.2/symfony-cache-contracts-v2.5.2.zip", + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0|^3.0" + }, "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/cache-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Cache\\": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to caching", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/console", + "version": "v6.3.4", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/symfony/console/v6.3.4/symfony-console-v6.3.4.zip", + "reference": "eca495f2ee845130855ddf1cf18460c38966c8b6", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/lock": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/var-dumper": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -2309,7 +2454,6 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2327,56 +2471,28 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], - "support": { - "source": "https://github.com/symfony/console/tree/v5.4.17" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-12-28T14:15:31+00:00" + "time": "2023-08-16T10:10:12+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" - }, + "version": "v3.3.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/deprecation-contracts/v3.3.0/symfony-deprecation-contracts-v3.3.0.zip", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -2388,7 +2504,6 @@ "function.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2404,44 +2519,16 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/polyfill-ctype/v1.28.0/symfony-polyfill-ctype-v1.28.0.zip", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2455,7 +2542,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2470,7 +2557,6 @@ "Symfony\\Polyfill\\Ctype\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2492,44 +2578,16 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/polyfill-intl-grapheme/v1.28.0/symfony-polyfill-intl-grapheme-v1.28.0.zip", + "reference": "875e90aeea2777b6f135677f618529449334a612", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2540,7 +2598,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2555,7 +2613,6 @@ "Symfony\\Polyfill\\Intl\\Grapheme\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2579,44 +2636,16 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/polyfill-intl-normalizer/v1.28.0/symfony-polyfill-intl-normalizer-v1.28.0.zip", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2627,7 +2656,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2645,7 +2674,6 @@ "Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2669,44 +2697,16 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/polyfill-mbstring/v1.28.0/symfony-polyfill-mbstring-v1.28.0.zip", + "reference": "42292d99c55abe617799667f454222c54c60e229", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2720,7 +2720,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2735,7 +2735,6 @@ "Symfony\\Polyfill\\Mbstring\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2758,44 +2757,16 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/polyfill-php73/v1.28.0/symfony-polyfill-php73-v1.28.0.zip", + "reference": "fe2f306d1d9d346a7fee353d0d5012e401e984b5", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2803,7 +2774,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2821,7 +2792,6 @@ "Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2843,44 +2813,16 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" - }, + "version": "v1.28.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/polyfill-php80/v1.28.0/symfony-polyfill-php80-v1.28.0.zip", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "shasum": "" }, "require": { "php": ">=7.1" @@ -2888,7 +2830,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2906,7 +2848,6 @@ "Resources/stubs" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -2932,44 +2873,16 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/service-contracts", "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/service-contracts.git", - "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "url": "https://mirrors.tencent.com/repository/composer/symfony/service-contracts/v2.5.2/symfony-service-contracts-v2.5.2.zip", "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.2.5", @@ -2997,7 +2910,6 @@ "Symfony\\Contracts\\Service\\": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3021,61 +2933,33 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2022-05-30T19:17:29+00:00" }, { "name": "symfony/string", - "version": "v5.4.17", - "source": { - "type": "git", - "url": "https://github.com/symfony/string.git", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b" - }, + "version": "v6.3.2", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/55733a8664b8853b003e70251c58bc8cb2d82a6b", - "reference": "55733a8664b8853b003e70251c58bc8cb2d82a6b", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/string/v6.3.2/symfony-string-v6.3.2.zip", + "reference": "53d1a83225002635bca3482fcbf963001313fb68", + "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": ">=3.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^4.4|^5.0|^6.0", - "symfony/http-client": "^4.4|^5.0|^6.0", - "symfony/translation-contracts": "^1.1|^2", - "symfony/var-exporter": "^4.4|^5.0|^6.0" + "symfony/error-handler": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/intl": "^6.2", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -3089,7 +2973,6 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3113,80 +2996,50 @@ "utf-8", "utf8" ], - "support": { - "source": "https://github.com/symfony/string/tree/v5.4.17" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2022-12-12T15:54:21+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/translation", - "version": "v5.4.21", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation.git", - "reference": "6996affeea65705086939894b77110e9a7f80874" - }, + "version": "v6.3.3", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6996affeea65705086939894b77110e9a7f80874", - "reference": "6996affeea65705086939894b77110e9a7f80874", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/translation/v6.3.3/symfony-translation-v6.3.3.zip", + "reference": "3ed078c54bc98bbe4414e1e9b2d5e85ed5a5c8bd", + "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php80": "^1.16", - "symfony/translation-contracts": "^2.3" + "symfony/translation-contracts": "^2.5|^3.0" }, "conflict": { - "symfony/config": "<4.4", - "symfony/console": "<5.3", - "symfony/dependency-injection": "<5.0", - "symfony/http-kernel": "<5.0", - "symfony/twig-bundle": "<5.0", - "symfony/yaml": "<4.4" + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" }, "provide": { - "symfony/translation-implementation": "2.3" + "symfony/translation-implementation": "2.3|3.0" }, "require-dev": { + "nikic/php-parser": "^4.13", "psr/log": "^1|^2|^3", - "symfony/config": "^4.4|^5.0|^6.0", + "symfony/config": "^5.4|^6.0", "symfony/console": "^5.4|^6.0", - "symfony/dependency-injection": "^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/http-client-contracts": "^1.1|^2.0|^3.0", - "symfony/http-kernel": "^5.0|^6.0", - "symfony/intl": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", + "symfony/finder": "^5.4|^6.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/intl": "^5.4|^6.0", "symfony/polyfill-intl-icu": "^1.21", - "symfony/service-contracts": "^1.1.2|^2|^3", - "symfony/yaml": "^4.4|^5.0|^6.0" - }, - "suggest": { - "psr/log-implementation": "To use logging capability in translator", - "symfony/config": "", - "symfony/yaml": "" + "symfony/routing": "^5.4|^6.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0" }, "type": "library", "autoload": { @@ -3200,7 +3053,6 @@ "/Tests/" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3216,55 +3068,24 @@ ], "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/translation/tree/v5.4.21" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-02-21T19:46:44+00:00" + "time": "2023-07-31T07:08:24+00:00" }, { "name": "symfony/translation-contracts", - "version": "v2.5.2", - "source": { - "type": "git", - "url": "https://github.com/symfony/translation-contracts.git", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" - }, + "version": "v3.3.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/symfony/translation-contracts/v3.3.0/symfony-translation-contracts-v3.3.0.zip", + "reference": "02c24deb352fb0d79db5486c0c79905a85e37e86", + "shasum": "" }, "require": { - "php": ">=7.2.5" - }, - "suggest": { - "symfony/translation-implementation": "" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.5-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -3274,9 +3095,11 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Translation\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3300,44 +3123,128 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + "time": "2023-05-30T17:17:10+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.3.4", + "dist": { + "type": "zip", + "url": "https://mirrors.tencent.com/repository/composer/symfony/var-dumper/v6.3.4/symfony-var-dumper-v6.3.4.zip", + "reference": "2027be14f8ae8eae999ceadebcda5b4909b81d45", + "shasum": "" }, - "funding": [ + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0", + "symfony/http-kernel": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0", + "symfony/uid": "^5.4|^6.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "time": "2022-06-27T16:58:25+00:00" + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "time": "2023-08-24T14:51:05+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.3.4", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/symfony/var-exporter/v6.3.4/symfony-var-exporter-v6.3.4.zip", + "reference": "df1f8aac5751871b83d30bf3e2c355770f8f0691", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/var-dumper": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" + ], + "time": "2023-08-16T18:14:47+00:00" }, { "name": "taoser/webman-validate", "version": "v1.7.2", - "source": { - "type": "git", - "url": "https://github.com/taoser/webman-validate.git", - "reference": "f6ceda3700cabf3e48966b845fd980faa292127e" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/taoser/webman-validate/zipball/f6ceda3700cabf3e48966b845fd980faa292127e", + "url": "https://mirrors.cloud.tencent.com/repository/composer/taoser/webman-validate/v1.7.2/taoser-webman-validate-v1.7.2.zip", "reference": "f6ceda3700cabf3e48966b845fd980faa292127e", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.2.0", @@ -3354,7 +3261,6 @@ "taoser\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "mit" ], @@ -3365,84 +3271,55 @@ } ], "description": "The webman Validate Package", - "support": { - "issues": "https://github.com/taoser/webman-validate/issues", - "source": "https://github.com/taoser/webman-validate/tree/v1.7.2" - }, "time": "2022-08-27T08:29:08+00:00" }, { - "name": "tencentcloud/tencentcloud-sdk-php", - "version": "3.0.807", - "source": { - "type": "git", - "url": "https://github.com/TencentCloud/tencentcloud-sdk-php.git", - "reference": "d7c58728eee8842b0559866aea94b6d136f3a49b" - }, + "name": "textalk/websocket", + "version": "1.5.8", "dist": { "type": "zip", - "url": "https://api.github.com/repos/TencentCloud/tencentcloud-sdk-php/zipball/d7c58728eee8842b0559866aea94b6d136f3a49b", - "reference": "d7c58728eee8842b0559866aea94b6d136f3a49b", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/textalk/websocket/1.5.8/textalk-websocket-1.5.8.zip", + "reference": "d05dbaa97500176447ffb1f1800573f23085ab13", + "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.3 || ^7.0", - "php": ">=5.6.0" + "php": "^7.2 | ^8.0", + "psr/log": "^1 | ^2 | ^3" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.0", + "phpunit/phpunit": "^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.5" }, "type": "library", "autoload": { "psr-4": { - "TencentCloud\\": "./src/TencentCloud" - }, - "classmap": [ - "src/QcloudApi/QcloudApi.php" - ] + "WebSocket\\": "lib" + } }, - "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "ISC" ], "authors": [ { - "name": "coolli", - "email": "tencentcloudapi@tencent.com", - "homepage": "https://cloud.tencent.com/document/sdk/PHP", - "role": "Developer" + "name": "Fredrik Liljegren" + }, + { + "name": "Sören Jensen", + "email": "soren@abicart.se" } ], - "description": "TencentCloudApi php sdk", - "homepage": "https://github.com/TencentCloud/tencentcloud-sdk-php", - "support": { - "issues": "https://github.com/TencentCloud/tencentcloud-sdk-php/issues", - "source": "https://github.com/TencentCloud/tencentcloud-sdk-php/tree/3.0.807" - }, - "time": "2023-01-12T00:07:10+00:00" + "description": "WebSocket client and server", + "time": "2022-04-26T06:28:24+00:00" }, { "name": "tinywan/storage", "version": "v0.3.4", - "source": { - "type": "git", - "url": "https://github.com/Tinywan/webman-storage.git", - "reference": "0867631bbd1731658ac745481131ef93415cdf62" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Tinywan/webman-storage/zipball/0867631bbd1731658ac745481131ef93415cdf62", + "url": "https://mirrors.cloud.tencent.com/repository/composer/tinywan/storage/v0.3.4/tinywan-storage-v0.3.4.zip", "reference": "0867631bbd1731658ac745481131ef93415cdf62", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.2", @@ -3463,87 +3340,20 @@ "Tinywan\\Storage\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "webman storage plugin", - "support": { - "issues": "https://github.com/Tinywan/webman-storage/issues", - "source": "https://github.com/Tinywan/webman-storage/tree/v0.3.4" - }, "time": "2022-08-03T12:12:34+00:00" }, - { - "name": "topthink/think-cache", - "version": "v2.0.6", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-cache.git", - "reference": "75a56b24affc65b51688fd89ada48c102757fd74" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/top-think/think-cache/zipball/75a56b24affc65b51688fd89ada48c102757fd74", - "reference": "75a56b24affc65b51688fd89ada48c102757fd74", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "opis/closure": "^3.1", - "php": ">=7.1.0", - "psr/cache": "~1.0", - "psr/simple-cache": "^1.0", - "topthink/think-container": "~2.0" - }, - "type": "library", - "autoload": { - "files": [], - "psr-4": { - "think\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "liu21st", - "email": "liu21st@gmail.com" - } - ], - "description": "Cache Manager", - "support": { - "issues": "https://github.com/top-think/think-cache/issues", - "source": "https://github.com/top-think/think-cache/tree/v2.0.6" - }, - "time": "2019-07-07T14:34:35+00:00" - }, { "name": "topthink/think-container", "version": "v2.0.5", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-container.git", - "reference": "2189b39e42af2c14203ed4372b92e38989e9dabb" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-container/zipball/2189b39e42af2c14203ed4372b92e38989e9dabb", + "url": "https://mirrors.cloud.tencent.com/repository/composer/topthink/think-container/v2.0.5/topthink-think-container-v2.0.5.zip", "reference": "2189b39e42af2c14203ed4372b92e38989e9dabb", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.2.0", @@ -3560,7 +3370,6 @@ "think\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -3571,31 +3380,16 @@ } ], "description": "PHP Container & Facade Manager", - "support": { - "issues": "https://github.com/top-think/think-container/issues", - "source": "https://github.com/top-think/think-container/tree/v2.0.5" - }, "time": "2022-05-23T06:24:54+00:00" }, { "name": "topthink/think-helper", "version": "v3.1.6", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-helper.git", - "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-helper/zipball/769acbe50a4274327162f9c68ec2e89a38eb2aff", + "url": "https://mirrors.tencent.com/repository/composer/topthink/think-helper/v3.1.6/topthink-think-helper-v3.1.6.zip", "reference": "769acbe50a4274327162f9c68ec2e89a38eb2aff", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "php": ">=7.1.0" @@ -3612,7 +3406,6 @@ "think\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -3623,42 +3416,27 @@ } ], "description": "The ThinkPHP6 Helper Package", - "support": { - "issues": "https://github.com/top-think/think-helper/issues", - "source": "https://github.com/top-think/think-helper/tree/v3.1.6" - }, "time": "2021-12-15T04:27:55+00:00" }, { "name": "topthink/think-orm", - "version": "v2.0.56", - "source": { - "type": "git", - "url": "https://github.com/top-think/think-orm.git", - "reference": "75b8512736daaa056d511f42c15bed87c9f3605a" - }, + "version": "v3.0.13", "dist": { "type": "zip", - "url": "https://api.github.com/repos/top-think/think-orm/zipball/75b8512736daaa056d511f42c15bed87c9f3605a", - "reference": "75b8512736daaa056d511f42c15bed87c9f3605a", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/topthink/think-orm/v3.0.13/topthink-think-orm-v3.0.13.zip", + "reference": "e676e172d54055266005986d05685bdac5ac66b7", + "shasum": "" }, "require": { "ext-json": "*", "ext-pdo": "*", - "php": ">=7.1.0", - "psr/log": "^1.0|^2.0", - "psr/simple-cache": "^1.0|^2.0", + "php": ">=8.0.0", + "psr/log": ">=1.0", + "psr/simple-cache": ">=1.0", "topthink/think-helper": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^7|^8|^9.5" + "phpunit/phpunit": "^8|^9.5|^10" }, "type": "library", "autoload": { @@ -3669,7 +3447,6 @@ "think\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache-2.0" ], @@ -3679,36 +3456,21 @@ "email": "liu21st@gmail.com" } ], - "description": "think orm", + "description": "the PHP Database&ORM Framework", "keywords": [ "database", "orm" ], - "support": { - "issues": "https://github.com/top-think/think-orm/issues", - "source": "https://github.com/top-think/think-orm/tree/v2.0.56" - }, - "time": "2022-12-15T02:52:53+00:00" + "time": "2023-09-01T09:08:49+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v5.4.1", - "source": { - "type": "git", - "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f" - }, + "version": "v5.5.0", "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/264dce589e7ce37a7ba99cb901eed8249fbec92f", - "reference": "264dce589e7ce37a7ba99cb901eed8249fbec92f", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/vlucas/phpdotenv/v5.5.0/vlucas-phpdotenv-v5.5.0.zip", + "reference": "1a7ea2afc49c3ee6d87061f5a233e3a035d0eae7", + "shasum": "" }, "require": { "ext-pcre": "*", @@ -3722,15 +3484,19 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.4.1", "ext-filter": "*", - "phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10" + "phpunit/phpunit": "^7.5.20 || ^8.5.30 || ^9.5.25" }, "suggest": { "ext-filter": "Required to use the boolean validator." }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "5.5-dev" } }, "autoload": { @@ -3738,7 +3504,6 @@ "Dotenv\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" ], @@ -3760,41 +3525,58 @@ "env", "environment" ], - "support": { - "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/v5.4.1" + "time": "2022-10-16T01:01:54+00:00" + }, + { + "name": "voku/portable-ascii", + "version": "2.0.1", + "dist": { + "type": "zip", + "url": "https://mirrors.cloud.tencent.com/repository/composer/voku/portable-ascii/2.0.1/voku-portable-ascii-2.0.1.zip", + "reference": "b56450eed252f6801410d810c8e1727224ae0743", + "shasum": "" }, - "funding": [ + "require": { + "php": ">=7.0.0" + }, + "require-dev": { + "phpunit/phpunit": "~6.0 || ~7.0 || ~9.0" + }, + "suggest": { + "ext-intl": "Use Intl for transliterator_transliterate() support" + }, + "type": "library", + "autoload": { + "psr-4": { + "voku\\": "src/voku/" + } + }, + "license": [ + "MIT" + ], + "authors": [ { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", - "type": "tidelift" + "name": "Lars Moelleken", + "homepage": "http://www.moelleken.org/" } ], - "time": "2021-12-12T23:22:04+00:00" + "description": "Portable ASCII library - performance optimized (ascii) string functions for php.", + "homepage": "https://github.com/voku/portable-ascii", + "keywords": [ + "ascii", + "clean", + "php" + ], + "time": "2022-03-08T17:03:00+00:00" }, { "name": "webman/console", - "version": "v1.2.18", - "source": { - "type": "git", - "url": "https://github.com/webman-php/console.git", - "reference": "96c5d57b36a9c46c2fbb7dc6df251e30aeb48c63" - }, + "version": "v1.2.38", "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/console/zipball/96c5d57b36a9c46c2fbb7dc6df251e30aeb48c63", - "reference": "96c5d57b36a9c46c2fbb7dc6df251e30aeb48c63", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/webman/console/v1.2.38/webman-console-v1.2.38.zip", + "reference": "2a48e1d196e67f4deba2dc9d624fb09682bb034d", + "shasum": "" }, "require": { "doctrine/inflector": "^2.0", @@ -3809,7 +3591,6 @@ "Webman\\Console\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -3826,34 +3607,16 @@ "keywords": [ "webman console" ], - "support": { - "email": "walkor@workerman.net", - "forum": "http://www.workerman.net/questions", - "issues": "https://github.com/webman-php/console/issues", - "source": "https://github.com/webman-php/console", - "wiki": "http://www.workerman.net/doc/webman" - }, - "time": "2022-11-26T15:15:21+00:00" + "time": "2023-08-31T06:36:57+00:00" }, { "name": "webman/log", "version": "v1.1.5", - "source": { - "type": "git", - "url": "https://github.com/webman-php/log.git", - "reference": "28f722778ef722a78c9be2565d537eea7805cc01" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/log/zipball/28f722778ef722a78c9be2565d537eea7805cc01", + "url": "https://mirrors.cloud.tencent.com/repository/composer/webman/log/v1.1.5/webman-log-v1.1.5.zip", "reference": "28f722778ef722a78c9be2565d537eea7805cc01", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "type": "library", "autoload": { @@ -3861,78 +3624,23 @@ "Webman\\Log\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Webman plugin webman/log", - "support": { - "issues": "https://github.com/webman-php/log/issues", - "source": "https://github.com/webman-php/log/tree/v1.1.5" - }, "time": "2022-12-28T08:12:41+00:00" }, - { - "name": "webman/think-cache", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/webman-php/think-cache.git", - "reference": "25bd103d7fc9347aca680e677282db761cc90a43" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webman-php/think-cache/zipball/25bd103d7fc9347aca680e677282db761cc90a43", - "reference": "25bd103d7fc9347aca680e677282db761cc90a43", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] - }, - "require": { - "topthink/think-cache": "^2.0.6" - }, - "type": "library", - "autoload": { - "psr-4": { - "Webman\\ThinkCache\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "support": { - "issues": "https://github.com/webman-php/think-cache/issues", - "source": "https://github.com/webman-php/think-cache/tree/v1.0.1" - }, - "time": "2022-03-30T03:27:46+00:00" - }, { "name": "webman/think-orm", - "version": "v1.0.12", - "source": { - "type": "git", - "url": "https://github.com/webman-php/think-orm.git", - "reference": "6eabf395a7afa507bdb17e0ccd3bb4df9dda8d16" - }, + "version": "v1.1.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/webman-php/think-orm/zipball/6eabf395a7afa507bdb17e0ccd3bb4df9dda8d16", - "reference": "6eabf395a7afa507bdb17e0ccd3bb4df9dda8d16", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.cloud.tencent.com/repository/composer/webman/think-orm/v1.1.1/webman-think-orm-v1.1.1.zip", + "reference": "9f1e525c5c4b5a2e1eee6a4f82ef5d23c69139a2", + "shasum": "" }, "require": { - "topthink/think-orm": "^2.0.53", + "topthink/think-orm": "^2.0.53 || ^3.0.0", "workerman/webman-framework": "^1.2.1" }, "type": "library", @@ -3941,35 +3649,19 @@ "Webman\\ThinkOrm\\": "src" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "support": { - "issues": "https://github.com/webman-php/think-orm/issues", - "source": "https://github.com/webman-php/think-orm/tree/v1.0.12" - }, - "time": "2022-12-19T01:52:53+00:00" + "time": "2023-04-23T14:40:18+00:00" }, { "name": "webmozart/assert", "version": "1.11.0", - "source": { - "type": "git", - "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" - }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://mirrors.tencent.com/repository/composer/webmozart/assert/1.11.0/webmozart-assert-1.11.0.zip", "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "shasum": "" }, "require": { "ext-ctype": "*", @@ -3993,7 +3685,6 @@ "Webmozart\\Assert\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -4009,37 +3700,23 @@ "check", "validate" ], - "support": { - "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" - }, "time": "2022-06-03T18:03:27+00:00" }, { "name": "workerman/webman-framework", - "version": "v1.4.10", - "source": { - "type": "git", - "url": "https://github.com/walkor/webman-framework.git", - "reference": "d9d6a5317f1f11486e37bf5613aa0d1601b83edd" - }, + "version": "v1.5.8", "dist": { "type": "zip", - "url": "https://api.github.com/repos/walkor/webman-framework/zipball/d9d6a5317f1f11486e37bf5613aa0d1601b83edd", - "reference": "d9d6a5317f1f11486e37bf5613aa0d1601b83edd", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/workerman/webman-framework/v1.5.8/workerman-webman-framework-v1.5.8.zip", + "reference": "1cf2d1c8231dd4acaf88a491170552747f325732", + "shasum": "" }, "require": { + "ext-json": "*", "nikic/fast-route": "^1.3", "php": ">=7.2", "psr/container": ">=1.0", - "workerman/workerman": "^4.0.4" + "workerman/workerman": "^4.0.4 || ^5.0.0" }, "suggest": { "ext-event": "For better performance. " @@ -4055,7 +3732,6 @@ "Support\\Exception\\": "./src/support/exception" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -4073,34 +3749,16 @@ "High Performance", "http service" ], - "support": { - "email": "walkor@workerman.net", - "forum": "https://wenda.workerman.net/", - "issues": "https://github.com/walkor/webman/issues", - "source": "https://github.com/walkor/webman-framework", - "wiki": "https://doc.workerman.net/" - }, - "time": "2022-12-12T07:54:21+00:00" + "time": "2023-07-21T09:39:36+00:00" }, { "name": "workerman/workerman", - "version": "v4.1.5", - "source": { - "type": "git", - "url": "https://github.com/walkor/workerman.git", - "reference": "16bcfc2c7574feea46cdadaaa8ae73f14d464b21" - }, + "version": "v4.1.13", "dist": { "type": "zip", - "url": "https://api.github.com/repos/walkor/workerman/zipball/16bcfc2c7574feea46cdadaaa8ae73f14d464b21", - "reference": "16bcfc2c7574feea46cdadaaa8ae73f14d464b21", - "shasum": "", - "mirrors": [ - { - "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", - "preferred": true - } - ] + "url": "https://mirrors.tencent.com/repository/composer/workerman/workerman/v4.1.13/workerman-workerman-v4.1.13.zip", + "reference": "807780ff672775fcd08f89e573a2824e939021ce", + "shasum": "" }, "require": { "php": ">=7.0" @@ -4114,7 +3772,6 @@ "Workerman\\": "./" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -4132,24 +3789,7 @@ "asynchronous", "event-loop" ], - "support": { - "email": "walkor@workerman.net", - "forum": "http://wenda.workerman.net/", - "issues": "https://github.com/walkor/workerman/issues", - "source": "https://github.com/walkor/workerman", - "wiki": "http://doc.workerman.net/" - }, - "funding": [ - { - "url": "https://opencollective.com/workerman", - "type": "open_collective" - }, - { - "url": "https://www.patreon.com/walkor", - "type": "patreon" - } - ], - "time": "2022-12-14T11:58:06+00:00" + "time": "2023-07-31T05:57:25+00:00" } ], "packages-dev": [], diff --git a/composer.phar b/composer.phar new file mode 100755 index 0000000..d39c3e6 Binary files /dev/null and b/composer.phar differ diff --git a/config/bootstrap.php b/config/bootstrap.php index 6bcb734..3257ec5 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -16,5 +16,4 @@ return [ support\bootstrap\Session::class, support\bootstrap\LaravelDb::class, Webman\ThinkOrm\ThinkOrm::class, - Webman\ThinkCache\ThinkCache::class, ]; diff --git a/config/database.php b/config/database.php index 7dc463a..48402ad 100644 --- a/config/database.php +++ b/config/database.php @@ -1,15 +1,24 @@ - * @copyright walkor - * @link http://www.workerman.net/ - * @license http://www.opensource.org/licenses/mit-license.php MIT License - */ -return []; +use function DI\env; + +return [ + // 默认数据库 + 'default' => 'mysql', + // 各种数据库配置 + 'connections' => [ + + 'mysql' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST'), + 'port' => 3306, + 'database' => env('DB_DATABASE'), + 'username' => env('DB_USERNAME'), + 'password' => env('DB_PASSWORD'), + 'unix_socket' => '', + 'prefix' => 'la_', + 'strict' => true, + 'engine' => null, + ], + ], + ]; \ No newline at end of file diff --git a/config/plugin/webman/log/app.php b/config/plugin/webman/log/app.php new file mode 100644 index 0000000..391150e --- /dev/null +++ b/config/plugin/webman/log/app.php @@ -0,0 +1,12 @@ + true, + 'exception' => [ + // 是否记录异常到日志 + 'enable' => true, + // 不会记录到日志的异常类 + 'dontReport' => [ + support\exception\BusinessException::class + ] + ] +]; diff --git a/config/plugin/webman/log/middleware.php b/config/plugin/webman/log/middleware.php new file mode 100644 index 0000000..acf9763 --- /dev/null +++ b/config/plugin/webman/log/middleware.php @@ -0,0 +1,21 @@ + + * @copyright walkor + * @link http://www.workerman.net/ + * @license http://www.opensource.org/licenses/mit-license.php MIT License + */ + +use Webman\Log\Middleware; + +return [ + '' => [ + Middleware::class + ] +]; \ No newline at end of file diff --git a/config/thinkcache.php b/config/thinkcache.php deleted file mode 100644 index 09a530a..0000000 --- a/config/thinkcache.php +++ /dev/null @@ -1,22 +0,0 @@ - 'redis', - 'stores' => [ - 'file' => [ - 'type' => 'File', - // 缓存保存目录 - 'path' => runtime_path() . '/cache/', - // 缓存前缀 - 'prefix' => '', - // 缓存有效期 0表示永久缓存 - 'expire' => 0, - ], - 'redis' => [ - 'type' => 'redis', - 'host' => '127.0.0.1', - 'port' => 6379, - 'prefix' => '', - 'expire' => 0, - ], - ], -]; \ No newline at end of file diff --git a/config/thinkorm.php b/config/thinkorm.php index 9be215f..77eb1a6 100644 --- a/config/thinkorm.php +++ b/config/thinkorm.php @@ -23,7 +23,7 @@ return [ // 断线重连 'break_reconnect' => true, // 关闭SQL监听日志 - 'trigger_sql' => false, + 'trigger_sql' => true, // 自定义分页类 'bootstrap' => '' ], diff --git a/resource/translations/en/validate.php b/resource/translations/en/validate.php new file mode 100644 index 0000000..d3f26f3 --- /dev/null +++ b/resource/translations/en/validate.php @@ -0,0 +1,147 @@ + +// +---------------------------------------------------------------------- + +// 核心中文语言包 +return [ + // 系统错误提示 + 'Undefined variable' => '未定义变量', + 'Undefined index' => '未定义数组索引', + 'Undefined offset' => '未定义数组下标', + 'Parse error' => '语法解析错误', + 'Type error' => '类型错误', + 'Fatal error' => '致命错误', + 'syntax error' => '语法错误', + + // 框架核心错误提示 + 'dispatch type not support' => '不支持的调度类型', + 'method param miss' => '方法参数错误', + 'method not exists' => '方法不存在', + 'function not exists' => '函数不存在', + 'app not exists' => '应用不存在', + 'controller not exists' => '控制器不存在', + 'class not exists' => '类不存在', + 'property not exists' => '类的属性不存在', + 'template not exists' => '模板文件不存在', + 'illegal controller name' => '非法的控制器名称', + 'illegal action name' => '非法的操作名称', + 'url suffix deny' => '禁止的URL后缀访问', + 'Undefined cache config' => '缓存配置未定义', + 'Route Not Found' => '当前访问路由未定义或不匹配', + 'Undefined db config' => '数据库配置未定义', + 'Undefined log config' => '日志配置未定义', + 'Undefined db type' => '未定义数据库类型', + 'variable type error' => '变量类型错误', + 'PSR-4 error' => 'PSR-4 规范错误', + 'not support type' => '不支持的分页索引字段类型', + 'not support total' => '简洁模式下不能获取数据总数', + 'not support last' => '简洁模式下不能获取最后一页', + 'error session handler' => '错误的SESSION处理器类', + 'not allow php tag' => '模板不允许使用PHP语法', + 'not support' => '不支持', + 'database config error' => '数据库配置信息错误', + 'redisd master' => 'Redisd 主服务器错误', + 'redisd slave' => 'Redisd 从服务器错误', + 'must run at sae' => '必须在SAE运行', + 'memcache init error' => '未开通Memcache服务，请在SAE管理平台初始化Memcache服务', + 'KVDB init error' => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务', + 'fields not exists' => '数据表字段不存在', + 'where express error' => '查询表达式错误', + 'no data to update' => '没有任何数据需要更新', + 'miss data to insert' => '缺少需要写入的数据', + 'miss complex primary data' => '缺少复合主键数据', + 'miss update condition' => '缺少更新条件', + 'model data Not Found' => '模型数据不存在', + 'table data not Found' => '表数据不存在', + 'delete without condition' => '没有条件不会执行删除操作', + 'miss relation data' => '缺少关联表数据', + 'tag attr must' => '模板标签属性必须', + 'tag error' => '模板标签错误', + 'cache write error' => '缓存写入失败', + 'sae mc write error' => 'SAE mc 写入错误', + 'route name not exists' => '路由标识不存在（或参数不够）', + 'invalid request' => '非法请求', + 'bind attr has exists' => '模型的属性已经存在', + 'relation data not exists' => '关联数据不存在', + 'relation not support' => '关联不支持', + 'chunk not support order' => 'Chunk不支持调用order方法', + 'route pattern error' => '路由变量规则定义错误', + 'route behavior will not support' => '路由行为废弃（使用中间件替代）', + 'closure not support cache(true)' => '使用闭包查询不支持cache(true)，请指定缓存Key', + + // 上传错误信息 + 'unknown upload error' => '未知上传错误！', + 'file write error' => '文件写入失败！', + 'upload temp dir not found' => '找不到临时文件夹！', + 'no file to uploaded' => '没有文件被上传！', + 'only the portion of file is uploaded' => '文件只有部分被上传！', + 'upload File size exceeds the maximum value' => '上传文件大小超过了最大值！', + 'upload write error' => '文件上传保存错误！', + 'has the same filename: {:filename}' => '存在同名文件：{:filename}', + 'upload illegal files' => '非法上传文件', + 'illegal image files' => '非法图片文件', + 'extensions to upload is not allowed' => '上传文件后缀不允许', + 'mimetype to upload is not allowed' => '上传文件MIME类型不允许！', + 'filesize not match' => '上传文件大小不符！', + 'directory {:path} creation failed' => '目录 {:path} 创建失败！', + + 'The middleware must return Response instance' => '中间件方法必须返回Response对象实例', + 'The queue was exhausted, with no response returned' => '中间件队列为空', + // Validate Error Message + ':attribute require' => ':attribute不能为空', + ':attribute must' => ':attribute必须', + ':attribute must be numeric' => ':attribute必须是数字', + ':attribute must be integer' => ':attribute必须是整数', + ':attribute must be float' => ':attribute必须是浮点数', + ':attribute must be bool' => ':attribute必须是布尔值', + ':attribute not a valid email address' => ':attribute格式不符', + ':attribute not a valid mobile' => ':attribute格式不符', + ':attribute must be a array' => ':attribute必须是数组', + ':attribute must be yes,on or 1' => ':attribute必须是yes、on或者1', + ':attribute not a valid datetime' => ':attribute不是一个有效的日期或时间格式', + ':attribute not a valid file' => ':attribute不是有效的上传文件', + ':attribute not a valid image' => ':attribute不是有效的图像文件', + ':attribute must be alpha' => ':attribute只能是字母', + ':attribute must be alpha-numeric' => ':attribute只能是字母和数字', + ':attribute must be alpha-numeric, dash, underscore' => ':attribute只能是字母、数字和下划线_及破折号-', + ':attribute not a valid domain or ip' => ':attribute不是有效的域名或者IP', + ':attribute must be chinese' => ':attribute只能是汉字', + ':attribute must be chinese or alpha' => ':attribute只能是汉字、字母', + ':attribute must be chinese,alpha-numeric' => ':attribute只能是汉字、字母和数字', + ':attribute must be chinese,alpha-numeric,underscore, dash' => ':attribute只能是汉字、字母、数字和下划线_及破折号-', + ':attribute not a valid url' => ':attribute不是有效的URL地址', + ':attribute not a valid ip' => ':attribute不是有效的IP地址', + ':attribute must be dateFormat of :rule' => ':attribute必须使用日期格式 :rule', + ':attribute must be in :rule' => ':attribute必须在 :rule 范围内', + ':attribute be notin :rule' => ':attribute不能在 :rule 范围内', + ':attribute must between :1 - :2' => ':attribute只能在 :1 - :2 之间', + ':attribute not between :1 - :2' => ':attribute不能在 :1 - :2 之间', + 'size of :attribute must be :rule' => ':attribute长度不符合要求 :rule', + 'max size of :attribute must be :rule' => ':attribute长度不能超过 :rule', + 'min size of :attribute must be :rule' => ':attribute长度不能小于 :rule', + ':attribute cannot be less than :rule' => ':attribute日期不能小于 :rule', + ':attribute cannot exceed :rule' => ':attribute日期不能超过 :rule', + ':attribute not within :rule' => '不在有效期内 :rule', + 'access IP is not allowed' => '不允许的IP访问', + 'access IP denied' => '禁止的IP访问', + ':attribute out of accord with :2' => ':attribute和确认字段:2不一致', + ':attribute cannot be same with :2' => ':attribute和比较字段:2不能相同', + ':attribute must greater than or equal :rule' => ':attribute必须大于等于 :rule', + ':attribute must greater than :rule' => ':attribute必须大于 :rule', + ':attribute must less than or equal :rule' => ':attribute必须小于等于 :rule', + ':attribute must less than :rule' => ':attribute必须小于 :rule', + ':attribute must equal :rule' => ':attribute必须等于 :rule', + ':attribute has exists' => ':attribute已存在', + ':attribute not conform to the rules' => ':attribute不符合指定规则', + 'invalid Request method' => '无效的请求类型', + 'invalid token' => '令牌数据无效', + 'not conform to the rules' => '规则错误', + 'record has update' => '记录已经被更新了', +]; diff --git a/resource/translations/zh_CN/validate.php b/resource/translations/zh_CN/validate.php new file mode 100644 index 0000000..d3f26f3 --- /dev/null +++ b/resource/translations/zh_CN/validate.php @@ -0,0 +1,147 @@ + +// +---------------------------------------------------------------------- + +// 核心中文语言包 +return [ + // 系统错误提示 + 'Undefined variable' => '未定义变量', + 'Undefined index' => '未定义数组索引', + 'Undefined offset' => '未定义数组下标', + 'Parse error' => '语法解析错误', + 'Type error' => '类型错误', + 'Fatal error' => '致命错误', + 'syntax error' => '语法错误', + + // 框架核心错误提示 + 'dispatch type not support' => '不支持的调度类型', + 'method param miss' => '方法参数错误', + 'method not exists' => '方法不存在', + 'function not exists' => '函数不存在', + 'app not exists' => '应用不存在', + 'controller not exists' => '控制器不存在', + 'class not exists' => '类不存在', + 'property not exists' => '类的属性不存在', + 'template not exists' => '模板文件不存在', + 'illegal controller name' => '非法的控制器名称', + 'illegal action name' => '非法的操作名称', + 'url suffix deny' => '禁止的URL后缀访问', + 'Undefined cache config' => '缓存配置未定义', + 'Route Not Found' => '当前访问路由未定义或不匹配', + 'Undefined db config' => '数据库配置未定义', + 'Undefined log config' => '日志配置未定义', + 'Undefined db type' => '未定义数据库类型', + 'variable type error' => '变量类型错误', + 'PSR-4 error' => 'PSR-4 规范错误', + 'not support type' => '不支持的分页索引字段类型', + 'not support total' => '简洁模式下不能获取数据总数', + 'not support last' => '简洁模式下不能获取最后一页', + 'error session handler' => '错误的SESSION处理器类', + 'not allow php tag' => '模板不允许使用PHP语法', + 'not support' => '不支持', + 'database config error' => '数据库配置信息错误', + 'redisd master' => 'Redisd 主服务器错误', + 'redisd slave' => 'Redisd 从服务器错误', + 'must run at sae' => '必须在SAE运行', + 'memcache init error' => '未开通Memcache服务，请在SAE管理平台初始化Memcache服务', + 'KVDB init error' => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务', + 'fields not exists' => '数据表字段不存在', + 'where express error' => '查询表达式错误', + 'no data to update' => '没有任何数据需要更新', + 'miss data to insert' => '缺少需要写入的数据', + 'miss complex primary data' => '缺少复合主键数据', + 'miss update condition' => '缺少更新条件', + 'model data Not Found' => '模型数据不存在', + 'table data not Found' => '表数据不存在', + 'delete without condition' => '没有条件不会执行删除操作', + 'miss relation data' => '缺少关联表数据', + 'tag attr must' => '模板标签属性必须', + 'tag error' => '模板标签错误', + 'cache write error' => '缓存写入失败', + 'sae mc write error' => 'SAE mc 写入错误', + 'route name not exists' => '路由标识不存在（或参数不够）', + 'invalid request' => '非法请求', + 'bind attr has exists' => '模型的属性已经存在', + 'relation data not exists' => '关联数据不存在', + 'relation not support' => '关联不支持', + 'chunk not support order' => 'Chunk不支持调用order方法', + 'route pattern error' => '路由变量规则定义错误', + 'route behavior will not support' => '路由行为废弃（使用中间件替代）', + 'closure not support cache(true)' => '使用闭包查询不支持cache(true)，请指定缓存Key', + + // 上传错误信息 + 'unknown upload error' => '未知上传错误！', + 'file write error' => '文件写入失败！', + 'upload temp dir not found' => '找不到临时文件夹！', + 'no file to uploaded' => '没有文件被上传！', + 'only the portion of file is uploaded' => '文件只有部分被上传！', + 'upload File size exceeds the maximum value' => '上传文件大小超过了最大值！', + 'upload write error' => '文件上传保存错误！', + 'has the same filename: {:filename}' => '存在同名文件：{:filename}', + 'upload illegal files' => '非法上传文件', + 'illegal image files' => '非法图片文件', + 'extensions to upload is not allowed' => '上传文件后缀不允许', + 'mimetype to upload is not allowed' => '上传文件MIME类型不允许！', + 'filesize not match' => '上传文件大小不符！', + 'directory {:path} creation failed' => '目录 {:path} 创建失败！', + + 'The middleware must return Response instance' => '中间件方法必须返回Response对象实例', + 'The queue was exhausted, with no response returned' => '中间件队列为空', + // Validate Error Message + ':attribute require' => ':attribute不能为空', + ':attribute must' => ':attribute必须', + ':attribute must be numeric' => ':attribute必须是数字', + ':attribute must be integer' => ':attribute必须是整数', + ':attribute must be float' => ':attribute必须是浮点数', + ':attribute must be bool' => ':attribute必须是布尔值', + ':attribute not a valid email address' => ':attribute格式不符', + ':attribute not a valid mobile' => ':attribute格式不符', + ':attribute must be a array' => ':attribute必须是数组', + ':attribute must be yes,on or 1' => ':attribute必须是yes、on或者1', + ':attribute not a valid datetime' => ':attribute不是一个有效的日期或时间格式', + ':attribute not a valid file' => ':attribute不是有效的上传文件', + ':attribute not a valid image' => ':attribute不是有效的图像文件', + ':attribute must be alpha' => ':attribute只能是字母', + ':attribute must be alpha-numeric' => ':attribute只能是字母和数字', + ':attribute must be alpha-numeric, dash, underscore' => ':attribute只能是字母、数字和下划线_及破折号-', + ':attribute not a valid domain or ip' => ':attribute不是有效的域名或者IP', + ':attribute must be chinese' => ':attribute只能是汉字', + ':attribute must be chinese or alpha' => ':attribute只能是汉字、字母', + ':attribute must be chinese,alpha-numeric' => ':attribute只能是汉字、字母和数字', + ':attribute must be chinese,alpha-numeric,underscore, dash' => ':attribute只能是汉字、字母、数字和下划线_及破折号-', + ':attribute not a valid url' => ':attribute不是有效的URL地址', + ':attribute not a valid ip' => ':attribute不是有效的IP地址', + ':attribute must be dateFormat of :rule' => ':attribute必须使用日期格式 :rule', + ':attribute must be in :rule' => ':attribute必须在 :rule 范围内', + ':attribute be notin :rule' => ':attribute不能在 :rule 范围内', + ':attribute must between :1 - :2' => ':attribute只能在 :1 - :2 之间', + ':attribute not between :1 - :2' => ':attribute不能在 :1 - :2 之间', + 'size of :attribute must be :rule' => ':attribute长度不符合要求 :rule', + 'max size of :attribute must be :rule' => ':attribute长度不能超过 :rule', + 'min size of :attribute must be :rule' => ':attribute长度不能小于 :rule', + ':attribute cannot be less than :rule' => ':attribute日期不能小于 :rule', + ':attribute cannot exceed :rule' => ':attribute日期不能超过 :rule', + ':attribute not within :rule' => '不在有效期内 :rule', + 'access IP is not allowed' => '不允许的IP访问', + 'access IP denied' => '禁止的IP访问', + ':attribute out of accord with :2' => ':attribute和确认字段:2不一致', + ':attribute cannot be same with :2' => ':attribute和比较字段:2不能相同', + ':attribute must greater than or equal :rule' => ':attribute必须大于等于 :rule', + ':attribute must greater than :rule' => ':attribute必须大于 :rule', + ':attribute must less than or equal :rule' => ':attribute必须小于等于 :rule', + ':attribute must less than :rule' => ':attribute必须小于 :rule', + ':attribute must equal :rule' => ':attribute必须等于 :rule', + ':attribute has exists' => ':attribute已存在', + ':attribute not conform to the rules' => ':attribute不符合指定规则', + 'invalid Request method' => '无效的请求类型', + 'invalid token' => '令牌数据无效', + 'not conform to the rules' => '规则错误', + 'record has update' => '记录已经被更新了', +]; diff --git a/support/bootstrap.php b/support/bootstrap.php index 7a08896..d9471e6 100644 --- a/support/bootstrap.php +++ b/support/bootstrap.php @@ -16,8 +16,8 @@ use Dotenv\Dotenv; use support\Log; use Webman\Bootstrap; use Webman\Config; -use Webman\Route; use Webman\Middleware; +use Webman\Route; use Webman\Util; $worker = $worker ?? null; @@ -29,18 +29,18 @@ set_error_handler(function ($level, $message, $file = '', $line = 0) { }); if ($worker) { - register_shutdown_function(function ($start_time) { - if (time() - $start_time <= 1) { + register_shutdown_function(function ($startTime) { + if (time() - $startTime <= 0.1) { sleep(1); } }, time()); } -if (class_exists('Dotenv\Dotenv') && file_exists(base_path() . '/.env')) { - if (method_exists('Dotenv\Dotenv', 'createUnsafeImmutable')) { - Dotenv::createUnsafeImmutable(base_path())->load(); +if (class_exists('Dotenv\Dotenv') && file_exists(base_path(false) . '/.env')) { + if (method_exists('Dotenv\Dotenv', 'createUnsafeMutable')) { + Dotenv::createUnsafeMutable(base_path(false))->load(); } else { - Dotenv::createMutable(base_path())->load(); + Dotenv::createMutable(base_path(false))->load(); } } @@ -67,30 +67,30 @@ foreach (config('plugin', []) as $firm => $projects) { } } -Middleware::load(config('middleware', []), ''); +Middleware::load(config('middleware', [])); foreach (config('plugin', []) as $firm => $projects) { foreach ($projects as $name => $project) { if (!is_array($project) || $name === 'static') { continue; } - Middleware::load($project['middleware'] ?? [], ''); + Middleware::load($project['middleware'] ?? []); } Middleware::load($projects['middleware'] ?? [], $firm); - if ($static_middlewares = config("plugin.$firm.static.middleware")) { - Middleware::load(['__static__' => $static_middlewares], $firm); + if ($staticMiddlewares = config("plugin.$firm.static.middleware")) { + Middleware::load(['__static__' => $staticMiddlewares], $firm); } } -Middleware::load(['__static__' => config('static.middleware', [])], ''); +Middleware::load(['__static__' => config('static.middleware', [])]); -foreach (config('bootstrap', []) as $class_name) { - if (!class_exists($class_name)) { - $log = "Warning: Class $class_name setting in config/bootstrap.php not found\r\n"; +foreach (config('bootstrap', []) as $className) { + if (!class_exists($className)) { + $log = "Warning: Class $className setting in config/bootstrap.php not found\r\n"; echo $log; Log::error($log); continue; } - /** @var Bootstrap $class_name */ - $class_name::start($worker); + /** @var Bootstrap $className */ + $className::start($worker); } foreach (config('plugin', []) as $firm => $projects) { @@ -98,26 +98,27 @@ foreach (config('plugin', []) as $firm => $projects) { if (!is_array($project)) { continue; } - foreach ($project['bootstrap'] ?? [] as $class_name) { - if (!class_exists($class_name)) { - $log = "Warning: Class $class_name setting in config/plugin/$firm/$name/bootstrap.php not found\r\n"; + foreach ($project['bootstrap'] ?? [] as $className) { + if (!class_exists($className)) { + $log = "Warning: Class $className setting in config/plugin/$firm/$name/bootstrap.php not found\r\n"; echo $log; Log::error($log); continue; } - /** @var Bootstrap $class_name */ - $class_name::start($worker); + /** @var Bootstrap $className */ + $className::start($worker); } } - foreach ($projects['bootstrap'] ?? [] as $class_name) { - if (!class_exists($class_name)) { - $log = "Warning: Class $class_name setting in plugin/$firm/config/bootstrap.php not found\r\n"; + foreach ($projects['bootstrap'] ?? [] as $className) { + /** @var string $className */ + if (!class_exists($className)) { + $log = "Warning: Class $className setting in plugin/$firm/config/bootstrap.php not found\r\n"; echo $log; Log::error($log); continue; } - /** @var Bootstrap $class_name */ - $class_name::start($worker); + /** @var Bootstrap $className */ + $className::start($worker); } } diff --git a/support/helpers.php b/support/helpers.php index 6302810..f6d25b5 100644 --- a/support/helpers.php +++ b/support/helpers.php @@ -17,17 +17,17 @@ use support\Container; use support\Request; use support\Response; use support\Translation; -use support\view\Raw; use support\view\Blade; +use support\view\Raw; use support\view\ThinkPHP; use support\view\Twig; -use Workerman\Worker; +use Twig\Error\LoaderError; +use Twig\Error\RuntimeError; +use Twig\Error\SyntaxError; use Webman\App; use Webman\Config; use Webman\Route; - -// Webman version -const WEBMAN_VERSION = '1.4'; +use Workerman\Worker; // Project base path define('BASE_PATH', dirname(__DIR__)); @@ -39,11 +39,11 @@ define('BASE_PATH', dirname(__DIR__)); */ function run_path(string $path = ''): string { - static $run_path = ''; - if (!$run_path) { - $run_path = \is_phar() ? \dirname(\Phar::running(false)) : BASE_PATH; + static $runPath = ''; + if (!$runPath) { + $runPath = is_phar() ? dirname(Phar::running(false)) : BASE_PATH; } - return \path_combine($run_path, $path); + return path_combine($runPath, $path); } /** @@ -54,9 +54,9 @@ function run_path(string $path = ''): string function base_path($path = ''): string { if (false === $path) { - return \run_path(); + return run_path(); } - return \path_combine(BASE_PATH, $path); + return path_combine(BASE_PATH, $path); } /** @@ -66,7 +66,7 @@ function base_path($path = ''): string */ function app_path(string $path = ''): string { - return \path_combine(BASE_PATH . DIRECTORY_SEPARATOR . 'app', $path); + return path_combine(BASE_PATH . DIRECTORY_SEPARATOR . 'app', $path); } /** @@ -76,11 +76,11 @@ function app_path(string $path = ''): string */ function public_path(string $path = ''): string { - static $public_path = ''; - if (!$public_path) { - $public_path = \config('app.public_path') ? : \run_path('public'); + static $publicPath = ''; + if (!$publicPath) { + $publicPath = \config('app.public_path') ?: run_path('public'); } - return \path_combine($public_path, $path); + return path_combine($publicPath, $path); } /** @@ -90,7 +90,7 @@ function public_path(string $path = ''): string */ function config_path(string $path = ''): string { - return \path_combine(BASE_PATH . DIRECTORY_SEPARATOR . 'config', $path); + return path_combine(BASE_PATH . DIRECTORY_SEPARATOR . 'config', $path); } /** @@ -100,11 +100,11 @@ function config_path(string $path = ''): string */ function runtime_path(string $path = ''): string { - static $runtime_path = ''; - if (!$runtime_path) { - $runtime_path = \config('app.runtime_path') ? : \run_path('runtime'); + static $runtimePath = ''; + if (!$runtimePath) { + $runtimePath = \config('app.runtime_path') ?: run_path('runtime'); } - return \path_combine($runtime_path, $path); + return path_combine($runtimePath, $path); } /** @@ -138,7 +138,7 @@ function response(string $body = '', int $status = 200, array $headers = []): Re */ function json($data, int $options = JSON_UNESCAPED_UNICODE): Response { - return new Response(200, ['Content-Type' => 'application/json'], \json_encode($data, $options)); + return new Response(200, ['Content-Type' => 'application/json'], json_encode($data, $options)); } /** @@ -157,15 +157,15 @@ function xml($xml): Response /** * Jsonp response * @param $data - * @param string $callback_name + * @param string $callbackName * @return Response */ -function jsonp($data, string $callback_name = 'callback'): Response +function jsonp($data, string $callbackName = 'callback'): Response { - if (!\is_scalar($data) && null !== $data) { - $data = \json_encode($data); + if (!is_scalar($data) && null !== $data) { + $data = json_encode($data); } - return new Response(200, [], "$callback_name($data)"); + return new Response(200, [], "$callbackName($data)"); } /** @@ -189,14 +189,15 @@ function redirect(string $location, int $status = 302, array $headers = []): Res * @param string $template * @param array $vars * @param string|null $app + * @param string|null $plugin * @return Response */ -function view(string $template, array $vars = [], string $app = null): Response +function view(string $template, array $vars = [], string $app = null, string $plugin = null): Response { $request = \request(); - $plugin = $request->plugin ?? ''; + $plugin = $plugin === null ? ($request->plugin ?? '') : $plugin; $handler = \config($plugin ? "plugin.$plugin.view.handler" : 'view.handler'); - return new Response(200, [], $handler::render($template, $vars, $app)); + return new Response(200, [], $handler::render($template, $vars, $app, $plugin)); } /** @@ -242,6 +243,9 @@ function think_view(string $template, array $vars = [], string $app = null): Res * @param array $vars * @param string|null $app * @return Response + * @throws LoaderError + * @throws RuntimeError + * @throws SyntaxError */ function twig_view(string $template, array $vars = [], string $app = null): Response { @@ -285,8 +289,8 @@ function route(string $name, ...$parameters): string return $route->url(); } - if (\is_array(\current($parameters))) { - $parameters = \current($parameters); + if (is_array(current($parameters))) { + $parameters = current($parameters); } return $route->url($parameters); @@ -304,14 +308,14 @@ function session($key = null, $default = null) if (null === $key) { return $session; } - if (\is_array($key)) { + if (is_array($key)) { $session->put($key); return null; } - if (\strpos($key, '.')) { - $key_array = \explode('.', $key); + if (strpos($key, '.')) { + $keyArray = explode('.', $key); $value = $session->all(); - foreach ($key_array as $index) { + foreach ($keyArray as $index) { if (!isset($value[$index])) { return $default; } @@ -339,7 +343,7 @@ function trans(string $id, array $parameters = [], string $domain = null, string /** * Locale * @param string|null $locale - * @return void + * @return string */ function locale(string $locale = null): string { @@ -347,6 +351,7 @@ function locale(string $locale = null): string return Translation::getLocale(); } Translation::setLocale($locale); + return $locale; } /** @@ -355,7 +360,7 @@ function locale(string $locale = null): string */ function not_found(): Response { - return new Response(404, [], \file_get_contents(public_path() . '/404.html')); + return new Response(404, [], file_get_contents(public_path() . '/404.html')); } /** @@ -367,18 +372,18 @@ function not_found(): Response */ function copy_dir(string $source, string $dest, bool $overwrite = false) { - if (\is_dir($source)) { + if (is_dir($source)) { if (!is_dir($dest)) { - \mkdir($dest); + mkdir($dest); } - $files = \scandir($source); + $files = scandir($source); foreach ($files as $file) { if ($file !== "." && $file !== "..") { - \copy_dir("$source/$file", "$dest/$file"); + copy_dir("$source/$file", "$dest/$file"); } } - } else if (\file_exists($source) && ($overwrite || !\file_exists($dest))) { - \copy($source, $dest); + } else if (file_exists($source) && ($overwrite || !file_exists($dest))) { + copy($source, $dest); } } @@ -389,14 +394,14 @@ function copy_dir(string $source, string $dest, bool $overwrite = false) */ function remove_dir(string $dir): bool { - if (\is_link($dir) || \is_file($dir)) { - return \unlink($dir); + if (is_link($dir) || is_file($dir)) { + return unlink($dir); } - $files = \array_diff(\scandir($dir), array('.', '..')); + $files = array_diff(scandir($dir), array('.', '..')); foreach ($files as $file) { - (\is_dir("$dir/$file") && !\is_link($dir)) ? \remove_dir("$dir/$file") : \unlink("$dir/$file"); + (is_dir("$dir/$file") && !is_link($dir)) ? remove_dir("$dir/$file") : unlink("$dir/$file"); } - return \rmdir($dir); + return rmdir($dir); } /** @@ -406,7 +411,7 @@ function remove_dir(string $dir): bool */ function worker_bind($worker, $class) { - $callback_map = [ + $callbackMap = [ 'onConnect', 'onMessage', 'onClose', @@ -414,28 +419,29 @@ function worker_bind($worker, $class) 'onBufferFull', 'onBufferDrain', 'onWorkerStop', - 'onWebSocketConnect' + 'onWebSocketConnect', + 'onWorkerReload' ]; - foreach ($callback_map as $name) { - if (\method_exists($class, $name)) { + foreach ($callbackMap as $name) { + if (method_exists($class, $name)) { $worker->$name = [$class, $name]; } } - if (\method_exists($class, 'onWorkerStart')) { - \call_user_func([$class, 'onWorkerStart'], $worker); + if (method_exists($class, 'onWorkerStart')) { + call_user_func([$class, 'onWorkerStart'], $worker); } } /** * Start worker - * @param $process_name + * @param $processName * @param $config * @return void */ -function worker_start($process_name, $config) +function worker_start($processName, $config) { $worker = new Worker($config['listen'] ?? null, $config['context'] ?? []); - $property_map = [ + $propertyMap = [ 'count', 'user', 'group', @@ -444,53 +450,38 @@ function worker_start($process_name, $config) 'transport', 'protocol', ]; - $worker->name = $process_name; - foreach ($property_map as $property) { + $worker->name = $processName; + foreach ($propertyMap as $property) { if (isset($config[$property])) { $worker->$property = $config[$property]; } } $worker->onWorkerStart = function ($worker) use ($config) { - require_once \base_path() . '/support/bootstrap.php'; - - foreach ($config['services'] ?? [] as $server) { - if (!\class_exists($server['handler'])) { - echo "process error: class {$server['handler']} not exists\r\n"; - continue; - } - $listen = new Worker($server['listen'] ?? null, $server['context'] ?? []); - if (isset($server['listen'])) { - echo "listen: {$server['listen']}\n"; - } - $instance = Container::make($server['handler'], $server['constructor'] ?? []); - \worker_bind($listen, $instance); - $listen->listen(); - } - + require_once base_path('/support/bootstrap.php'); if (isset($config['handler'])) { - if (!\class_exists($config['handler'])) { + if (!class_exists($config['handler'])) { echo "process error: class {$config['handler']} not exists\r\n"; return; } $instance = Container::make($config['handler'], $config['constructor'] ?? []); - \worker_bind($worker, $instance); + worker_bind($worker, $instance); } }; } /** * Get realpath - * @param string $file_path + * @param string $filePath * @return string */ -function get_realpath(string $file_path): string +function get_realpath(string $filePath): string { - if (\strpos($file_path, 'phar://') === 0) { - return $file_path; + if (strpos($filePath, 'phar://') === 0) { + return $filePath; } else { - return \realpath($file_path); + return realpath($filePath); } } @@ -500,7 +491,7 @@ function get_realpath(string $file_path): string */ function is_phar(): bool { - return \class_exists(\Phar::class, false) && Phar::running(); + return class_exists(Phar::class, false) && Phar::running(); } /** @@ -510,15 +501,15 @@ function is_phar(): bool function cpu_count(): int { // Windows does not support the number of processes setting. - if (\DIRECTORY_SEPARATOR === '\\') { + if (DIRECTORY_SEPARATOR === '\\') { return 1; } $count = 4; - if (\is_callable('shell_exec')) { - if (\strtolower(PHP_OS) === 'darwin') { - $count = (int)\shell_exec('sysctl -n machdep.cpu.core_count'); + if (is_callable('shell_exec')) { + if (strtolower(PHP_OS) === 'darwin') { + $count = (int)shell_exec('sysctl -n machdep.cpu.core_count'); } else { - $count = (int)\shell_exec('nproc'); + $count = (int)shell_exec('nproc'); } } return $count > 0 ? $count : 4; diff --git a/windows.php b/windows.php index 08cd4ec..d1975d6 100644 --- a/windows.php +++ b/windows.php @@ -4,9 +4,9 @@ */ require_once __DIR__ . '/vendor/autoload.php'; +use Dotenv\Dotenv; use process\Monitor; use support\App; -use Dotenv\Dotenv; use Workerman\Worker; ini_set('display_errors', 'on'); @@ -22,20 +22,20 @@ if (class_exists('Dotenv\Dotenv') && file_exists(base_path() . '/.env')) { App::loadAllConfig(['route']); -$error_reporting = config('app.error_reporting'); -if (isset($error_reporting)) { - error_reporting($error_reporting); +$errorReporting = config('app.error_reporting'); +if (isset($errorReporting)) { + error_reporting($errorReporting); } -$runtime_process_path = runtime_path() . DIRECTORY_SEPARATOR . '/windows'; -if (!is_dir($runtime_process_path)) { - mkdir($runtime_process_path); +$runtimeProcessPath = runtime_path() . DIRECTORY_SEPARATOR . '/windows'; +if (!is_dir($runtimeProcessPath)) { + mkdir($runtimeProcessPath); } -$process_files = [ +$processFiles = [ __DIR__ . DIRECTORY_SEPARATOR . 'start.php' ]; -foreach (config('process', []) as $process_name => $config) { - $process_files[] = write_process_file($runtime_process_path, $process_name, ''); +foreach (config('process', []) as $processName => $config) { + $processFiles[] = write_process_file($runtimeProcessPath, $processName, ''); } foreach (config('plugin', []) as $firm => $projects) { @@ -43,20 +43,20 @@ foreach (config('plugin', []) as $firm => $projects) { if (!is_array($project)) { continue; } - foreach ($project['process'] ?? [] as $process_name => $config) { - $process_files[] = write_process_file($runtime_process_path, $process_name, "$firm.$name"); + foreach ($project['process'] ?? [] as $processName => $config) { + $processFiles[] = write_process_file($runtimeProcessPath, $processName, "$firm.$name"); } } - foreach ($projects['process'] ?? [] as $process_name => $config) { - $process_files[] = write_process_file($runtime_process_path, $process_name, $firm); + foreach ($projects['process'] ?? [] as $processName => $config) { + $processFiles[] = write_process_file($runtimeProcessPath, $processName, $firm); } } -function write_process_file($runtime_process_path, $process_name, $firm) +function write_process_file($runtimeProcessPath, $processName, $firm): string { - $process_param = $firm ? "plugin.$firm.$process_name" : $process_name; - $config_param = $firm ? "config('plugin.$firm.process')['$process_name']" : "config('process')['$process_name']"; - $file_content = << true]); if (!$resource) { exit("Can not execute $cmd\r\n"); } return $resource; } -$resource = popen_processes($process_files); +$resource = popen_processes($processFiles); echo "\r\n"; while (1) { sleep(1); @@ -111,6 +111,6 @@ while (1) { $pid = $status['pid']; shell_exec("taskkill /F /T /PID $pid"); proc_close($resource); - $resource = popen_processes($process_files); + $resource = popen_processes($processFiles); } }