合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3240

@@ -46,7 +46,7 @@ class LinkDataLogic extends BaseLogic
         foreach ($this->param['data'] as $v){
         foreach ($this->param['data'] as $v){
             $data[] = [
             $data[] = [
                 'url'=>$v['url'],
                 'url'=>$v['url'],
-                'da_values'=>$v['da_values'],
+                'da'=>$v['da_values'],
                 'type'=>GeoLink::TYPE_LINK,
                 'type'=>GeoLink::TYPE_LINK,
                 'project_id'=>$this->user['project_id'],
                 'project_id'=>$this->user['project_id'],
                 'send_time'=>$v['send_time'] ?? date('Y-m-d H:i:s')
                 'send_time'=>$v['send_time'] ?? date('Y-m-d H:i:s')
@@ -80,8 +80,8 @@ class LinkDataLogic extends BaseLogic
             $end   = Carbon::parse(date('Y-m-d'));
             $end   = Carbon::parse(date('Y-m-d'));
             $diff = $start->diffInDays($end);
             $diff = $start->diffInDays($end);
             if($diff <= 60){
             if($diff <= 60){
-                $info['da_values'] = $daInfo['da'];
-                $this->model->edit(['da_values'=>$daInfo['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
+                $info['da'] = $daInfo['da'];
+                $this->model->edit(['da'=>$daInfo['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
                 return $this->success($info);
                 return $this->success($info);
             }
             }
         }
         }
@@ -90,14 +90,14 @@ class LinkDataLogic extends BaseLogic
         if(!isset($result['data']) || empty($result['data'])){
         if(!isset($result['data']) || empty($result['data'])){
             return $this->success($info);
             return $this->success($info);
         }
         }
-        $info['da_values'] = (int)$result['data']['mozDA'];//获取数据中的da值
+        $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值
         //保存数据
         //保存数据
         if($daInfo !== false){
         if($daInfo !== false){
-            $domainDaModel->edit(['da'=>$info['da_values'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]);
+            $domainDaModel->edit(['da'=>$info['da'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]);
         }else{
         }else{
-            $domainDaModel->addReturnId(['da'=>$info['da_values'],'domain'=>$host,'result'=>json_encode($result,true)]);
+            $domainDaModel->addReturnId(['da'=>$info['da'],'domain'=>$host,'result'=>json_encode($result,true)]);
         }
         }
-        $this->model->edit(['da'=>$info['da_values'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
+        $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
         return $this->success($info);
         return $this->success($info);
     }
     }