周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 b5974370943b95ec25e3f09651f577ba42059505 2 个父辈 6c57247b c19583ac

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 12 行增加 和 12 行删除
@@ -129,8 +129,8 @@ class ProjectLogic extends BaseLogic @@ -129,8 +129,8 @@ class ProjectLogic extends BaseLogic
129 * @time :2023/8/30 11:57 129 * @time :2023/8/30 11:57
130 */ 130 */
131 public function projectSave(){ 131 public function projectSave(){
132 - DB::beginTransaction();  
133 - try { 132 +// DB::beginTransaction();
  133 +// try {
134 if($this->param['type'] == Project::TYPE_SEVEN){ 134 if($this->param['type'] == Project::TYPE_SEVEN){
135 //错误单直接返回,单独处理 135 //错误单直接返回,单独处理
136 $this->setTypeSevenEdit($this->param); 136 $this->setTypeSevenEdit($this->param);
@@ -154,11 +154,11 @@ class ProjectLogic extends BaseLogic @@ -154,11 +154,11 @@ class ProjectLogic extends BaseLogic
154 //创建站点 154 //创建站点
155 // $this->createSite($this->param); 155 // $this->createSite($this->param);
156 } 156 }
157 - DB::commit();  
158 - }catch (\Exception $e){  
159 - DB::rollBack();  
160 - $this->fail('保存失败，请联系管理员');  
161 - } 157 +// DB::commit();
  158 +// }catch (\Exception $e){
  159 +// DB::rollBack();
  160 +// $this->fail('保存失败，请联系管理员');
  161 +// }
162 (new SyncService())->projectAcceptAddress($this->param['id']); 162 (new SyncService())->projectAcceptAddress($this->param['id']);
163 return $this->success(); 163 return $this->success();
164 } 164 }
@@ -69,7 +69,7 @@ class AmazonS3Service @@ -69,7 +69,7 @@ class AmazonS3Service
69 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($files, true) . PHP_EOL, FILE_APPEND); 69 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($files, true) . PHP_EOL, FILE_APPEND);
70 $key = str_replace_url($files); 70 $key = str_replace_url($files);
71 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($key, true) . PHP_EOL, FILE_APPEND); 71 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($key, true) . PHP_EOL, FILE_APPEND);
72 - try { 72 +// try {
73 $result = $this->s3->putObject([ 73 $result = $this->s3->putObject([
74 'Bucket' => $this->bucket, 74 'Bucket' => $this->bucket,
75 'Key' => $key, 75 'Key' => $key,
@@ -77,9 +77,9 @@ class AmazonS3Service @@ -77,9 +77,9 @@ class AmazonS3Service
77 ]); 77 ]);
78 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($result, true) . PHP_EOL, FILE_APPEND); 78 @file_put_contents(storage_path('logs/lyh_error.log'), var_export($result, true) . PHP_EOL, FILE_APPEND);
79 return $result['ObjectURL']; 79 return $result['ObjectURL'];
80 - } catch (AwsException $e) {  
81 - @file_put_contents(storage_path('logs/lyh_error.log'), var_export('图片:'.$e->getMessage(), true) . PHP_EOL, FILE_APPEND);  
82 - return '上传文件到S3时发生错误：' . $e->getMessage();  
83 - } 80 +// } catch (AwsException $e) {
  81 +// @file_put_contents(storage_path('logs/lyh_error.log'), var_export('图片:'.$e->getMessage(), true) . PHP_EOL, FILE_APPEND);
  82 +// return '上传文件到S3时发生错误：' . $e->getMessage();
  83 +// }
84 } 84 }
85 } 85 }