From a9b60b8052524f1825df7e1e4fff23c7b968c7cd Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Wed, 19 Oct 2022 19:36:49 +0800 Subject: [PATCH 1/7] encryption --- pkg/common/db/mysql.go | 3 +-- pkg/common/db/mysql_model/im_mysql_model/client_config.go | 2 +- pkg/proto/auth/auth.proto | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index 2da7add65..ca0e62008 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -3,7 +3,6 @@ package db import ( "Open_IM/pkg/common/config" "fmt" - "sync" "time" "gorm.io/driver/mysql" @@ -12,7 +11,7 @@ import ( ) type mysqlDB struct { - sync.RWMutex + //sync.RWMutex db *gorm.DB } diff --git a/pkg/common/db/mysql_model/im_mysql_model/client_config.go b/pkg/common/db/mysql_model/im_mysql_model/client_config.go index ae932ed92..08300cefe 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/client_config.go +++ b/pkg/common/db/mysql_model/im_mysql_model/client_config.go @@ -17,6 +17,6 @@ func SetClientInitConfig(m map[string]interface{}) error { func GetClientInitConfig() (db.ClientInitConfig, error) { var config db.ClientInitConfig - err := db.DB.MysqlDB.DefaultGormDB().Model((&db.ClientInitConfig{})).First(&config).Error + err := db.DB.MysqlDB.DefaultGormDB().Model(&db.ClientInitConfig{}).First(&config).Error return config, err } diff --git a/pkg/proto/auth/auth.proto b/pkg/proto/auth/auth.proto index d6018c667..9370ef916 100644 --- a/pkg/proto/auth/auth.proto +++ b/pkg/proto/auth/auth.proto @@ -31,7 +31,6 @@ message UserTokenResp { } - message ForceLogoutReq { int32 Platform = 1; string FromUserID = 2; @@ -56,8 +55,6 @@ message ParseTokenResp{ } - - service Auth { rpc UserRegister(UserRegisterReq) returns(UserRegisterResp); rpc UserToken(UserTokenReq) returns(UserTokenResp); From d33e15a2bb336ce8ef88c878988713347c906ec0 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Thu, 20 Oct 2022 15:23:12 +0800 Subject: [PATCH 2/7] log --- pkg/common/http/http_client.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index b83ad7516..a0cdfc0ff 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -7,6 +7,7 @@ package http import ( + "Open_IM/pkg/common/log" "bytes" "encoding/json" "io/ioutil" @@ -64,6 +65,7 @@ func CallBackPostReturn(url, callbackCommand string, input, output interface{}, if err != nil { return err } + log.Info("post resp content: ", string(b)) if err = json.Unmarshal(b, output); err != nil { return err } From 83779a684b2cea7f82bf9f8dab0f6c5911d87f63 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 4 Nov 2022 15:00:54 +0800 Subject: [PATCH 3/7] limit memory --- docker-compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 6cf32b5a1..3e932ee60 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -81,6 +81,7 @@ services: KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE + KAFKA_HEAP_OPTS: "-Xmx512M -Xms256M" depends_on: - zookeeper From 1f0040ceb64e07389c71174377ca9acd0ba6a7b7 Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 11:08:27 +0800 Subject: [PATCH 4/7] Specify the relative path for the configuration file --- pkg/common/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index a12497601..ff6828814 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -578,7 +578,7 @@ func init() { panic(err.Error()) } } else { - bytes, err := ioutil.ReadFile(filepath.Join(Root, "config", "config.yaml")) + bytes, err := ioutil.ReadFile("../config/config.yaml") if err != nil { panic(err.Error()) } From 9f4a8952a4a31de4992a4644d9fae83fee96c46f Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 11:13:07 +0800 Subject: [PATCH 5/7] remove log --- pkg/common/http/http_client.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index a0cdfc0ff..b83ad7516 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -7,7 +7,6 @@ package http import ( - "Open_IM/pkg/common/log" "bytes" "encoding/json" "io/ioutil" @@ -65,7 +64,6 @@ func CallBackPostReturn(url, callbackCommand string, input, output interface{}, if err != nil { return err } - log.Info("post resp content: ", string(b)) if err = json.Unmarshal(b, output); err != nil { return err } From 2a4fae4718ede4e70c62dcba8cc1b961a4dce83e Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 17:01:18 +0800 Subject: [PATCH 6/7] Optimize the configuration --- .env | 3 +++ docker-compose.yaml | 55 ++++++++++++++++++++------------------------- 2 files changed, 27 insertions(+), 31 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 000000000..777731025 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +USER=root +PASSWORD=openIM123 +DATA_DIR=/data/IM diff --git a/docker-compose.yaml b/docker-compose.yaml index 3e932ee60..1581b3eed 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,5 @@ -version: "3" #fixme Clone openIM Server project before using docker-compose,project address：https://github.com/OpenIMSDK/Open-IM-Server.git - +version: "3" services: mysql: image: mysql:5.7 @@ -9,10 +8,10 @@ services: - 23306:33060 container_name: mysql volumes: - - ./components/mysql/data:/var/lib/mysql + - ${DATA_DIR}/components/mysql/data:/var/lib/mysql - /etc/localtime:/etc/localtime environment: - MYSQL_ROOT_PASSWORD: openIM + MYSQL_ROOT_PASSWORD: ${PASSWORD} restart: always mongodb: @@ -22,19 +21,17 @@ services: container_name: mongo command: --wiredTigerCacheSizeGB 1 volumes: - - ./components/mongodb/data/db:/data/db - - ./components/mongodb/data/logs:/data/logs - - ./components/mongodb/data/conf:/etc/mongo - # - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh + - ${DATA_DIR}/components/mongodb/data/db:/data/db + - ${DATA_DIR}/components/mongodb/data/logs:/data/logs + - ${DATA_DIR}/components/mongodb/data/conf:/etc/mongo + - ./script/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro environment: - TZ=Asia/Shanghai # cache - wiredTigerCacheSizeGB=1 - # - MONGO_USERNAME=openIM - # - MONGO_PASSWORD=openIM - # - MONGO_INITDB_ROOT_USERNAME=root - # - MONGO_INITDB_ROOT_PASSWORD=root - # - MONGO_INITDB_DATABASE=openIM + - MONGO_INITDB_ROOT_USERNAME=${USER} + - MONGO_INITDB_ROOT_PASSWORD=${PASSWORD} + - MONGO_INITDB_DATABASE=openIM restart: always redis: @@ -43,15 +40,15 @@ services: - 16379:6379 container_name: redis volumes: - - ./components/redis/data:/data + - ${DATA_DIR}/components/redis/data:/data #redis config file - - ./components/redis/config/redis.conf:/usr/local/redis/config/redis.conf + - ${DATA_DIR}/components/redis/config/redis.conf:/usr/local/redis/config/redis.conf environment: TZ: Asia/Shanghai restart: always sysctls: net.core.somaxconn: 1024 - command: redis-server --requirepass openIM --appendonly yes + command: redis-server --requirepass ${PASSWORD} --appendonly yes zookeeper: @@ -81,7 +78,6 @@ services: KAFKA_LISTENERS: INSIDE://:9092,OUTSIDE://:9093 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: "INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT" KAFKA_INTER_BROKER_LISTENER_NAME: INSIDE - KAFKA_HEAP_OPTS: "-Xmx512M -Xms256M" depends_on: - zookeeper @@ -109,19 +105,19 @@ services: - /mnt/data:/data - /mnt/config:/root/.minio environment: - MINIO_ROOT_USER: user12345 - MINIO_ROOT_PASSWORD: key12345 + MINIO_ROOT_USER: ${USER} + MINIO_ROOT_PASSWORD: ${PASSWORD} restart: always command: minio server /data --console-address ':9090' open_im_server: - image: openim/open_im_server:v2.3.3 + image: openim/open_im_server:v2.3.2 container_name: open_im_server volumes: - ./logs:/Open-IM-Server/logs - ./config/config.yaml:/Open-IM-Server/config/config.yaml - - ./db/sdk:/Open-IM-Server/db/sdk + - ${DATA_DIR}/db/sdk:/Open-IM-Server/db/sdk - ./script:/Open-IM-Server/script restart: always depends_on: @@ -141,8 +137,8 @@ services: prometheus: image: prom/prometheus volumes: - - ./docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml - # - ./components/prometheus_data:/prometheus + - ${DATA_DIR}/docker-compose_cfg/prometheus-compose.yml:/etc/prometheus/prometheus.yml + # - ${DATA_DIR}/components/prometheus_data:/prometheus container_name: prometheus ports: - 9091:9091 @@ -154,20 +150,17 @@ services: grafana: image: grafana/grafana volumes: - - ./docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml - - ./docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini - # - ./docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json - # - ./components/grafana:/var/lib/grafana - - ./docker-compose_cfg/grafana.db:/var/lib/grafana/grafana.db + # - ./grafana/dashboards/dashboard.json:/var/lib/grafana/dashboards/dashboard.json + # - ./grafana/provisioning/dashboard.yaml:/etc/grafana/provisioning/dashboards/dashboard.yaml + - ${DATA_DIR}/docker-compose_cfg/datasource-compose.yaml:/etc/grafana/provisioning/datasources/datasource.yaml + - ${DATA_DIR}/docker-compose_cfg/grafana.ini:/etc/grafana/grafana.ini + - ${DATA_DIR}/docker-compose_cfg/node-exporter-full_rev1.json:/var/lib/grafana/dashboards/node-exporter-full_rev1.json container_name: grafana ports: - 10007:10007 depends_on: - prometheus network_mode: "host" - privileged: true - user: root - # -rw-r----- node-exporter: image: quay.io/prometheus/node-exporter From 24d917bb2d9cf6375c0452b6fbc69d93469c8aca Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Tue, 8 Nov 2022 17:04:18 +0800 Subject: [PATCH 7/7] Optimize the configuration --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 777731025..8f2a06dcc 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ USER=root -PASSWORD=openIM123 -DATA_DIR=/data/IM +PASSWORD=openIM +DATA_DIR=./