diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index edf305b0..2f5df3f4 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -16,6 +16,8 @@ log_with_style "INFO" "🚀 1. 检测配置文件..." import_config "$@" # Export BACK_PORT from QlPort for backend server to use export BACK_PORT="${ql_port}" +# Export GRPC_PORT from QlGrpcPort for gRPC server to use +export GRPC_PORT="${ql_grpc_port}" fix_config pm2 l &>/dev/null diff --git a/shell/preload/client.js b/shell/preload/client.js index 605aa9f4..51475311 100644 --- a/shell/preload/client.js +++ b/shell/preload/client.js @@ -5,7 +5,7 @@ const { join } = require('path'); class GrpcClient { static #config = { protoPath: join(process.env.QL_DIR, 'back/protos/api.proto'), - serverAddress: '0.0.0.0:5500', + serverAddress: `0.0.0.0:${process.env.GRPC_PORT || '5500'}`, protoOptions: { keepCase: true, longs: String, diff --git a/shell/share.sh b/shell/share.sh index 235d0bd9..f79d4923 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -89,6 +89,7 @@ import_config() { ql_base_url=${QlBaseUrl:-"/"} ql_port=${QlPort:-"5700"} + ql_grpc_port=${QlGrpcPort:-"5500"} command_timeout_time=${CommandTimeoutTime:-""} file_extensions=${RepoFileExtensions:-"js py"} proxy_url=${ProxyUrl:-""}