Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -312,11 +312,16 @@ class SyncSubmitTaskService
                 //过滤内容关键字
                 //过滤内容关键字
                 if (!empty($config['filter_contents'])){
                 if (!empty($config['filter_contents'])){
                     foreach ($config['filter_contents'] as $filter_content) {
                     foreach ($config['filter_contents'] as $filter_content) {
-                        if (Str::contains(strtolower($data['data']['message']), strtolower($filter_content))) {
+                        //要指定词才过滤
+                        if (preg_match("/\b" . preg_quote($filter_content, "/") . "\b/i", $data['data']['message'])) {
                             throw new InquiryFilterException('过滤内容：' . $filter_content);
                             throw new InquiryFilterException('过滤内容：' . $filter_content);
                         }
                         }
+//                        if (Str::contains(strtolower($data['data']['message']), strtolower($filter_content))) {
+//                            throw new InquiryFilterException('过滤内容：' . $filter_content);
+//                        }
                     }
                     }
                 }
                 }
+
                 //是否允许包含链接
                 //是否允许包含链接
                 if(isset($config['is_allow_link']) && !$config['is_allow_link']){
                 if(isset($config['is_allow_link']) && !$config['is_allow_link']){
                     if (Str::contains(strtolower($data['data']['message']), ['http://', 'https://', 'www.'])) {
                     if (Str::contains(strtolower($data['data']['message']), ['http://', 'https://', 'www.'])) {