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

赵彬吉
app/Console/Commands/DayCount/Count.php
app/Console/Commands/MonthlyCount/InquiryMonthlyCount.php
app/Console/Commands/UpdateProductCategory.php
app/Console/Commands/UpdateRoute.php
app/Helper/helper.php
app/Http/Controllers/Bside/News/NewsController.php
app/Http/Controllers/Bside/Product/CategoryController.php
app/Http/Controllers/Bside/Product/ProductController.php
app/Http/Logic/Aside/User/UserLogic.php
app/Http/Logic/Bside/Product/ProductLogic.php
app/Models/Product/Category.php
app/Models/RouteMap/RouteMap.php
--- a/app/Console/Commands/DayCount/Count.php
查看文件 @cffd0c9
+++ b/app/Console/Commands/DayCount/Count.php
查看文件 @cffd0c9
@@ -42,7 +42,7 @@ class Count extends Command
     public function handle()
     {
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)->where('gl_project.delete_status',0)
+            ->where('gl_project.type','!=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get();
--- a/app/Console/Commands/MonthlyCount/InquiryMonthlyCount.php
查看文件 @cffd0c9
+++ b/app/Console/Commands/MonthlyCount/InquiryMonthlyCount.php
查看文件 @cffd0c9
@@ -38,7 +38,7 @@ class InquiryMonthlyCount extends Command
      */
     public function handle(){
         $list = DB::table('gl_project')->where('gl_project.extend_type','=',0)
-            ->where('gl_project.type','!=',0)->where('gl_project.delete_status',0)
+            ->where('gl_project.type','!=',0)
             ->leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             ->leftJoin('gl_project_deploy_optimize', 'gl_project.id', '=', 'gl_project_deploy_optimize.project_id')
             ->select($this->selectParam())->get()->toArray();
--- a/app/Console/Commands/UpdateProductCategory.php
查看文件 @cffd0c9
+++ b/app/Console/Commands/UpdateProductCategory.php
查看文件 @cffd0c9
@@ -50,7 +50,7 @@ class UpdateProductCategory extends Command
     public function handle(){
         //获取所有项目
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[218]]],'id',['id']);
+        $list = $projectModel->list(['id'=>['in',[475]]],'id',['id']);
         echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
         try {
             foreach ($list as $v) {
--- a/app/Console/Commands/UpdateRoute.php
查看文件 @cffd0c9
+++ b/app/Console/Commands/UpdateRoute.php
查看文件 @cffd0c9
@@ -60,14 +60,7 @@ class UpdateRoute extends Command
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-//            $this->delProductKeyword();
-//            $this->checkProduct($data,$v['id']);
-//            $this->getProduct();
             $this->setProductKeyword();
-//            $this->getRouteMap();
-//            $this->getProductCategory();
-//            $this->delRouteMap();
-//            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -114,19 +107,19 @@ class UpdateRoute extends Command
         if(!empty($lists)){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
-//                    $tag = "-tag";
-//                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
-//                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
-////                        $route = Translate::tran($v['route'], 'en').$tag;
-//                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-//                        $route = trim($v['route'],'-tag');
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }else{
-//                        $route = Translate::tran($v['title'], 'en').$tag;
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }
+                    $tag = "-tag";
+                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
+                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
+//                        $route = Translate::tran($v['route'], 'en').$tag;
+                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
+                        $route = trim($v['route'],'-tag');
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }else{
+                        $route = Translate::tran($v['title'], 'en').$tag;
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     $route = Translate::tran($v['title'], 'en');
--- a/app/Helper/helper.php
查看文件 @cffd0c9
+++ b/app/Helper/helper.php
查看文件 @cffd0c9
@@ -100,12 +100,17 @@ if (!function_exists('http_get')) {
         curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch1, CURLOPT_ENCODING, '');
         curl_setopt($ch1, CURLOPT_MAXREDIRS, 10);
+        curl_setopt($ch1, CURLOPT_TIMEOUT, 120);
         curl_setopt($ch1, CURLOPT_HTTPHEADER, $header);
         curl_setopt($ch1, CURLOPT_CONNECTTIMEOUT, $timeout);
         curl_setopt($ch1, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($ch1, CURLOPT_CUSTOMREQUEST, 'GET');
         curl_setopt($ch1, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
         $access_txt = curl_exec($ch1);
+        if (curl_errno($ch1)) {
+            $error_message = curl_error($ch1);
+            @file_put_contents(storage_path('logs/lyh_error.log'), var_export($error_message, true) . PHP_EOL, FILE_APPEND);
+        }
         curl_close($ch1);
         return json_decode($access_txt, true);
     }
--- a/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @cffd0c9
+++ b/app/Http/Controllers/Bside/News/NewsController.php
查看文件 @cffd0c9
@@ -313,7 +313,7 @@ class NewsController extends BaseController
         ],[
             'keyword.required' => 'keyword不能为空',
         ]);
-        $data = http_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword']);
+        $data = http_get('http://gnews.globalso.com/gnews_news.php?keyword='.$this->param['keyword'],['charset=utf-8']);
         $this->response('success',Code::SUCCESS,$data);
     }
 }
