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

@@ -76,6 +76,9 @@ class InquiryFormData extends Base
 
 
             //推送邮件发送
             //推送邮件发送
             foreach ($data as $k => $v){
             foreach ($data as $k => $v){
+                if(empty($v)){
+                    continue;
+                }
                 if(is_array($v) && !empty($v['path'])){
                 if(is_array($v) && !empty($v['path'])){
                     $v = getImageUrl($v['path']);
                     $v = getImageUrl($v['path']);
                     $data[$k] = $v;
                     $data[$k] = $v;

@@ -248,10 +248,10 @@ class SyncSubmitTaskService
         //ip 一分钟请求3次 就半小时内不写入这个ip了
         //ip 一分钟请求3次 就半小时内不写入这个ip了
         $ip_cache_key = "inquiry_{$data['project_id']}_{$data['ip']}";
         $ip_cache_key = "inquiry_{$data['project_id']}_{$data['ip']}";
         $ip_lock_cache_key = "inquiry_{$data['project_id']}_{$data['ip']}_lock";
         $ip_lock_cache_key = "inquiry_{$data['project_id']}_{$data['ip']}_lock";
-        if (!Cache::get($ip_cache_key)) {
+        $num = Cache::get($ip_cache_key);
+        if (!$num) {
             Cache::put($ip_cache_key, 0, 60);
             Cache::put($ip_cache_key, 0, 60);
         }
         }
-        $num = Cache::increment($ip_cache_key);
         if($num > 2){
         if($num > 2){
             //这个ip 锁半个小时
             //这个ip 锁半个小时
             Cache::put($ip_lock_cache_key, 1, 1800);
             Cache::put($ip_lock_cache_key, 1, 1800);
@@ -303,6 +303,8 @@ class SyncSubmitTaskService
         }
         }
         Log::channel('inquiry')->info($task_id . '询盘完成' . PHP_EOL);
         Log::channel('inquiry')->info($task_id . '询盘完成' . PHP_EOL);
 
 
+        Cache::increment($ip_cache_key);
+
         return true;
         return true;
     }
     }