周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 273606756ff37cd234590378c98fffcde51e4243 2 个父辈 44884bf4 4091b215

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

变更数据



查看合并请求 !2932
内嵌 并排对比
正在显示 2 个修改的文件 包含 8 行增加 和 0 行删除
@@ -139,7 +139,11 @@ class GeoLinkLogic extends BaseLogic @@ -139,7 +139,11 @@ class GeoLinkLogic extends BaseLogic
139 } 139 }
140 $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值 140 $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值
141 //保存数据 141 //保存数据
  142 + if($daInfo !== false){
  143 + $domainDaModel->edit(['da'=>$info['da'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]);
  144 + }else{
142 $domainDaModel->addReturnId(['da'=>$info['da'],'domain'=>$host,'result'=>json_encode($result,true)]); 145 $domainDaModel->addReturnId(['da'=>$info['da'],'domain'=>$host,'result'=>json_encode($result,true)]);
  146 + }
143 $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]); 147 $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
144 return $this->success($info); 148 return $this->success($info);
145 } 149 }
@@ -89,7 +89,11 @@ class LinkDataLogic extends BaseLogic @@ -89,7 +89,11 @@ class LinkDataLogic extends BaseLogic
89 } 89 }
90 $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值 90 $info['da'] = (int)$result['data']['mozDA'];//获取数据中的da值
91 //保存数据 91 //保存数据
  92 + if($daInfo !== false){
  93 + $domainDaModel->edit(['da'=>$info['da'],'result'=>json_encode($result,true)],['id'=>$daInfo['id']]);
  94 + }else{
92 $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 + }
93 $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]); 97 $this->model->edit(['da'=>$info['da'],'time'=>date('Y-m-d')], ['id'=>$info['id']]);
94 return $this->success($info); 98 return $this->success($info);
95 } 99 }