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

@@ -273,7 +273,7 @@ class VideoTask extends Command
                 if (strpos(','.$keyword_id.',', ','.$productKeyword->id.',') === false) {
                     //不包含
                     $productModel = new Product();
-                    $keyword_id = $keyword_id . $productKeyword->id.',';
+                    $keyword_id = ','.$keyword_id.',' . $productKeyword->id.',';
                     $productModel->edit(['keyword_id'=>$keyword_id],['id'=>$item->id]);
                 }
                 $data[] = ['url'=>getImageUrl($item->thumb['url']),'title'=>$item->title];

@@ -13,9 +13,12 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Models\HomeCount\Count;
 use App\Models\HomeCount\MonthCount;
+use App\Models\Inquiry\InquiryIP;
+use App\Models\Inquiry\InquirySet;
 use App\Models\News\News;
 use App\Models\Product\Category;
 use App\Models\Product\Product;
+use App\Models\Visit\Visit;
 use Carbon\Carbon;
 
 class MonthReportController extends BaseController
@@ -82,6 +85,9 @@ class MonthReportController extends BaseController
         $info['news_num_last_7'] = $newsModel->formatQuery(
             ['status'=>0,'created_at'=>['between',[now()->subDays(7)->startOfDay()->toDateString(),now()->startOfDay()->toDateString()]]
             ])->count();
+        $info['service_duration'] = $this->user['service_duration'];//服务天数
+        $info['ip_total'] = (new Visit())->count();//ip总数
+        $info['remain_day'] = $this->user['remain_day'];//剩余服务天数
         $info['speed'] = round((0.3 + mt_rand()/mt_getrandmax() * (1-0.3)),2);
         $this->response('success',Code::SUCCESS,$info);
     }

@@ -41,6 +41,9 @@ class BaseController extends Controller
             $this->uid = $info['id'];
             //参数处理
             $this->getParam();
+            if(!empty($this->user)){
+                $this->project = Cache::get('user-'.$this->user['project_id']);
+            }
             //日志记录
             $this->set_user_log();
         }

@@ -173,6 +173,8 @@ class UserLoginLogic
         $info['is_update_language'] = $project['is_update_language'];
         $info['configuration'] = $project['deploy_build']['configuration'];
         $info['project_type'] = $project['type'];
+        $info['service_duration'] = $project['deploy_build']['service_duration'];
+        $info['remain_day'] = $project['remain_day'];
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }
@@ -272,6 +274,8 @@ class UserLoginLogic
         $info['project_type'] = $project['type'];
         $info['storage_type'] = $project['storage_type'];
         $info['project_location'] = $project['project_location'];
+        $info['service_duration'] = $project['deploy_build']['service_duration'] ?? 0;
+        $info['remain_day'] = $project['remain_day'] ?? 0;
         if($info['is_customized'] == 1){
             $info['is_visualization'] = json_decode($project['is_visualization']);
         }