正在显示
4 个修改的文件
包含
6 行增加
和
32 行删除
| @@ -294,29 +294,4 @@ class LoginController extends BaseController | @@ -294,29 +294,4 @@ class LoginController extends BaseController | ||
| 294 | } | 294 | } |
| 295 | return $data; | 295 | return $data; |
| 296 | } | 296 | } |
| 297 | - public function ceshi(){ | ||
| 298 | - $projectModel = new Project(); | ||
| 299 | - $info = $projectModel->with('payment')->with('deploy_build') | ||
| 300 | - ->with('deploy_optimize')->where(['id'=>1])->first()->toArray(); | ||
| 301 | - $url = 'https://form.globalso.com/api/globalsov6'; | ||
| 302 | - $data = [ | ||
| 303 | - 'id' => $info['from_order_id'], | ||
| 304 | - 'company_name'=>$info['company'], | ||
| 305 | - 'token'=>md5($info['from_order_id'].'qqs'.date('Y-m-d')), | ||
| 306 | - ]; | ||
| 307 | - if(!empty($info['mobile'])){ | ||
| 308 | - $data['mobile'] = $info['mobile']; | ||
| 309 | - } | ||
| 310 | - if(!empty($info['deploy_optimize']['domain'])){ | ||
| 311 | - $domainModel = new DomainInfo(); | ||
| 312 | - $data['main_url'] = $domainModel->getDomain($info['deploy_optimize']['domain']); | ||
| 313 | - } | ||
| 314 | - if($info['deploy_build']['test_domain']){ | ||
| 315 | - $data['test_url'] = $info['deploy_build']['test_domain']; | ||
| 316 | - } | ||
| 317 | - $header = array( | ||
| 318 | - "charset=utf-8" | ||
| 319 | - ); | ||
| 320 | - return http_post($url,$data,$header); | ||
| 321 | - } | ||
| 322 | } | 297 | } |
| @@ -26,7 +26,6 @@ class CustomTemplateController extends BaseController | @@ -26,7 +26,6 @@ class CustomTemplateController extends BaseController | ||
| 26 | $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order); | 26 | $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order); |
| 27 | if (!empty($lists)){ | 27 | if (!empty($lists)){ |
| 28 | foreach ($lists['list'] as $k => $v){ | 28 | foreach ($lists['list'] as $k => $v){ |
| 29 | - $v['route'] = $v['route'].'/'; | ||
| 30 | $lists['list'][$k] = $v; | 29 | $lists['list'][$k] = $v; |
| 31 | } | 30 | } |
| 32 | } | 31 | } |
| @@ -529,9 +529,9 @@ class ProjectLogic extends BaseLogic | @@ -529,9 +529,9 @@ class ProjectLogic extends BaseLogic | ||
| 529 | ->with('deploy_optimize')->where(['id'=>$project_id])->first()->toArray(); | 529 | ->with('deploy_optimize')->where(['id'=>$project_id])->first()->toArray(); |
| 530 | $url = 'https://form.globalso.com/api/globalsov6'; | 530 | $url = 'https://form.globalso.com/api/globalsov6'; |
| 531 | $data = [ | 531 | $data = [ |
| 532 | - 'id' => $info['from_order_id'], | 532 | + 'id' => $info['id'], |
| 533 | 'company_name'=>$info['company'], | 533 | 'company_name'=>$info['company'], |
| 534 | - 'token'=>md5($info['from_order_id'].'qqs'.date('Y-m-d')), | 534 | + 'token'=>md5($info['id'].'qqs'.date('Y-m-d')), |
| 535 | ]; | 535 | ]; |
| 536 | if(!empty($info['mobile'])){ | 536 | if(!empty($info['mobile'])){ |
| 537 | $data['mobile'] = $info['mobile']; | 537 | $data['mobile'] = $info['mobile']; |
| @@ -44,7 +44,7 @@ class WebSettingSeoLogic extends BaseLogic | @@ -44,7 +44,7 @@ class WebSettingSeoLogic extends BaseLogic | ||
| 44 | * @time :2023/9/11 16:34 | 44 | * @time :2023/9/11 16:34 |
| 45 | */ | 45 | */ |
| 46 | public function seoSave(){ | 46 | public function seoSave(){ |
| 47 | -// try { | 47 | + try { |
| 48 | $info = $this->model->read(['project_id'=>$this->user['project_id']]); | 48 | $info = $this->model->read(['project_id'=>$this->user['project_id']]); |
| 49 | if($info === false){ | 49 | if($info === false){ |
| 50 | $this->param['project_id'] = $this->user['project_id']; | 50 | $this->param['project_id'] = $this->user['project_id']; |
| @@ -52,9 +52,9 @@ class WebSettingSeoLogic extends BaseLogic | @@ -52,9 +52,9 @@ class WebSettingSeoLogic extends BaseLogic | ||
| 52 | }else{ | 52 | }else{ |
| 53 | $this->model->edit($this->param,['project_id'=>$this->user['project_id']]); | 53 | $this->model->edit($this->param,['project_id'=>$this->user['project_id']]); |
| 54 | } | 54 | } |
| 55 | -// }catch (\Exception $e){ | ||
| 56 | -// $this->fail('error'); | ||
| 57 | -// } | 55 | + }catch (\Exception $e){ |
| 56 | + $this->fail('error'); | ||
| 57 | + } | ||
| 58 | return $this->success(); | 58 | return $this->success(); |
| 59 | } | 59 | } |
| 60 | } | 60 | } |
-
请 注册 或 登录 后发表评论