From d7200826447c5dbffbe81b3da4654d835b1a5a54 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 6 Apr 2022 11:47:01 +0800 Subject: [PATCH 1/4] shell update --- script/docker_start_all.sh | 9 ++++++++- script/msg_gateway_start.sh | 2 +- script/start_all.sh | 11 +++++++++++ script/start_rpc_service.sh | 9 ++++----- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/script/docker_start_all.sh b/script/docker_start_all.sh index 99887bff9..42ee81992 100644 --- a/script/docker_start_all.sh +++ b/script/docker_start_all.sh @@ -15,7 +15,14 @@ need_to_start_server_shell=( #fixme The 10 second delay to start the project is for the docker-compose one-click to start openIM when the infrastructure dependencies are not started sleep 10 - +time=`date +"%Y-%m-%d %H:%M:%S"` +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & for i in ${need_to_start_server_shell[*]}; do chmod +x $i ./$i diff --git a/script/msg_gateway_start.sh b/script/msg_gateway_start.sh index 978cc11fb..7c107f16a 100644 --- a/script/msg_gateway_start.sh +++ b/script/msg_gateway_start.sh @@ -14,7 +14,7 @@ ws_ports=($ports_array) if [ ${#rpc_ports[@]} -ne ${#ws_ports[@]} ]; then echo -e ${RED_PREFIX}"ws_ports does not match push_rpc_ports in quantity!!!"${COLOR_SUFFIX} - exit 0 + exit -1 fi #Check if the service exists diff --git a/script/start_all.sh b/script/start_all.sh index 4125ca50a..bf7170d68 100644 --- a/script/start_all.sh +++ b/script/start_all.sh @@ -11,8 +11,19 @@ need_to_start_server_shell=( sdk_svr_start.sh demo_svr_start.sh ) +time=`date +"%Y-%m-%d %H:%M:%S"` +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & +echo "==========================================================">>../logs/openIM.log 2>&1 & for i in ${need_to_start_server_shell[*]}; do chmod +x $i ./$i + if [ $? -ne 0 ]; then + exit -1 + fi done diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index 0b54493c2..e15307f45 100644 --- a/script/start_rpc_service.sh +++ b/script/start_rpc_service.sh @@ -45,24 +45,23 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do if [ $(eval ${count}) -gt 0 ]; then pid="${service_name}| awk '{print \$2}'" - echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} service has been started,pid:$(eval $pid)$COLOR_SUFFIX" - echo -e "${SKY_BLUE_PREFIX}Killing the service ${service_filename[$i]} pid:$(eval $pid)${COLOR_SUFFIX}" + echo "${service_filename[$i]} service has been started,pid:$(eval $pid)" + echo "killing the service ${service_filename[$i]} pid:$(eval $pid)" #kill the service that existed kill -9 $(eval $pid) sleep 0.5 fi - cd ../bin && echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} service is starting${COLOR_SUFFIX}" + cd ../bin #Get the rpc port in the configuration file portList=$(cat $config_path | grep ${service_port_name[$i]} | awk -F '[:]' '{print $NF}') list_to_string ${portList} #Start related rpc services based on the number of ports for j in ${ports_array}; do - echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} Service is starting,port number:$j $COLOR_SUFFIX" #Start the service in the background # ./${service_filename[$i]} -port $j & nohup ./${service_filename[$i]} -port $j >>../logs/openIM.log 2>&1 & sleep 1 pid="netstat -ntlp|grep $j |awk '{printf \$7}'|cut -d/ -f1" - echo -e "${RED_PREFIX}${service_filename[$i]} Service is started,port number:$j pid:$(eval $pid)$COLOR_SUFFIX" + echo -e "${GREEN_PREFIX}${service_filename[$i]} start success,port number:$j pid:$(eval $pid)$COLOR_SUFFIX" done done \ No newline at end of file From 46d7d30089caf9081c942f918d3c9ac5c2a12e4b Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 6 Apr 2022 12:01:29 +0800 Subject: [PATCH 2/4] shell update --- script/build_all_service.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/build_all_service.sh b/script/build_all_service.sh index d3b01785f..0d9814bec 100644 --- a/script/build_all_service.sh +++ b/script/build_all_service.sh @@ -32,6 +32,5 @@ for ((i = 0; i < ${#service_source_root[*]}; i++)); do else echo -e "${GREEN_PREFIX}${service_names[$i]} successfully be built ${COLOR_SUFFIX}\n" fi - - done +echo -e ${YELLOW_PREFIX}"all services build success"${COLOR_SUFFIX} From f64c40e91ff2e6f9faf2c1cd54855c7dd3b849fc Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 6 Apr 2022 14:31:25 +0800 Subject: [PATCH 3/4] tag msg --- internal/rpc/msg/tag_send_msg.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/rpc/msg/tag_send_msg.go b/internal/rpc/msg/tag_send_msg.go index 6d8c0a0b3..7f0550d62 100644 --- a/internal/rpc/msg/tag_send_msg.go +++ b/internal/rpc/msg/tag_send_msg.go @@ -10,7 +10,6 @@ import ( "Open_IM/pkg/utils" "context" "strings" - "time" ) func TagSendMessage(operationID, sendID, recvID, content string, senderPlatformID int32) { @@ -25,8 +24,8 @@ func TagSendMessage(operationID, sendID, recvID, content string, senderPlatformI msgData.Content = []byte(content) msgData.Options = map[string]bool{} msgData.Options[constant.IsSenderConversationUpdate] = false - msgData.SendTime = time.Now().Unix() - msgData.CreateTime = time.Now().Unix() + msgData.CreateTime = utils.GetCurrentTimestampByMill() + msgData.ClientMsgID = utils.GetMsgID(sendID) msgData.SenderPlatformID = senderPlatformID req.MsgData = &msgData req.OperationID = operationID From 59cc45eaab0a3da2db7a4a40069f5eb783d82a52 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 6 Apr 2022 14:41:36 +0800 Subject: [PATCH 4/4] replace log --- pkg/common/db/mysql.go | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkg/common/db/mysql.go b/pkg/common/db/mysql.go index ad35cd5da..32cf7458b 100644 --- a/pkg/common/db/mysql.go +++ b/pkg/common/db/mysql.go @@ -2,7 +2,7 @@ package db import ( "Open_IM/pkg/common/config" - "Open_IM/pkg/common/log" + "fmt" "sync" "time" @@ -24,13 +24,13 @@ func initMysqlDB() { var err1 error db, err := gorm.Open("mysql", dsn) if err != nil { - log.NewError("0", "Open failed ", err.Error(), dsn) + fmt.Println("0", "Open failed ", err.Error(), dsn) } if err != nil { time.Sleep(time.Duration(30) * time.Second) db, err1 = gorm.Open("mysql", dsn) if err1 != nil { - log.NewError("0", "Open failed ", err1.Error(), dsn) + fmt.Println("0", "Open failed ", err1.Error(), dsn) panic(err1.Error()) } } @@ -39,7 +39,7 @@ func initMysqlDB() { sql := fmt.Sprintf("CREATE DATABASE IF NOT EXISTS %s default charset utf8 COLLATE utf8_general_ci;", config.Config.Mysql.DBDatabaseName) err = db.Exec(sql).Error if err != nil { - log.NewError("0", "Exec failed ", err.Error(), sql) + fmt.Println("0", "Exec failed ", err.Error(), sql) panic(err.Error()) } db.Close() @@ -48,11 +48,11 @@ func initMysqlDB() { config.Config.Mysql.DBUserName, config.Config.Mysql.DBPassword, config.Config.Mysql.DBAddress[0], config.Config.Mysql.DBDatabaseName) db, err = gorm.Open("mysql", dsn) if err != nil { - log.NewError("0", "Open failed ", err.Error(), dsn) + fmt.Println("0", "Open failed ", err.Error(), dsn) panic(err.Error()) } - log.NewInfo("open db ok ", dsn) + fmt.Println("open db ok ", dsn) db.AutoMigrate(&Friend{}, &FriendRequest{}, &Group{}, @@ -64,49 +64,49 @@ func initMysqlDB() { db.Set("gorm:table_options", "collation=utf8_unicode_ci") if !db.HasTable(&Friend{}) { - log.NewInfo("CreateTable Friend") + fmt.Println("CreateTable Friend") db.CreateTable(&Friend{}) } if !db.HasTable(&FriendRequest{}) { - log.NewInfo("CreateTable FriendRequest") + fmt.Println("CreateTable FriendRequest") db.CreateTable(&FriendRequest{}) } if !db.HasTable(&Group{}) { - log.NewInfo("CreateTable Group") + fmt.Println("CreateTable Group") db.CreateTable(&Group{}) } if !db.HasTable(&GroupMember{}) { - log.NewInfo("CreateTable GroupMember") + fmt.Println("CreateTable GroupMember") db.CreateTable(&GroupMember{}) } if !db.HasTable(&GroupRequest{}) { - log.NewInfo("CreateTable GroupRequest") + fmt.Println("CreateTable GroupRequest") db.CreateTable(&GroupRequest{}) } if !db.HasTable(&User{}) { - log.NewInfo("CreateTable User") + fmt.Println("CreateTable User") db.CreateTable(&User{}) } if !db.HasTable(&Black{}) { - log.NewInfo("CreateTable Black") + fmt.Println("CreateTable Black") db.CreateTable(&Black{}) } if !db.HasTable(&ChatLog{}) { - log.NewInfo("CreateTable Black") + fmt.Println("CreateTable Black") db.CreateTable(&ChatLog{}) } if !db.HasTable(&Register{}) { - log.NewInfo("CreateTable Black") + fmt.Println("CreateTable Black") db.CreateTable(&Register{}) } if !db.HasTable(&Conversation{}) { - log.NewInfo("CreateTable Black") + fmt.Println("CreateTable Black") db.CreateTable(&Conversation{}) }