fixed bugs

workbunny · Jan 16, 2024 · 0ecc774 · 0ecc774
1 parent 99dbc35
commit 0ecc774
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/Builders/GroupBuilder.php b/src/Builders/GroupBuilder.php
@@ -162,7 +162,7 @@ class $className extends GroupBuilder
     public function handler(string \$id, array \$value, Connection \$connection): bool 
     {
         \$header = new Headers(\$value['_header']);
-        \$body   = \$value['_body']
+        \$body   = \$value['_body'];
         // TODO 请重写消费逻辑
         echo "请重写 $className::handler\\n";
         return true;

diff --git a/src/Builders/QueueBuilder.php b/src/Builders/QueueBuilder.php
@@ -155,7 +155,7 @@ class $className extends QueueBuilder
     public function handler(string \$id, array \$value, Connection \$connection): bool 
     {
         \$header = new Headers(\$value['_header']);
-        \$body   = \$value['_body']
+        \$body   = \$value['_body'];
         // TODO 请重写消费逻辑
         echo "请重写 $className::handler\\n";
         return true;

diff --git a/src/Commands/WorkbunnyWebmanRqueueBuilder.php b/src/Commands/WorkbunnyWebmanRqueueBuilder.php
@@ -47,7 +47,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         if(!file_exists($process = config_path() . '/plugin/workbunny/webman-rqueue/process.php')) {
             return $this->error($output, "Builder {$name} failed to create: plugin/workbunny/webman-rqueue/process.php does not exist.");
         }
-        $processName = AbstractBuilder::getName($className = "$namespace\\$name", true) . "-$mode";
+        $processName = AbstractBuilder::getName($className = "$namespace\\$name", true);
         // check config
         $config = config('plugin.workbunny.webman-rqueue.process', []);
         if(isset($config[$processName])){

diff --git a/src/Commands/WorkbunnyWebmanRqueueList.php b/src/Commands/WorkbunnyWebmanRqueueList.php
@@ -10,6 +10,7 @@
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Workbunny\WebmanRqueue\Builders\AbstractBuilder;
 use function Workbunny\WebmanRqueue\base_path;
 use function Workbunny\WebmanRqueue\config;
 
@@ -38,12 +39,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $configs = config('plugin.workbunny.webman-rqueue.process', []);
 
         /** @var SplFileInfo $file */
-        foreach ($files as $file){
-            $key = str_replace(
-                '/',
-                '.',
-                str_replace(base_path() . '/' , '', $fileName = $file->getPath() . '/' . $file->getBasename('.php'))
+        foreach ($files as $file) {
+            $key = AbstractBuilder::getName(
+                str_replace('/', '\\',
+                    str_replace(base_path() . '/' , '', $fileName = $file->getPath() . '/' . $file->getBasename('.php'))
+                )
             );
+//            $key = str_replace(
+//                '/',
+//                '.',
+//                str_replace(base_path() . '/' , '', $fileName = $file->getPath() . '/' . $file->getBasename('.php'))
+//            );
             $name = str_replace(base_path() . '/' . self::$baseProcessPath . '/', '', $fileName);
             $rows[] = [
                 strtolower(