gx

@@ -130,8 +130,8 @@ class ProjectLogic extends BaseLogic
                 $this->fail('正式域名格式不正确');
                 $this->fail('正式域名格式不正确');
             }
             }
         }
         }
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             if(!empty($param['payment']['amount'])) unset($param['payment']['amount']);
             if(!empty($param['payment']['amount'])) unset($param['payment']['amount']);
             if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']);
             if(!empty($param['deploy_build']['test_domain'])) unset($param['deploy_build']['test_domain']);
             if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']);
             if(!empty($param['deploy_build']['plan'])) unset($param['deploy_build']['plan']);
@@ -145,12 +145,12 @@ class ProjectLogic extends BaseLogic
             $this->savePayment($param);
             $this->savePayment($param);
             $this->saveDeployBuild($param);
             $this->saveDeployBuild($param);
             $this->saveDeployOptimize($param);
             $this->saveDeployOptimize($param);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            errorLog('项目保存失败', $param, $e);
-//            $this->fail('保存失败');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            errorLog('项目保存失败', $param, $e);
+            $this->fail('保存失败');
+        }
         return $this->success();
         return $this->success();
     }
     }
 
 
@@ -181,9 +181,9 @@ class ProjectLogic extends BaseLogic
         }
         }
         $data = $param['deploy_build'];
         $data = $param['deploy_build'];
         $data['project_id'] = $param['id'];
         $data['project_id'] = $param['id'];
-//        $hashids = new Hashids('test_domain', 5, 'abcdefghjkmnpqrstuvwxyz1234567890');
-//        $code = $hashids->encode($this->project_id);
-//        $data['test_domain'] = 'v6-' . $code . '.globalso.site';
+        $hashids = new Hashids('test_domain', 5, 'abcdefghjkmnpqrstuvwxyz1234567890');
+        $code = $hashids->encode($data['project_id']);
+        $data['test_domain'] = 'v6-' . $code . '.globalso.site';;
         $data['id'] = DeployBuild::where('project_id', $param['id'])->value('id');
         $data['id'] = DeployBuild::where('project_id', $param['id'])->value('id');
 //        Arr::forget($data, ['test_domain', 'plan']);
 //        Arr::forget($data, ['test_domain', 'plan']);
         return (new DeployBuildLogic)->save($data);
         return (new DeployBuildLogic)->save($data);
@@ -294,6 +294,7 @@ class ProjectLogic extends BaseLogic
             'deploy_build' => [
             'deploy_build' => [
                 'service_duration' => $param['years'],
                 'service_duration' => $param['years'],
                 'plan' => $this->versionData($param['plan_marketing']),
                 'plan' => $this->versionData($param['plan_marketing']),
+                'test_domain'=>
             ],
             ],
             'deploy_optimize' => [
             'deploy_optimize' => [
                 'api_no' => $param['id']
                 'api_no' => $param['id']
@@ -309,12 +310,8 @@ class ProjectLogic extends BaseLogic
             $res = parent::save($data);
             $res = parent::save($data);
             $data['id'] = $res['id'];
             $data['id'] = $res['id'];
             $this->savePayment($data);
             $this->savePayment($data);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export(1111111111, true) . PHP_EOL, FILE_APPEND);
             $this->saveDeployBuild($data);
             $this->saveDeployBuild($data);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export(22222222, true) . PHP_EOL, FILE_APPEND);
             $this->saveDeployOptimize($data);
             $this->saveDeployOptimize($data);
-            @file_put_contents(storage_path('logs/lyh_error.log'), var_export(333333, true) . PHP_EOL, FILE_APPEND);
-
             $this->setPostId($data['deploy_build']['plan'],$res['id']);
             $this->setPostId($data['deploy_build']['plan'],$res['id']);
             DB::commit();
             DB::commit();
             Cache::put('project_' . date('Ymd'), $num + 1, 24 * 60 * 60);
             Cache::put('project_' . date('Ymd'), $num + 1, 24 * 60 * 60);