作者 lyh

gx

@@ -60,7 +60,6 @@ class SyncProject extends Command @@ -60,7 +60,6 @@ class SyncProject extends Command
60 try { 60 try {
61 $api = new OaGlobalsoApi(); 61 $api = new OaGlobalsoApi();
62 $data = $api->order_info($item['data']['order_id']); 62 $data = $api->order_info($item['data']['order_id']);
63 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data['data'], true) . PHP_EOL, FILE_APPEND);  
64 if(!$data || empty($data['data'])){ 63 if(!$data || empty($data['data'])){
65 LogUtils::error('OaGlobalsoApi order_info error', $data); 64 LogUtils::error('OaGlobalsoApi order_info error', $data);
66 $this->retry($item); 65 $this->retry($item);
@@ -188,20 +187,12 @@ class SyncProject extends Command @@ -188,20 +187,12 @@ class SyncProject extends Command
188 } 187 }
189 DB::beginTransaction(); 188 DB::beginTransaction();
190 try { 189 try {
191 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(1111, true) . PHP_EOL, FILE_APPEND);  
192 $id = $this->saveProject($data['project']); 190 $id = $this->saveProject($data['project']);
193 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($id, true) . PHP_EOL, FILE_APPEND);  
194 - $this->setPostId($data['deploy_build']['plan'],$id);  
195 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(222, true) . PHP_EOL, FILE_APPEND);  
196 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data['payment'], true) . PHP_EOL, FILE_APPEND); 191 + $this->setPostId($data['deploy_build']['plan'],$id);;
197 $this->savePayment($data['payment'],$id); 192 $this->savePayment($data['payment'],$id);
198 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(444, true) . PHP_EOL, FILE_APPEND);  
199 $this->saveDeployBuild($data['deploy_build'],$id); 193 $this->saveDeployBuild($data['deploy_build'],$id);
200 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(555, true) . PHP_EOL, FILE_APPEND);  
201 $this->saveDeployOptimize($data['deploy_optimize'],$id); 194 $this->saveDeployOptimize($data['deploy_optimize'],$id);
202 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(666, true) . PHP_EOL, FILE_APPEND);  
203 $this->saveAfter($data['project_after'],$id); 195 $this->saveAfter($data['project_after'],$id);
204 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export(777, true) . PHP_EOL, FILE_APPEND);  
205 DB::commit(); 196 DB::commit();
206 }catch (\Exception $e){ 197 }catch (\Exception $e){
207 DB::rollBack(); 198 DB::rollBack();
@@ -435,7 +435,7 @@ if (!function_exists('getImageUrl')) { @@ -435,7 +435,7 @@ if (!function_exists('getImageUrl')) {
435 if($info['is_cos'] == 1){ 435 if($info['is_cos'] == 1){
436 $cos = config('filesystems.disks.cos'); 436 $cos = config('filesystems.disks.cos');
437 $cosCdn = $cos['cdn']; 437 $cosCdn = $cos['cdn'];
438 - $url = $cosCdn.$info['path']; 438 + $url = $cosCdn.'/upload'.$info['path'];
439 }else{ 439 }else{
440 $url = url('upload'.$info['path']); 440 $url = url('upload'.$info['path']);
441 } 441 }
@@ -470,7 +470,7 @@ if (!function_exists('getFileUrl')) { @@ -470,7 +470,7 @@ if (!function_exists('getFileUrl')) {
470 if($info['is_cos'] == 1){ 470 if($info['is_cos'] == 1){
471 $cos = config('filesystems.disks.cos'); 471 $cos = config('filesystems.disks.cos');
472 $cosCdn = $cos['cdn']; 472 $cosCdn = $cos['cdn'];
473 - $url = $cosCdn.$info['path']; 473 + $url = $cosCdn.'/upload'.$info['path'];
474 }else{ 474 }else{
475 $url = url('upload'.$info['path']); 475 $url = url('upload'.$info['path']);
476 } 476 }
@@ -258,11 +258,8 @@ class LoginController extends BaseController @@ -258,11 +258,8 @@ class LoginController extends BaseController
258 return $data; 258 return $data;
259 } 259 }
260 260
261 - public function ceshi(){  
262 -  
263 - }  
264 261
265 - public function daoru(){ 262 + public function ceshi(){
266 $templateModel = new Template(); 263 $templateModel = new Template();
267 $list = $templateModel->list(); 264 $list = $templateModel->list();
268 foreach ($list as $k => $v){ 265 foreach ($list as $k => $v){
@@ -294,8 +291,8 @@ class LoginController extends BaseController @@ -294,8 +291,8 @@ class LoginController extends BaseController
294 } 291 }
295 292
296 public function updateHtml(){ 293 public function updateHtml(){
297 - $html = $this->re($v['html'],'https://develop.globalso.com/a/image/','https://ecdn6.globalso.com/public/template/');  
298 - $html = $this->re($v['html'],'https://develop.globalso.com/b/image/','https://ecdn6.globalso.com/public/template/'); 294 + $html = $this->re($v['html'],'develop.globalso.com','ecdn6.globalso.com');
  295 + $html = $this->re($v['html'],'develop.globalso.com','ecdn6.globalso.com');
299 } 296 }
300 297
301 public function updateCe(){ 298 public function updateCe(){