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

Your Name
app/Console/Commands/KeywordInVideo/VideoTask.php
app/Http/Controllers/Bside/BCom/MonthReportController.php
app/Http/Controllers/Bside/BaseController.php
app/Http/Logic/Aside/Project/ProjectLogic.php
app/Http/Logic/Bside/User/UserLoginLogic.php
app/Jobs/CopyProjectJob.php
--- a/app/Console/Commands/KeywordInVideo/VideoTask.php
查看文件 @67e6cfd
+++ b/app/Console/Commands/KeywordInVideo/VideoTask.php
查看文件 @67e6cfd
@@ -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];
--- a/app/Http/Controllers/Bside/BCom/MonthReportController.php
查看文件 @67e6cfd
+++ b/app/Http/Controllers/Bside/BCom/MonthReportController.php
查看文件 @67e6cfd
@@ -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);
     }
--- a/app/Http/Controllers/Bside/BaseController.php
查看文件 @67e6cfd
+++ b/app/Http/Controllers/Bside/BaseController.php
查看文件 @67e6cfd
@@ -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();
         }
--- a/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @67e6cfd
+++ b/app/Http/Logic/Aside/Project/ProjectLogic.php
查看文件 @67e6cfd
@@ -158,7 +158,6 @@ class ProjectLogic extends BaseLogic
                 $this->saveProjectAfter($this->param['project_after']);
                 $this->saveMinorLanguages($this->param['minor_language'] ?? []);
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
-                //创建站点
                 (new SyncService())->projectAcceptAddress($this->param['id']);
             }
             DB::commit();
--- a/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @67e6cfd
+++ b/app/Http/Logic/Bside/User/UserLoginLogic.php
查看文件 @67e6cfd
@@ -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']);
         }
--- a/app/Jobs/CopyProjectJob.php
查看文件 @67e6cfd
+++ b/app/Jobs/CopyProjectJob.php
查看文件 @67e6cfd
@@ -58,6 +58,7 @@ class CopyProjectJob implements ShouldQueue
             $type = $data['type'];
             $data['type'] = 0;
             $data['status'] = 0;
+            $data['finish_remain_day'] = 0;
             $data['title'] = $data['title'].'-copy';
             unset($data['id']);
             $project_id = $projectModel->insertGetId($data);
@@ -82,6 +83,8 @@ class CopyProjectJob implements ShouldQueue
                 $optimizeData = $optimizeData->getAttributes();
                 unset($optimizeData['id'],$optimizeData['domain']);
                 $optimizeData['project_id'] = $project_id;
+                $optimizeData['api_no'] = 0;
+                $optimizeData['minor_languages'] = json_encode([]);
                 $optimizeModel->insert($optimizeData);
             }
             //复制付费表
@@ -160,6 +163,9 @@ class CopyProjectJob implements ShouldQueue
                 $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
                 DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             }
+            if($table == 'gl_customer_visit' ||  $table == 'gl_customer_visit_item' || $table == 'gl_inquiry_other' || $table == 'gl_inquiry_form_data' || $table == 'gl_inquiry_form'){
+                continue;
+            }
 //            DB::connection('custom_mysql')->table($table)->truncate(); // 清空目标表数据
             DB::connection('custom_mysql')->table($table)->insertUsing(
                 [], // 列名数组，留空表示插入所有列