Merge branch 'develop' into dc

@@ -54,7 +54,7 @@ class ImageController
             $this->response('指定图片不存在!', Code::USER_ERROR);
             $this->response('指定图片不存在!', Code::USER_ERROR);
         }
         }
         //查看缩略图是否存在
         //查看缩略图是否存在
-//        $header['Content-Type'] = 'image/'.$info['type'];
+        $header['Content-Type'] = 'image/'.$info['type'];
         $filename = $this->path . $info['hash'] . $w . '_' . $h;
         $filename = $this->path . $info['hash'] . $w . '_' . $h;
         if(is_file($filename)){
         if(is_file($filename)){
             $last_modified_time = gmdate(time() + ((30 * 60 * 60 * 24))) . " GMT";
             $last_modified_time = gmdate(time() + ((30 * 60 * 60 * 24))) . " GMT";

@@ -99,7 +99,7 @@ class NewsLogic extends BaseLogic
             }
             }
             //设置路由
             //设置路由
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
             RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
-            $this->model->edit($this->param,['id'=>$this->param['id']]);
+            $this->edit($this->param,['id'=>$this->param['id']]);
             DB::commit();
             DB::commit();
         }catch (\exception $e){
         }catch (\exception $e){
             DB::rollBack();
             DB::rollBack();