作者 lyh

gx

@@ -15,6 +15,7 @@ use App\Http\Logic\Bside\Setting\WebSettingLogic; @@ -15,6 +15,7 @@ use App\Http\Logic\Bside\Setting\WebSettingLogic;
15 use App\Models\Com\UpdateNotify; 15 use App\Models\Com\UpdateNotify;
16 use App\Models\Com\UpdateProgress; 16 use App\Models\Com\UpdateProgress;
17 use App\Models\Project\Country as CountryModel; 17 use App\Models\Project\Country as CountryModel;
  18 +use App\Models\Project\Project;
18 use App\Models\RouteMap\RouteMap; 19 use App\Models\RouteMap\RouteMap;
19 use App\Models\WebSetting\WebSettingCountry; 20 use App\Models\WebSetting\WebSettingCountry;
20 use Illuminate\Http\Request; 21 use Illuminate\Http\Request;
@@ -49,7 +50,6 @@ class CNoticeController extends BaseController @@ -49,7 +50,6 @@ class CNoticeController extends BaseController
49 $this->updateMinorLanguages(); 50 $this->updateMinorLanguages();
50 } 51 }
51 $urlStr = $this->getString($this->param['type'],$this->param['page']); 52 $urlStr = $this->getString($this->param['type'],$this->param['page']);
52 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($urlStr, true) . PHP_EOL, FILE_APPEND);  
53 curlGet($urlStr); 53 curlGet($urlStr);
54 $this->response('更新成功'); 54 $this->response('更新成功');
55 } 55 }
@@ -110,6 +110,11 @@ class CNoticeController extends BaseController @@ -110,6 +110,11 @@ class CNoticeController extends BaseController
110 $extent = json_encode(['url'=>$this->param['url'],'language'=>$this->param['language']]); 110 $extent = json_encode(['url'=>$this->param['url'],'language'=>$this->param['language']]);
111 $this->addProgress($count,$this->param['type'],$this->param['page'],$extent); 111 $this->addProgress($count,$this->param['type'],$this->param['page'],$extent);
112 } 112 }
  113 + //更新小语种,同步更新项目表
  114 + if(isset($this->user['is_domain']) && ($this->user['is_domain'] != 0)){
  115 + $projectModel = new Project();
  116 + $projectModel->edit(['is_language'=>$this->user['is_domain']],['id'=>$this->user['project_id']]);
  117 + }
113 }catch (\Exception $e){ 118 }catch (\Exception $e){
114 $this->response('error',Code::USER_ERROR); 119 $this->response('error',Code::USER_ERROR);
115 } 120 }
@@ -187,7 +187,9 @@ class UserLoginLogic @@ -187,7 +187,9 @@ class UserLoginLogic
187 $info['aicc'] = $project['aicc'] ?? ''; 187 $info['aicc'] = $project['aicc'] ?? '';
188 $info['hagro'] = $project['hagro'] ?? ''; 188 $info['hagro'] = $project['hagro'] ?? '';
189 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 189 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
190 - $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 190 + $info['is_domain'] = empty($project['deploy_optimize']['domain']) ? 0 : 1;
  191 + $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
  192 + ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
191 //保存项目缓存 193 //保存项目缓存
192 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 194 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
193 return $this->success($info); 195 return $this->success($info);