作者 李宇航

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

Lyh server



查看合并请求 !2093
@@ -28,6 +28,7 @@ use App\Models\RouteMap\RouteMap; @@ -28,6 +28,7 @@ use App\Models\RouteMap\RouteMap;
28 use App\Models\Template\BTemplateMain; 28 use App\Models\Template\BTemplateMain;
29 use App\Models\Template\TemplateTypeMain; 29 use App\Models\Template\TemplateTypeMain;
30 use App\Models\Visit\Visit; 30 use App\Models\Visit\Visit;
  31 +use App\Models\WebSetting\TranslateBigProject;
31 use App\Models\WebSetting\WebLanguage; 32 use App\Models\WebSetting\WebLanguage;
32 use App\Models\WebSetting\WebSetting; 33 use App\Models\WebSetting\WebSetting;
33 use App\Models\Workchat\MessagePush; 34 use App\Models\Workchat\MessagePush;
@@ -56,19 +57,26 @@ class lyhDemo extends Command @@ -56,19 +57,26 @@ class lyhDemo extends Command
56 protected $description = '更新路由'; 57 protected $description = '更新路由';
57 58
58 public function handle(){ 59 public function handle(){
59 - $projectModel = new Project();  
60 - $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);  
61 - foreach ($lists as $item){  
62 -// echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;  
63 - ProjectServer::useProject($item['id']);  
64 - $webSettingModel = new WebSetting();  
65 - $info = $webSettingModel->read(['project_id'=>$item['id']]);  
66 - if($info === false){  
67 - $webSettingModel->addReturnId(['project_id'=>$item['id']]);  
68 - echo '当前数据为空:'.$item['id'].PHP_EOL;  
69 - }  
70 - DB::disconnect('custom_mysql'); 60 + $str = '3671,955,752,1270,439,2674,3588,2388,1271,1543,738,624,552,1417,1237,651,1143,817,1556,1234,1350,650,538,491,631,2059,1845,866,1194,1699,546,684,905,1805,1728,2811,952,2972,2827,983,812,3081,554,741,1349,980';
  61 + $arr = explode(',',$str);
  62 + $model = new TranslateBigProject();
  63 + foreach ($arr as $val){
  64 + $model->addReturnId(['project_id'=>$val]);
71 } 65 }
  66 + return true;
  67 +// $projectModel = new Project();
  68 +// $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
  69 +// foreach ($lists as $item){
  70 +//// echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
  71 +// ProjectServer::useProject($item['id']);
  72 +// $webSettingModel = new WebSetting();
  73 +// $info = $webSettingModel->read(['project_id'=>$item['id']]);
  74 +// if($info === false){
  75 +// $webSettingModel->addReturnId(['project_id'=>$item['id']]);
  76 +// echo '当前数据为空:'.$item['id'].PHP_EOL;
  77 +// }
  78 +// DB::disconnect('custom_mysql');
  79 +// }
72 } 80 }
73 81
74 public function _actionTemplateMain(){ 82 public function _actionTemplateMain(){
@@ -34,6 +34,7 @@ use App\Models\Project\Country as CountryModel; @@ -34,6 +34,7 @@ use App\Models\Project\Country as CountryModel;
34 use App\Models\Project\Project; 34 use App\Models\Project\Project;
35 use App\Models\RouteMap\RouteMap; 35 use App\Models\RouteMap\RouteMap;
36 use App\Models\WebSetting\SettingNum; 36 use App\Models\WebSetting\SettingNum;
  37 +use App\Models\WebSetting\TranslateBigProject;
37 use App\Models\WebSetting\WebLanguage; 38 use App\Models\WebSetting\WebLanguage;
38 use Illuminate\Http\Request; 39 use Illuminate\Http\Request;
39 use Illuminate\Support\Facades\DB; 40 use Illuminate\Support\Facades\DB;
@@ -61,7 +62,8 @@ class CNoticeController extends BaseController @@ -61,7 +62,8 @@ class CNoticeController extends BaseController
61 ],[ 62 ],[
62 'language.required' => 'language不能为空', 63 'language.required' => 'language不能为空',
63 ]); 64 ]);
64 - $project_id_arr = explode(',',env('PROJECT_ID')) ?? []; 65 + $bigProjectModel = new TranslateBigProject();
  66 + $project_id_arr = $bigProjectModel->selectField(['status'=>1],'project_id') ?? [];
65 if(in_array($this->user['project_id'],$project_id_arr)){ 67 if(in_array($this->user['project_id'],$project_id_arr)){
66 $this->response('success'); 68 $this->response('success');
67 } 69 }
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TranslateBigProject.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2025/6/4 14:40
  8 + */
  9 +
  10 +namespace App\Models\WebSetting;
  11 +
  12 +use App\Models\Base;
  13 +
  14 +/**
  15 + * @remark :需要翻译的大网站
  16 + * @name :TranslateBigProject
  17 + * @author :lyh
  18 + * @method :post
  19 + * @time :2025/6/4 14:41
  20 + */
  21 +class TranslateBigProject extends Base
  22 +{
  23 + protected $table = 'gl_translate_big_project';
  24 +}