Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>264]);
+        $list = $projectModel->list(['id'=>917]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -55,7 +55,8 @@ class RouteMap extends Base
     public static function generateRoute($title, $source, $source_id, $project_id){
     public static function generateRoute($title, $source, $source_id, $project_id){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
         if(preg_match('/[\x{4e00}-\x{9fa5}]/u', $title)){
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
-        }elseif (preg_match('/[а-яА-Я]/u', $title)) {
+        }
+        if (preg_match('/[а-яА-Я]/u', $title) || mb_ereg('[а-яА-Я]', $title)) {
             $title = Translate::tran($title, 'en');
             $title = Translate::tran($title, 'en');
         }
         }
         $i=1;
         $i=1;