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

@@ -166,7 +166,7 @@ class VideoTask extends Command
                     'images' => $valData['images'],
                     'images' => $valData['images'],
                     'logo'=> $valData['logo_bg']['logo'] ?? '',
                     'logo'=> $valData['logo_bg']['logo'] ?? '',
                     'bg'=> $valData['logo_bg']['bg'] ?? '',
                     'bg'=> $valData['logo_bg']['bg'] ?? '',
-                    'template_id'=> ((array)$valData['template_data'])['template_id'],
+                    'template_id'=> ((array)$valData['template_data'])['template_id'] ?? '',
                 ],
                 ],
                 'task_id' => $task_id,
                 'task_id' => $task_id,
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',
                 'callback_url' => env('APP_URL') . '/api/video_task_callback',

@@ -209,14 +209,15 @@ class KeywordVideoController extends BaseController
      */
      */
     public function get_template(){
     public function get_template(){
         $data = Cache::get('template_data');
         $data = Cache::get('template_data');
+        $data = null;
         if(empty($data)){
         if(empty($data)){
             $url = 'http://216.250.255.116:7866/get_template';
             $url = 'http://216.250.255.116:7866/get_template';
             $header = [
             $header = [
                 'accept: application/json'
                 'accept: application/json'
             ];
             ];
             $data = http_get($url,$header);
             $data = http_get($url,$header);
-            if(!empty($data)){
-                Cache::put('template_data',$data,12 * 3600);
+            if(!empty($data['data'])){
+                Cache::put('template_data',$data['data'],12 * 3600);
             }
             }
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);

@@ -26,6 +26,7 @@ use App\Models\Manage\Manage;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\Payment;
 use App\Models\Project\Payment;
+use App\Models\Project\ProcessRecords;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\ProjectUpdateTdk;
 use App\Models\Project\RenewLog;
 use App\Models\Project\RenewLog;
@@ -356,6 +357,14 @@ class ProjectController extends BaseController
         if($item['type'] != Project::TYPE_ZERO){
         if($item['type'] != Project::TYPE_ZERO){
             $data = APublicModel::getNumByProjectId($item['id']);
             $data = APublicModel::getNumByProjectId($item['id']);
         }
         }
+        if($item['type'] == Project::TYPE_ONE){//建站中
+            $processModel = new ProcessRecords();
+            $item['sign_project'] = 0;
+            $proInfo = $processModel->read(['project_id'=>$item['id'],'updated_at'=>['>=',time() - 3 * 12 * 3600]],['id']);
+            if($proInfo === false){
+                $item['sign_project'] = 1;
+            }
+        }
         $manageModel = new ManageHr();
         $manageModel = new ManageHr();
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['channel'] = Channel::getChannelText($item['channel']['user_id'] ?? 0);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);
         $item['build_leader'] = $manageModel->getName($item['leader_mid']);

@@ -3,6 +3,7 @@
 namespace App\Http\Logic\Bside\News;
 namespace App\Http\Logic\Bside\News;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
+use App\Helper\Arr;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\News\NewsCategory;
 use App\Models\News\NewsCategory;
@@ -185,9 +186,7 @@ class NewsLogic extends BaseLogic
         if(isset($param['image'])){
         if(isset($param['image'])){
             $param['image'] = str_replace_url($param['image'] ?? '');
             $param['image'] = str_replace_url($param['image'] ?? '');
         }
         }
-        if(isset($param['related_news_id'])){
-            $param['related_news_id'] = implode(',',$param['related_news_id']);
-        }
+
         if(isset($this->param['id'])){
         if(isset($this->param['id'])){
             $param['operator_id'] = $this->user['id'];
             $param['operator_id'] = $this->user['id'];
         }else{
         }else{
@@ -204,6 +203,9 @@ class NewsLogic extends BaseLogic
                 $this->fail('发布时间需大于当天');
                 $this->fail('发布时间需大于当天');
             }
             }
         }
         }
+        if(isset($param['related_news_id'])){
+            $param['related_news_id'] = implode(',',$param['related_news_id']);
+        }
         return $this->success($param);
         return $this->success($param);
     }
     }