gx

@@ -35,7 +35,7 @@ class Translate extends Command
     protected $description = 'translate';
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['delete_status'=>0,'type'=>['!=',0],'id'=>['<=',1194]]);
+        $list = $projectModel->list(['delete_status'=>0,'type'=>['!=',0]]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -71,7 +71,7 @@ class Translate extends Command
             $data['source'] = 1;
             return $data;
         }
-        $route = basename($route);
+        $route = $this->handleRoute($route);
         $routeModel = new RouteMap();
         $routeInfo = $routeModel->read(['route'=>$route]);
         if($routeInfo === false){
@@ -81,6 +81,46 @@ class Translate extends Command
     }
 
     /**
+     * @remark :处理路由
+     * @name   :handleRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/18 17:25
+     */
+    public function handleRoute($url){
+        $str = trim($url,'/');
+        $route = 'index';
+        if(!empty($str)){
+            $arr = explode('/',$str);
+            $num = count($arr);
+            if($num == 1){
+                $route = $arr[0];
+            }elseif ($num == 2){
+                if(ctype_digit($arr[1])){//是数字的情况
+                    $route = $arr[0];
+                }else{
+                    $route = $arr[1];
+                }
+            }elseif($num == 3){
+                if(ctype_digit($arr[2])){//是数字的情况
+                    $route = $arr[0];
+                }else{
+                    if($arr[2] == 'page'){
+                        $route = $arr[1];
+                    }else{
+                        $route = $arr[0];
+                    }
+                }
+            }elseif ($num == 4){
+                if(ctype_digit($arr[3])){//是数字的情况
+                    $route = $arr[1];
+                }
+            }
+        }
+        return $this->success($route);
+    }
+
+    /**
      * @remark :返回数据
      * @name   :resultData
      * @author :lyh

@@ -256,10 +256,12 @@ class TranslateLogic extends BaseLogic
             }
             $this->param['data'] = $data;
         }
-//        try {
+        //解析路由
+        $sendData = $this->handleRoute($this->param['url']);
+        try {
             $info = $this->model->read(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'project_id'=>$this->user['project_id'],'type'=>$this->param['type']]);
             if($info === false){
-                $sourceInfo = $this->getRouteSource($this->param['url']);
+                $sourceInfo = $this->getRouteSource($sendData['new_route']);
                 $param = [
                     'type'=>$this->param['type'],
                     'project_id'=>$this->user['project_id'],
@@ -282,10 +284,10 @@ class TranslateLogic extends BaseLogic
             //写日志
             $userLogModel = new UserLog();
             $userLogModel->add(['model'=>'translate/save','remark'=>json_encode($this->param,true),'type'=>0,'operator_id'=>$this->user['id'],'project_id'=>$this->user['project_id']]);
-//        }catch (\Exception $e){
-//            $this->fail('系统错误请联系管理员');
-//        }
-        $this->handleRoute($this->param['url']);
+        }catch (\Exception $e){
+            $this->fail('系统错误请联系管理员');
+        }
+        $this->sendMessage($sendData);
         return $this->success();
     }
 
@@ -308,6 +310,9 @@ class TranslateLogic extends BaseLogic
         $route = basename($route);
         $routeModel = new RouteMap();
         $routeInfo = $routeModel->read(['route'=>$route]);
+        if($routeInfo === false){
+            return $data;
+        }
         return $this->resultData($routeInfo,$data);
     }
 
@@ -415,6 +420,17 @@ class TranslateLogic extends BaseLogic
         $data['new_route'] = $route;
         $data['lang'] = $lang;
         $data['project_id']= $this->user['project_id'];
-        $this->curlDelRoute($data);
+        return $this->success($data);
+    }
+
+    /**
+     * @remark :发送通知
+     * @name   :send
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/21 11:13
+     */
+    public function sendMessage($data){
+        return $this->curlDelRoute($data);
     }
 }