Merge branch 'master' of http://git.bjzxtw.org.cn:3000/zxt/news_producer

app/JsonRpc/NewsServiceInterface.php

@@ -396,6 +396,21 @@ interface NewsServiceInterface
      */
     public function getWebsiteTsbbDetail(array $data):array;
     public function getWebsiteLevelJob(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteCompany(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteCompanyInfo(array $data):array;
+    /**
+     * @param array $data
+     * @return array
+     */
+    public function getWebsiteCompanyList(array $data):array;
 
     /**
      * 农网导航首页

app/Model/JobResume.php → app/Model/WhiteRouter.php

@@ -8,12 +8,12 @@ use Hyperf\DbConnection\Model\Model;
 
 /**
  */
-class JobResume extends Model
+class WhiteRouter extends Model
 {
     /**
      * The table associated with the model.
      */
-    protected ?string $table = 'job_resume';
+    protected ?string $table = 'white_router';
 
     /**
      * The attributes that are mass assignable.

app/Model/jobResume.php

@@ -1,27 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace App\Model;
-
-use Hyperf\DbConnection\Model\Model;
-
-/**
- */
-class JobResume extends Model
-{
-    /**
-     * The table associated with the model.
-     */
-    protected ?string $table = 'job_resume';
-
-    /**
-     * The attributes that are mass assignable.
-     */
-    protected array $fillable = [];
-
-    /**
-     * The attributes that should be cast to native types.
-     */
-    protected array $casts = [];
-}

runtime/hyperf.pid

@@ -1 +1 @@
-58471
+52968

vendor/composer/autoload_classmap.php

@@ -733,7 +733,6 @@ return array(
     'Hyperf\\Coordinator\\CoordinatorManager' => $vendorDir . '/hyperf/coordinator/src/CoordinatorManager.php',
     'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => $vendorDir . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
     'Hyperf\\Coordinator\\Timer' => $vendorDir . '/hyperf/coordinator/src/Timer.php',
-    'Hyperf\\Coroutine\\Barrier' => $vendorDir . '/hyperf/coroutine/src/Barrier.php',
     'Hyperf\\Coroutine\\Channel\\Caller' => $vendorDir . '/hyperf/coroutine/src/Channel/Caller.php',
     'Hyperf\\Coroutine\\Channel\\Manager' => $vendorDir . '/hyperf/coroutine/src/Channel/Manager.php',
     'Hyperf\\Coroutine\\Channel\\Pool' => $vendorDir . '/hyperf/coroutine/src/Channel/Pool.php',

vendor/composer/autoload_psr4.php

@@ -39,7 +39,7 @@ return array(
     'Ramsey\\Collection\\' => array($vendorDir . '/ramsey/collection/src'),
     'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/src'),
-    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
+    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-middleware/src', $vendorDir . '/psr/http-server-handler/src'),
     'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
@@ -56,7 +56,7 @@ return array(
     'Laminas\\Stdlib\\' => array($vendorDir . '/laminas/laminas-stdlib/src'),
     'Laminas\\Mime\\' => array($vendorDir . '/laminas/laminas-mime/src'),
     'JetBrains\\PhpStorm\\' => array($vendorDir . '/jetbrains/phpstorm-attributes/src'),
-    'Illuminate\\Support\\' => array($vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/macroable', $vendorDir . '/illuminate/support'),
+    'Illuminate\\Support\\' => array($vendorDir . '/illuminate/support', $vendorDir . '/illuminate/collections', $vendorDir . '/illuminate/conditionable', $vendorDir . '/illuminate/macroable'),
     'Illuminate\\Contracts\\' => array($vendorDir . '/illuminate/contracts'),
     'Illuminate\\Cache\\' => array($vendorDir . '/illuminate/cache'),
     'Hyperf\\Watcher\\' => array($vendorDir . '/hyperf/watcher/src'),

vendor/composer/autoload_static.php

@@ -359,8 +359,8 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         ),
         'Psr\\Http\\Server\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
-            1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+            0 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
+            1 => __DIR__ . '/..' . '/psr/http-server-handler/src',
         ),
         'Psr\\Http\\Message\\' => 
         array (
@@ -429,10 +429,10 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         ),
         'Illuminate\\Support\\' => 
         array (
-            0 => __DIR__ . '/..' . '/illuminate/collections',
-            1 => __DIR__ . '/..' . '/illuminate/conditionable',
-            2 => __DIR__ . '/..' . '/illuminate/macroable',
-            3 => __DIR__ . '/..' . '/illuminate/support',
+            0 => __DIR__ . '/..' . '/illuminate/support',
+            1 => __DIR__ . '/..' . '/illuminate/collections',
+            2 => __DIR__ . '/..' . '/illuminate/conditionable',
+            3 => __DIR__ . '/..' . '/illuminate/macroable',
         ),
         'Illuminate\\Contracts\\' => 
         array (
@@ -1484,7 +1484,6 @@ class ComposerStaticInit93d050353fc587b1b1fb188f0a8c068c
         'Hyperf\\Coordinator\\CoordinatorManager' => __DIR__ . '/..' . '/hyperf/coordinator/src/CoordinatorManager.php',
         'Hyperf\\Coordinator\\Listener\\ResumeExitCoordinatorListener' => __DIR__ . '/..' . '/hyperf/coordinator/src/Listener/ResumeExitCoordinatorListener.php',
         'Hyperf\\Coordinator\\Timer' => __DIR__ . '/..' . '/hyperf/coordinator/src/Timer.php',
-        'Hyperf\\Coroutine\\Barrier' => __DIR__ . '/..' . '/hyperf/coroutine/src/Barrier.php',
         'Hyperf\\Coroutine\\Channel\\Caller' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Caller.php',
         'Hyperf\\Coroutine\\Channel\\Manager' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Manager.php',
         'Hyperf\\Coroutine\\Channel\\Pool' => __DIR__ . '/..' . '/hyperf/coroutine/src/Channel/Pool.php',

vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'hyperf/hyperf-skeleton',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'aeff99533d628447c4fbb8f7f02c347c3375ace7',
+        'reference' => '9d12071cf0586267e5cb1c8008d745bd7632820e',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -457,7 +457,7 @@
         'hyperf/hyperf-skeleton' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'aeff99533d628447c4fbb8f7f02c347c3375ace7',
+            'reference' => '9d12071cf0586267e5cb1c8008d745bd7632820e',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

vendor/hyperf/cache/src/Annotation/CacheAhead.php

@@ -24,6 +24,7 @@ class CacheAhead extends AbstractAnnotation
 {
     /**
      * @param null|int $ttl the max offset for ttl
+     * @param bool $runAsync when this method is executed for the first time, the original method is executed asynchronously and cached, so the return value is null
      */
     public function __construct(
         public ?string $prefix = null,
@@ -34,7 +35,8 @@ class CacheAhead extends AbstractAnnotation
         public int $offset = 0,
         public string $group = 'default',
         public bool $collect = false,
-        public ?array $skipCacheResults = null
+        public ?array $skipCacheResults = null,
+        public bool $runAsync = false,
     ) {
     }
 

vendor/hyperf/cache/src/Aspect/CacheAheadAspect.php

@@ -39,6 +39,9 @@ class CacheAheadAspect extends AbstractAspect
         $arguments = $proceedingJoinPoint->arguments['keys'];
         $now = time();
 
+        /**
+         * @var CacheAhead $annotation
+         */
         [$key, $ttl, $group, $annotation] = $this->annotationManager->getCacheAheadValue($className, $method, $arguments);
         $driver = $this->manager->getDriver($group);
 
@@ -78,6 +81,11 @@ class CacheAheadAspect extends AbstractAspect
         }
 
         // If the cache does not exist, execute the callback and cache the result.
+        if ($annotation->runAsync) {
+            Coroutine::create($callback);
+            return null;
+        }
+
         return $callback();
     }
 }

vendor/hyperf/cache/src/Driver/CoroutineMemoryDriver.php

@@ -53,7 +53,7 @@ class CoroutineMemoryDriver extends Driver implements KeyCollectorInterface
     public function setMultiple($values, $ttl = null): bool
     {
         foreach ($values as $key => $value) {
-            $this->set($key, $values, $ttl);
+            $this->set($key, $value, $ttl);
         }
 
         return true;

vendor/hyperf/command/src/AsCommand.php

@@ -29,9 +29,11 @@ final class AsCommand extends Command
         string $signature,
         private string $class,
         private string $method,
+        bool $coroutine = true,
     ) {
         $this->signature = $signature;
         $this->parameterParser = $container->get(ParameterParser::class);
+        $this->coroutine = $coroutine;
 
         parent::__construct();
 

vendor/hyperf/command/src/ClosureCommand.php

@@ -75,6 +75,13 @@ final class ClosureCommand extends Command
         return $this;
     }
 
+    public function coroutine(bool $coroutine): self
+    {
+        $this->coroutine = $coroutine;
+
+        return $this;
+    }
+
     /**
      * @param null|callable(Crontab $crontab):Crontab $callback
      */

vendor/hyperf/coroutine/composer.json

@@ -19,7 +19,7 @@
         "php": ">=8.1",
         "hyperf/context": "~3.1.0",
         "hyperf/contract": "~3.1.0",
-        "hyperf/engine": "^2.13.0"
+        "hyperf/engine": "^2.14.0"
     },
     "autoload": {
         "psr-4": {

vendor/hyperf/database/src/Commands/ModelCommand.php

@@ -158,10 +158,15 @@ class ModelCommand extends Command
         $table = Str::replaceFirst($option->getPrefix(), '', $table);
         $pureTable = Str::after($table, '.');
         $databaseName = Str::contains($table, '.') ? Str::before($table, '.') : null;
-        $columns = $this->formatColumns($builder->getColumnTypeListing($pureTable, $databaseName));
+        $driver = $this->resolver->connection($option->getPool())->getConfig('driver');
+        $columns = match ($driver) {
+            'pgsql' => $this->formatColumns($builder->getColumnTypeListing($table, $databaseName)),
+            default => $this->formatColumns($builder->getColumnTypeListing($pureTable, $databaseName)),
+        };
+
         if (empty($columns)) {
             $this->output?->error(
-                sprintf('Query columns empty, maybe is table `%s` does not exist.You can check it in database.', $table)
+                sprintf('Query columns are empty, maybe the table `%s` does not exist. You can check it in the database.', $table)
             );
         }
 

vendor/hyperf/database/src/Schema/Blueprint.php

@@ -153,6 +153,10 @@ class Blueprint
         $this->ensureCommandsAreValid($connection);
 
         foreach ($this->commands as $command) {
+            if ($command->shouldBeSkipped) {
+                continue;
+            }
+
             $method = 'compile' . ucfirst($command->name);
 
             if (method_exists($grammar, $method)) {
@@ -1488,6 +1492,11 @@ class Blueprint
         $this->addFluentIndexes();
 
         $this->addFluentCommands($grammar);
+
+        // Add table comment command for PostgreSQL if table has comment and is being created
+        if ($this->creating() && ! empty($this->comment) && in_array('TableComment', $grammar->getFluentCommands())) {
+            $this->addCommand('tableComment', ['value' => $this->comment]);
+        }
     }
 
     /**

vendor/hyperf/database/src/Schema/Grammars/MySqlGrammar.php

@@ -529,11 +529,23 @@ class MySqlGrammar extends Grammar
      */
     protected function compileCreateTable($blueprint, $command, $connection)
     {
+        $tableStructure = $this->getColumns($blueprint);
+
+        if ($primaryKey = $this->getCommandByName($blueprint, 'primary')) {
+            $tableStructure[] = sprintf(
+                'primary key %s(%s)',
+                $primaryKey->algorithm ? 'using ' . $primaryKey->algorithm : '',
+                $this->columnize($primaryKey->columns)
+            );
+
+            $primaryKey->shouldBeSkipped = true;
+        }
+
         return sprintf(
             '%s table %s (%s)',
             $blueprint->temporary ? 'create temporary' : 'create',
             $this->wrapTable($blueprint),
-            implode(', ', $this->getColumns($blueprint))
+            implode(', ', $tableStructure)
         );
     }
 

vendor/hyperf/watcher/src/Watcher.php

@@ -77,7 +77,7 @@ class Watcher
                 }
             } else {
                 $ret = exec(sprintf('%s %s/vendor/hyperf/watcher/collector-reload.php %s', $this->option->getBin(), BASE_PATH, $file));
-                if ($ret['code'] === 0) {
+                if (isset($ret['code']) && $ret['code'] === 0) {
                     $this->output->writeln('Class reload success.');
                 } else {
                     $this->output->writeln('Class reload failed.');