Przeglądaj źródła

完成b端企业管理:获取企业列表;添加企业;编辑企业;删除企业;的获取企业详情的接口搬到news服务上

15313670163 2 dni temu
rodzic
commit
bd3bfe7813

+ 214 - 1
app/JsonRpc/NewsService.php

@@ -61,7 +61,7 @@ use App\Model\Riddle;
 use App\Model\Idiom;
 use App\Model\WhiteRouter;
 use Illuminate\Support\Facades\Cache;
-
+use App\Model\Company;
 #[RpcService(name: "NewsService", protocol: "jsonrpc-http", server: "jsonrpc-http")]
 class NewsService implements NewsServiceInterface
 {
@@ -5794,4 +5794,217 @@ class NewsService implements NewsServiceInterface
     }, $data);
     return Result::success($result);
   }
+  /**
+     * 企业管理
+     * @param array $data
+     * @return array
+     */
+    public function getCompanyList(array $data): array
+    {
+        $where = [];
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error('用户不存在!');
+        }
+        if($user['type_id']!= 10000){
+            $where['user_id'] = $data['user_id'];
+        }
+        if(isset($data['title']) && $data['title']){
+            array_push($where, ['company.title', 'like', '%'. $data['title']. '%']);
+        }
+        if(isset($data['website_id']) && $data['website_id']){
+            $where['company.website_id'] = $data['website_id'];
+        }
+        if(isset($data['ischeck']) && !empty($data['ischeck'])){
+            if($data['ischeck'] == 1){
+                $query =  Company::whereIn('company.status', [0,2]);
+            }else{
+                $query =  Company::where('company.status', 1);
+            }
+        }
+        $result = $query->where($where)
+        ->leftJoin('website_category', function ($query) {
+            $query->on('website_category.category_id', '=', 'company.category_id')
+                ->on('website_category.website_id', '=', 'company.website_id');        
+        })
+        ->leftJoin('website', 'company.website_id', '=', 'website.id')
+        ->select(
+          'company.id as company_id', 
+          'company.title', 
+          'company.website_id', 
+          'company.category_id', 
+          'website.website_name', 
+          'website_category.alias as category_name',
+          'company.status',
+          'company.updated_at',
+        )
+        ->orderBy('company.updated_at', 'desc')
+        ->paginate($data['pageSize'], ['*'], 'page', $data['page']);
+
+      if($result->isEmpty()){
+          return Result::error("暂无企业", 0);
+      }
+        return Result::success($result);
+    }
+    /**
+     * 添加企业
+     * @param array $data
+     * @return array
+     */
+    public function addCompany(array $data): array
+    {
+        $data['category_id'] = isset($data['cat_arr_id']) ? end($data['cat_arr_id']) : '';
+        if(isset($data['cat_arr_id']) &&!empty($data['cat_arr_id']) && is_array($data['cat_arr_id'])){
+          $car_arr_id = array_values(array_unique(array_map('intval', $data['cat_arr_id'])));
+          $data['cat_arr_id'] = json_encode($car_arr_id);
+        }else{
+            $data['cat_arr_id'] = '';
+        }
+        if ($data['imgurl'] == '') {
+            //content中提取图片第一个图,正则提取
+            $reg = '/<img.*?src=[\"|\']?(.*?)[\"|\']?\s.*?>/i';
+            preg_match_all($reg, $data['content'], $matches);
+            if (isset($matches[1][0])) {
+                //截取varchar240
+                $data['imgurl'] = substr($matches[1][0], 0, 240);
+            } 
+        }
+        if ($data['keyword'] == '') {
+            //提取标题+内容中的关键词
+            $data['keyword'] = $data['title'];
+            //  . substr(str_replace(' ', '', strip_tags($data['content'])), 0, 20);
+            Jieba::init(); // 初始化 jieba-php
+            Finalseg::init();
+            $segList = Jieba::cut($data['keyword']);
+            $segList1 = array_slice($segList, 0, 8);
+            $data['keyword'] = implode(',', $segList1);
+        }
+        if ($data['introduce'] == '') {
+            //提取内容中的描述
+            $data['introduce'] = substr(str_replace(' ', '', strip_tags($data['content'])), 0, 100);
+        }
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error('用户不存在!');
+        }
+        if($user['type_id']== 10000){
+            $data['status'] = 1;
+        }
+        $result = Company::insertGetId($data);
+        if ($result) {
+            return Result::success($result);
+        } else {
+            return Result::error('添加失败');
+        }
+    }
+    /**
+     * 更新企业
+     * @param array $data
+     * @return array
+     */
+    public function upCompany(array $data): array
+    {
+        $data['category_id'] = isset($data['cat_arr_id']) ? end($data['cat_arr_id']) : '';
+        if(isset($data['cat_arr_id']) &&!empty($data['cat_arr_id']) && is_array($data['cat_arr_id'])){
+            $car_arr_id = array_values(array_unique(array_map('intval', $data['cat_arr_id'])));
+            $data['cat_arr_id'] = json_encode($car_arr_id);
+        }else{
+            $data['cat_arr_id'] = '';
+        }
+        
+        // $data['cat_arr_id'] = isset($data['cat_arr_id']) ? json_encode($data['cat_arr_id']) : '';
+        if ($data['imgurl'] == '') {
+            //content中提取图片第一个图,正则提取
+            $reg = '/<img.*?src=[\"|\']?(.*?)[\"|\']?\s.*?>/i';
+            preg_match_all($reg, $data['content'], $matches);
+            if (isset($matches[1][0])) {
+                //截取varchar240
+                $data['imgurl'] = substr($matches[1][0], 0, 240);
+            } 
+        }
+        if ($data['keyword'] == '') {
+            //提取标题+内容中的关键词
+            $data['keyword'] = $data['title'];
+            //  . substr(str_replace(' ', '', strip_tags($data['content'])), 0, 20);
+            Jieba::init(); // 初始化 jieba-php
+            Finalseg::init();
+            $segList = Jieba::cut($data['keyword']);
+            $segList1 = array_slice($segList, 0, 8);
+            $data['keyword'] = implode(',', $segList1);
+        }
+        if ($data['introduce'] == '') {
+            //提取内容中的描述
+            $data['introduce'] = substr(str_replace(' ', '', strip_tags($data['content'])), 0, 100);
+        }
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error('用户不存在!');
+        }
+        if($user['type_id']== 10000){
+            $data['status'] = 1;
+        }else{
+            $data['status'] = 0;
+        }
+        $result = Company::where('id', $data['id'])->update($data);
+        if ($result) {
+            return Result::success($result);
+        } else {
+            return Result::error('修改失败');
+        }
+    }
+    /**
+     * 删除企业
+     * @param array $data
+     * @return array
+     */
+    public function delCompany(array $data): array
+    {
+        $result = Company::where('id', $data['id'])->delete();
+        if ($result) {
+            return Result::success($result);
+        } else {
+            return Result::error('删除失败');
+        }
+    }
+    /**
+     * 审核企业
+     * @param array $data
+     * @return array
+     */
+    public function checkCompany(array $data): array
+    {
+        $user = User::where('id', $data['user_id'])->first();
+        if(empty($user)){
+            return Result::error('用户不存在!');
+        }
+        $company = Company::where('id', $data['id'])->first();
+        if(empty($company)){
+            return Result::error('企业不存在!');
+        }
+        // 状态:0:未审核 1:已审核 2:已拒绝
+        if($company['status'] == 0 || $company['status'] == 1){
+            $result = Company::where('id', $data['id'])->update(['status' => $data['status']]);
+        }else{
+            $result = Company::where('id', $data['id'])->update(['status' => $data['status'],'reject_reason'=> $data['reject_reason']]);
+        }
+        if(empty($result)){
+            return Result::error('审核失败!');
+        }else{
+            return Result::success($result);
+        }
+    }
+    /**
+     * 获取企业信息
+     * @param array $data
+     * @return array
+     */
+    public function getCompanyInfo(array $data): array
+    {
+        $result = Company::where('id', $data['id'])->first();
+        if(empty($result)){
+            return Result::error('企业不存在!');
+        }else{
+            return Result::success($result);
+        }
+    }
 }

