作者 李宇航

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

变更数据



查看合并请求 !3173
@@ -85,10 +85,10 @@ class GeoController extends BaseController @@ -85,10 +85,10 @@ class GeoController extends BaseController
85 $geoWritingsModel = new GeoWritings(); 85 $geoWritingsModel = new GeoWritings();
86 $info = $geoWritingsModel->read(['uniqid' => $token]); 86 $info = $geoWritingsModel->read(['uniqid' => $token]);
87 if ($info === false){ 87 if ($info === false){
88 - return $this->error('非法请求'); 88 + return $this->response('非法请求',Code::SYSTEM_ERROR);
89 } 89 }
90 if ($info['status'] == GeoWritings::STATUS_FINISH){ 90 if ($info['status'] == GeoWritings::STATUS_FINISH){
91 - return $this->error('当前文章已确认,不可再次确认'); 91 + return $this->response('当前文章已确认,不可再次确认',Code::SYSTEM_ERROR);
92 } 92 }
93 $this->param['confirm_ip'] = $this->request->ip(); 93 $this->param['confirm_ip'] = $this->request->ip();
94 $this->param['confirm_at'] = date('Y-m-d H:i:s'); 94 $this->param['confirm_at'] = date('Y-m-d H:i:s');
@@ -108,7 +108,7 @@ class GeoController extends BaseController @@ -108,7 +108,7 @@ class GeoController extends BaseController
108 $token = trim($this->param['token']); 108 $token = trim($this->param['token']);
109 $data = GeoConfirm::where(['uniqid' => $token])->first(); 109 $data = GeoConfirm::where(['uniqid' => $token])->first();
110 if (empty($data)){ 110 if (empty($data)){
111 - return $this->error('确认链接已重置,请查看最新推送链接!'); 111 + return $this->response('确认链接已重置,请查看最新推送链接!',Code::SYSTEM_ERROR);
112 } 112 }
113 $content = explode("\n", $data->content); 113 $content = explode("\n", $data->content);
114 $confirm = explode("\n", $data->confirm); 114 $confirm = explode("\n", $data->confirm);
@@ -25,9 +25,6 @@ class LinkDataController extends BaseController @@ -25,9 +25,6 @@ class LinkDataController extends BaseController
25 * @time :2025/3/14 16:33 25 * @time :2025/3/14 16:33
26 */ 26 */
27 public function lists(GeoLink $linkData){ 27 public function lists(GeoLink $linkData){
28 - if(!isset($this->map['type']) || empty($this->map['type'])){  
29 - $this->map['type'] = $linkData::TYPE_LINK;  
30 - }  
31 $this->map['project_id'] = $this->user['project_id']; 28 $this->map['project_id'] = $this->user['project_id'];
32 $lists = $linkData->lists($this->map,$this->page,$this->row); 29 $lists = $linkData->lists($this->map,$this->page,$this->row);
33 $this->response('success',Code::SUCCESS,$lists); 30 $this->response('success',Code::SUCCESS,$lists);