--- a/app/Http/Controllers/Bside/Product/CategoryController.php
查看文件 @cffd0c9
+++ b/app/Http/Controllers/Bside/Product/CategoryController.php
查看文件 @cffd0c9
@@ -40,7 +40,7 @@ class CategoryController extends BaseController
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
             foreach ($list as $k =>$v){
                 $v['url'] = $this->user['domain'] . $v['route'].'/';
-                $v['product_num'] = Category::getProductNum($v['id']);
+                $v['product_num'] = $category->getProductNum($v['id']);
                 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
                 $list[$k] = $v;
--- a/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @cffd0c9
+++ b/app/Http/Controllers/Bside/Product/ProductController.php
查看文件 @cffd0c9
@@ -111,14 +111,10 @@ class ProductController extends BaseController
     public function searchParam(&$query){
         $query = $query->where('project_id',$this->user['project_id']);
         if (isset($this->map['category_id']) && !empty($this->map['category_id'])) {
-            $str = [];
             $str[] = $this->map['category_id'];
-            $this->getAllSub($this->map['category_id'],$str);
-            $query->where(function ($subQuery) use ($str) {
-                foreach ($str as $v) {
-                    $subQuery->orWhereRaw("FIND_IN_SET(?, category_id) > 0", [$v]);
-                }
-            });
+            $str = $this->getAllSub($this->map['category_id'],$str);
+            $productArr = CategoryRelated::whereIn('cate_id',$str)->pluck('product_id')->toArray();
+            $query->whereIn('id',$productArr);
         }
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $query = $query->where('title','like','%'.$this->map['title'].'%');
--- a/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @cffd0c9
+++ b/app/Http/Logic/Aside/User/UserLogic.php
查看文件 @cffd0c9
@@ -55,9 +55,9 @@ class UserLogic extends BaseLogic
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
         } else {
-            $mobileModel = new Mobile();
-            //查看当前手机号码是否存在于手机号码库
-            $mobileInfo = $mobileModel->read(['mobile'=>$this->param['mobile']]);
+//            $mobileModel = new Mobile();
+//            //查看当前手机号码是否存在于手机号码库
+//            $mobileInfo = $mobileModel->read(['mobile'=>$this->param['mobile']]);
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $rs = $this->model->add($this->param);
         }
--- a/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @cffd0c9
+++ b/app/Http/Logic/Bside/Product/ProductLogic.php
查看文件 @cffd0c9
@@ -46,7 +46,7 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id'],$this->param['six_read'] ?? 1);
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];
--- a/app/Models/Product/Category.php
查看文件 @cffd0c9
+++ b/app/Models/Product/Category.php
查看文件 @cffd0c9
@@ -41,7 +41,23 @@ class Category extends Base
         return $ids;
     }
-
+    /**
+     * @remark :获取当前id下所有子集
+     * @name   :getAllSub
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/18 15:10
+     */
+    public function getAllSub($id,&$str = []){
+        $list = $this->list(['pid'=>$id,'status'=>1],['id','pid']);
+        if(!empty($list)){
+            foreach ($list as $v){
+                $str[] = $v['id'];
+                $this->getAllSub($v['id'],$str);
+            }
+        }
+        return $str;
+    }
     /**
      * 关联产品数量
@@ -50,10 +66,11 @@ class Category extends Base
      * @author zbj
      * @date 2023/4/28
      */
-    public static function getProductNum($cate_id){
-        $cate_ids = self::getChildIdsArr($cate_id);
-        $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();
-//        $str = 0;
+    public function getProductNum($cate_id){
+        $str[] = $cate_id;
+        $cate_ids = $this->getAllSub($cate_id,$str);
+        $productArr = CategoryRelated::whereIn('cate_id',$cate_ids)->pluck('product_id')->unique()->toArray();
+        $count  = count($productArr);
         return $count;
     }
 }
--- a/app/Models/RouteMap/RouteMap.php
查看文件 @cffd0c9
+++ b/app/Models/RouteMap/RouteMap.php
查看文件 @cffd0c9
@@ -111,7 +111,10 @@ class RouteMap extends Base
      * @author zbj
      * @date 2023/4/17
      */
-    public static function setRoute($title, $source, $source_id, $project_id = 0){
+    public static function setRoute($title, $source, $source_id, $project_id = 0,$is_upgrade = 0){
+        if($is_upgrade != 0){//5.0数据编辑路由时，直接返回路由
+            return $title;
+        }
         $route = self::generateRoute($title, $source, $source_id, $project_id);
         if(!$route){
             throw new \Exception('路由生成失败');