+ 7 - 0
app/JsonRpc/NewsServiceInterface.php

@@ -403,4 +403,11 @@ interface NewsServiceInterface
      * @return array
      */
     public function getWebsiteNwHomeList(array $data):array;
+    // --------------企业管理-----------
+    public function getCompanyList(array $data): array;
+    public function addCompany(array $data): array;
+    public function upCompany(array $data): array;
+    public function delCompany(array $data): array;
+    public function checkCompany(array $data): array;
+    public function getCompanyInfo(array $data): array;
 }

+ 40 - 40
composer.lock

@@ -1020,16 +1020,16 @@
         },
         {
             "name": "hyperf/cache",
-            "version": "v3.1.43",
+            "version": "v3.1.56",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/cache.git",
-                "reference": "1e3cc54cee776c8d32cf40912dee5d366383bc33"
+                "reference": "4848c733560941490d9bf3aa8605deb4cce8fbf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/cache/zipball/1e3cc54cee776c8d32cf40912dee5d366383bc33",
-                "reference": "1e3cc54cee776c8d32cf40912dee5d366383bc33",
+                "url": "https://api.github.com/repos/hyperf/cache/zipball/4848c733560941490d9bf3aa8605deb4cce8fbf1",
+                "reference": "4848c733560941490d9bf3aa8605deb4cce8fbf1",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1093,7 +1093,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-10-09T10:22:39+00:00"
+            "time": "2025-06-05T06:13:29+00:00"
         },
         {
             "name": "hyperf/code-parser",
@@ -1309,16 +1309,16 @@
         },
         {
             "name": "hyperf/command",
-            "version": "v3.1.51",
+            "version": "v3.1.56",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/command.git",
-                "reference": "e71af684e6f01140221b608b3d4f4cf6f78144fe"
+                "reference": "79188b44faff62e305fdb34cf2929ff517430e34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/command/zipball/e71af684e6f01140221b608b3d4f4cf6f78144fe",
-                "reference": "e71af684e6f01140221b608b3d4f4cf6f78144fe",
+                "url": "https://api.github.com/repos/hyperf/command/zipball/79188b44faff62e305fdb34cf2929ff517430e34",
+                "reference": "79188b44faff62e305fdb34cf2929ff517430e34",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1370,7 +1370,7 @@
             ],
             "support": {
                 "issues": "https://github.com/hyperf/command/issues",
-                "source": "https://github.com/hyperf/command/tree/v3.1.51"
+                "source": "https://github.com/hyperf/command/tree/v3.1.56"
             },
             "funding": [
                 {
@@ -1382,7 +1382,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-02-06T03:40:37+00:00"
+            "time": "2025-06-03T08:26:34+00:00"
         },
         {
             "name": "hyperf/conditionable",
@@ -2026,16 +2026,16 @@
         },
         {
             "name": "hyperf/coroutine",
-            "version": "v3.1.52",
+            "version": "v3.1.54",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/coroutine.git",
-                "reference": "223f0f9e17ee9dc8bf6e8da9e651296ba93e8d64"
+                "reference": "5b474c4bb46be015f1340939d92931b96a0b0cad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/coroutine/zipball/223f0f9e17ee9dc8bf6e8da9e651296ba93e8d64",
-                "reference": "223f0f9e17ee9dc8bf6e8da9e651296ba93e8d64",
+                "url": "https://api.github.com/repos/hyperf/coroutine/zipball/5b474c4bb46be015f1340939d92931b96a0b0cad",
+                "reference": "5b474c4bb46be015f1340939d92931b96a0b0cad",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2047,7 +2047,7 @@
             "require": {
                 "hyperf/context": "~3.1.0",
                 "hyperf/contract": "~3.1.0",
-                "hyperf/engine": "^2.13.0",
+                "hyperf/engine": "^2.14.0",
                 "php": ">=8.1"
             },
             "type": "library",
@@ -2092,20 +2092,20 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-02-08T03:41:26+00:00"
+            "time": "2025-04-14T01:38:29+00:00"
         },
         {
             "name": "hyperf/database",
-            "version": "v3.1.53",
+            "version": "v3.1.56",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/database.git",
-                "reference": "50f79d0bf6007f1c7ef63215426bb2f9cae83aa5"
+                "reference": "a4e5f11df6a74337836f1690c05506adf6e82f0f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/database/zipball/50f79d0bf6007f1c7ef63215426bb2f9cae83aa5",
-                "reference": "50f79d0bf6007f1c7ef63215426bb2f9cae83aa5",
+                "url": "https://api.github.com/repos/hyperf/database/zipball/a4e5f11df6a74337836f1690c05506adf6e82f0f",
+                "reference": "a4e5f11df6a74337836f1690c05506adf6e82f0f",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -2171,7 +2171,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2025-04-01T09:46:46+00:00"
+            "time": "2025-05-30T09:09:02+00:00"
         },
         {
             "name": "hyperf/db-connection",
@@ -6881,16 +6881,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v6.4.20",
+            "version": "v6.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36"
+                "reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2e4af9c952617cc3f9559ff706aee420a8464c36",
-                "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a3011c7b7adb58d89f6c0d822abb641d7a5f9719",
+                "reference": "a3011c7b7adb58d89f6c0d822abb641d7a5f9719",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -6961,7 +6961,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.20"
+                "source": "https://github.com/symfony/console/tree/v6.4.21"
             },
             "funding": [
                 {
@@ -6977,7 +6977,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-03T17:16:38+00:00"
+            "time": "2025-04-07T15:42:41+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -8841,16 +8841,16 @@
         },
         {
             "name": "hyperf/watcher",
-            "version": "v3.1.43",
+            "version": "v3.1.54",
             "source": {
                 "type": "git",
                 "url": "https://github.com/hyperf/watcher.git",
-                "reference": "a5f41a66a8b8f651335b4a7c403e03ff0b0f4802"
+                "reference": "c92dc6bd94c6e2369a3de262a700550427041b70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/hyperf/watcher/zipball/a5f41a66a8b8f651335b4a7c403e03ff0b0f4802",
-                "reference": "a5f41a66a8b8f651335b4a7c403e03ff0b0f4802",
+                "url": "https://api.github.com/repos/hyperf/watcher/zipball/c92dc6bd94c6e2369a3de262a700550427041b70",
+                "reference": "c92dc6bd94c6e2369a3de262a700550427041b70",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -8897,7 +8897,7 @@
             ],
             "support": {
                 "issues": "https://github.com/hyperf/watcher/issues",
-                "source": "https://github.com/hyperf/watcher/tree/v3.1.43"
+                "source": "https://github.com/hyperf/watcher/tree/v3.1.54"
             },
             "funding": [
                 {
@@ -8909,7 +8909,7 @@
                     "type": "open_collective"
                 }
             ],
-            "time": "2024-10-06T12:33:12+00:00"
+            "time": "2025-04-26T13:02:01+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -11656,16 +11656,16 @@
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v6.4.13",
+            "version": "v6.4.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db"
+                "reference": "368128ad168f20e22c32159b9f761e456cec0c78"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0a62a9f2504a8dd27083f89d21894ceb01cc59db",
-                "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/368128ad168f20e22c32159b9f761e456cec0c78",
+                "reference": "368128ad168f20e22c32159b9f761e456cec0c78",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -11709,7 +11709,7 @@
                 "options"
             ],
             "support": {
-                "source": "https://github.com/symfony/options-resolver/tree/v6.4.13"
+                "source": "https://github.com/symfony/options-resolver/tree/v6.4.16"
             },
             "funding": [
                 {
@@ -11725,7 +11725,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-25T14:18:03+00:00"
+            "time": "2024-11-20T10:57:02+00:00"
         },
         {
             "name": "symfony/polyfill-php81",

Plik diff jest za duży
+ 0 - 0
runtime/container/classes.cache


Plik diff jest za duży
+ 0 - 0
runtime/container/scan.cache


+ 1 - 1
runtime/hyperf.pid

@@ -1 +1 @@
-17978
+58471

+ 0 - 7
runtime/logs/hyperf.log

@@ -1,7 +0,0 @@
-[2024-12-30T06:38:12.496098+00:00] sql.INFO: [709.21] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '7') [] []
-[2024-12-30T06:38:47.428649+00:00] sql.INFO: [17.24] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '5') [] []
-[2024-12-30T06:51:39.863013+00:00] sql.INFO: [65.56] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '5') [] []
-[2024-12-30T06:54:42.876483+00:00] sql.INFO: [68.75] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '5') [] []
-[2024-12-30T06:54:56.791140+00:00] sql.INFO: [3328.19] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '0') [] []
-[2024-12-30T06:56:06.854836+00:00] sql.INFO: [67] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '0') [] []
-[2024-12-30T06:56:15.144154+00:00] sql.INFO: [17.25] select `category`.*, `category`.`id` as `category_id` from `category` where (`pid` = '5') [] []

