Merge branch 'master' into ysx-供应商0.5-20220302

app/Http/Services/SupplierService.php

@@ -375,6 +375,7 @@ class SupplierService
             $preChannelUid = $supplier['channel_uid'];
             $preChannelUid = explode(',', $preChannelUid);
             $preChannelUid[] = $channelUid;
+            $preChannelUid = array_unique($preChannelUid);
             $preChannelUid = implode(',', $preChannelUid);
             $result = $model->where('supplier_id', $supplierId)->update([
                 'update_time' => time(),

app/Model/IntracodeModel.php

@@ -33,7 +33,7 @@ class IntracodeModel extends Model
                     }
                 }
                 $redis->set('EncodedList_supplier_' . $includeResigned, json_encode($codeList));
-                $redis->expire('EncodedList_supplier_' . $includeResigned, 30);//缓存10分钟
+                $redis->expire('EncodedList_supplier_' . $includeResigned, 1);//缓存1s
             }
         }
         return $codeList;