Merge remote-tracking branch 'origin/master' into akun

@@ -139,6 +139,7 @@ class NavLogic extends  BaseLogic
         foreach ($str as $v){
             $this->model->del(['id'=>$v]);
         }
+        $this->model->del(['id'=>$this->param['id']]);
         //编辑菜单后,通知更新
         $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all');
         return $this->success();

@@ -71,7 +71,7 @@ class KeywordLogic extends  BaseLogic
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
-            $this->fail('保存失败');
+            $this->fail('保存失败,请连续管理员');
         }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
         $this->curlDelRoute(['new_route'=>$route]);
@@ -137,12 +137,12 @@ class KeywordLogic extends  BaseLogic
                     $param['title'] = $v;
                     $id = $this->model->insertGetId($param);
                     $route = RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
-                    $this->curlDelRoute(['new_route'=>$route]);
                     $this->model->edit(['route'=>$route],['id'=>$id]);
+//                    $this->curlDelRoute(['new_route'=>$route]);
                 }
             }
         }catch (\Exception $e){
-            $this->fail('error');
+            $this->fail('保存失败，请联系管理员');
         }
         return $this->success();
     }
@@ -181,8 +181,8 @@ class KeywordLogic extends  BaseLogic
         //删除路由映射
         RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
         //生成一条删除路由记录
-        $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute(['route'=>$info['route']]);
+//        $info = $this->model->read(['id'=>$id],['id','route']);
+//        $this->curlDelRoute(['route'=>$info['route']]);
         return $this->success();
     }
 

@@ -54,10 +54,8 @@ class RouteMap extends Base
      * @date 2023/4/17
      */
     public static function generateRoute($title, $source, $source_id, $project_id){
-        //有中文先翻译
-        if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
-            $title = Translate::tran($title, 'en');
-        }
+        // 所有的都需要翻译成为英文
+        $title = Translate::tran($title, 'en');
         $i=1;
         $sign = generateRoute($title);
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();