+ 1 - 1
vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit88f2a4d4a4e81dc7d415bcdf39930654::getLoader();
+return ComposerAutoloaderInit93d050353fc587b1b1fb188f0a8c068c::getLoader();

+ 4 - 23
vendor/composer/InstalledVersions.php

@@ -32,11 +32,6 @@ class InstalledVersions
      */
     private static $installed;
 
-    /**
-     * @var bool
-     */
-    private static $installedIsLocalDir;
-
     /**
      * @var bool|null
      */
@@ -314,12 +309,6 @@ class InstalledVersions
     {
         self::$installed = $data;
         self::$installedByVendor = array();
-
-        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
-        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
-        // so we have to assume it does not, and that may result in duplicate data being returned when listing
-        // all installed packages for example
-        self::$installedIsLocalDir = false;
     }
 
     /**
@@ -333,27 +322,19 @@ class InstalledVersions
         }
 
         $installed = array();
-        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
-            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    self::$installedByVendor[$vendorDir] = $required;
-                    $installed[] = $required;
-                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
-                        self::$installed = $required;
-                        self::$installedIsLocalDir = true;
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
+                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
+                        self::$installed = $installed[count($installed) - 1];
                     }
                 }
-                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
-                    $copiedLocalDir = true;
-                }
             }
         }
 
@@ -369,7 +350,7 @@ class InstalledVersions
             }
         }
 
-        if (self::$installed !== array() && !$copiedLocalDir) {
+        if (self::$installed !== array()) {
             $installed[] = self::$installed;
         }
 

+ 2 - 0
vendor/composer/autoload_classmap.php

@@ -24,6 +24,7 @@ return array(
     'App\\Model\\ChatGroups' => $baseDir . '/app/Model/ChatGroups.php',
     'App\\Model\\ChatGroupsMember' => $baseDir . '/app/Model/ChatGroupsMember.php',
     'App\\Model\\ChatRecords' => $baseDir . '/app/Model/ChatRecords.php',
+    'App\\Model\\Company' => $baseDir . '/app/Model/Company.php',
     'App\\Model\\Couplet' => $baseDir . '/app/Model/Couplet.php',
     'App\\Model\\District' => $baseDir . '/app/Model/District.php',
     'App\\Model\\Festival' => $baseDir . '/app/Model/Festival.php',
@@ -732,6 +733,7 @@ return array(
     'Hyperf\\Coordinator\\CoordinatorManager' => $vendorDir . '/hyperf/coordinator/src/CoordinatorManager.php',
     'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => $vendorDir . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
     'Hyperf\\Coordinator\\Timer' => $vendorDir . '/hyperf/coordinator/src/Timer.php',
+    'Hyperf\\Coroutine\\Barrier' => $vendorDir . '/hyperf/coroutine/src/Barrier.php',
     'Hyperf\\Coroutine\\Channel\\Caller' => $vendorDir . '/hyperf/coroutine/src/Channel/Caller.php',
     'Hyperf\\Coroutine\\Channel\\Manager' => $vendorDir . '/hyperf/coroutine/src/Channel/Manager.php',
     'Hyperf\\Coroutine\\Channel\\Pool' => $vendorDir . '/hyperf/coroutine/src/Channel/Pool.php',

+ 2 - 2
vendor/composer/autoload_psr4.php

@@ -39,7 +39,7 @@ return array(
     'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
     'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
-    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-middleware/src', $vendorDir . '/psr/http-server-handler/src'),
+    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
@@ -56,7 +56,7 @@ return array(
     'Laminas\\Stdlib\\' => array($vendorDir . '/laminas/laminas-stdlib/src'),
     'Laminas\\Mime\\' => array($vendorDir . '/laminas/laminas-mime/src'),
     'JetBrains\\PhpStorm\\' => array($vendorDir . '/jetbrains/phpstorm-attributes/src'),
-    'Illuminate\\Support\\' => array($vendorDir . '/illuminate/support', $vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/macroable'),
+    'Illuminate\\Support\\' => array($vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/macroable', $vendorDir . '/illuminate/support'),
     'Illuminate\\Contracts\\' => array($vendorDir . '/illuminate/contracts'),
     'Illuminate\\Cache\\' => array($vendorDir . '/illuminate/cache'),
     'Hyperf\\Watcher\\' => array($vendorDir . '/hyperf/watcher/src'),

+ 5 - 5
vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit88f2a4d4a4e81dc7d415bcdf39930654
+class ComposerAutoloaderInit93d050353fc587b1b1fb188f0a8c068c
 {
     private static $loader;
 
@@ -24,16 +24,16 @@ class ComposerAutoloaderInit88f2a4d4a4e81dc7d415bcdf39930654
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit88f2a4d4a4e81dc7d415bcdf39930654', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit93d050353fc587b1b1fb188f0a8c068c', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit88f2a4d4a4e81dc7d415bcdf39930654', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit93d050353fc587b1b1fb188f0a8c068c', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

+ 12 - 10
vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
+class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
 {
     public static $files = array (
         '9c7a683baffd24f5595c1dc5f5273030' => __DIR__ . '/..' . '/hyperf/engine/src/Functions.php',
@@ -359,8 +359,8 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         ),
         'Psr\\Http\\Server\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
-            1 => __DIR__ . '/..' . '/psr/http-server-handler/src',
+            0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
+            1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
         ),
         'Psr\\Http\\Message\\' => 
         array (
@@ -429,10 +429,10 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         ),
         'Illuminate\\Support\\' => 
         array (
-            0 => __DIR__ . '/..' . '/illuminate/support',
-            1 => __DIR__ . '/..' . '/illuminate/collections',
-            2 => __DIR__ . '/..' . '/illuminate/conditionable',
-            3 => __DIR__ . '/..' . '/illuminate/macroable',
+            0 => __DIR__ . '/..' . '/illuminate/collections',
+            1 => __DIR__ . '/..' . '/illuminate/conditionable',
+            2 => __DIR__ . '/..' . '/illuminate/macroable',
+            3 => __DIR__ . '/..' . '/illuminate/support',
         ),
         'Illuminate\\Contracts\\' => 
         array (
@@ -775,6 +775,7 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'App\\Model\\ChatGroups' => __DIR__ . '/../..' . '/app/Model/ChatGroups.php',
         'App\\Model\\ChatGroupsMember' => __DIR__ . '/../..' . '/app/Model/ChatGroupsMember.php',
         'App\\Model\\ChatRecords' => __DIR__ . '/../..' . '/app/Model/ChatRecords.php',
+        'App\\Model\\Company' => __DIR__ . '/../..' . '/app/Model/Company.php',
         'App\\Model\\Couplet' => __DIR__ . '/../..' . '/app/Model/Couplet.php',
         'App\\Model\\District' => __DIR__ . '/../..' . '/app/Model/District.php',
         'App\\Model\\Festival' => __DIR__ . '/../..' . '/app/Model/Festival.php',
@@ -1483,6 +1484,7 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
         'Hyperf\\Coordinator\\CoordinatorManager' => __DIR__ . '/..' . '/hyperf/coordinator/src/CoordinatorManager.php',
         'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/..' . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
         'Hyperf\\Coordinator\\Timer' => __DIR__ . '/..' . '/hyperf/coordinator/src/Timer.php',
+        'Hyperf\\Coroutine\\Barrier' => __DIR__ . '/..' . '/hyperf/coroutine/src/Barrier.php',
         'Hyperf\\Coroutine\\Channel\\Caller' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Caller.php',
         'Hyperf\\Coroutine\\Channel\\Manager' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Manager.php',
         'Hyperf\\Coroutine\\Channel\\Pool' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Pool.php',
@@ -5793,9 +5795,9 @@ class ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit88f2a4d4a4e81dc7d415bcdf39930654::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c::$classMap;
 
         }, null, ClassLoader::class);
     }

Plik diff jest za duży
+ 410 - 92
vendor/composer/installed.json


+ 23 - 23
vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '558bc6fbabb165938593827ac74dabb42c5c7598',
+        'reference' => 'aeff99533d628447c4fbb8f7f02c347c3375ace7',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -203,9 +203,9 @@
             'dev_requirement' => true,
         ),
         'hyperf/cache' => array(
-            'pretty_version' => 'v3.1.43',
-            'version' => '3.1.43.0',
-            'reference' => '1e3cc54cee776c8d32cf40912dee5d366383bc33',
+            'pretty_version' => 'v3.1.56',
+            'version' => '3.1.56.0',
+            'reference' => '4848c733560941490d9bf3aa8605deb4cce8fbf1',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hyperf/cache',
             'aliases' => array(),
@@ -239,9 +239,9 @@
             'dev_requirement' => false,
         ),
         'hyperf/command' => array(
-            'pretty_version' => 'v3.1.51',
-            'version' => '3.1.51.0',
-            'reference' => 'e71af684e6f01140221b608b3d4f4cf6f78144fe',
+            'pretty_version' => 'v3.1.56',
+            'version' => '3.1.56.0',
+            'reference' => '79188b44faff62e305fdb34cf2929ff517430e34',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hyperf/command',
             'aliases' => array(),
@@ -329,18 +329,18 @@
             'dev_requirement' => false,
         ),
         'hyperf/coroutine' => array(
-            'pretty_version' => 'v3.1.52',
-            'version' => '3.1.52.0',
-            'reference' => '223f0f9e17ee9dc8bf6e8da9e651296ba93e8d64',
+            'pretty_version' => 'v3.1.54',
+            'version' => '3.1.54.0',
+            'reference' => '5b474c4bb46be015f1340939d92931b96a0b0cad',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hyperf/coroutine',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'hyperf/database' => array(
-            'pretty_version' => 'v3.1.53',
-            'version' => '3.1.53.0',
-            'reference' => '50f79d0bf6007f1c7ef63215426bb2f9cae83aa5',
+            'pretty_version' => 'v3.1.56',
+            'version' => '3.1.56.0',
+            'reference' => 'a4e5f11df6a74337836f1690c05506adf6e82f0f',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hyperf/database',
             'aliases' => array(),
@@ -457,7 +457,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '558bc6fbabb165938593827ac74dabb42c5c7598',
+            'reference' => 'aeff99533d628447c4fbb8f7f02c347c3375ace7',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
@@ -698,9 +698,9 @@
             'dev_requirement' => false,
         ),
         'hyperf/watcher' => array(
-            'pretty_version' => 'v3.1.43',
-            'version' => '3.1.43.0',
-            'reference' => 'a5f41a66a8b8f651335b4a7c403e03ff0b0f4802',
+            'pretty_version' => 'v3.1.54',
+            'version' => '3.1.54.0',
+            'reference' => 'c92dc6bd94c6e2369a3de262a700550427041b70',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hyperf/watcher',
             'aliases' => array(),
@@ -1349,9 +1349,9 @@
             'dev_requirement' => false,
         ),
         'symfony/console' => array(
-            'pretty_version' => 'v6.4.20',
-            'version' => '6.4.20.0',
-            'reference' => '2e4af9c952617cc3f9559ff706aee420a8464c36',
+            'pretty_version' => 'v6.4.21',
+            'version' => '6.4.21.0',
+            'reference' => 'a3011c7b7adb58d89f6c0d822abb641d7a5f9719',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/console',
             'aliases' => array(),
@@ -1418,9 +1418,9 @@
             'dev_requirement' => true,
         ),
         'symfony/options-resolver' => array(
-            'pretty_version' => 'v6.4.13',
-            'version' => '6.4.13.0',
-            'reference' => '0a62a9f2504a8dd27083f89d21894ceb01cc59db',
+            'pretty_version' => 'v6.4.16',
+            'version' => '6.4.16.0',
+            'reference' => '368128ad168f20e22c32159b9f761e456cec0c78',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/options-resolver',
             'aliases' => array(),

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików