From e5c2e25ece8ec2a85debd868990447b0d6c29990 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Fri, 13 Oct 2023 15:44:05 +0800 Subject: [PATCH 01/28] fiexd --- app/api/controller/IndexController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 1654cf9f2..2a4fcaa45 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -443,7 +443,7 @@ class IndexController extends BaseApiController //小组公司与镇街公司解约 if($vehicleBuyRecord['status'] == 1){ //获取租赁车辆信息 - $rentCarsInfo = VehicleRent::field('id,type,contract_id')->where('car_id',$cars_ids[0])->findOrEmpty(); + $rentCarsInfo = VehicleRent::where('car_id',$cars_ids[0])->findOrEmpty(); if($rentCarsInfo['type'] == 0){ //修改租赁车俩状态 VehicleRent::where('id',$rentCarsInfo['id'])->update(['status'=>0,'rent_company_id'=>0,'rent_contract_id'=>0,'rent_time'=>0]); From 6bd04e5c2ac5473e49b968e5fc9d693c3355903c Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Fri, 13 Oct 2023 16:51:49 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B4=AD=E4=B9=B0done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/VehicleContractController.php | 3 + app/api/controller/IndexController.php | 60 ++++++++++++++++--- app/api/controller/VehicleController.php | 44 +++++++++++++- 3 files changed, 97 insertions(+), 10 deletions(-) diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index a8d16aa3b..a7441c1a0 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -158,6 +158,9 @@ class VehicleContractController extends BaseAdminController if($contract['type'] == 0){ $smsTitle = '《租赁合同》'; $notify_url = env('project.website_domain').'/api/index/townCarRent'; + }elseif($contract['type'] == 1){ + $smsTitle = '《自有车辆上传合同》'; + $notify_url = env('project.website_domain').'/api/index/selfCarRent'; }elseif($contract['type'] == 2){ $smsTitle = '《解约合同》'; $notify_url = env('project.website_domain').'/api/index/cancelRent'; diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 2a4fcaa45..3d4cc903d 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -360,6 +360,7 @@ class IndexController extends BaseApiController 'car_license' => $vehicle['license'], 'status' => 2, 'rent_time' => time(), + 'rent_contract_id' => $contract['id'], 'rent_company_id' => $contract['company_b_id'], 'create_time' => time(), 'type' => 1 @@ -482,7 +483,51 @@ class IndexController extends BaseApiController return json(['success' => true, 'msg' => '成功']); } //小组公司与镇街公司解约,然后镇街公司与平台公司解约 - if($vehicleBuyRecord['status'] == 2){} + if($vehicleBuyRecord['status'] == 2){ + //获取租赁车辆信息 + $rentCarsInfo = VehicleRent::where('car_id',$cars_ids[0])->findOrEmpty(); + //获取镇街公司信息 + $zjCompany = Company::where('id',$rentCarsInfo['company_id'])->findOrEmpty(); + //判断购买车辆中是否包含镇街公司租赁的车辆 + $car_ids = array_column(json_decode($vehicleBuyRecord['cars_info'],true),'id'); + $zjRentCars = VehicleRent::field('car_id as id,car_license as license')->where('company_id',$zjCompany['id'])->where('car_id','in',$car_ids)->where('status',0)->where('type',0)->select(); + if($rentCarsInfo['type'] == 0){ + //修改租赁车俩状态 + VehicleRent::where('id',$rentCarsInfo['id'])->update(['status'=>0,'rent_company_id'=>0,'rent_contract_id'=>0,'rent_time'=>0]); + } + if($rentCarsInfo['type'] == 1){ + //修改租赁车俩状态 + VehicleRent::where('id',$rentCarsInfo['id'])->delete(); + } + //删除原合同 + VehicleContract::where('id',$rentCarsInfo['rent_contract_id'])->delete(); + //修改物流系统车辆租赁信息 + curl_post(env('project.logistic_domain').'/api/Vehicle/delRentUseInfo', [], [ + 'car_id' => $cars_ids[0] + ]); + //发送镇公司与平台公司的解约合同 + $curl_result = curl_post(env('project.logistic_domain').'/api/signContract',[],[ + 'num' => count($zjRentCars), + 'company_id' => $zjCompany['id'], + 'company_name' => $zjCompany['company_name'], + 'company_code' => $zjCompany['organization_code'], + 'company_user' => $zjCompany['master_name'], + 'company_phone' => $zjCompany['master_phone'], + 'company_email' => $zjCompany['master_email'], + 'cars_info' => json_encode($zjRentCars), + 'type' => 2 + ]); + if(empty($curl_result)){ + return $this->fail('null return from logistic'); + } + if($curl_result['code'] == 0){ + return $this->fail($curl_result['msg'].' from logistic'); + } + //生成本地合同 + VehicleContract::create($curl_result['data']); + VehicleBuyRecord::where('id',$vehicleBuyRecord['id'])->update(['status'=>3]); + return json(['success' => true, 'msg' => '成功']); + } //镇街公司与平台公司解约 if($vehicleBuyRecord['status'] == 3){ //删除本地租赁信息 @@ -518,16 +563,13 @@ class IndexController extends BaseApiController //更改租赁列表车辆状态 $vehicle = json_decode($contract['cars_info'], true); //获取租赁车辆信息 - $vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find(); + $vehicleRentInfo = VehicleRent::where('car_id', $vehicle[0]['id'])->find(); //更新原始合同类型 - VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['status' => 6]); - VehicleRent::where('car_id', $vehicle['id'])->update([ - 'status' => 3, - ]); + VehicleContract::where('id', $vehicleRentInfo['rent_contract_id'])->delete(); + VehicleRent::where('car_id', $vehicle[0]['id'])->delete(); //通知物流系统跟新 - curl_post(env('project.logistic_domain').'/api/cancelRent', [], [ - 'car_id' => $vehicle['id'], - 'status' => 1 + curl_post(env('project.logistic_domain').'/api/Vehicle/delRentUseInfo', [], [ + 'car_id' => $vehicle[0]['id'] ]); return json(['success' => true, 'msg' => '成功']); } diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 712dbbf5b..f86cc2e4d 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -243,7 +243,7 @@ class VehicleController extends BaseApiController return $this->fail('请勿重复申请'); } if($params['type'] == 1){ - $cars_info = json_encode(['license'=>$params['license'],'pic'=>$params['pic']]); + $cars_info = json_encode([['license'=>$params['license'],'pic'=>$params['pic']]]); $car_type = 1; }else{ $cars_info = null; @@ -768,6 +768,48 @@ class VehicleController extends BaseApiController 'create_time' => time() ]); } + //如果有租赁车俩和上传自有车辆,也有购买镇街公司租赁的车辆 则先向镇街公司发起解约合同，再由镇街公司向平台公司发起解约合同 + if(!$xzRentCars->isEmpty() && !$zjRentCars->isEmpty()){ + //获取镇街公司信息 + $zjCompanyInfo = Company::field('id,company_name,master_name,master_phone,master_email,organization_code')->where('id',$zjCompany['party_a'])->findOrEmpty(); + //生成本地解约合同 + $res = VehicleContract::create([ + 'contract_no' => time(), + 'contract_logistic_id' => 0, + 'company_a_id' => $zjCompanyInfo['id'], + 'company_a_name' => $zjCompanyInfo['company_name'], + 'company_a_code' => $zjCompanyInfo['organization_code'], + 'company_a_user' => $zjCompanyInfo['master_name'], + 'company_a_phone' => $zjCompanyInfo['master_phone'], + 'company_a_email' => $zjCompanyInfo['master_email'], + 'company_b_id' => $xzCompany['id'], + 'company_b_name' => $xzCompany['company_name'], + 'company_b_code' => $xzCompany['organization_code'], + 'company_b_user' => $xzCompany['master_name'], + 'company_b_phone' => $xzCompany['master_phone'], + 'company_b_email' => $xzCompany['master_email'], + 'num' =>1, + 'cars_info' => json_encode([['id'=>$xzRentCars['car_id'],'license'=>$xzRentCars['car_license']]]), + 'type' => 2, + 'status' => 0, + 'create_time' => time(), + 'update_time' => time(), + ]); + //生成关联记录 + VehicleBuyRecord::create([ + 'company_id' => $xzCompany['id'], + 'company_name' => $xzCompany['company_name'], + 'company_code' => $xzCompany['organization_code'], + 'company_user' => $xzCompany['master_name'], + 'company_phone' => $xzCompany['master_phone'], + 'company_email' => $xzCompany['master_email'], + 'cars_info' => json_encode($cars), + 'num' => count($cars), + 'status' => 2, + 'contract_id' => $res->id, + 'create_time' => time() + ]); + } //更新物流系统 curl_post(env('project.logistic_domain').'/api/Vehicle/updateVehicleStatusToBuy',[],['car_ids'=>implode(',',$car_ids)]); return $this->success('合同发起成功,等待审核 from task'); From 98f0995b7e8865c5f8281fa5f65914b509a7f03f Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Fri, 13 Oct 2023 17:06:27 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B4=AD=E4=B9=B0done2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/VehicleController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index f86cc2e4d..5f24547f1 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -632,6 +632,9 @@ class VehicleController extends BaseApiController $xzRentCars = array_column($xzRentCars,'car_id'); //5、获取平台未出租的车辆 $result = curl_post(env('project.logistic_domain').'/api/Vehicle/getFreeCars',[],['ids'=>implode(',',array_merge($zjRentCars,$xzRentCars))]); + foreach($result['data'] as $k => $v){ + $result['data'][$k]['checked'] = []; + } //6、返回 return $this->success('success',$result['data']); } From 7473a3aaec03d2b595361092d6ab1fa7a501254a Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 09:35:09 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index ac45ce461..872f8a0cf 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -88,7 +88,7 @@ class UserInformationg extends BaseModel public static function informationg_demand($param, $id, $admin_id) { if (isset($param['card_id']) && $param['card_id'] > 0) { - $category_id = Db::name('category_business')->where('id', $param['card_id'])->value('pid'); + $category_info = Db::name('category_business')->where('id', $param['card_id'])->feild(['pid', 'data_field'])->find(); $category_child = $param['card_id']; } else { $category_id = 0; @@ -96,7 +96,7 @@ class UserInformationg extends BaseModel } $data = [ 'create_user_id' => $admin_id, - 'category_id' => $category_id, + 'category_id' => $category_info['pid'] ?? 0, 'category_child' => $category_child, 'data' => json_encode($param['datas']), 'create_time' => time(), @@ -104,6 +104,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; + dd($category_info->toArray(), $data); return UserInformationgDemand::create($data); } From 146e7c05657c5725c5f9d14f262f0041a7d104aa Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 09:39:18 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 872f8a0cf..ad528d748 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -88,7 +88,7 @@ class UserInformationg extends BaseModel public static function informationg_demand($param, $id, $admin_id) { if (isset($param['card_id']) && $param['card_id'] > 0) { - $category_info = Db::name('category_business')->where('id', $param['card_id'])->feild(['pid', 'data_field'])->find(); + $category_info = Db::name('category_business')->where('id', $param['card_id'])->felid(['pid', 'data_field'])->find(); $category_child = $param['card_id']; } else { $category_id = 0; From 10935e29e3c156d661be919049f50bf2f292cef3 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 09:40:04 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index ad528d748..fda581375 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -88,7 +88,7 @@ class UserInformationg extends BaseModel public static function informationg_demand($param, $id, $admin_id) { if (isset($param['card_id']) && $param['card_id'] > 0) { - $category_info = Db::name('category_business')->where('id', $param['card_id'])->felid(['pid', 'data_field'])->find(); + $category_info = Db::name('category_business')->where('id', $param['card_id'])->field(['pid', 'data_field'])->find(); $category_child = $param['card_id']; } else { $category_id = 0; From e2b861ad675130e00befa7ef6e6ac8b09c4bf284 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 09:41:29 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index fda581375..b2bd729e4 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -104,7 +104,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - dd($category_info->toArray(), $data); + dd($category_info, $data); return UserInformationgDemand::create($data); } From 8c4b9f7bd230c85c9daf835b9772b157bcc98b02 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Sat, 14 Oct 2023 09:56:30 +0800 Subject: [PATCH 08/28] fixed buycar --- app/api/controller/VehicleController.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 5f24547f1..606ea14bd 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -419,9 +419,17 @@ class VehicleController extends BaseApiController if($company['company_type'] != 18 ){ return $this->fail('非小组公司不能访问'); } + //获取购买车辆记录 + $buyCarRent = VehicleBuyRecord::where('company_id',$company['id'])->where('status','<>',4)->findOrEmpty(); + if($buyCarRent->isEmpty()){ + $data = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->findOrEmpty(); + }else{ + $data = $buyCarRent; + $data['status'] = 0; + $data['type'] = 0; + } //获取签约合同 - $vehicleContract = VehicleContract::where('company_b_id',$company['id'])->where('type','<>',2)->order('id desc')->findOrEmpty(); - return $this->success('请求成功',$vehicleContract->toArray()); + return $this->success('请求成功',$data->toArray()); } //车辆详情 From e6b8d7fd28a7eb6939fcaaf5c2574ab3d2ccedfa Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 10:38:51 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88AI?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/informationg/UserInformationg.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index b2bd729e4..34a776bad 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -87,9 +87,23 @@ class UserInformationg extends BaseModel public static function informationg_demand($param, $id, $admin_id) { + $data_field = []; if (isset($param['card_id']) && $param['card_id'] > 0) { $category_info = Db::name('category_business')->where('id', $param['card_id'])->field(['pid', 'data_field'])->find(); $category_child = $param['card_id']; + $field_array = json_decode($category_info['data_field'], true); + if (!empty($field_array) && is_array($field_array)) { + foreach($param['datas'] as $k => $v) { + if (!empty($field_array[$k]['text'])) { + $key = $field_array[$k]['text']; + if (!empty($field_array[$k]['enum'])) { + $data_field[$key] = $field_array[$k]['enum'][$v] ?? ''; + } else { + $data_field[$key] = $v; + } + } + } + } } else { $category_id = 0; $category_child = 0; @@ -104,7 +118,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - dd($category_info, $data); + dd($category_info, $field_array, $data); return UserInformationgDemand::create($data); } From a27baa0c2da13a4cbb41d5dc8e58366e0ad7afac Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 10:43:01 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88AI?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 34a776bad..634cdd9eb 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -113,6 +113,7 @@ class UserInformationg extends BaseModel 'category_id' => $category_info['pid'] ?? 0, 'category_child' => $category_child, 'data' => json_encode($param['datas']), + 'data_field' => json_encode($data_field), 'create_time' => time(), 'update_time' => time(), 'status' => 1, From 8ffc0c97713e143d1f98758540a4f4c7c3e578d0 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 10:44:18 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88AI?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 634cdd9eb..a60a1f01f 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -119,7 +119,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - dd($category_info, $field_array, $data); + dd($category_info, $data_field, $data); return UserInformationgDemand::create($data); } From b1e33a2656693157c242263fd97e62498d475b62 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 10:55:47 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A1=A3=E6=A1=88AI?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index a60a1f01f..d0879494a 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -119,7 +119,6 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - dd($category_info, $data_field, $data); return UserInformationgDemand::create($data); } From fe9eb7cb411128f589c1400d096e0a4274e4ac3c Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 11:56:12 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/XunFeiController.php | 87 +++++++------------ .../model/informationg/UserInformationg.php | 1 + 2 files changed, 32 insertions(+), 56 deletions(-) diff --git a/app/api/controller/XunFeiController.php b/app/api/controller/XunFeiController.php index 3e017dc79..4fc3cf4c0 100644 --- a/app/api/controller/XunFeiController.php +++ b/app/api/controller/XunFeiController.php @@ -41,90 +41,65 @@ class XunFeiController extends BaseApiController public function chat() { header('X-Accel-Buffering: no'); - $parmas=$this->request->param('content'); - if(empty($parmas)){ - return $this->success('success'); + $content = $this->request->param('content'); + if(empty($content)){ + return $this->data(['answer' => '']); } $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); // 连接到 WebSocket 服务器 if ($client) { - // 发送数据到 WebSocket 服务器 - $data = $this->getBody($this->app_id,$parmas); + $header = [ + "app_id" => $this->app_id, + "uid" => "1" + ]; + $parameter = [ + "chat" => [ + "domain" => "generalv2", + "temperature" => 0.5, + "max_tokens" => 1024 + ] + ]; + $payload = [ + "message" => [ + "text" => [ + ["role" => "user", "content" => $content] + ] + ] + ]; + $data = json_encode([ + "header" => $header, + "parameter" => $parameter, + "payload" => $payload + ]); $client->send($data); - // 从 WebSocket 服务器接收数据 $answer = ""; while(true){ $response = $client->receive(); - $resp = json_decode($response,true); - $code = $resp["header"]["code"]; - // echo "从服务器接收到的数据： " . $response; + $resp = json_decode($response, true); + $code = $resp["header"]["code"] ?? 0; if(0 == $code){ $status = $resp["header"]["status"]; if($status != 2){ $content = $resp['payload']['choices']['text'][0]['content']; $answer .= $content; - print($answer); - ob_flush(); // 刷新输出缓冲区 - flush(); // 刷新系统输出缓冲区 }else{ $content = $resp['payload']['choices']['text'][0]['content']; $answer .= $content; - $total_tokens = $resp['payload']['usage']['text']['total_tokens']; - print("\n本次消耗token用量：\n"); - print($total_tokens); - ob_flush(); // 刷新输出缓冲区 - flush(); // 刷新系统输出缓冲区 break; } }else{ - return $this->fail( "服务返回报错".$response); + return $this->fail( "服务返回报错 " . $response); break; } } - ob_flush(); // 刷新输出缓冲区 - flush(); // 刷新系统输出缓冲区 - return $this->success('success'); - + return $this->data(['answer' => $answer]); } else { return $this->fail('无法连接到 WebSocket 服务器'); } } - //构造参数体 - function getBody($appid,$question){ - $header = array( - "app_id" => $appid, - "uid" => "1" - ); - - $parameter = array( - "chat" => array( - "domain" => "generalv2", - "temperature" => 0.5, - "max_tokens" => 1024 - ) - ); - - $payload = array( - "message" => array( - "text" => array( - array("role" => "user", "content" => $question) - ) - ) - ); - - $json_string = json_encode(array( - "header" => $header, - "parameter" => $parameter, - "payload" => $payload - )); - - return $json_string; - - } - //语音听写（流式版） public function iat() { @@ -147,7 +122,7 @@ class XunFeiController extends BaseApiController $last_file = substr($savename, -36); $copyFile = app()->getRootPath() . '/public/uploads/iat/' . $last_file; - // 临时方案 + // ********** 临时方案 ********** // copy($file, $copyFile); // $last_file = 'a1fcdd96c7967b48add17b52ab456368.mp3'; $curl_url = "https://dev.app.tword.cn/ffmpeg.php?file={$last_file}"; diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index d0879494a..fec977ef0 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -93,6 +93,7 @@ class UserInformationg extends BaseModel $category_child = $param['card_id']; $field_array = json_decode($category_info['data_field'], true); if (!empty($field_array) && is_array($field_array)) { + // 拼装词语 foreach($param['datas'] as $k => $v) { if (!empty($field_array[$k]['text'])) { $key = $field_array[$k]['text']; From bd77a97d2fc44c214af0d535f34e84ed628a9c96 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 15:32:48 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/XunFeiController.php | 92 +++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/app/api/controller/XunFeiController.php b/app/api/controller/XunFeiController.php index 4fc3cf4c0..c807f3244 100644 --- a/app/api/controller/XunFeiController.php +++ b/app/api/controller/XunFeiController.php @@ -18,6 +18,7 @@ use IFlytek\Xfyun\Speech\ChatClient; use IFlytek\Xfyun\Speech\IatClient; use IFlytek\Xfyun\Speech\TtsClient; use IFlytek\Xfyun\Speech\OcrClient; +use think\facade\Db; use WebSocket\Client; use GuzzleHttp\Client as GzClient; use GuzzleHttp\Psr7\Request; @@ -30,14 +31,13 @@ use Guzzle\Http\Exception\RequestException; */ class XunFeiController extends BaseApiController { - public array $notNeedLogin = ['chat', 'iat', 'tts', 'ocr', 'iatWss']; + public array $notNeedLogin = ['chat', 'iat', 'tts', 'ocr', 'iatWss', 'analyse']; private $app_id='2eda6c2e'; - private $api_key='12ec1f9d113932575fc4b114a2f60ffd'; - private $api_secret='MDEyMzE5YTc5YmQ5NjMwOTU1MWY4N2Y2'; + //星火认知chat public function chat() { header('X-Accel-Buffering: no'); @@ -100,6 +100,90 @@ class XunFeiController extends BaseApiController } } + //AI分析信息 + public function analyse() + { + $informationg_demand_id = $this->request->param('informationg_demand_id'); + if(empty($informationg_demand_id)){ + return $this->fail('信息参数错误'); + } + $informationg = Db::name('user_informationg_demand')->where('id', $informationg_demand_id)->where('status', 1)->find(); + $type_name = Db::name('category_business')->where('id', $informationg['category_child'])->value('name'); + $data_field = json_decode($informationg['data_field'], true); + $demand = ''; + foreach($data_field as $k=>$v) { + $demand .= $k . '：' . $v . '；'; + } + $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？"; + $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); + $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); + // 连接到 WebSocket 服务器 + if ($client) { + $header = [ + "app_id" => $this->app_id, + "uid" => "1" + ]; + $parameter = [ + "chat" => [ + "domain" => "generalv2", + "temperature" => 0.5, + "max_tokens" => 1024 + ] + ]; + $payload = [ + "message" => [ + "text" => [ + ["role" => "user", "content" => $question] + ] + ] + ]; + $data = json_encode([ + "header" => $header, + "parameter" => $parameter, + "payload" => $payload + ]); + + $client->send($data); + $answer = ''; + while(true){ + $response = $client->receive(); + $resp = json_decode($response, true); + $code = $resp["header"]["code"] ?? 0; + if($code == 0){ + $status = $resp["header"]["status"]; + $content = $resp['payload']['choices']['text'][0]['content'] ?? ''; + $content = trim(str_replace(['\n', '\n\n', '\t', '\r', ' '], '', $content)); + if ($content) { + $answer .= $content; + } + if($status == 2){ + break; + } + }else{ + return $this->fail( "服务返回报错 " . $response); + break; + } + } + $data = [ + 'informationg_demand_id' => $informationg_demand_id, + 'information_id' => $informationg['information_id'] ?? 0, + 'category_id' => $informationg['category_id'] ?? 0, + 'category_child' => $informationg['category_child'] ?? 0, + 'send_data' => $question, + 'receive_data' => $answer, + 'create_time' => time(), + 'update_time' => time(), + ]; + $res = Db::name('user_informationg_aianalyse')->insert($data); + if (!$res) { + return $this->fail('AI分析信息失败'); + } + } else { + return $this->fail('无法连接到 WebSocket 服务器'); + } + return $this->data(['question'=>$question, 'answer' => $answer]); + } + //语音听写（流式版） public function iat() { @@ -252,7 +336,7 @@ class XunFeiController extends BaseApiController return $this->data(['words' => $words]); } - //获取websocket + //获取语音听写（流式版）websocket地址 public function iatWss() { header('X-Accel-Buffering: no'); From 36d86f82e28281fd501918152dac3bcaeea9d11d Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 15:55:48 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/XunFeiController.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/app/api/controller/XunFeiController.php b/app/api/controller/XunFeiController.php index c807f3244..1bbc82654 100644 --- a/app/api/controller/XunFeiController.php +++ b/app/api/controller/XunFeiController.php @@ -152,10 +152,7 @@ class XunFeiController extends BaseApiController if($code == 0){ $status = $resp["header"]["status"]; $content = $resp['payload']['choices']['text'][0]['content'] ?? ''; - $content = trim(str_replace(['\n', '\n\n', '\t', '\r', ' '], '', $content)); - if ($content) { - $answer .= $content; - } + $answer .= $content; if($status == 2){ break; } @@ -165,16 +162,10 @@ class XunFeiController extends BaseApiController } } $data = [ - 'informationg_demand_id' => $informationg_demand_id, - 'information_id' => $informationg['information_id'] ?? 0, - 'category_id' => $informationg['category_id'] ?? 0, - 'category_child' => $informationg['category_child'] ?? 0, - 'send_data' => $question, - 'receive_data' => $answer, - 'create_time' => time(), + 'ai_aianalyse' => $answer, 'update_time' => time(), ]; - $res = Db::name('user_informationg_aianalyse')->insert($data); + $res = Db::name('user_informationg_demand')->where('id', $informationg_demand_id)->update($data); if (!$res) { return $this->fail('AI分析信息失败'); } From e3bdf99015574f3904d940931442cce0cfe3c3a6 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 16:47:25 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E8=81=8A=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/InformationController.php | 1 - app/common/model/informationg/UserInformationg.php | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index ed6814353..8b8f544d0 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -113,7 +113,6 @@ class InformationController extends BaseApiController } UserInformationg::where('id', $param['id'])->update(['update_time' => time(), 'is_update' => 1]); - return $this->success('成功'); } diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index fec977ef0..59b4b8926 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -8,6 +8,7 @@ use think\facade\Log; use app\common\logic\BaseLogic; use app\common\model\Company; use app\common\model\user\User; +use app\job\AiAianalyse; class UserInformationg extends BaseModel { @@ -120,6 +121,7 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; + queue(AiAianalyse::class, $data); return UserInformationgDemand::create($data); } From 81e706dce9c4598ec007d21012c8a43d12611109 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 16:50:13 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 app/job/AiAianalyse.php diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php new file mode 100644 index 000000000..fa084f417 --- /dev/null +++ b/app/job/AiAianalyse.php @@ -0,0 +1,91 @@ +attempts() > 3) { + //通过这个方法可以检查这个任务已经重试了几次了 + } + $type_name = Db::name('category_business')->where('id', $data['category_child'])->value('name'); + $data_field = json_decode($data['data_field'], true); + $demand = ''; + foreach($data_field as $k=>$v) { + $demand .= $k . '：' . $v . '；'; + } + $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？"; + try { + $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); + $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); + // 连接到 WebSocket 服务器 + if ($client) { + $header = [ + "app_id" => $this->app_id, + "uid" => "1" + ]; + $parameter = [ + "chat" => [ + "domain" => "generalv2", + "temperature" => 0.5, + "max_tokens" => 1024 + ] + ]; + $payload = [ + "message" => [ + "text" => [ + ["role" => "user", "content" => $question] + ] + ] + ]; + $data = json_encode([ + "header" => $header, + "parameter" => $parameter, + "payload" => $payload + ]); + + $client->send($data); + $answer = ''; + while(true){ + $response = $client->receive(); + $resp = json_decode($response, true); + $code = $resp["header"]["code"] ?? 0; + if($code == 0){ + $status = $resp["header"]["status"]; + $content = $resp['payload']['choices']['text'][0]['content'] ?? ''; + $answer .= $content; + if($status == 2){ + break; + } + }else{ + break; + } + } + $update_data = [ + 'ai_aianalyse' => $answer, + 'update_time' => time(), + ]; + Db::name('user_informationg_demand')->where($data)->update($update_data); + } + } catch (\Exception $e) {} + $job->delete(); + } +} From 76db77d4682a85671497fb775e956d8f0617b19a Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 16:51:20 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index fa084f417..3b1bdb1d3 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -5,6 +5,7 @@ namespace app\job; use app\common\model\informationg\UserInformationg; use think\facade\Db; use think\queue\Job; +use IFlytek\Xfyun\Speech\ChatClient; use WebSocket\Client; use GuzzleHttp\Client as GzClient; use GuzzleHttp\Psr7\Request; From de6c6021e45ac99514c14e142dc15e809018fb54 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 17:13:07 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index 3b1bdb1d3..36ca2d21e 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -57,13 +57,13 @@ class AiAianalyse ] ] ]; - $data = json_encode([ + $chat_data = json_encode([ "header" => $header, "parameter" => $parameter, "payload" => $payload ]); - $client->send($data); + $client->send($chat_data); $answer = ''; while(true){ $response = $client->receive(); @@ -80,11 +80,14 @@ class AiAianalyse break; } } + $update_data = [ 'ai_aianalyse' => $answer, 'update_time' => time(), ]; - Db::name('user_informationg_demand')->where($data)->update($update_data); + unset($data['data'], $data['data_field']); + $id = Db::name('user_informationg_demand')->where($data)->fetchSql(false)->value('id'); + Db::name('user_informationg_demand')->where('id', $id)->fetchSql(false)->update($update_data); } } catch (\Exception $e) {} $job->delete(); From 76a52dc9d9351d4379729a2458c6a9ccc7dbde44 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 17:24:49 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/model/informationg/UserInformationg.php | 7 +++++-- app/job/AiAianalyse.php | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 59b4b8926..731ab1c8e 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -121,8 +121,11 @@ class UserInformationg extends BaseModel 'status' => 1, 'information_id' => $id, ]; - queue(AiAianalyse::class, $data); - return UserInformationgDemand::create($data); + $res = UserInformationgDemand::create($data); + if ($res) { + queue(AiAianalyse::class, $data); + } + return $res; } public static function details($id) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index 36ca2d21e..78a043885 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -80,14 +80,12 @@ class AiAianalyse break; } } - $update_data = [ 'ai_aianalyse' => $answer, 'update_time' => time(), ]; unset($data['data'], $data['data_field']); - $id = Db::name('user_informationg_demand')->where($data)->fetchSql(false)->value('id'); - Db::name('user_informationg_demand')->where('id', $id)->fetchSql(false)->update($update_data); + Db::name('user_informationg_demand')->where($data)->fetchSql(false)->update($update_data); } } catch (\Exception $e) {} $job->delete(); From 1ef7446e438aa405d0fba0d12026bae96096afd3 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 14 Oct 2023 17:31:38 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index 78a043885..a91f3a8b5 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -26,6 +26,7 @@ class AiAianalyse { if ($job->attempts() > 3) { //通过这个方法可以检查这个任务已经重试了几次了 + $job->delete(); } $type_name = Db::name('category_business')->where('id', $data['category_child'])->value('name'); $data_field = json_decode($data['data_field'], true); @@ -37,7 +38,6 @@ class AiAianalyse try { $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); - // 连接到 WebSocket 服务器 if ($client) { $header = [ "app_id" => $this->app_id, @@ -69,14 +69,13 @@ class AiAianalyse $response = $client->receive(); $resp = json_decode($response, true); $code = $resp["header"]["code"] ?? 0; - if($code == 0){ - $status = $resp["header"]["status"]; - $content = $resp['payload']['choices']['text'][0]['content'] ?? ''; - $answer .= $content; - if($status == 2){ - break; - } - }else{ + if($code > 0){ + break; + } + $status = $resp["header"]["status"]; + $content = $resp['payload']['choices']['text'][0]['content'] ?? ''; + $answer .= $content; + if($status == 2){ break; } } @@ -85,7 +84,7 @@ class AiAianalyse 'update_time' => time(), ]; unset($data['data'], $data['data_field']); - Db::name('user_informationg_demand')->where($data)->fetchSql(false)->update($update_data); + Db::name('user_informationg_demand')->where($data)->update($update_data); } } catch (\Exception $e) {} $job->delete(); From b69fc141d1145672791871b918d898dd01cce8c2 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 11:30:57 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2AI=E5=95=86=E6=9C=BA=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/InformationController.php | 22 +++++++++++++++++++ .../model/informationg/UserInformationg.php | 13 +++++++++++ 2 files changed, 35 insertions(+) diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index 8b8f544d0..831123f3c 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -128,4 +128,26 @@ class InformationController extends BaseApiController } return $this->success('成功'); } + + public function business_opportunity() + { + $param = Request()->param(); + [$page, $limit] = $this->getPage(); + if (isset($param['user_id']) && $param['user_id'] > 0) { + $data[] = ['create_user_id', '=', $param['user_id']]; + } else { + $data[] = ['company_id', '=', $this->userInfo['company_id']]; + } + $res = UserInformationg::list($data, $page, $limit); + if ($res != true) { + return $this->fail(BaseLogic::getError()); + } + $informationg_array = ($res->toArray()) ?? []; + $informationg_id_array = ($res->column('id')) ?? []; + $opportunity = UserInformationg::business_opportunity($informationg_id_array); + foreach($informationg_array as $k=>$v) { + $informationg_array[$k]['opportunity'] = $opportunity[$v['id']] ?? []; + } + return $this->success('ok', $informationg_array); + } } diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 731ab1c8e..0ca87c2b0 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -152,6 +152,19 @@ class UserInformationg extends BaseModel return $item; } + public static function business_opportunity($informationg_id_array) + { + $demand_id_array = UserInformationgDemand::whereIn('information_id', $informationg_id_array)->where('status', 1)->field(['max(id) as demand_id'])->group('information_id')->select()->column('demand_id'); + $data = UserInformationgDemand::whereIn('id', $demand_id_array)->column('*', 'information_id'); + foreach($data as &$item) { + $item['data'] = json_decode($item['data'], true); + $item['data_field'] = json_decode($item['data_field'], true); + $item['relation_goods'] = []; + } + unset($item); + return $data; + } + public function company() { return $this->hasOne(Company::class, 'id', 'company_id')->field(['id', 'company_name', 'admin_id']); From 3d29183d037b26090f3b9c05ffbb857a511e9b2d Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 11:36:40 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index a91f3a8b5..d32417d49 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -34,7 +34,7 @@ class AiAianalyse foreach($data_field as $k=>$v) { $demand .= $k . '：' . $v . '；'; } - $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？"; + $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些商品？"; try { $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); @@ -80,6 +80,7 @@ class AiAianalyse } } $update_data = [ + 'ai_question' => $question, 'ai_aianalyse' => $answer, 'update_time' => time(), ]; From 3ef002ab166090c3f43b167cf7e75c495e8267c2 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 11:40:23 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index d32417d49..7b009e3ba 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -34,7 +34,7 @@ class AiAianalyse foreach($data_field as $k=>$v) { $demand .= $k . '：' . $v . '；'; } - $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些商品？"; + $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些类型的商品？"; try { $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); From 634b876b9a94d9d876661009e1288d2603eae9f4 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 11:42:36 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=9F=E7=81=AB?= =?UTF-8?q?=E8=AE=A4=E7=9F=A5=E6=A8=A1=E5=9E=8B=E5=88=86=E6=9E=90=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/job/AiAianalyse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/job/AiAianalyse.php b/app/job/AiAianalyse.php index 7b009e3ba..d32417d49 100644 --- a/app/job/AiAianalyse.php +++ b/app/job/AiAianalyse.php @@ -34,7 +34,7 @@ class AiAianalyse foreach($data_field as $k=>$v) { $demand .= $k . '：' . $v . '；'; } - $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些类型的商品？"; + $question = "分析以下{$type_name}信息【{$demand}】请问有那些商机？需要购买哪些商品？"; try { $chat=new ChatClient($this->app_id,$this->api_key,$this->api_secret); $client = new Client($chat->assembleAuthUrl('wss://spark-api.xf-yun.com/v2.1/chat')); From df77185f6cbf78c84c0dccc32a881c02b7aa8274 Mon Sep 17 00:00:00 2001 From: unknown <736250432@qq.com> Date: Mon, 16 Oct 2023 13:34:27 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E5=8F=AF=E5=9C=A8=E7=A7=9F=E8=BD=A6?= =?UTF-8?q?=E8=BE=86=E5=8F=96=E5=80=BC=E4=B8=BA=E8=B4=9F=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/VehicleController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 606ea14bd..a30a26e2f 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -30,7 +30,7 @@ class VehicleController extends BaseApiController //自有车辆数量 $selfCar = VehicleRent::field('id')->where('company_id',$this->userInfo['company_id'])->where('status','<>',3)->where('type',1)->count(); //可在租车辆 - $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar; + $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar,0); if($params['num'] > $doubleRentCar ){ return $this->fail('数量超过可再租车辆数'); } @@ -395,7 +395,7 @@ class VehicleController extends BaseApiController //自有车辆数量 $selfCar = VehicleRent::field('id')->where('company_id',$company['id'])->where('status','<>',3)->where('type',1)->count(); //可在租车辆 - $doubleRentCar = $villageCompany - $rentCar - $applyCar - $selfCar; + $doubleRentCar = max($villageCompany - $rentCar - $applyCar - $selfCar,0); //设置数据 $data = [ 'apply' => $vehicleContract, From efb2f2a8e322e9ae39a738616899a9de06a78674 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 14:09:55 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=9C=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/InformationController.php | 22 ---------- app/api/controller/ZhiboController.php | 41 +++++++++++++++++++ .../model/informationg/UserInformationg.php | 5 ++- 3 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 app/api/controller/ZhiboController.php diff --git a/app/api/controller/InformationController.php b/app/api/controller/InformationController.php index 831123f3c..8b8f544d0 100644 --- a/app/api/controller/InformationController.php +++ b/app/api/controller/InformationController.php @@ -128,26 +128,4 @@ class InformationController extends BaseApiController } return $this->success('成功'); } - - public function business_opportunity() - { - $param = Request()->param(); - [$page, $limit] = $this->getPage(); - if (isset($param['user_id']) && $param['user_id'] > 0) { - $data[] = ['create_user_id', '=', $param['user_id']]; - } else { - $data[] = ['company_id', '=', $this->userInfo['company_id']]; - } - $res = UserInformationg::list($data, $page, $limit); - if ($res != true) { - return $this->fail(BaseLogic::getError()); - } - $informationg_array = ($res->toArray()) ?? []; - $informationg_id_array = ($res->column('id')) ?? []; - $opportunity = UserInformationg::business_opportunity($informationg_id_array); - foreach($informationg_array as $k=>$v) { - $informationg_array[$k]['opportunity'] = $opportunity[$v['id']] ?? []; - } - return $this->success('ok', $informationg_array); - } } diff --git a/app/api/controller/ZhiboController.php b/app/api/controller/ZhiboController.php new file mode 100644 index 000000000..c363b9f0e --- /dev/null +++ b/app/api/controller/ZhiboController.php @@ -0,0 +1,41 @@ +data([]); + } + +} diff --git a/app/common/model/informationg/UserInformationg.php b/app/common/model/informationg/UserInformationg.php index 0ca87c2b0..1d84b9ef9 100644 --- a/app/common/model/informationg/UserInformationg.php +++ b/app/common/model/informationg/UserInformationg.php @@ -141,7 +141,10 @@ class UserInformationg extends BaseModel $arr = [ 'id' => $v['category_child'], 'update_time' => $v['update_time'], - 'datas' => $v['data'] + 'datas' => $v['data'], + 'data_field' => json_decode($v['data_field']), + 'ai_question' => $v['ai_question'], + 'ai_aianalyse' => $v['ai_aianalyse'], ]; if ($v['data']) { array_push($datas, $arr); From a1c67b2dd1cb0a8c125194915edcd6374aa59dc9 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 16 Oct 2023 15:01:11 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=9C=BA?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=8A=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../informationg/UserInformationgLogic.php | 5 +- composer.json | 3 +- composer.lock | 60 +++++++++++++++++- vendor/composer/autoload_files.php | 6 +- vendor/composer/autoload_psr4.php | 3 +- vendor/composer/autoload_static.php | 21 ++++--- vendor/composer/installed.json | 61 +++++++++++++++++++ vendor/composer/installed.php | 13 +++- vendor/services.php | 2 +- 9 files changed, 156 insertions(+), 18 deletions(-) diff --git a/app/adminapi/logic/informationg/UserInformationgLogic.php b/app/adminapi/logic/informationg/UserInformationgLogic.php index 41b86ddaa..90f854c9d 100644 --- a/app/adminapi/logic/informationg/UserInformationgLogic.php +++ b/app/adminapi/logic/informationg/UserInformationgLogic.php @@ -151,7 +151,10 @@ class UserInformationgLogic extends BaseLogic 'category_child' => $v['category_child'], 'create_time' => $v['create_time'], 'update_time' => $v['update_time'], - 'datas' => $a + 'datas' => $a, + 'data_field' => json_decode($v['data_field']), + 'ai_question' => $v['ai_question'], + 'ai_aianalyse' => $v['ai_aianalyse'], ]; if ($a) { array_push($datas, $arr); diff --git a/composer.json b/composer.json index 1629869c5..6f6006354 100755 --- a/composer.json +++ b/composer.json @@ -42,7 +42,8 @@ "workerman/gateway-worker": "^3.1", "workerman/gatewayclient": "^3.0", "jpush/jpush": "^3.6", - "topthink/think-filesystem": "^2.0" + "topthink/think-filesystem": "^2.0", + "alibabacloud/live": "^1.8" }, "require-dev": { "symfony/var-dumper": "^4.2", diff --git a/composer.lock b/composer.lock index 476d0f8ce..430db2866 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d25d7e585d92ff404a5aaad86a120d75", + "content-hash": "0ba9392aaf4e23b4c1f1d571084d8951", "packages": [ { "name": "adbario/php-dot-notation", @@ -155,6 +155,64 @@ }, "time": "2022-12-09T04:05:55+00:00" }, + { + "name": "alibabacloud/live", + "version": "1.8.958", + "source": { + "type": "git", + "url": "https://github.com/alibabacloud-sdk-php/live.git", + "reference": "2dc756e9e156cb33bc1287d28fc3fade87e4ae60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/alibabacloud-sdk-php/live/zipball/2dc756e9e156cb33bc1287d28fc3fade87e4ae60", + "reference": "2dc756e9e156cb33bc1287d28fc3fade87e4ae60", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "alibabacloud/client": "^1.5", + "php": ">=5.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "AlibabaCloud\\Live\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Alibaba Cloud SDK", + "email": "sdk-team@alibabacloud.com", + "homepage": "http://www.alibabacloud.com" + } + ], + "description": "Alibaba Cloud Live SDK for PHP", + "homepage": "https://www.alibabacloud.com/", + "keywords": [ + "alibaba", + "alibabacloud", + "aliyun", + "cloud", + "library", + "live", + "sdk" + ], + "support": { + "issues": "https://github.com/alibabacloud-sdk-php/live/issues", + "source": "https://github.com/alibabacloud-sdk-php/live" + }, + "time": "2021-04-29T09:14:45+00:00" + }, { "name": "aliyuncs/oss-sdk-php", "version": "v2.6.0", diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php index bec0e6301..5ed199ec7 100644 --- a/vendor/composer/autoload_files.php +++ b/vendor/composer/autoload_files.php @@ -16,16 +16,16 @@ return array( '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'a1105708a18b76903365ca1c4aa61b02' => $vendorDir . '/symfony/translation/Resources/functions.php', + 'd767e4fc2dc52fe66584ab8c6684783e' => $vendorDir . '/adbario/php-dot-notation/src/helpers.php', + 'b067bc7112e384b61c701452d53a14a8' => $vendorDir . '/mtdowling/jmespath.php/src/JmesPath.php', 'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php', '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php', - 'd767e4fc2dc52fe66584ab8c6684783e' => $vendorDir . '/adbario/php-dot-notation/src/helpers.php', + '66453932bc1be9fb2f910a27947d11b6' => $vendorDir . '/alibabacloud/client/src/Functions.php', '2cffec82183ee1cea088009cef9a6fc3' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', - 'b067bc7112e384b61c701452d53a14a8' => $vendorDir . '/mtdowling/jmespath.php/src/JmesPath.php', 'c5521cebe610a9bf42c44b3a5163adfd' => $vendorDir . '/overtrue/socialite/src/Contracts/FactoryInterface.php', 'ccd11c8e7dd9b33638b248681bdfba27' => $vendorDir . '/overtrue/socialite/src/Contracts/UserInterface.php', '5649552725dea6ec47381627600e3ac1' => $vendorDir . '/overtrue/socialite/src/Contracts/ProviderInterface.php', '23c18046f52bef3eea034657bafda50f' => $vendorDir . '/symfony/polyfill-php81/bootstrap.php', - '66453932bc1be9fb2f910a27947d11b6' => $vendorDir . '/alibabacloud/client/src/Functions.php', 'cd5441689b14144e5573bf989ee47b34' => $vendorDir . '/qcloud/cos-sdk-v5/src/Common.php', '841780ea2e1d6545ea3a253239d59c05' => $vendorDir . '/qiniu/php-sdk/src/Qiniu/functions.php', '941748b3c8cae4466c827dfb5ca9602a' => $vendorDir . '/rmccue/requests/library/Deprecated.php', diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php index ccca41103..1306e8a46 100644 --- a/vendor/composer/autoload_psr4.php +++ b/vendor/composer/autoload_psr4.php @@ -10,7 +10,7 @@ return array( 'think\\view\\driver\\' => array($vendorDir . '/topthink/think-view/src'), 'think\\trace\\' => array($vendorDir . '/topthink/think-trace/src'), 'think\\app\\' => array($vendorDir . '/topthink/think-multi-app/src'), - 'think\\' => array($vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src', $vendorDir . '/topthink/think-queue/src', $vendorDir . '/topthink/think-template/src', $vendorDir . '/topthink/think-filesystem/src'), + 'think\\' => array($vendorDir . '/topthink/framework/src/think', $vendorDir . '/topthink/think-filesystem/src', $vendorDir . '/topthink/think-helper/src', $vendorDir . '/topthink/think-orm/src', $vendorDir . '/topthink/think-queue/src', $vendorDir . '/topthink/think-template/src'), 'clagiordano\\weblibs\\configmanager\\' => array($vendorDir . '/clagiordano/weblibs-configmanager/src'), 'app\\' => array($baseDir . '/app'), 'ZipStream\\' => array($vendorDir . '/maennchen/zipstream-php/src'), @@ -74,6 +74,7 @@ return array( 'Cron\\' => array($vendorDir . '/dragonmantank/cron-expression/src/Cron'), 'Complex\\' => array($vendorDir . '/markbaker/complex/classes/src'), 'Carbon\\' => array($vendorDir . '/nesbot/carbon/src/Carbon'), + 'AlibabaCloud\\Live\\' => array($vendorDir . '/alibabacloud/live'), 'AlibabaCloud\\Client\\' => array($vendorDir . '/alibabacloud/client/src'), 'Adbar\\' => array($vendorDir . '/adbario/php-dot-notation/src'), '' => array($vendorDir . '/phrity/util-errorhandler/src'), diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 5b1380ffd..bdef077a7 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -17,16 +17,16 @@ class ComposerStaticInit7f3b0f886ea5f6310a43341d4e2b8ffb '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php', 'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php', 'a1105708a18b76903365ca1c4aa61b02' => __DIR__ . '/..' . '/symfony/translation/Resources/functions.php', + 'd767e4fc2dc52fe66584ab8c6684783e' => __DIR__ . '/..' . '/adbario/php-dot-notation/src/helpers.php', + 'b067bc7112e384b61c701452d53a14a8' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/JmesPath.php', 'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php', '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php', - 'd767e4fc2dc52fe66584ab8c6684783e' => __DIR__ . '/..' . '/adbario/php-dot-notation/src/helpers.php', + '66453932bc1be9fb2f910a27947d11b6' => __DIR__ . '/..' . '/alibabacloud/client/src/Functions.php', '2cffec82183ee1cea088009cef9a6fc3' => __DIR__ . '/..' . '/ezyang/htmlpurifier/library/HTMLPurifier.composer.php', - 'b067bc7112e384b61c701452d53a14a8' => __DIR__ . '/..' . '/mtdowling/jmespath.php/src/JmesPath.php', 'c5521cebe610a9bf42c44b3a5163adfd' => __DIR__ . '/..' . '/overtrue/socialite/src/Contracts/FactoryInterface.php', 'ccd11c8e7dd9b33638b248681bdfba27' => __DIR__ . '/..' . '/overtrue/socialite/src/Contracts/UserInterface.php', '5649552725dea6ec47381627600e3ac1' => __DIR__ . '/..' . '/overtrue/socialite/src/Contracts/ProviderInterface.php', '23c18046f52bef3eea034657bafda50f' => __DIR__ . '/..' . '/symfony/polyfill-php81/bootstrap.php', - '66453932bc1be9fb2f910a27947d11b6' => __DIR__ . '/..' . '/alibabacloud/client/src/Functions.php', 'cd5441689b14144e5573bf989ee47b34' => __DIR__ . '/..' . '/qcloud/cos-sdk-v5/src/Common.php', '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', '941748b3c8cae4466c827dfb5ca9602a' => __DIR__ . '/..' . '/rmccue/requests/library/Deprecated.php', @@ -162,6 +162,7 @@ class ComposerStaticInit7f3b0f886ea5f6310a43341d4e2b8ffb ), 'A' => array ( + 'AlibabaCloud\\Live\\' => 18, 'AlibabaCloud\\Client\\' => 20, 'Adbar\\' => 6, ), @@ -187,11 +188,11 @@ class ComposerStaticInit7f3b0f886ea5f6310a43341d4e2b8ffb 'think\\' => array ( 0 => __DIR__ . '/..' . '/topthink/framework/src/think', - 1 => __DIR__ . '/..' . '/topthink/think-helper/src', - 2 => __DIR__ . '/..' . '/topthink/think-orm/src', - 3 => __DIR__ . '/..' . '/topthink/think-queue/src', - 4 => __DIR__ . '/..' . '/topthink/think-template/src', - 5 => __DIR__ . '/..' . '/topthink/think-filesystem/src', + 1 => __DIR__ . '/..' . '/topthink/think-filesystem/src', + 2 => __DIR__ . '/..' . '/topthink/think-helper/src', + 3 => __DIR__ . '/..' . '/topthink/think-orm/src', + 4 => __DIR__ . '/..' . '/topthink/think-queue/src', + 5 => __DIR__ . '/..' . '/topthink/think-template/src', ), 'clagiordano\\weblibs\\configmanager\\' => array ( @@ -446,6 +447,10 @@ class ComposerStaticInit7f3b0f886ea5f6310a43341d4e2b8ffb array ( 0 => __DIR__ . '/..' . '/nesbot/carbon/src/Carbon', ), + 'AlibabaCloud\\Live\\' => + array ( + 0 => __DIR__ . '/..' . '/alibabacloud/live', + ), 'AlibabaCloud\\Client\\' => array ( 0 => __DIR__ . '/..' . '/alibabacloud/client/src', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index fc826a447..bc53f6004 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -155,6 +155,67 @@ }, "install-path": "../alibabacloud/client" }, + { + "name": "alibabacloud/live", + "version": "1.8.958", + "version_normalized": "1.8.958.0", + "source": { + "type": "git", + "url": "https://github.com/alibabacloud-sdk-php/live.git", + "reference": "2dc756e9e156cb33bc1287d28fc3fade87e4ae60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/alibabacloud-sdk-php/live/zipball/2dc756e9e156cb33bc1287d28fc3fade87e4ae60", + "reference": "2dc756e9e156cb33bc1287d28fc3fade87e4ae60", + "shasum": "", + "mirrors": [ + { + "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%", + "preferred": true + } + ] + }, + "require": { + "alibabacloud/client": "^1.5", + "php": ">=5.5" + }, + "time": "2021-04-29T09:14:45+00:00", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-4": { + "AlibabaCloud\\Live\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Alibaba Cloud SDK", + "email": "sdk-team@alibabacloud.com", + "homepage": "http://www.alibabacloud.com" + } + ], + "description": "Alibaba Cloud Live SDK for PHP", + "homepage": "https://www.alibabacloud.com/", + "keywords": [ + "alibaba", + "alibabacloud", + "aliyun", + "cloud", + "library", + "live", + "sdk" + ], + "support": { + "issues": "https://github.com/alibabacloud-sdk-php/live/issues", + "source": "https://github.com/alibabacloud-sdk-php/live" + }, + "install-path": "../alibabacloud/live" + }, { "name": "aliyuncs/oss-sdk-php", "version": "v2.6.0", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 6f5fb6fb5..a1cba6e1f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'topthink/think', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '79fc9780490166b204ecd49aaeda85e93e94cf2d', + 'reference' => '93ef4ca7130cd285dd44ca7dec8be67c86d7be20', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -28,6 +28,15 @@ 'aliases' => array(), 'dev_requirement' => false, ), + 'alibabacloud/live' => array( + 'pretty_version' => '1.8.958', + 'version' => '1.8.958.0', + 'reference' => '2dc756e9e156cb33bc1287d28fc3fade87e4ae60', + 'type' => 'library', + 'install_path' => __DIR__ . '/../alibabacloud/live', + 'aliases' => array(), + 'dev_requirement' => false, + ), 'aliyuncs/oss-sdk-php' => array( 'pretty_version' => 'v2.6.0', 'version' => '2.6.0.0', @@ -676,7 +685,7 @@ 'topthink/think' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '79fc9780490166b204ecd49aaeda85e93e94cf2d', + 'reference' => '93ef4ca7130cd285dd44ca7dec8be67c86d7be20', 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/vendor/services.php b/vendor/services.php index 565e9e7bb..5443224a5 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\app\\Service',