周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 9f57e602466f222e0874d427fd177b2e40ae8d4f 1 个父辈 438e19d3

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 73 行增加 和 16 行删除
  1 +<?php
  2 +/**
  3 + * @remark :
  4 + * @name :TranslateRead.php
  5 + * @author :lyh
  6 + * @method :post
  7 + * @time :2024/1/17 16:47
  8 + */
  9 +
  10 +namespace App\Console\Commands;
  11 +
  12 +use App\Models\Project\Project;
  13 +use App\Services\ProjectServer;
  14 +use Illuminate\Console\Command;
  15 +use Illuminate\Support\Facades\DB;
  16 +
  17 +class TranslateRead extends Command
  18 +{
  19 + /**
  20 + * The name and signature of the console command.
  21 + *
  22 + * @var string
  23 + */
  24 + protected $signature = 'translate_read';
  25 +
  26 + /**
  27 + * The console command description.
  28 + *
  29 + * @var string
  30 + */
  31 + protected $description = '生成视频模块';
  32 +
  33 + /**
  34 + * @remark :统一更新路由
  35 + * @name :handle
  36 + * @author :lyh
  37 + * @method :post
  38 + * @time :2023/11/20 15:13
  39 + */
  40 + public function handle(){
  41 + $projectModel = new Project();
  42 + $list = $projectModel->list(['type'=>['!=',0]]);
  43 + foreach ($list as $v){
  44 + echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
  45 + ProjectServer::useProject($v['id']);
  46 + DB::disconnect('custom_mysql');
  47 + }
  48 + echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
  49 + }
  50 +
  51 + public function read(){
  52 +
  53 + }
  54 +}
@@ -123,7 +123,7 @@ class TranslateController extends BaseController @@ -123,7 +123,7 @@ class TranslateController extends BaseController
123 if($v['route'] == 'index'){ 123 if($v['route'] == 'index'){
124 $data[] = '/'; 124 $data[] = '/';
125 }else{ 125 }else{
126 - $data[] = $v['route'].'/'; 126 + $data[] = $v['route'];
127 } 127 }
128 break; 128 break;
129 case RouteMap::SOURCE_PRODUCT_CATE: 129 case RouteMap::SOURCE_PRODUCT_CATE:
@@ -133,10 +133,10 @@ class TranslateController extends BaseController @@ -133,10 +133,10 @@ class TranslateController extends BaseController
133 $this->pageList($data,$count,$v,1,15); 133 $this->pageList($data,$count,$v,1,15);
134 break; 134 break;
135 case RouteMap::SOURCE_BLOG: 135 case RouteMap::SOURCE_BLOG:
136 - $data[] = 'blogs/'.$v['route'].'/'; 136 + $data[] = 'blogs/'.$v['route'];
137 break; 137 break;
138 case RouteMap::SOURCE_NEWS: 138 case RouteMap::SOURCE_NEWS:
139 - $data[] = 'news/'.$v['route'].'/'; 139 + $data[] = 'news/'.$v['route'];
140 break; 140 break;
141 case RouteMap::SOURCE_BLOG_CATE: 141 case RouteMap::SOURCE_BLOG_CATE:
142 $blogModel = new Blog(); 142 $blogModel = new Blog();
@@ -156,8 +156,11 @@ class TranslateController extends BaseController @@ -156,8 +156,11 @@ class TranslateController extends BaseController
156 $cate_id = (int)array_shift($categoryIdArr); 156 $cate_id = (int)array_shift($categoryIdArr);
157 $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]); 157 $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]);
158 $v['path'] = ($routeInfo['route'] ?? ''); 158 $v['path'] = ($routeInfo['route'] ?? '');
  159 + if(!empty($v['path'])){
  160 + $v['path'] = $v['path'].'/';
  161 + }
