修复 doAndSubmit abort 没有传参的bug

Fixed doAndSubmit abort
dtm-php · May 16, 2022 · afdf2bf · afdf2bf
2 parents c596d99 + 4c723d5
commit afdf2bf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,11 +25,14 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           tools: phpize
-          ini-values: opcache.enable_cli=1
+          ini-values: ｜
+            opcache.enable_cli=1
+
           coverage: none
       - name: Setup Swoole
         if: ${{ matrix.engine == 'swoole' }}
         run: |
+          sudo apt-get update
           sudo apt-get install libcurl4-openssl-dev
           wget https://github.com/swoole/swoole-src/archive/v${SWOOLE_VERSION}.tar.gz -O swoole.tar.gz
           mkdir -p swoole
@@ -71,5 +74,8 @@ jobs:
           composer require hyperf/http-server
           composer require hyperf/db
           composer require hyperf/db-connection
+          composer require hyperf/json-rpc
+          composer require hyperf/rpc-client
+          composer require symfony/serializer:^5.0
           composer analyse
           composer test
diff --git a/src/Msg.php b/src/Msg.php
@@ -49,7 +49,10 @@ public function doAndSubmit(string $queryPrepared, callable $businessCall)
             $businessCall();
             $this->submit();
         } catch (FailureException $failureException) {
-            $this->api->abort();
+            $this->api->abort([
+                'gid' => TransContext::getGid(),
+                'trans_type' => TransType::MSG,
+            ]);
             throw $failureException;
         } catch (\Exception $exception) {
             $this->queryPrepared($queryPrepared);