stanley-king пре 7 година
родитељ
комит
6d40726594

+ 6 - 0
daemon/something.txt

@@ -20,3 +20,9 @@ grep -c "act=inoherb" 20170614.log 20170615.log 20170616.log 20170617.log 201706
 
 grep -c "act=" 20170610.log 20170611.log 20170612.log 20170613.log 20170614.log 20170615.log 20170616.log 20170617.log 20170618.log 20170619.log 20170620.log 20170621.log
 
+
+修改文件上传大小限制:
+
+lrlz_setting 表中 image_max_filesize
+PHP ini 文件中修改大小 upload_max_filesize
+代码中 	private $max_size = '1024'; 要修改下

BIN
data/resource/mobile/defimg/panda.jpeg


+ 6 - 4
helper/fcode/present_manager.php

@@ -90,10 +90,12 @@ class present_manager
         {
             $oper = new operator($commonid,$batch_code);
 
-            if($oper->grabed()) continue;
-            $fcode = $oper->grab();
-            if($fcode != false) {
-                return ['fcode' => $fcode,'common_id' => $commonid,'batch_code' => $batch_code];
+            if($oper->grabed() == false)
+            {
+                $fcode = $oper->grab();
+                if($fcode != false) {
+                    return ['fcode' => $fcode,'common_id' => $commonid,'batch_code' => $batch_code];
+                }
             }
         }
         return false;

+ 10 - 52
helper/fcode/send_manager.php

@@ -21,7 +21,6 @@ class send_manager
     public static $stInstance;
     private $mGoodsBlock;
     private $mNormalGoods;
-    private $mAdditionGoods;
 
     private function __construct()
     {
@@ -44,7 +43,6 @@ class send_manager
     {
         $this->mNormalGoods = [];
         $this->mGoodsBlock  = [];
-        $this->mAdditionGoods = [];
 
         global $config;
         $fcodes_id = $config['autosend_fcodes']['fcodes_spid'];
@@ -73,72 +71,30 @@ class send_manager
 
     private function add($amount,$item,$block)
     {
-        global $config;
-        $add_gids = $config['autosend_fcodes']['additional_gids'];
-
         $goods_id = intval($item['data']);
         if($goods_id <= 0) return;
 
-        if(!empty($add_gids) && is_array($add_gids) && in_array($goods_id,$add_gids))
-        {
-            if(array_key_exists($amount,$this->mNormalGoods) == false) {
-                $this->mAdditionGoods[$amount] = [];
-            }
-            $this->mAdditionGoods[$amount][] = $goods_id;
-        }
-        else
-        {
-            if(array_key_exists($amount,$this->mNormalGoods) == false) {
-                $this->mNormalGoods[$amount] = [];
-            }
-            $this->mNormalGoods[$amount][] = $goods_id;
+
+        if(array_key_exists($amount,$this->mNormalGoods) == false) {
+            $this->mNormalGoods[$amount] = [];
         }
+        $this->mNormalGoods[$amount][] = $goods_id;
         $this->mGoodsBlock[$goods_id] = $block;
     }
 
     public function fetch($amount,$pay_sn)
     {
         $normal = $this->fetch_normal($amount,$pay_sn);
-        $addition = $this->fetch_addition($amount,$pay_sn);
 
         $result = [];
         if(!empty($normal)) {
             $result['fcode'][]  = $normal['fcode'];
             $result['banner'][] = $normal['banner'];
         }
-        if(!empty($addition)) {
-            $result['fcode'][]  = $addition['fcode'];
-            $result['banner'][] = $addition['banner'];
-        }
 
         return empty($result) ? false : $result;
     }
 
-    public function fetch_addition($amount,$pay_sn)
-    {
-        $amount = intval($amount);
-        if($amount <= 0) return false;
-
-        $gids = [];
-        foreach ($this->mAdditionGoods as $key => $goods_ids)
-        {
-            if(empty($goods_ids)) continue;
-
-            if($key <= $amount)
-            {
-                foreach ($goods_ids as $gid) {
-                    $gids[] = $gid;
-                }
-            }
-        }
-        if(empty($gids)) {
-            return false;
-        }
-
-        $result = $this->validate_one($gids,$pay_sn);
-        return $result;
-    }
-
     public function fetch_normal($amount,$pay_sn)
     {
         $amount = intval($amount);
@@ -187,10 +143,12 @@ class send_manager
                 $batch_code = $block['items'][0]['title'];
                 $oper = new operator($commonid,$batch_code);
 
-                if($oper->grabed()) continue;
-                $fcode = $oper->lock($pay_sn);
-                if($fcode != false) {
-                    return ['fcode' => $fcode,'banner' => $block];
+                if($oper->grabed() == false)
+                {
+                    $fcode = $oper->lock($pay_sn);
+                    if($fcode != false) {
+                        return ['fcode' => $fcode,'banner' => $block];
+                    }
                 }
             }
         }

+ 2 - 3
mobile/control/member_ugc.php

@@ -7,7 +7,7 @@
  */
 
 
-class member_ugcControl extends mbMemberControl
+class 雇cmember_ugcControl extends mbMemberControl
 {
     public function __construct()
     {
@@ -20,8 +20,6 @@ class member_ugcControl extends mbMemberControl
     public function addOp()
     {
         $contet = urldecode($_POST['content']);
-
-
     }
     public function publishOp()
     {
@@ -32,4 +30,5 @@ class member_ugcControl extends mbMemberControl
     public function delOp()
     {
     }
+
 }