gx

@@ -167,7 +167,21 @@ class LoginController extends BaseController
     public function eventMessage(){
     public function eventMessage(){
         $message = file_get_contents("php://input");
         $message = file_get_contents("php://input");
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
         $message = simplexml_load_string($message, 'SimpleXMLElement', LIBXML_NOCDATA | LIBXML_NOERROR);
+<<<<<<< HEAD
         @file_put_contents(storage_path('logs/hook/wx.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
         @file_put_contents(storage_path('logs/hook/wx.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
+=======
+        $arr = [
+            'ToUserName' => 'gh_27174ac5c9d8',
+            'FromUserName' => 'oMbcI6gRzvfrU8ssGsEyvzXOO94w',
+            'CreateTime' => '1693385898',
+            'MsgType' => 'event',
+            'Event' => 'subscribe',
+            'EventKey' => 'qrscene_global-v6_v6',
+            'Ticket' => 'gQF27zwAAAAAAAAAAS5odHRwOi8vd2VpeGluLnFxLmNvbS9xLzAyWnppdHhWTlRjOEcxTlBpTE5BY2IAAgRjBO9kAwQQDgAA',
+        ];
+
+        @file_put_contents(storage_path('logs/lyh_error.log'), var_export($message, true) . PHP_EOL, FILE_APPEND);
+>>>>>>> cb4013abb5967a24f5c482c21f3a93a48789077d
         return "<xml>
         return "<xml>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>
                 <ToUserName><![CDATA[$message->FromUserName]]></ToUserName>
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>
                 <FromUserName><![CDATA[$message->ToUserName]]></FromUserName>

@@ -74,8 +74,8 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 11:57
      * @time   :2023/8/30 11:57
      */
      */
     public function projectSave(){
     public function projectSave(){
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             $this->createProjectData($this->param);
             $this->createProjectData($this->param);
             //保存项目信息
             //保存项目信息
             $this->saveProject($this->param);
             $this->saveProject($this->param);
@@ -87,11 +87,11 @@ class ProjectLogic extends BaseLogic
             $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
             $this->saveProjectDeployOptimize($this->param['deploy_optimize']);
             //保存售后信息
             //保存售后信息
             $this->saveProjectAfter($this->param['project_after']);
             $this->saveProjectAfter($this->param['project_after']);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('error');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('error');
+//        }
         return $this->success();
         return $this->success();
     }
     }
 
 

-OVatVgfhsrm_aegL02EYqhICpZAaunOZPfn8yEuby2s.3cPo6boRQoXspiio5AnhCF8zPCXVJzlazJRcktmRn-Y

-kxWexxJJFyqeRjaKdORH93QIf3VQ0PU4aQuFuGWlkTY.3cPo6boRQoXspiio5AnhCF8zPCXVJzlazJRcktmRn-Y