Merge branch 'master' into 3.2-merge

# Conflicts:
#	src/amqp/composer.json
#	src/async-queue/composer.json
#	src/cache/composer.json
#	src/circuit-breaker/composer.json
#	src/config-apollo/composer.json
#	src/config-center/composer.json
#	src/config-etcd/composer.json
#	src/config-nacos/composer.json
#	src/config/composer.json
#	src/constants/composer.json
#	src/consul/composer.json
#	src/crontab/composer.json
#	src/dag/composer.json
#	src/database-pgsql/composer.json
#	src/database-sqlite/composer.json
#	src/database/composer.json
#	src/db-connection/composer.json
#	src/db/composer.json
#	src/devtool/composer.json
#	src/di/composer.json
#	src/elasticsearch/composer.json
#	src/etcd/composer.json
#	src/exception-handler/composer.json
#	src/filesystem/composer.json
#	src/grpc-client/composer.json
#	src/grpc-server/composer.json
#	src/http-message/composer.json
#	src/http-server/composer.json
#	src/http2-client/composer.json
#	src/json-rpc/composer.json
#	src/kafka/composer.json
#	src/logger/composer.json
#	src/metric/composer.json
#	src/migration-generator/composer.json
#	src/model-cache/composer.json
#	src/model-listener/composer.json
#	src/nacos/composer.json
#	src/nats/composer.json
#	src/nsq/composer.json
#	src/paginator/composer.json
#	src/pool/composer.json
#	src/process/composer.json
#	src/rate-limit/composer.json
#	src/reactive-x/composer.json
#	src/redis/composer.json
#	src/resource-grpc/composer.json
#	src/resource/composer.json
#	src/retry/composer.json
#	src/rpc-client/composer.json
#	src/rpc-multiplex/composer.json
#	src/rpc-server/composer.json
#	src/rpc/composer.json
#	src/scout/composer.json
#	src/server/composer.json
#	src/service-governance-consul/composer.json
#	src/service-governance-nacos/composer.json
#	src/session/composer.json
#	src/signal/composer.json
#	src/snowflake/composer.json
#	src/socket/composer.json
#	src/socketio-server/composer.json
#	src/stringable/composer.json
#	src/super-globals/composer.json
#	src/support/composer.json
#	src/swagger/composer.json
#	src/task/composer.json
#	src/testing/composer.json
#	src/tracer/composer.json
#	src/translation/composer.json
#	src/utils/composer.json
#	src/validation/composer.json
#	src/view-engine/composer.json
#	src/view/composer.json
#	src/watcher/composer.json
#	src/websocket-client/composer.json
#	src/websocket-server/composer.json

Author: limingxinleo

composer.json

@@ -17,10 +17,11 @@
     "require": {
         "php": ">=8.2",
         "hyperf/codec": "~3.2.0",
+        "hyperf/collection": "~3.2.0",
+        "hyperf/context": "~3.2.0",
         "hyperf/contract": "~3.2.0",
         "hyperf/db-connection": "~3.2.0",
         "hyperf/support": "~3.2.0",
-        "hyperf/utils": "~3.2.0",
         "psr/container": "^1.0 || ^2.0",
         "psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
     },

src/Redis/LuaManager.php

@@ -41,18 +41,20 @@ public function __construct(protected Config $config)
 
     public function handle(string $key, array $keys, ?int $num = null)
     {
-        if ($this->config->isLoadScript()) {
-            $sha = $this->getLuaSha($key);
-        }
-
         $operator = $this->getOperator($key);
 
         if ($num === null) {
             $num = count($keys);
         }
 
-        if (! empty($sha)) {
+        if ($this->config->isLoadScript()) {
+            $sha = $this->getLuaSha($key);
             $luaData = $this->redis->evalSha($sha, $keys, $num);
+            if ($luaData === false) {
+                $this->flushLuaSha($key);
+                $script = $operator->getScript();
+                $luaData = $this->redis->eval($script, $keys, $num);
+            }
         } else {
             $script = $operator->getScript();
             $luaData = $this->redis->eval($script, $keys, $num);
@@ -81,4 +83,9 @@ public function getLuaSha(string $key): string
         }
         return $this->luaShas[$key];
     }
+
+    public function flushLuaSha(string $key): void
+    {
+        unset($this->luaShas[$key]);
+    }
 }