Merge remote-tracking branch 'origin/master' into akun

@@ -379,13 +379,25 @@ class ImageController extends Controller
             $max = config('upload.default_b_image')['size']['max'];
             $max = config('upload.default_b_image')['size']['max'];
             if(is_array($files)){
             if(is_array($files)){
                 foreach ($files as $file){
                 foreach ($files as $file){
-                    if ($file->getSize() > $max) {
-                        $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                    if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
+                        if ($file->getSize() > $this->cache['image_max']) {
+                            $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                        }
+                    }else{
+                        if ($file->getSize() > $max) {
+                            $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                        }
                     }
                     }
                 }
                 }
             }else{
             }else{
-                if ($files->getSize() > $max) {
-                    $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                if(isset($this->cache['image_max']) && ($this->cache['image_max'] != 0)){
+                    if ($files->getSize() > $this->cache['image_max']) {
+                        $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                    }
+                }else{
+                    if ($files->getSize() > $max) {
+                        $this->response('图片最大为500K',Code::SYSTEM_ERROR);
+                    }
                 }
                 }
             }
             }
             if(!isset($this->param['upload_method'])){
             if(!isset($this->param['upload_method'])){

@@ -292,7 +292,8 @@ class BlogLogic extends BaseLogic
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
                     'status' => Blog::STATUS_ONE,
                     'status' => Blog::STATUS_ONE,
-                    'url' => ''
+                    'url' => '',
+                    'is_upgrade'=>1
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由

@@ -328,7 +328,8 @@ class NewsLogic extends BaseLogic
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
                     'status' => News::STATUS_ONE,
                     'status' => News::STATUS_ONE,
-                    'url' => ''
+                    'url' => '',
+                    'is_upgrade'=>1
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由

@@ -637,7 +637,8 @@ class ProductLogic extends  BaseLogic
                     'content' => $content,
                     'content' => $content,
                     'seo_mate' => Arr::a2s($seo_mate),
                     'seo_mate' => Arr::a2s($seo_mate),
                     'created_uid' => $user_id,
                     'created_uid' => $user_id,
-                    'status' => Product::STATUS_ON
+                    'status' => Product::STATUS_ON,
+                    'is_upgrade'=>1
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由