合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !1894

@@ -99,6 +99,9 @@ class RemainDay extends Command
             }
             }
             //白帽版本的系统
             //白帽版本的系统
             if($deploy_build['seo_plan'] == 1){
             if($deploy_build['seo_plan'] == 1){
+                if($deploy_build['seo_service_duration'] == 0){
+                    continue;
+                }
                 if($item['uptime']){
                 if($item['uptime']){
                     $diff = time() - strtotime($item['uptime']);
                     $diff = time() - strtotime($item['uptime']);
                     $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
                     $seo_remain_day = $deploy_build['seo_service_duration'] - floor($diff / (60 * 60 * 24));
@@ -115,6 +118,10 @@ class RemainDay extends Command
                 //同时包括白帽版本+默认版本的项目
                 //同时包括白帽版本+默认版本的项目
                 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
                 $this->project->edit(['seo_remain_day'=>$seo_remain_day],['id'=>$item['id']]);
             }
             }
+            if($deploy_build['service_duration'] == 0){
+                //服务时长为0自动跳过
+                continue;
+            }
             //默认版本计算剩余服务时常
             //默认版本计算剩余服务时常
             if($item['type'] == Project::TYPE_TWO || $item['type'] == Project::TYPE_FOUR){
             if($item['type'] == Project::TYPE_TWO || $item['type'] == Project::TYPE_FOUR){
                 if(in_array($item['id'],$this->projectId)){//已开始优化的时间结算
                 if(in_array($item['id'],$this->projectId)){//已开始优化的时间结算

@@ -13,6 +13,8 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
 use App\Http\Logic\Bside\Setting\TranslateLogic;
 use App\Models\Blog\Blog;
 use App\Models\Blog\Blog;
+use App\Models\CustomModule\CustomModule;
+use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
@@ -279,7 +281,19 @@ class TranslateController extends BaseController
                 case RouteMap::SOURCE_MODULE_CATE:
                 case RouteMap::SOURCE_MODULE_CATE:
                     $customModel = new CustomModuleContent();
                     $customModel = new CustomModuleContent();
                     $count = $customModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
                     $count = $customModel->formatQuery(['category_id'=>['like','%,'.$v['source_id'].',%']])->count();
-                    $this->pageSixList($data,$count,$v,3,10);
+                    //获取module_id
+                    $customCateModel = new CustomModuleCategory();
+                    $cateInfo = $customCateModel->read(['route'=>$v['route']],['module_id']);
+                    if($cateInfo !== false){
+                        $model = new CustomModule();
+                        $moduleInfo = $model->read(['id'=>$cateInfo['module_id']],['route']);
+                        if($moduleInfo !== false){
+                            if($v['route'] != $moduleInfo['route']){
+                                $v['route'] = $moduleInfo['route'].'/'.$v['route'];
+                            }
+                        }
+                    }
+                    $this->pageList($data,$count,$v,3,10);
                     break;
                     break;
                 default:
                 default:
                     $data[] = $v['route'];
                     $data[] = $v['route'];
@@ -393,7 +407,7 @@ class TranslateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :
+     * @remark :5.0列表页路由处理
      * @name   :pageList
      * @name   :pageList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
@@ -412,6 +426,15 @@ class TranslateController extends BaseController
             }
             }
             $page = ceil($count / $pageNum);//向上取整
             $page = ceil($count / $pageNum);//向上取整
         }
         }
+        if($v['source'] == RouteMap::SOURCE_NEWS_CATE){
+            if($v['route'] != 'news'){
+                $v['route'] = RouteMap::PATH_NEWS_CATE.'/'.$v['route'];
+            }
+        }elseif($v['source'] == RouteMap::SOURCE_BLOG_CATE){
+            if($v['route'] != 'blog'){
+                $v['route'] = RouteMap::PATH_BLOG_CATE.'/'.$v['route'];
+            }
+        }
         for ($i = 1;$i <= $page;$i++){
         for ($i = 1;$i <= $page;$i++){
             if($i == 1){
             if($i == 1){
                 $data[] = $v['route'];
                 $data[] = $v['route'];
@@ -423,7 +446,7 @@ class TranslateController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :
+     * @remark :6.0列表路由处理
      * @name   :pageList
      * @name   :pageList
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post