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

@@ -438,7 +438,7 @@ class RelayInquiry extends Command
     {
     {
         $cache_key = 'inquiry_ads_task';
         $cache_key = 'inquiry_ads_task';
         $ads = Cache::get($cache_key, function () use ($cache_key) {
         $ads = Cache::get($cache_key, function () use ($cache_key) {
-            $ads = ReInquiryTask::where(['status' => ReInquiryTask::STATUS_OPEN])->get(['id', 'ad_id', 'num', 'target']);
+            $ads = ReInquiryTask::where(['status' => ReInquiryTask::STATUS_OPEN])->get(['id', 'ad_id', 'num', 'target', 'is_replace_text']);
             $array = [];
             $array = [];
             foreach ($ads as $key=>$val) {
             foreach ($ads as $key=>$val) {
                 $array[$val->ad_id] = $val;
                 $array[$val->ad_id] = $val;

@@ -987,6 +987,20 @@ if (!function_exists('check_domain_record')) {
             return false;
             return false;
         }
         }
     }
     }
+
+    /**
+     * 邮箱脱敏
+     * @author zbj
+     * @date 2024/10/25
+     */
+    function email_desensitize($email){
+        $parts = explode('@', $email);
+        $username = $parts[0];
+        $domain = $parts[1];
+        $maskedUsername = substr($username, 0, -4) . '****';
+        $maskedDomain = '****.' . substr($domain, -5);
+        return $maskedUsername . '@' . $maskedDomain;
+    }
 }
 }
 
 
 
 

@@ -167,6 +167,13 @@ class InquiryController extends BaseController
 
 
         $data = $data['list'] ?? [];
         $data = $data['list'] ?? [];
         foreach ($data as &$item){
         foreach ($data as &$item){
+            //非正常登录的
+            if($this->param['login_source'] != 2){
+                //脱敏
+                $item['email'] = email_desensitize($item['email']);
+                $item['phone'] = substr($item['phone'], 0, -4) . '****';
+            }
+
             $item['ip_address'] = "{$item['country']}({$item['ip']})";
             $item['ip_address'] = "{$item['country']}({$item['ip']})";
 
 
             if(!empty($this->param['form_id'])){
             if(!empty($this->param['form_id'])){