gx

@@ -127,7 +127,7 @@ class GeoQuestionRes extends Command
                     }
                     }
                     echo 'MZ-url'.json_encode($hit_url).PHP_EOL;
                     echo 'MZ-url'.json_encode($hit_url).PHP_EOL;
                     // 保存数据结果
                     // 保存数据结果
-                    $geo_result = $geoResultModel->read(['project_id' => $taskInfo['project_id'], 'question_id' => $task_id, 'platform' => $platform, 'question' => $question],['id']);
+                    $geo_result = $geoResultModel->read(['project_id' => $taskInfo['project_id'],'type' => $taskInfo['type'], 'question_id' => $task_id, 'platform' => $platform, 'question' => $question],['id']);
                     $save_data = [
                     $save_data = [
                         'project_id' => $taskInfo['project_id'],
                         'project_id' => $taskInfo['project_id'],
                         'question_id' => $task_id,
                         'question_id' => $task_id,

@@ -757,6 +757,9 @@ class Translate
             return '';
             return '';
         }
         }
         $result = self::translate($texts, $tls);
         $result = self::translate($texts, $tls);
+        if(!isset($result[0]['texts']) || empty($result[0]['texts'])){
+            $result = self::translate($texts, $tls);
+        }
         return $result[0]['texts'] ?? '';
         return $result[0]['texts'] ?? '';
     }
     }
     /**
     /**

@@ -32,12 +32,6 @@ if (!function_exists('generateRoute')) {
             $string = $string[0];
             $string = $string[0];
         }
         }
         $sign = str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
         $sign = str_replace(".", "", trim(strtolower(preg_replace('/[^\w.]+/', '-', trim($string))), '-'));
-        if (strpos($sign, 'well-known-') === 0) {
-            $sign = substr($sign, strlen('well-known-'));
-        }
-        if(empty($sign)){
-            $sign = 'u';
-        }
         return $sign;
         return $sign;
     }
     }
 }
 }

@@ -230,6 +230,9 @@ class ImageController extends Controller
         $suffix = array_pop($nameArr) ?? 'jpg';
         $suffix = array_pop($nameArr) ?? 'jpg';
         $nameStr = implode('-', $nameArr);
         $nameStr = implode('-', $nameArr);
         $tran_name = Translate::tran($nameStr, 'en');
         $tran_name = Translate::tran($nameStr, 'en');
+        if(empty($tran_name)){
+            $tran_name = Translate::tran($nameStr, 'en');
+        }
         if(is_array($tran_name)){
         if(is_array($tran_name)){
             $tran_name = $tran_name[0];
             $tran_name = $tran_name[0];
         }
         }

@@ -69,6 +69,9 @@ class RouteMap extends Base
         }
         }
         //过滤特殊字符
         //过滤特殊字符
         $sign = generateRoute($title);
         $sign = generateRoute($title);
+        if (strpos($sign, 'well-known-') === 0) {
+            $sign = substr($sign, strlen('well-known-'));
+        }
         //查看当前数据路由是否存在
         //查看当前数据路由是否存在
         $routeInfo = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $routeInfo = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $suffix = '';//设置路由后缀
         $suffix = '';//设置路由后缀