Merge pull request 'set request url' (#2) from zhangwei into master

Reviewed-on: #2

app/adminapi/controller/contract/VehicleContractController.php

@@ -8,10 +8,6 @@ use app\common\model\contract\VehicleContract;
 
 class VehicleContractController extends BaseAdminController
 {
-
-//    private string $url = 'http://www.lst.local';
-    private string $url = 'https://logistics.lihaink.cn';
-
     //风控中心上传合同
     public function uploadContract() {
         //获取参数
@@ -32,7 +28,7 @@ class VehicleContractController extends BaseAdminController
             //判断合同类型
             if(!empty($vehicle_contract['contract_logistic_id'])){
                 //更新物流系统
-                curl_post($this->url.'/api/updateContract',[],[
+                curl_post(env('project.logistic_domain').'/api/updateContract',[],[
                     'id' => $vehicle_contract['contract_logistic_id'],
                     'file' => $params['file'],
                     'status' => 1

app/api/controller/IndexController.php

@@ -32,8 +32,6 @@ class IndexController extends BaseApiController
 {
     public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent'];
 
-    private $domain = 'https://logistics.lihaink.cn';
-
     /**
      * @notes 首页数据
      * @return Json
@@ -159,7 +157,7 @@ class IndexController extends BaseApiController
             ]);
             $party_b = Company::where('id', $contract['company_b_id'])->find();
             //通知物流系统跟新
-            curl_post($this->domain . '/api/updateVehicleRent', [], [
+            curl_post(env('project.logistic_domain') . '/api/updateVehicleRent', [], [
                 'car_id' => $vehicle['id'],
                 'use_user_id' => $party_b['user_id'],
                 'use_user_name' => $party_b['master_name'],
@@ -205,7 +203,7 @@ class IndexController extends BaseApiController
         } else if ($contract['signing_timer'] == 1) {
             //添加车辆到物流系统
             $vehicle = json_decode($contract['cars_info'], true);
-            $curl_res = curl_post($this->domain . '/api/addSelfCar', [], [
+            $curl_res = curl_post(env('project.logistic_domain') . '/api/addSelfCar', [], [
                 'license' => $vehicle['license'],
                 'company_id' => $contract['company_a_id'],
                 'company_name' => $contract['company_a_name'],
@@ -231,7 +229,7 @@ class IndexController extends BaseApiController
             $car_id = $curl_res['data']['car_id'];
             $party_b = Company::where('id', $contract['company_b_id'])->find();
             //通知物流系统跟新
-            curl_post($this->domain . '/api/updateVehicleRent', [], [
+            curl_post(env('project.logistic_domain') . '/api/updateVehicleRent', [], [
                 'car_id' => $car_id,
                 'use_user_id' => $party_b['user_id'],
                 'use_user_name' => $party_b['master_name'],
@@ -286,7 +284,7 @@ class IndexController extends BaseApiController
                 'status' => 3,
             ]);
             //通知物流系统跟新
-            curl_post($this->domain . '/api/cancelRent', [], [
+            curl_post(env('project.logistic_domain') . '/api/cancelRent', [], [
                 'car_id' => $vehicle['id'],
                 'status' => 1
             ]);

app/api/controller/RemoteController.php

@@ -176,7 +176,7 @@ class RemoteController extends BaseApiController
      * 获取坐标的距离
      */
     public function coordinate($parmas,$longitude1,$latitude1){
-        $res = HttpClient::create()->request('GET', 'https://logistics.lihaink.cn/api/getCarHistory', [
+        $res = HttpClient::create()->request('GET', env('project.logistic_domain').'/api/getCarHistory', [
             'query' => $parmas,
         ]);
         $json=json_decode($res->getContent(),true);

app/api/controller/VehicleController.php

@@ -11,7 +11,6 @@ use think\facade\Db;
 
 class VehicleController extends BaseApiController
 {
-    public string $url = 'https://logistics.lihaink.cn';
     //镇街公司想物流平台申请租赁车辆
     public function setContractByTownCompany()
     {
@@ -44,7 +43,7 @@ class VehicleController extends BaseApiController
             return ['code'=>0,'msg'=>'非镇街公司不能签约'];
         }
         //发送生成合同给物流信息
-        $curl_result = curl_post($this->url.'/api/signContract',[],[
+        $curl_result = curl_post(env('project.logistic_domain').'/api/signContract',[],[
             'num' => $params['num'],
             'company_id' => $party_b['id'],
             'company_name' => $party_b['company_name'],
@@ -384,7 +383,7 @@ class VehicleController extends BaseApiController
                 if(!empty($vehicleContract['cars_info'])){
                     $arr = $vehicleContract['cars_info'];
                     $arr['mileage'] = 0;
-                    $position = curl_get($this->url.'/api/getCarLocal?car_id='.$arr['id']);
+                    $position = curl_get(env('project.logistic_domain').'/api/getCarLocal?car_id='.$arr['id']);
                     if($position && $position['code'] == 1){
                         $arr['lon'] = $position['data']['lon'];
                         $arr['lat'] = $position['data']['lat'];
@@ -422,7 +421,7 @@ class VehicleController extends BaseApiController
             $data['contract'] = VehicleContract::field('id,contract_no,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();
         }
         //当前坐标位置
-        $position = curl_post($this->url.'/api/getCarLocal',[],['car_id'=>$carId]);
+        $position = curl_post(env('project.logistic_domain').'/api/getCarLocal',[],['car_id'=>$carId]);
         if($position && $position['code'] == 1){
             $data['position'] = $position['data'];
         }else{
@@ -438,7 +437,7 @@ class VehicleController extends BaseApiController
             return $this->fail('缺少必要参数');
         }
         //获取轨迹
-        $url = $this->url.'/api/getCarHistory?car_id='.$params['car_id'].'&start_time='.$params['start_time'].'&end_time='.$params['end_time'];
+        $url = env('project.logistic_domain').'/api/getCarHistory?car_id='.$params['car_id'].'&start_time='.$params['start_time'].'&end_time='.$params['end_time'];
         $result = curl_get($url);
         $data = [];
         foreach($result['data'] as $k => $v){