From 186f01ba33eb1deea523a57478ff9daff8b0c08c Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Mon, 4 Sep 2023 15:29:44 +0800
Subject: [PATCH] update

---
 app/api/controller/IndexController.php     |  6 ++----
 app/api/controller/JunziqianController.php | 12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index b55236d3..d6aa165b 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -31,8 +31,6 @@ class IndexController extends BaseApiController
 {
     public array $notNeedLogin = ['index', 'config', 'policy', 'decorate','notifyUrl'];
 
-    private $domain = 'https://worker-task.lihaink.cn';
-
     /**
      * @notes 首页数据
      * @return Json
@@ -110,7 +108,7 @@ class IndexController extends BaseApiController
             //更新本地合同状态
             $updateLocalRes = Contract::where('id',$contract['id'])->update(['signing_timer'=>1]);
             //更新远程
-            $updateSverRes =curl_post($this->domain.'/api/index/notifyVehicleContractUpdate',[],[
+            $updateSverRes =curl_post(env('project.website_domain').'/api/index/notifyVehicleContractUpdate',[],[
                 'contract_logistic_id' => $contract['id'],
                 'signing_timer' => 1,
             ]);
@@ -141,7 +139,7 @@ class IndexController extends BaseApiController
             }
             $vehicleRent = new VehicleRent();
             $vehicleRent -> saveAll($data);
-            curl_post($this->domain.'/api/index/notifyVehicleContractUpdate',[],[
+            curl_post(env('project.website_domain').'/api/index/notifyVehicleContractUpdate',[],[
                 'contract_logistic_id' => $contract['id'],
                 'signing_timer' => 2,
                 'status' => 3
diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index d2198c1f..e8c9e8e9 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -27,8 +27,6 @@ class JunziqianController extends BaseApiController
     /**默认ts单位:1毫秒,2秒*/
     private $tsType;
 
-    private $domain = 'https://ceshi-logistics.lihaink.cn';
-
     /**
      * 填充签名数据
      * @param $req array
@@ -77,7 +75,7 @@ class JunziqianController extends BaseApiController
         if (isset($data['master_email'])) {
             $request->emailOrMobile = $data['master_email']; //邮箱
         }
-        $request->notifyUrl = 'https://worker-task.lihaink.cn/notify_authentication?id=' . $data['id'];
+        $request->notifyUrl = env('project.notify_domain').'/notify_authentication?id=' . $data['id'];
         //发起创建企业请求
         $response = $requestUtils->doPost("/v2/user/organizationCreate", $request);
         return $response;
@@ -138,7 +136,7 @@ class JunziqianController extends BaseApiController
         $request->serverCa = 1; //是否需要服务端云证书
         $request->fileType = 1; //合同上传方式 url
         $request->url = $data['url'];
-        $request->notifyUrl = $this->domain.'/api/index/notifyUrl?id='.$id;
+        $request->notifyUrl = env('project.website_domain').'/api/index/notifyUrl?id='.$id;
         $request->needQifengSign = 1;
         //发起PING请求
         // halt($request);
@@ -183,7 +181,7 @@ class JunziqianController extends BaseApiController
         $request->serverCa = 1; //是否需要服务端云证书
         $request->fileType = 3;
         $request->htmlContent = $data['content'];
-        $request->notifyUrl = $this->domain.'/api/index/notifyUrl?id='.$id;
+        $request->notifyUrl = env('project.website_domain').'/api/index/notifyUrl?id='.$id;
         $request->needQifengSign = 1;
 
         //发起PING请求
@@ -196,7 +194,7 @@ class JunziqianController extends BaseApiController
         $requestUtils = new RequestUtils($this->serviceUrl, $this->appkey, $this->appSecret);
         $find = Db::name('contract')->where('contract_no', $applyNo)->value('contract_url');
         if ($find) {
-            return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn' . $find]);
+            return $this->success('获取成功', ['url' => env('project.notify_domain').$find]);
         }
         //初始化请求参数
         $request = array(
@@ -206,7 +204,7 @@ class JunziqianController extends BaseApiController
         if ($response->success == true) {
             $this->getDownload($response->data, root_path() . 'public/uploads/contract/' . $applyNo . '.pdf');
             Db::name('contract')->where('contract_no', $applyNo)->update(['contract_url' => '/uploads/contract/' . $applyNo . '.pdf']);
-            return $this->success('获取成功', ['url' => 'https://worker-task.lihaink.cn/uploads/contract/' . $applyNo . '.pdf']);
+            return $this->success('获取成功', ['url' => env('project.notify_domain').$applyNo . '.pdf']);
         } else {
             return $this->fail('获取失败');
         }