gx

@@ -12,6 +12,7 @@ namespace App\Http\Controllers\Bside\Setting;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
+use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\WebSetting\WebLanguage;
 use App\Models\WebSetting\WebLanguage;
 
 
@@ -94,16 +95,40 @@ class TranslateController extends BaseController
         $routeMapModel = new RouteMap();
         $routeMapModel = new RouteMap();
         $list = $routeMapModel->list();
         $list = $routeMapModel->list();
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
-            if(!empty($v['path'])){
-                if($v['path'] == 'blog'){
-                    $v['path'] = $v['path'].'s';
+            //查看项目是5.0还是6.0
+            if($this->user['is_upgrade'] == Project::IS_UPGRADE_TRUE){//升级项目
+                if(!empty($v['path'])){
+                    if($v['path'] == 'blog'){
+                        $v['path'] = $v['path'].'s';
+                    }
+                    $route = $v['path'].'/'.$v['route'];
+                }else{
+                    if($v['route'] == 'index'){
+                        $v['route'] = '';
+                    }
+                    $route = $v['route'];
                 }
                 }
-                $route = $v['path'].'/'.$v['route'];
             }else{
             }else{
-                $route = $v['route'];
+                if(!empty($v['path'])){
+                    if($v['path'] == 'blog'){
+                        $v['path'] = $v['path'].'s';
+                    }elseif ($v['path'] == RouteMap::PATH_NEWS_CATE){
+                        $routeMapModel->edit(['path'=>''],['id'=>$v['id']]);
+                        $v['path'] = '';
+                    }elseif ($v['path'] == RouteMap::PATH_NEWS_CATE){
+                        $routeMapModel->edit(['path'=>''],['id'=>$v['id']]);
+                        $v['path'] = '';
+                    }
+                    $route = $v['path'].'/'.$v['route'];
+                }else{
+                    if($v['route'] == 'index'){
+                        $v['route'] = '';
+                    }
+                    $route = $v['route'];
+                }
             }
             }
-            $data[] = $this->user['domain'].$route;
         }
         }
+        $data[] = $this->user['domain'].$route;
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -35,7 +35,7 @@ class TranslateLogic extends BaseLogic
      */
      */
     public function getTranslateList(){
     public function getTranslateList(){
         $languageInfo = $this->getLanguage($this->param['language_id']);
         $languageInfo = $this->getLanguage($this->param['language_id']);
-        $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
+        $info = $this->model->read(['url'=>str_replace_url($this->param['url']),'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
         //获取当前URl的所有文本内容
         //获取当前URl的所有文本内容
         $new_key = $this->getUrlRead($this->param['url']);
         $new_key = $this->getUrlRead($this->param['url']);
         if($info === false){
         if($info === false){
@@ -64,6 +64,7 @@ class TranslateLogic extends BaseLogic
         }
         }
         $this->success($data);
         $this->success($data);
     }
     }
+
     /**
     /**
      * @remark :获取图片列表
      * @remark :获取图片列表
      * @name   :imageList
      * @name   :imageList
@@ -72,7 +73,7 @@ class TranslateLogic extends BaseLogic
      * @time   :2023/11/23 17:29
      * @time   :2023/11/23 17:29
      */
      */
     public function getTranslateImageList(){
     public function getTranslateImageList(){
-        $info = $this->model->read(['url'=>$this->param['url'],'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
+        $info = $this->model->read(['url'=>str_replace_url($this->param['url']),'language_id'=>$this->param['language_id'],'type'=>$this->param['type']]);
         $data = [];
         $data = [];
         if($info === false){
         if($info === false){
             $new_list = $this->getUrlImageRead($this->param['url']);
             $new_list = $this->getUrlImageRead($this->param['url']);
@@ -213,7 +214,7 @@ class TranslateLogic extends BaseLogic
                 $param = [
                 $param = [
                     'type'=>1,
                     'type'=>1,
                     'project_id'=>$this->user['project_id'],
                     'project_id'=>$this->user['project_id'],
-                    'url'=>$this->param['url'],
+                    'url'=>str_replace_url($this->param['url']),
                     'language_id'=>$this->param['language_id'],
                     'language_id'=>$this->param['language_id'],
                     'alias'=>$this->param['alias'],
                     'alias'=>$this->param['alias'],
                 ];
                 ];

@@ -201,6 +201,7 @@ class UserLoginLogic
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
         $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
             ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
             ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         $info['is_customized'] = $project['is_customized'];
         $info['is_customized'] = $project['is_customized'];
+        $info['is_upgrade'] = $project['is_upgrade'];
         $info['is_upload_manage'] = $project['is_upload_manage'];
         $info['is_upload_manage'] = $project['is_upload_manage'];
         $info['is_show_blog'] = $project['is_show_blog'];
         $info['is_show_blog'] = $project['is_show_blog'];
         $info['upload_config'] = $project['upload_config'];
         $info['upload_config'] = $project['upload_config'];