Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/UploadController.php

@@ -33,6 +33,7 @@ class UploadController extends BaseController
         if (intval($mainId) == 0) {
             Yii::error('------- lose token -------');
             noticeUtil::push('save-file 无token进行上传文件');
+            return;
         }
         $shopId = $this->shopId;
         $month = date("Ym");

app-hd/controllers/UploadController.php

@@ -33,6 +33,7 @@ class UploadController extends BaseController
         if (intval($mainId) == 0) {
             Yii::error('------- lose token -------');
             noticeUtil::push('save-file 无token进行上传文件');
+            return;
         }
         $shopId = $this->shopId;
         $month = date("Ym");