Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -241,12 +241,15 @@ class BaseController extends Controller
     public function getImageUrl($hash){
     public function getImageUrl($hash){
         $imageModel = new Image();
         $imageModel = new Image();
         $info = $imageModel->read(['hash'=>$hash]);
         $info = $imageModel->read(['hash'=>$hash]);
+        $url = '';
+        if($info !== false){
             if($info['is_cos'] == 1){
             if($info['is_cos'] == 1){
                 $cos = new CosService();
                 $cos = new CosService();
                 $url = $cos->getImageUrl($info['path']);
                 $url = $cos->getImageUrl($info['path']);
             }else{
             }else{
                 $url = url('b/image/'.$info['hash']);
                 $url = url('b/image/'.$info['hash']);
             }
             }
+        }
         return $url;
         return $url;
     }
     }
 
 

@@ -34,7 +34,7 @@ class BlogController extends BaseController
                 $v = $blogLabelLogic->get_label_name($v);
                 $v = $blogLabelLogic->get_label_name($v);
                 $v['route'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG, $v['id'], $this->user['project_id']);
                 $v['route'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG, $v['id'], $this->user['project_id']);
                 $v['url'] = $this->getProjectDomain() . $v['route'];
                 $v['url'] = $this->getProjectDomain() . $v['route'];
-//                $v['image_link'] = $this->getImageUrl($v['image']);
+                $v['image_link'] = $this->getImageUrl($v['image']);
                 $lists['list'][$k] = $v;
                 $lists['list'][$k] = $v;
             }
             }
         }
         }