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

@@ -145,7 +145,7 @@ class IndexController extends BaseController
         $token = md5(uniqid().'auto'.$info['id']);
         $token = md5(uniqid().'auto'.$info['id']);
         //存储缓存
         //存储缓存
         $info['token'] = $token;
         $info['token'] = $token;
-        Cache::add($token,$info,3600);
+        Cache::add($token,$info,12 * 3600);
         $languageModel = new WebLanguage();
         $languageModel = new WebLanguage();
         $languageInfo = $languageModel->read(['id'=>$info['main_lang_id']],['short','english','chinese']);
         $languageInfo = $languageModel->read(['id'=>$info['main_lang_id']],['short','english','chinese']);
         $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id'],'language_info'=>$languageInfo];
         $data = ['token'=>$token,'main_lang_id'=>$info['main_lang_id'],'language_info'=>$languageInfo];

@@ -221,7 +221,29 @@ class TranslateController extends BaseController
     public function getSixUrl($map){
     public function getSixUrl($map){
         $data = [];
         $data = [];
         $routeMapModel = new RouteMap();
         $routeMapModel = new RouteMap();
+        //查询路由中是否包含products
         $list = $routeMapModel->list($map);
         $list = $routeMapModel->list($map);
+        $productInfo = $routeMapModel->read(['route'=>'products']);
+        if($productInfo === false){
+            $productModel = new Product();
+            $count = $productModel->formatQuery(['status'=>1])->count();
+            $v['route'] = 'products';
+            $this->pageSixList($data,$count,$v,1,15);
+        }
+        $newsInfo = $routeMapModel->read(['route'=>'news']);
+        if($newsInfo === false){
+            $newsModel = new News();
+            $count = $newsModel->formatQuery(['status'=>1])->count();
+            $v['route'] = 'news';
+            $this->pageSixList($data,$count,$v,1,15);
+        }
+        $blogInfo = $routeMapModel->read(['route'=>'blog']);
+        if($blogInfo === false){
+            $blogModel = new Blog();
+            $count = $blogModel->formatQuery(['status'=>1])->count();
+            $v['route'] = 'blog';
+            $this->pageSixList($data,$count,$v,1,15);
+        }
         foreach ($list as $k => $v){
         foreach ($list as $k => $v){
             switch ($v['source']){
             switch ($v['source']){
                 case RouteMap::SOURCE_PAGE:
                 case RouteMap::SOURCE_PAGE:
@@ -293,6 +315,17 @@ class TranslateController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取默认数据
+     * @name   :getDefaultData
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/16 15:28
+     */
+    public function getDefaultData(){
+
+    }
+
+    /**
      * @remark :
      * @remark :
      * @name   :pageList
      * @name   :pageList
      * @author :lyh
      * @author :lyh

@@ -274,4 +274,15 @@ class Base extends Model
         }, ARRAY_FILTER_USE_KEY);
         }, ARRAY_FILTER_USE_KEY);
     }
     }
 
 
+    /**
+     * @remark :查询一个字段返回数组
+     * @name   :selectField
+     * @author :lyh
+     * @method :post
+     * @time   :2024/7/15 17:11
+     */
+    public function selectField($data,$filed){
+        $data = $this->filterRequestData($data);
+        return $this->formatQuery($data)->pluck($filed)->toArray();
+    }
 }
 }