From b6fcf2e02163af01a559dc8a4ea58fa59a995bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Thu, 22 Apr 2021 15:43:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A7=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8data.chinatravel.com=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ctmobilefirst/controllers/api.php           |  9 +++++----
 .../ctmobilefirst/models/api_model.php          | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/application/third_party/ctmobilefirst/controllers/api.php b/application/third_party/ctmobilefirst/controllers/api.php
index 25579e75..92e0b2a0 100644
--- a/application/third_party/ctmobilefirst/controllers/api.php
+++ b/application/third_party/ctmobilefirst/controllers/api.php
@@ -203,10 +203,11 @@ class Api extends CI_Controller {
            }else{
                $picurl="//data.chinatravel.com/images/loading2.gif";
            }
-           if (strpos($picurl,"chinatravel.com")!== false){
-           }else{
-                $picurl = $this->imageCdn.$picurl;
-            }
+        //    if (strpos($picurl,"chinatravel.com")!== false){
+        //    }else{
+        //         $picurl = $this->imageCdn.$picurl;
+        //     }
+           $picurl = $this->api_model->getPicCdn($picurl).$picurl;
            $row->pic = $picurl; //显示图片地址
        }
 
diff --git a/application/third_party/ctmobilefirst/models/api_model.php b/application/third_party/ctmobilefirst/models/api_model.php
index 6a2fcaca..90ce19ad 100644
--- a/application/third_party/ctmobilefirst/models/api_model.php
+++ b/application/third_party/ctmobilefirst/models/api_model.php
@@ -381,6 +381,23 @@ class Api_model extends CI_Model {
         }
     }
 
+    //根据图片URL判断CDN的地址
+   function getPicCdn($picurl){
+        $strCdn ="";
+        if (strpos($picurl,"chinatravel.com")!== false) {
+            $strCdn="";
+        } else if (strpos($picurl,"allpicture")!== false){
+            $strCdn = "//images.chinatravel.com";
+        }else if (strpos($picurl,"/album/userupload/")!== false){
+            $strCdn = "//data.chinatravel.com";
+        }else if (strpos($picurl,"/images/")!== false) {
+            $strCdn = "//data.chinatravel.com";
+        }else{
+            $strCdn = "//images.chinatravel.com"; 
+        }
+        return $strCdn;
+    }
+
 }
 
 /* End of file Api_model.php */