Merge branch 'master' into dev

app/controller/api/Auth.php

@@ -587,7 +587,7 @@ class Auth extends BaseController
         return app('json')->success($result);
 
         } finally {
-            $redis->del($lockKey);
+            // $redis->del($lockKey);
         }
 
     }

app/controller/api/douhuomall/Take.php

@@ -67,6 +67,9 @@ class Take
                 //sku信息处理
                 $skuInfo = $goodsInfo['sku_list'];
                 foreach ($skuInfo as $k => $v) {
+                    if (empty($v['plat_price'])) {
+                        continue;
+                    }
                     $skuInfo[$k]['img_url'] = $this->seveImg($value['goods_id'], $v['main_img'], $targetDir);//规格图片
                     $skuInfo[$k]['cost_price'] = bcadd($v['plat_price'], bcmul($v['plat_price'], 0.03, 2), 2);//成本价格 原来进价的基础上加百分之3
                     $skuInfo[$k]['market_price'] = bcadd($skuInfo[$k]['cost_price'], bcmul($skuInfo[$k]['cost_price'], 0.2, 2), 2);//销售价格  售价在成本价格的基础上加百分20
@@ -145,7 +148,7 @@ class Take
             'slider_image' => $slider_image,
         ];
         Db::name('store_product')->where('product_id', $product_id)->update($product_insert_data);
-        echo '更新产品图片数据成功' . json_encode($product_insert_data);
+        // echo '更新产品图片数据成功' . json_encode($product_insert_data);
         $detail = $spuId_info['detail'];
         if (!is_null(json_decode($detail))) {
             $detail_list = json_decode($detail);

app/controller/api/store/merchant/Taskorderguquan.php

@@ -20,67 +20,12 @@ class Taskorderguquan
         /**
          * 业绩25000分配
          * 补贴下面人员
-         * 13231658486周行体900
-         * 13333069689魏   新400
-         * 18715313601大饼300
-         * 15810064711 王   玲 300
-         * 13521438652徐立苹300
-         * 13701061395李素红300
-         * 13161909228刘银霞300
-         * 18310188227陈震300
-         * 13959100621周金花200
-         * 13801358713金波200
-         * 13601071082隋彩云200
-         * 13901074090陈玉刚200
-         * 15832971815孟晓玮200
-         * 17501006833邢艳丽100
-         * 15631982690魏震洪100
-         * 18603401312黄金花100
-         * 13932925303会强100
-         * 13331043787张吉良85
-         * 13601179856陈瑞元50
-         * 18760167163刘春梅50
-         * 13215917919李小秋50
-         * 15532683963李玉芝50
-         * 13381085923王建军50
-         * 13895311647李素玲50
-         * 15332507711张传莲50
-         * 18959022728吴碧红50
-         * 1593402751马贵中50
-         * 13895677473李素敏50
-         * 15232797965侯玉兰50
+         * 13331043787张吉良55
+         *
          * 其余部分做分红
          */
         $data = [
-            '13231658486' => 900,
-            '13333069689' => 400,
-            '18715313601' => 300,
-            '15810064711' => 300,
-            '13521438652' => 300,
-            '13701061395' => 300,
-            '13161909228' => 300,
-            '18310188227' => 300,
-            '13959100621' => 200,
-            '13801358713' => 200,
-            '13601071082' => 200,
-            '13901074090' => 200,
-            '15832971815' => 200,
-            '17501006833' => 100,
-            '15631982690' => 100,
-            '18603401312' => 100,
-            '13932925303' => 100,
-            '13331043787' => 85,
-            '13601179856' => 50,
-            '18760167163' => 50,
-            '13215917919' => 50,
-            '15532683963' => 50,
-            '13381085923' => 50,
-            '13895311647' => 50,
-            '15332507711' => 50,
-            '18959022728' => 50,
-            '15934027514' => 50,
-            '13895677473' => 50,
-            '15232797965' => 50
+            '13331043787' => 55
         ];
 
         $result = Db::name("user")

app/middleware/SecurityMiddleware.php

@@ -94,7 +94,7 @@ class SecurityMiddleware
     /**
      * 检测攻击
      */
-    protected function detectAttack($value, string $key = ''): bool
+    protected function detectAttack($value, $key): bool
     {
         if (!is_string($value)) {
             return false;