周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 a6364769a35f8e22775c670928d84356bb20a0c6 2 个父辈 84f6dfec 83e8a648

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 8 行删除
@@ -139,6 +139,7 @@ class NavLogic extends BaseLogic @@ -139,6 +139,7 @@ class NavLogic extends BaseLogic
139 foreach ($str as $v){ 139 foreach ($str as $v){
140 $this->model->del(['id'=>$v]); 140 $this->model->del(['id'=>$v]);
141 } 141 }
  142 + $this->model->del(['id'=>$this->param['id']]);
142 //编辑菜单后,通知更新 143 //编辑菜单后,通知更新
143 $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all'); 144 $this->addUpdateNotify(RouteMap::SOURCE_NAV, 'all');
144 return $this->success(); 145 return $this->success();
@@ -71,7 +71,7 @@ class KeywordLogic extends BaseLogic @@ -71,7 +71,7 @@ class KeywordLogic extends BaseLogic
71 DB::commit(); 71 DB::commit();
72 }catch (\Exception $e){ 72 }catch (\Exception $e){
73 DB::rollBack(); 73 DB::rollBack();
74 - $this->fail('保存失败'); 74 + $this->fail('保存失败,请连续管理员');
75 } 75 }
76 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route); 76 $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT_KEYWORD,$route);
77 $this->curlDelRoute(['new_route'=>$route]); 77 $this->curlDelRoute(['new_route'=>$route]);
@@ -137,12 +137,12 @@ class KeywordLogic extends BaseLogic @@ -137,12 +137,12 @@ class KeywordLogic extends BaseLogic
137 $param['title'] = $v; 137 $param['title'] = $v;
138 $id = $this->model->insertGetId($param); 138 $id = $this->model->insertGetId($param);
139 $route = RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']); 139 $route = RouteMap::setRoute($v, RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
140 - $this->curlDelRoute(['new_route'=>$route]);  
141 $this->model->edit(['route'=>$route],['id'=>$id]); 140 $this->model->edit(['route'=>$route],['id'=>$id]);
  141 +// $this->curlDelRoute(['new_route'=>$route]);
142 } 142 }
143 } 143 }
144 }catch (\Exception $e){ 144 }catch (\Exception $e){
145 - $this->fail('error'); 145 + $this->fail('保存失败，请联系管理员');
146 } 146 }
147 return $this->success(); 147 return $this->success();
148 } 148 }
@@ -181,8 +181,8 @@ class KeywordLogic extends BaseLogic @@ -181,8 +181,8 @@ class KeywordLogic extends BaseLogic
181 //删除路由映射 181 //删除路由映射
182 RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']); 182 RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_KEYWORD, $id, $this->user['project_id']);
183 //生成一条删除路由记录 183 //生成一条删除路由记录
184 - $info = $this->model->read(['id'=>$id],['id','route']);  
185 - $this->curlDelRoute(['route'=>$info['route']]); 184 +// $info = $this->model->read(['id'=>$id],['id','route']);
  185 +// $this->curlDelRoute(['route'=>$info['route']]);
186 return $this->success(); 186 return $this->success();
187 } 187 }
188 188
@@ -54,10 +54,8 @@ class RouteMap extends Base @@ -54,10 +54,8 @@ class RouteMap extends Base
54 * @date 2023/4/17 54 * @date 2023/4/17
55 */ 55 */
56 public static function generateRoute($title, $source, $source_id, $project_id){ 56 public static function generateRoute($title, $source, $source_id, $project_id){
57 - //有中文先翻译  
58 - if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){ 57 + // 所有的都需要翻译成为英文
59 $title = Translate::tran($title, 'en'); 58 $title = Translate::tran($title, 'en');
60 - }  
61 $i=1; 59 $i=1;
62 $sign = generateRoute($title); 60 $sign = generateRoute($title);
63 $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first(); 61 $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();