diff --git a/.env b/.env index d51317fb6..145d7e917 100644 --- a/.env +++ b/.env @@ -12,15 +12,15 @@ PASSWORD=openIM123 # Endpoint for the MinIO object storage service. # Default: MINIO_ENDPOINT=http://172.28.0.1:10005 -MINIO_ENDPOINT=http://172.21.0.1:10005 +MINIO_ENDPOINT=http://172.28.0.1:10005 # Base URL for the application programming interface (API). # Default: API_URL=http://172.28.0.1:10002 -API_URL=http://14.153.6.114:10002 +API_URL=http://172.28.0.1:10002 # Directory path for storing data files or related information. # Default: DATA_DIR=./ -DATA_DIR=/root/workspaces/openim/openim-server +DATA_DIR=./ # ====================================== # ========= Network Configuration ====== @@ -28,55 +28,55 @@ DATA_DIR=/root/workspaces/openim/openim-server # Subnet for the Docker network. # Default: DOCKER_BRIDGE_SUBNET=172.28.0.0/16 -DOCKER_BRIDGE_SUBNET=172.21.0.0/16 +DOCKER_BRIDGE_SUBNET=172.28.0.0/16 # Gateway for the Docker network. # Default: DOCKER_BRIDGE_GATEWAY=172.28.0.1 -DOCKER_BRIDGE_GATEWAY=172.21.0.1 +DOCKER_BRIDGE_GATEWAY=172.28.0.1 # Address or hostname for the MySQL network. # Default: MYSQL_NETWORK_ADDRESS=172.28.0.2 -MYSQL_NETWORK_ADDRESS=172.21.0.2 +MYSQL_NETWORK_ADDRESS=172.28.0.2 # Address or hostname for the MongoDB network. # Default: MONGO_NETWORK_ADDRESS=172.28.0.3 -MONGO_NETWORK_ADDRESS=172.21.0.3 +MONGO_NETWORK_ADDRESS=172.28.0.3 # Address or hostname for the Redis network. # Default: REDIS_NETWORK_ADDRESS=172.28.0.4 -REDIS_NETWORK_ADDRESS=172.21.0.4 +REDIS_NETWORK_ADDRESS=172.28.0.4 # Address or hostname for the Kafka network. # Default: KAFKA_NETWORK_ADDRESS=172.28.0.5 -KAFKA_NETWORK_ADDRESS=172.21.0.5 +KAFKA_NETWORK_ADDRESS=172.28.0.5 # Address or hostname for the ZooKeeper network. # Default: ZOOKEEPER_NETWORK_ADDRESS=172.28.0.6 -ZOOKEEPER_NETWORK_ADDRESS=172.21.0.6 +ZOOKEEPER_NETWORK_ADDRESS=172.28.0.6 # Address or hostname for the MinIO network. # Default: MINIO_NETWORK_ADDRESS=172.28.0.7 -MINIO_NETWORK_ADDRESS=172.21.0.7 +MINIO_NETWORK_ADDRESS=172.28.0.7 # Address or hostname for the OpenIM web network. # Default: OPENIM_WEB_NETWORK_ADDRESS=172.28.0.8 -OPENIM_WEB_NETWORK_ADDRESS=172.21.0.8 +OPENIM_WEB_NETWORK_ADDRESS=172.28.0.8 # Address or hostname for the OpenIM server network. # Default: OPENIM_SERVER_NETWORK_ADDRESS=172.28.0.9 -OPENIM_SERVER_NETWORK_ADDRESS=172.21.0.9 +OPENIM_SERVER_NETWORK_ADDRESS=172.28.0.9 # Address or hostname for the OpenIM chat network. # Default: OPENIM_CHAT_NETWORK_ADDRESS=172.28.0.10 -OPENIM_CHAT_NETWORK_ADDRESS=172.21.0.10 +OPENIM_CHAT_NETWORK_ADDRESS=172.28.0.10 # Address or hostname for the Prometheus network. # Default: PROMETHEUS_NETWORK_ADDRESS=172.28.0.11 -PROMETHEUS_NETWORK_ADDRESS=172.21.0.11 +PROMETHEUS_NETWORK_ADDRESS=172.28.0.11 # Address or hostname for the Grafana network. # Default: GRAFANA_NETWORK_ADDRESS=172.28.0.12 -GRAFANA_NETWORK_ADDRESS=172.21.0.12 +GRAFANA_NETWORK_ADDRESS=172.28.0.12 # =============================================== @@ -87,7 +87,7 @@ GRAFANA_NETWORK_ADDRESS=172.21.0.12 # ----- ZooKeeper Configuration ----- # Address or hostname for the ZooKeeper service. # Default: ZOOKEEPER_ADDRESS=172.28.0.1 -ZOOKEEPER_ADDRESS=172.21.0.6 +ZOOKEEPER_ADDRESS=172.28.0.6 # Port for ZooKeeper service. # Default: ZOOKEEPER_PORT=12181 @@ -97,7 +97,7 @@ ZOOKEEPER_PORT=12181 # Address or hostname for the MySQL service. # Default: MYSQL_ADDRESS=172.28.0.1 -MYSQL_ADDRESS=172.21.0.2 +MYSQL_ADDRESS=172.28.0.2 # Port on which MySQL database service is running. # Default: MYSQL_PORT=13306 @@ -110,7 +110,7 @@ MYSQL_PASSWORD=openIM123 # ----- MongoDB Configuration ----- # Address or hostname for the MongoDB service. # Default: MONGO_ADDRESS=172.28.0.1 -MONGO_ADDRESS=172.21.0.3 +MONGO_ADDRESS=172.28.0.3 # Port on which MongoDB service is running. # Default: MONGO_PORT=37017 @@ -131,7 +131,7 @@ MONGO_DATABASE=openIM_v3 # ----- Redis Configuration ----- # Address or hostname for the Redis service. # Default: REDIS_ADDRESS=172.28.0.1 -REDIS_ADDRESS=172.21.0.4 +REDIS_ADDRESS=172.28.0.4 # Port on which Redis in-memory data structure store is running. # Default: REDIS_PORT=16379 @@ -144,7 +144,7 @@ REDIS_PASSWORD=openIM123 # ----- Kafka Configuration ----- # Address or hostname for the Kafka service. # Default: KAFKA_ADDRESS=172.28.0.1 -KAFKA_ADDRESS=172.21.0.5 +KAFKA_ADDRESS=172.28.0.5 # Port on which Kafka distributed streaming platform is running. # Default: KAFKA_PORT=19092 @@ -165,7 +165,7 @@ KAFKA_OFFLINEMSG_MONGO_TOPIC=offlineMsgToMongoMysql # ----- MinIO Configuration ---- # Address or hostname for the MinIO object storage service. # Default: MINIO_ADDRESS=172.28.0.1 -MINIO_ADDRESS=172.21.0.7 +MINIO_ADDRESS=172.28.0.7 # Port on which MinIO object storage service is running. # Default: MINIO_PORT=10005 @@ -182,7 +182,7 @@ MINIO_SECRET_KEY=openIM123 # ----- Prometheus Configuration ----- # Address or hostname for the Prometheus service. # Default: PROMETHEUS_ADDRESS=172.28.0.1 -PROMETHEUS_ADDRESS=172.21.0.11 +PROMETHEUS_ADDRESS=172.28.0.11 # Port on which Prometheus service is running. # Default: PROMETHEUS_PORT=19090 @@ -191,7 +191,7 @@ PROMETHEUS_PORT=19090 # ----- Grafana Configuration ----- # Address or hostname for the Grafana service. # Default: GRAFANA_ADDRESS=172.28.0.1 -GRAFANA_ADDRESS=172.21.0.12 +GRAFANA_ADDRESS=172.28.0.12 # Port on which Grafana service is running. # Default: GRAFANA_PORT=3000 @@ -211,7 +211,7 @@ OPENIM_WEB_PORT=11001 # Address or hostname for the OpenIM web service. # Default: OPENIM_WEB_ADDRESS=172.28.0.1 -OPENIM_WEB_ADDRESS=172.21.0.8 +OPENIM_WEB_ADDRESS=172.28.0.8 # ====================================== @@ -220,7 +220,7 @@ OPENIM_WEB_ADDRESS=172.21.0.8 # Address or hostname for the OpenIM server. # Default: OPENIM_SERVER_ADDRESS=172.28.0.1 -OPENIM_SERVER_ADDRESS=172.21.0.9 +OPENIM_SERVER_ADDRESS=172.28.0.9 # Port for the OpenIM WebSockets. # Default: OPENIM_WS_PORT=10001 @@ -241,7 +241,7 @@ CHAT_BRANCH=main # Address or hostname for the OpenIM chat service. # Default: OPENIM_CHAT_ADDRESS=172.28.0.1 -OPENIM_CHAT_ADDRESS=172.21.0.10 +OPENIM_CHAT_ADDRESS=172.28.0.10 # Port for the OpenIM chat API. # Default: OPENIM_CHAT_API_PORT=10008 diff --git a/config/config.yaml b/config/config.yaml index 23e5ef547..c8c994c36 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -28,7 +28,7 @@ # Zookeeper password zookeeper: schema: openim - address: [ 172.21.0.1:12181 ] + address: [ 172.28.0.1:12181 ] username: '' password: '' @@ -42,7 +42,7 @@ zookeeper: # Log level: 1=slient, 2=error, 3=warn, 4=info # Slow query threshold in milliseconds mysql: - address: [ 172.21.0.1:13306 ] + address: [ 172.28.0.1:13306 ] username: root password: openIM123 database: openIM_v3 @@ -61,7 +61,7 @@ mysql: # Maximum connection pool size mongo: uri: '' - address: [ 172.21.0.1:37017 ] + address: [ 172.28.0.1:37017 ] database: openIM_v3 username: root password: openIM123 @@ -72,7 +72,7 @@ mongo: # # Username is required only for Redis version 6.0+ redis: - address: [ 172.21.0.1:16379 ] + address: [ 172.28.0.1:16379 ] username: '' password: openIM123 @@ -86,7 +86,7 @@ redis: kafka: username: '' password: '' - addr: [ 172.21.0.1:19094 ] + addr: [ 172.28.0.1:19094 ] latestMsgToRedis: topic: "latestMsgToRedis" offlineMsgToMongo: @@ -135,7 +135,7 @@ object: apiURL: "http://14.153.6.114:10002" minio: bucket: "openim" - endpoint: "http://172.21.0.1:10005" + endpoint: "http://172.28.0.1:10005" accessKeyID: "root" secretAccessKey: "openIM123" sessionToken: '' @@ -194,7 +194,7 @@ rpcRegisterName: # Whether to output in json format # Whether to include stack trace in logs log: - storageLocation: /root/workspaces/openim/openim-server/logs/ + storageLocation: ../logs rotationTime: 24 remainRotationCount: 2 remainLogLevel: 6