作者 李宇航

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

变更数据



查看合并请求 !2933
@@ -77,8 +77,8 @@ class LinkDataLogic extends BaseLogic @@ -77,8 +77,8 @@ class LinkDataLogic extends BaseLogic
77 $end = Carbon::parse(date('Y-m-d')); 77 $end = Carbon::parse(date('Y-m-d'));
78 $diff = $start->diffInDays($end); 78 $diff = $start->diffInDays($end);
79 if($diff <= 60){ 79 if($diff <= 60){
80 - $info['da'] = $daInfo['da'];  
81 - $this->model->edit(['da'=>$daInfo['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]); 80 + $info['da_values'] = $daInfo['da'];
  81 + $this->model->edit(['da_values'=>$daInfo['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
82 return $this->success($info); 82 return $this->success($info);
83 } 83 }
84 } 84 }
@@ -87,14 +87,14 @@ class LinkDataLogic extends BaseLogic @@ -87,14 +87,14 @@ class LinkDataLogic extends BaseLogic
87 if(!isset($result['data']) || empty($result['data'])){ 87 if(!isset($result['data']) || empty($result['data'])){
88 return $this->success($info); 88 return $this->success($info);
89 } 89 }
90 - $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值 90 + $info['da_values'] = (int)$result['data']['mozDA'];//获取数据中的da值
91 //保存数据 91 //保存数据
92 if($daInfo !== false){ 92 if($daInfo !== false){
93 $domainDaModel->edit(['da'=>$info['da'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]); 93 $domainDaModel->edit(['da'=>$info['da'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]);
94 }else{ 94 }else{
95 $domainDaModel->addReturnId(['da'=>$info['da'],'domain'=>$host,'result'=>json_encode($result,true)]); 95 $domainDaModel->addReturnId(['da'=>$info['da'],'domain'=>$host,'result'=>json_encode($result,true)]);
96 } 96 }
97 - $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]); 97 + $this->model->edit(['da_values'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
98 return $this->success($info); 98 return $this->success($info);
99 } 99 }
100 100