作者 lyh

gx

@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 2
3 namespace App\Console\Commands; 3 namespace App\Console\Commands;
4 4
  5 +use App\Helper\Arr;
5 use App\Helper\OaGlobalsoApi; 6 use App\Helper\OaGlobalsoApi;
6 use App\Http\Logic\Aside\Project\DeployBuildLogic; 7 use App\Http\Logic\Aside\Project\DeployBuildLogic;
7 use App\Http\Logic\Aside\Project\DeployOptimizeLogic; 8 use App\Http\Logic\Aside\Project\DeployOptimizeLogic;
@@ -232,9 +233,27 @@ class SyncProject extends Command @@ -232,9 +233,27 @@ class SyncProject extends Command
232 * @method :post 233 * @method :post
233 * @time :2023/8/30 15:53 234 * @time :2023/8/30 15:53
234 */ 235 */
235 - public function saveProject($project){ 236 + public function saveProject($param){
  237 + if(isset($param['level']) && !empty($param['level'])){
  238 + $param['level'] = Arr::arrToSet($param['level']);
  239 + }
  240 + if(isset($param['channel']) && !empty($param['channel'])){
  241 + $param['channel'] = Arr::a2s($param['channel']);
  242 + }
  243 + if(isset($param['notice_file']) && !empty($param['notice_file'])){
  244 + foreach ($param['notice_file'] as &$v1) {
  245 + $v1['url'] = basename($v1['url']);
  246 + }
  247 + $param['notice_file'] = Arr::a2s($param['notice_file']);
  248 + }
  249 + if(isset($param['confirm_file']) && !empty($param['confirm_file'])){
  250 + foreach ($param['confirm_file'] as &$v2) {
  251 + $v2['url'] = basename($v2['url']);
  252 + }
  253 + $param['confirm_file'] = Arr::a2s($param['confirm_file']);
  254 + }
236 $projectModel = new Project(); 255 $projectModel = new Project();
237 - return $projectModel->addReturnId($project); 256 + return $projectModel->addReturnId($param);
238 } 257 }
239 258
240 /** 259 /**
@@ -259,6 +278,15 @@ class SyncProject extends Command @@ -259,6 +278,15 @@ class SyncProject extends Command
259 protected function savePayment($param,$id){ 278 protected function savePayment($param,$id){
260 $param['project_id'] = $id; 279 $param['project_id'] = $id;
261 $paymentModel= new Payment(); 280 $paymentModel= new Payment();
  281 + if(isset($param['renewal_record']) && !empty($param['renewal_record'])){
  282 + $param['renewal_record'] = Arr::a2s($param['renewal_record']);
  283 + }
  284 + if(isset($param['contract']) && !empty($param['contract'])){
  285 + $param['contract'] = Arr::a2s($param['contract']);
  286 + }
  287 + if(isset($param['renewal_record']) && !empty($param['renewal_record'])){
  288 + $param['bill'] = Arr::a2s($param['bill']);
  289 + }
262 return $paymentModel->add($param); 290 return $paymentModel->add($param);
263 } 291 }
264 292
@@ -287,10 +315,11 @@ class SyncProject extends Command @@ -287,10 +315,11 @@ class SyncProject extends Command
287 */ 315 */
288 protected function saveDeployOptimize($param,$id){ 316 protected function saveDeployOptimize($param,$id){
289 $param['project_id'] = $id; 317 $param['project_id'] = $id;
290 - if(isset($param['domain']) && !empty($param['domain'])){  
291 - if (!preg_match('/http/', $param['domain'])) {  
292 - $param['domain'] = 'https://'.trim($param['domain'],'/').'/'; 318 + if(isset($param['minor_languages']) && !empty($param['minor_languages'])){
  319 + $param['minor_languages'] = Arr::a2s($param['minor_languages']);
293 } 320 }
  321 + if(isset($param['minor_keywords']) && !empty($param['minor_keywords'])){
  322 + $param['minor_keywords'] = Arr::a2s($param['minor_keywords']);
294 } 323 }
295 $deployOptimizeModel = new DeployOptimize(); 324 $deployOptimizeModel = new DeployOptimize();
296 return $deployOptimizeModel->add($param); 325 return $deployOptimizeModel->add($param);