作者 lyh

gx

@@ -79,9 +79,9 @@ class SyncSubmitTaskDistribution extends Command @@ -79,9 +79,9 @@ class SyncSubmitTaskDistribution extends Command
79 foreach ($list as $task) { 79 foreach ($list as $task) {
80 $data[] = [ 80 $data[] = [
81 'type' => $task->type, 81 'type' => $task->type,
82 - 'data' => json_encode($task->data),  
83 - 'created_at' => $task['created_at'],  
84 - 'updated_at' => $task['updated_at'], 82 + 'data' => $task->data,
  83 + 'created_at' => $task->created_at,
  84 + 'updated_at' => $task->updated_at,
85 ]; 85 ];
86 } 86 }
87 $data && SyncSubmitTaskModel::insert($data); 87 $data && SyncSubmitTaskModel::insert($data);
@@ -24,7 +24,6 @@ use App\Models\Product\Keyword; @@ -24,7 +24,6 @@ use App\Models\Product\Keyword;
24 use App\Models\Product\Product; 24 use App\Models\Product\Product;
25 use App\Models\Project\DeployOptimize; 25 use App\Models\Project\DeployOptimize;
26 use App\Models\Project\MinorLanguages; 26 use App\Models\Project\MinorLanguages;
27 -use App\Models\Project\PageSetting;  
28 use App\Models\Project\Project; 27 use App\Models\Project\Project;
29 use App\Models\Purchaser\PurchaserInfo; 28 use App\Models\Purchaser\PurchaserInfo;
30 use App\Models\RouteMap\RouteMap; 29 use App\Models\RouteMap\RouteMap;
@@ -53,103 +52,7 @@ class Demo extends Command @@ -53,103 +52,7 @@ class Demo extends Command
53 protected $description = 'demo'; 52 protected $description = 'demo';
54 53
55 public function handle(){ 54 public function handle(){
56 - $pageSettingModel = new PageSetting();  
57 - $pageList = $pageSettingModel->list();  
58 - foreach ($pageList as $v){  
59 - ProjectServer::useProject($v['project_id']);  
60 - if($v['product_list'] == 1){  
61 - $param = [  
62 - 'name'=>'产品列表',  
63 - 'source'=>2,  
64 - 'is_list'=>1,  
65 - 'is_custom'=>0,  
66 - 'header_status'=>1,  
67 - 'footer_status'=>1,  
68 - 'created_at'=>date('Y-m-d H:i:s'),  
69 - 'updated_at'=>date('Y-m-d H:i:s'),  
70 - ];  
71 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
72 - }  
73 - if($v['product_details'] == 1){  
74 - $param = [  
75 - 'name'=>'产品详情',  
76 - 'source'=>2,  
77 - 'is_list'=>0,  
78 - 'is_custom'=>0,  
79 - 'header_status'=>1,  
80 - 'footer_status'=>1,  
81 - 'created_at'=>date('Y-m-d H:i:s'),  
82 - 'updated_at'=>date('Y-m-d H:i:s'),  
83 - ];  
84 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
85 - }  
86 - if($v['page_list'] == 1){  
87 - $param = [  
88 - 'name'=>'单页面',  
89 - 'source'=>9,  
90 - 'is_list'=>0,  
91 - 'is_custom'=>0,  
92 - 'header_status'=>1,  
93 - 'footer_status'=>1,  
94 - 'created_at'=>date('Y-m-d H:i:s'),  
95 - 'updated_at'=>date('Y-m-d H:i:s'),  
96 - ];  
97 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
98 - }  
99 - if($v['blog_list'] == 1){  
100 - $param = [  
101 - 'name'=>'博客列表',  
102 - 'source'=>3,  
103 - 'is_list'=>1,  
104 - 'is_custom'=>0,  
105 - 'header_status'=>1,  
106 - 'footer_status'=>1,  
107 - 'created_at'=>date('Y-m-d H:i:s'),  
108 - 'updated_at'=>date('Y-m-d H:i:s'),  
109 - ];  
110 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
111 - }  
112 - if($v['blog_details'] == 1){  
113 - $param = [  
114 - 'name'=>'博客详情',  
115 - 'source'=>3,  
116 - 'is_list'=>0,  
117 - 'is_custom'=>0,  
118 - 'header_status'=>1,  
119 - 'footer_status'=>1,  
120 - 'created_at'=>date('Y-m-d H:i:s'),  
121 - 'updated_at'=>date('Y-m-d H:i:s'),  
122 - ];  
123 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
124 - }  
125 - if($v['news_list'] == 1){  
126 - $param = [  
127 - 'name'=>'新闻列表',  
128 - 'source'=>4,  
129 - 'is_list'=>1,  
130 - 'is_custom'=>0,  
131 - 'header_status'=>1,  
132 - 'footer_status'=>1,  
133 - 'created_at'=>date('Y-m-d H:i:s'),  
134 - 'updated_at'=>date('Y-m-d H:i:s'),  
135 - ];  
136 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
137 - }  
138 - if($v['news_details'] == 1){  
139 - $param = [  
140 - 'name'=>'新闻详情',  
141 - 'source'=>4,  
142 - 'is_list'=>0,  
143 - 'is_custom'=>0,  
144 - 'header_status'=>1,  
145 - 'footer_status'=>1,  
146 - 'created_at'=>date('Y-m-d H:i:s'),  
147 - 'updated_at'=>date('Y-m-d H:i:s'),  
148 - ];  
149 - DB::connection('custom_mysql')->table('gl_project_com_config')->insert($param);  
150 - }  
151 - DB::disconnect('custom_mysql');  
152 - } 55 +
153 } 56 }
154 57
155 public function synchronizationFile($path_name){ 58 public function synchronizationFile($path_name){
@@ -188,6 +188,7 @@ class UserLoginLogic @@ -188,6 +188,7 @@ class UserLoginLogic
188 $info['is_visualization'] = json_decode($project['is_visualization']); 188 $info['is_visualization'] = json_decode($project['is_visualization']);
189 } 189 }
190 $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority']; 190 $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
  191 + $info['is_inquiry_country'] = $project['is_inquiry_country'];
191 //是否开通AMP 192 //是否开通AMP
192 $is_amp = 0; 193 $is_amp = 0;
193 if(!empty($project['deploy_optimize']['domain'])){ 194 if(!empty($project['deploy_optimize']['domain'])){
@@ -293,6 +294,7 @@ class UserLoginLogic @@ -293,6 +294,7 @@ class UserLoginLogic
293 $info['is_visualization'] = json_decode($project['is_visualization']); 294 $info['is_visualization'] = json_decode($project['is_visualization']);
294 } 295 }
295 $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority']; 296 $info['is_visualization_authority'] = $project['deploy_build']['is_visualization_authority'];
  297 + $info['is_inquiry_country'] = $project['is_inquiry_country'];
296 //是否开通AMP 298 //是否开通AMP
297 $is_amp = 0; 299 $is_amp = 0;
298 if(!empty($project['deploy_optimize']['domain'])){ 300 if(!empty($project['deploy_optimize']['domain'])){