Merge remote-tracking branch 'origin/master' into akun

@@ -127,7 +127,7 @@ class RemainDay extends Command
                     //按自然日统计
                     //按自然日统计
                     $diff = time() - strtotime($item['uptime']);
                     $diff = time() - strtotime($item['uptime']);
                     $compliance_day = floor($diff / (60 * 60 * 24));
                     $compliance_day = floor($diff / (60 * 60 * 24));
-                    $seo_remain_day = $deploy_build['service_duration'] - $compliance_day;
+                    $seo_remain_day = $deploy_build['seo_service_duration'] - $compliance_day;
                 }
                 }
                 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中
                 if($deploy_build['plan'] == 0 && $seo_remain_day < 0 && $deploy_build['seo_service_duration'] != 0){//只有白帽版本的项目且剩余服务时常为0，放入未续费中
 //                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);
 //                    $this->project->edit(['seo_remain_day'=>$seo_remain_day,'finish_remain_day'=>$compliance_day ?? 0,'extend_type'=>Project::TYPE_FIVE],['id'=>$item['id']]);

@@ -61,11 +61,11 @@ class ComController extends BaseController
         $data = [];
         $data = [];
         $is_ai_blog = $this->getIsAiBlog();
         $is_ai_blog = $this->getIsAiBlog();
         if($is_ai_blog != 1){
         if($is_ai_blog != 1){
-            $data[] = 57;
+            $data[] = 6;
         }
         }
         $is_ai_video = $this->getIsAiVideo();
         $is_ai_video = $this->getIsAiVideo();
         if($is_ai_video != 1){
         if($is_ai_video != 1){
-            $data[] = 74;
+            $data[] = 27;
         }
         }
         if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){
         if($this->user['login_source'] == User::LOGIN_PASSWORD_SOURCE){
             $data[] = 19;
             $data[] = 19;

@@ -287,7 +287,6 @@ class InquiryController extends BaseController
             throw new \Exception('文件生成失败，请重试');
             throw new \Exception('文件生成失败，请重试');
         }
         }
         $fileurl = Storage::disk('runtime')->url($file);
         $fileurl = Storage::disk('runtime')->url($file);
-//        return Storage::disk('runtime')->download($file); //直接下载
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
         $this->response('success',Code::SUCCESS,['url' => $fileurl]);
     }
     }
 
 

@@ -51,7 +51,7 @@ class AuthorityScoreLogic extends BaseLogic
         //当月ai_blog发布数量及链接
         //当月ai_blog发布数量及链接
         $aiBlogModel = new AiBlog();
         $aiBlogModel = new AiBlog();
         $data['ai_blog']['count'] = $aiBlogModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
         $data['ai_blog']['count'] = $aiBlogModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
-        $aiRouteArr = $aiBlogModel->selectField(['created_at'=>['between',[$startTime,$endTime]]],'route');
+        $aiRouteArr = $aiBlogModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         if(!empty($aiRouteArr)){
         if(!empty($aiRouteArr)){
             foreach ($aiRouteArr as $k => $item){
             foreach ($aiRouteArr as $k => $item){
                 $aiRouteArr[$k] = $this->user['domain'] . 'blog/' . $item;
                 $aiRouteArr[$k] = $this->user['domain'] . 'blog/' . $item;
@@ -61,7 +61,7 @@ class AuthorityScoreLogic extends BaseLogic
         //当月ai_video发布数量及链接
         //当月ai_video发布数量及链接
         $aiVideoModel = new AiVideo();
         $aiVideoModel = new AiVideo();
         $data['ai_video']['count'] =$aiVideoModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
         $data['ai_video']['count'] =$aiVideoModel->counts(['created_at'=>['between',[$startTime,$endTime]]]);
-        $aiVideoRouteArr = $aiVideoModel->selectField(['created_at'=>['between',[$startTime,$endTime]]],'route');
+        $aiVideoRouteArr = $aiVideoModel->selectField(['created_at'=>['between',[$startTime,$endTime]],'route'=>['!=',null]],'route');
         if(!empty($aiVideoRouteArr)){
         if(!empty($aiVideoRouteArr)){
             foreach ($aiVideoRouteArr as $kVideo => $itemVideo){
             foreach ($aiVideoRouteArr as $kVideo => $itemVideo){
                 $aiVideoRouteArr[$kVideo] = $this->user['domain'] . 'video/' . $itemVideo;
                 $aiVideoRouteArr[$kVideo] = $this->user['domain'] . 'video/' . $itemVideo;

@@ -116,7 +116,7 @@ class BTemplateLogic extends BaseLogic
         $bTemplateComModel = new BTemplateCom();
         $bTemplateComModel = new BTemplateCom();
         $otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
         $otherInfo = $bTemplateComModel->read(['source'=>$headComInfo['source'],'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
         if($otherInfo === false){
         if($otherInfo === false){
-            $this->fail('获取失败，请联系管理员222');
+            $otherInfo = $bTemplateComModel->read(['source'=>99,'common_type'=>BTemplate::COMMON_OTHER,'is_list'=>$headComInfo['is_list'],'is_custom'=>$headComInfo['is_custom'],'template_id'=>$template_id]);
         }
         }
         $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id);
         $footerComInfo = $this->getFooterComHtml($condition,$source,$is_list,$is_custom,$template_id);
         $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',
         $data = ['head_html'=>$headComInfo['html'] ?? '', 'head_style'=>$headComInfo['html_style'] ?? '', 'other'=>$otherInfo['html'] ?? '',

@@ -151,6 +151,7 @@ class CategoryLogic extends  BaseLogic
         }else{
         }else{
             $param['describe_image'] = json_encode([]);
             $param['describe_image'] = json_encode([]);
         }
         }
+        $this->param['image'] = $this->param['image'] ?? '';
         if(isset($param['cate_tak']) && !empty($param['cate_tak'])){
         if(isset($param['cate_tak']) && !empty($param['cate_tak'])){
             $param['cate_tak'] = json_encode($param['cate_tak']);
             $param['cate_tak'] = json_encode($param['cate_tak']);
         }else{
         }else{

@@ -80,7 +80,7 @@ class RouteMap extends Base
             if($source == self::SOURCE_PRODUCT){
             if($source == self::SOURCE_PRODUCT){
                 $suffix = '-product';
                 $suffix = '-product';
             }
             }
-            $route_len = 65;
+//            $route_len = 65;
         }
         }
         $length = strlen($sign);
         $length = strlen($sign);
         if($length > $route_len){
         if($length > $route_len){