diff --git a/.env b/.env index 4e81493..1e8e6bd 100644 --- a/.env +++ b/.env @@ -17,7 +17,7 @@ REDIS_PORT=6379 REDIS_DB=0 JSON_RPC_HOST=0.0.0.0 -JSON_RPC_PORT=9610 +JSON_RPC_PORT=9666 SWOOLE_WORKER_NUM=1 NACOS_HOST=192.168.28.199 @@ -26,4 +26,4 @@ NACOS_USERNAME=nacos NACOS_PASSWORD=nacos NACOS_NAMESPACE=e42b853c-5195-478b-b5e3-6d49f6a45053 NACOS_GROUP=DEFAULT_GROUP -NACOS_SERVICE_NAME=hyperf-data \ No newline at end of file +NACOS_SERVICE_NAME=DataCampus \ No newline at end of file diff --git a/config/autoload/nacos.php b/config/autoload/nacos.php index 1f9a838..b02b825 100644 --- a/config/autoload/nacos.php +++ b/config/autoload/nacos.php @@ -6,11 +6,11 @@ use function Hyperf\Support\env; return [ 'default' => [ - 'host' => env('NACOS_HOST', '127.0.0.1'), + 'host' => env('NACOS_HOST', '192.168.28.199'), 'port' => env('NACOS_PORT', 8848), - 'username' => env('NACOS_USERNAME', 'nacos'), - 'password' => env('NACOS_PASSWORD', 'nacos'), - 'namespace' => env('NACOS_NAMESPACE', 'public'), + // 'username' => env('NACOS_USERNAME', 'nacos'), + // 'password' => env('NACOS_PASSWORD', 'nacos'), + 'namespace' => env('NACOS_NAMESPACE', 'dev'), 'timeout' => 5.0, ], ]; diff --git a/config/autoload/services.php b/config/autoload/services.php index 0800ebd..54e06b5 100644 --- a/config/autoload/services.php +++ b/config/autoload/services.php @@ -7,24 +7,46 @@ use function Hyperf\Support\env; return [ 'enable' => true, 'driver' => 'nacos', - 'registries' => [ + 'drivers' => [ 'nacos' => [ + // nacos server url like https://nacos.hyperf.io, Priority is higher than host:port + // 'url' => '', + // The nacos host info 'host' => env('NACOS_HOST', '127.0.0.1'), 'port' => env('NACOS_PORT', 8848), - 'username' => env('NACOS_USERNAME', 'nacos'), - 'password' => env('NACOS_PASSWORD', 'nacos'), - 'namespace' => env('NACOS_NAMESPACE', 'public'), - 'group_name' => env('NACOS_GROUP_NAME', 'DEFAULT_GROUP'), - 'service_name' => env('NACOS_SERVICE_NAME', 'hyperf-organization'), - 'protect_threshold' => 0.5, - 'metadata' => [ - 'protocol' => 'jsonrpc-http', - 'server' => 'jsonrpc-http', - 'version' => '1.0.0', - 'weight' => 100, + // The nacos account info + 'username' => null, + 'password' => null, + 'guzzle' => [ + 'config' => null, ], + 'group_name' => 'api', + 'namespace_id' => env('NACOS_NAMESPACE', 'dev'), 'heartbeat' => 5, - 'heartbeat_timeout' => 15, ], ], + // 'registries' => [ + // 'nacos' => [ + // 'host' => env('NACOS_HOST', '192.168.28.199'), + // 'port' => env('NACOS_PORT', 8848), + // 'username' => null, + // 'password' => null, + // 'guzzle' => [ + // 'config' => null, + // ], + // 'group_name' => 'api', + // 'namespace' => env('NACOS_NAMESPACE', 'dev'), + // // 'group_name' => env('NACOS_GROUP_NAME', 'DEFAULT_GROUP'), + // 'service_name' => env('NACOS_SERVICE_NAME', 'DataCampus'), + // 'protect_threshold' => 0.5, + // 'metadata' => [ + // 'protocol' => 'jsonrpc-http', + // 'server' => 'jsonrpc-http', + // 'version' => '1.0.0', + // 'weight' => 100, + // ], + // 'heartbeat' => 5, + // 'heartbeat_timeout' => 15, + // ], + // ], ];