159 } 162 }
160 - $data[] = $v['path'].$v['route'].'/'; 163 + $data[] = $v['path'].$v['route'];
161 break; 164 break;
162 case RouteMap::SOURCE_MODULE_CATE: 165 case RouteMap::SOURCE_MODULE_CATE:
163 $customModel = new CustomModuleContent(); 166 $customModel = new CustomModuleContent();
@@ -165,7 +168,7 @@ class TranslateController extends BaseController @@ -165,7 +168,7 @@ class TranslateController extends BaseController
165 $this->pageSixList($data,$count,$v,3,10); 168 $this->pageSixList($data,$count,$v,3,10);
166 break; 169 break;
167 default: 170 default:
168 - $data[] = $v['route'].'/'; 171 + $data[] = $v['route'];
169 break; 172 break;
170 } 173 }
171 } 174 }
@@ -189,7 +192,7 @@ class TranslateController extends BaseController @@ -189,7 +192,7 @@ class TranslateController extends BaseController
189 if($v['route'] == 'index'){ 192 if($v['route'] == 'index'){
190 $data[] = '/';//首页 193 $data[] = '/';//首页
191 }else{ 194 }else{
192 - $data[] = $v['route'].'/'; 195 + $data[] = $v['route'];
193 } 196 }
194 break; 197 break;
195 case RouteMap::SOURCE_PRODUCT_CATE: 198 case RouteMap::SOURCE_PRODUCT_CATE:
@@ -199,10 +202,10 @@ class TranslateController extends BaseController @@ -199,10 +202,10 @@ class TranslateController extends BaseController
199 $this->pageSixList($data,$count,$v,1,15); 202 $this->pageSixList($data,$count,$v,1,15);
200 break; 203 break;
201 case RouteMap::SOURCE_BLOG: 204 case RouteMap::SOURCE_BLOG:
202 - $data[] = 'blogs/'.$v['route'].'/'; 205 + $data[] = 'blogs/'.$v['route'];
203 break; 206 break;
204 case RouteMap::SOURCE_NEWS: 207 case RouteMap::SOURCE_NEWS:
205 - $data[] = 'news/'.$v['route'].'/'; 208 + $data[] = 'news/'.$v['route'];
206 break; 209 break;
207 case RouteMap::SOURCE_BLOG_CATE: 210 case RouteMap::SOURCE_BLOG_CATE:
208 $blogModel = new Blog(); 211 $blogModel = new Blog();
@@ -222,8 +225,11 @@ class TranslateController extends BaseController @@ -222,8 +225,11 @@ class TranslateController extends BaseController
222 $cate_id = (int)array_shift($categoryIdArr); 225 $cate_id = (int)array_shift($categoryIdArr);
223 $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]); 226 $routeInfo = $routeMapModel->read(['source'=>RouteMap::SOURCE_MODULE_CATE,'source_id'=>$cate_id]);
224 $v['path'] = ($routeInfo['route'] ?? ''); 227 $v['path'] = ($routeInfo['route'] ?? '');
  228 + if(!empty($v['path'])){
  229 + $v['path'] = $v['path'].'/';
  230 + }
225 } 231 }
226 - $data[] = $v['path'].$v['route'].'/'; 232 + $data[] = $v['path'].$v['route'];
227 break; 233 break;
228 case RouteMap::SOURCE_MODULE_CATE: 234 case RouteMap::SOURCE_MODULE_CATE:
229 $customModel = new CustomModuleContent(); 235 $customModel = new CustomModuleContent();
@@ -231,7 +237,7 @@ class TranslateController extends BaseController @@ -231,7 +237,7 @@ class TranslateController extends BaseController
231 $this->pageSixList($data,$count,$v,3,10); 237 $this->pageSixList($data,$count,$v,3,10);
232 break; 238 break;
233 default: 239 default:
234 - $data[] = $v['route'].'/'; 240 + $data[] = $v['route'];
235 break; 241 break;
236 } 242 }
237 } 243 }
@@ -262,7 +268,7 @@ class TranslateController extends BaseController @@ -262,7 +268,7 @@ class TranslateController extends BaseController
262 if($i == 1){ 268 if($i == 1){
263 $data[] = $v['route']; 269 $data[] = $v['route'];
264 }else{ 270 }else{
265 - $data[] = $v['route'].'/page/'.$i.'/'; 271 + $data[] = $v['route'].'/page/'.$i;
266 } 272 }
267 } 273 }
268 return true; 274 return true;
@@ -290,9 +296,9 @@ class TranslateController extends BaseController @@ -290,9 +296,9 @@ class TranslateController extends BaseController
290 } 296 }
291 for ($i = 1;$i <= $page;$i++){ 297 for ($i = 1;$i <= $page;$i++){
292 if($i == 1){ 298 if($i == 1){
293 - $data[] = $v['route'].'/'; 299 + $data[] = $v['route'];
294 }else{ 300 }else{
295 - $data[] = $v['route'].'/'.$i.'/'; 301 + $data[] = $v['route'].'/'.$i;
296 } 302 }
297 } 303 }
298 return true; 304 return true;
@@ -9,13 +9,10 @@ @@ -9,13 +9,10 @@
9 9
10 namespace App\Http\Logic\Bside\Setting; 10 namespace App\Http\Logic\Bside\Setting;
11 11
12 -use App\Enums\Common\Code;  
13 use App\Http\Logic\Bside\BaseLogic; 12 use App\Http\Logic\Bside\BaseLogic;
14 -use App\Models\WebSetting\Proofreading;  
15 use App\Models\WebSetting\Translate as TranslateModel; 13 use App\Models\WebSetting\Translate as TranslateModel;
16 use App\Models\WebSetting\WebLanguage; 14 use App\Models\WebSetting\WebLanguage;
17 use App\Helper\Translate; 15 use App\Helper\Translate;
18 -use Illuminate\Support\Facades\DB;  
19 16
20 class TranslateLogic extends BaseLogic 17 class TranslateLogic extends BaseLogic
21 { 18 {