Merge pull request #2178 from openimsdk/cubxxw-patch-2

feat: update release-v3.2 images

.github/sync.yml

@@ -75,6 +75,17 @@ OpenIMSDK/OpenKF:
     dest: .github/.codecov.yml
     replace: false
 
+openim-sigs/openim-docker:
+  - source: ./config
+    dest: ./openim-server/config
+    replace: true
+  - source: ./docs
+    dest: ./openim-server/docs
+    replace: true
+  - source: ./scripts
+    dest: ./openim-server/scripts
+    replace: true
+
 group:
   # first group：common to all warehouses
   # TODO: add the required warehouse here
@@ -116,4 +127,4 @@ group:
         replace: false
       - source: ./scripts/githooks/
         dest: ./scripts/githooks/
-        replace: true
+        replace: true

Dockerfile

@@ -19,7 +19,7 @@ ADD . .
 RUN make clean
 RUN make build
 
-FROM ghcr.io/openim-sigs/openim-bash-image:latest
+FROM ghcr.io/openim-sigs/openim-ubuntu-image:latest
 
 WORKDIR ${SERVER_WORKDIR}
 

README.md

@@ -29,6 +29,7 @@
 
 </p>
 
+
 ## ✨ About OpenIM
 
 Open-IM-Server, crafted meticulously using pure Golang, stands as a robust instant messaging server. Its unique approach to communication, via JSON over WebSocket, treats every interaction as a message. This simplifies customization and eliminates the need for tinkering with server code. Harnessing the power of microservice architecture, the server can be deployed via clusters, promising impressive performance and scalability.

docker-compose.yaml

@@ -54,8 +54,6 @@ services:
 
   zookeeper:
     image: wurstmeister/zookeeper
-    ports:
-      - 2181:2181
     container_name: zookeeper
     volumes:
       - /etc/localtime:/etc/localtime
@@ -68,8 +66,6 @@ services:
     image: wurstmeister/kafka
     container_name: kafka
     restart: always
-    ports:
-      - 9092:9092
     environment:
       TZ: Asia/Shanghai
       KAFKA_BROKER_ID: 0
@@ -99,7 +95,7 @@ services:
     command: minio server /data --console-address ':9090'
 
   openim-server:
-    image: ghcr.io/openimsdk/openim-server:latest
+    image: openim/openim-server:release-v3.2
 #    build: .
     container_name: openim-server
     volumes:
@@ -122,7 +118,7 @@ services:
         max-file: "2"
 
   openim-chat:
-    image: ghcr.io/openimsdk/openim-chat:latest
+    image: openim/openim-chat:release-v1.2
     container_name: openim-chat
     volumes:
       - ./openim-chat/logs:/openim/openim-chat/logs
@@ -170,4 +166,4 @@ services:
   #   container_name: node-exporter
   #   restart: always
   #   ports:
-  #     - "9100:9100"
+  #     - "9100:9100"

pkg/common/convert/msg.go

@@ -15,6 +15,7 @@
 package convert
 
 import (
+	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/sdkws"
 
 	"github.com/OpenIMSDK/Open-IM-Server/pkg/common/db/table/unrelation"
@@ -78,7 +79,9 @@ func MsgDB2Pb(msgModel *unrelation.MsgDataModel) *sdkws.MsgData {
 	msg.SendTime = msgModel.SendTime
 	msg.CreateTime = msgModel.CreateTime
 	msg.Status = msgModel.Status
-	msg.IsRead = msgModel.IsRead
+	if msgModel.SessionType == constant.SingleChatType {
+		msg.IsRead = msgModel.IsRead
+	}
 	msg.Options = msgModel.Options
 	if msgModel.OfflinePush != nil {
 		msg.OfflinePushInfo = &sdkws.OfflinePushInfo{

scripts/make-rules/golang.mk

@@ -17,7 +17,7 @@
 #
 
 GO := go
-GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20
+GO_SUPPORTED_VERSIONS ?= 1.18|1.19|1.20|1.21
 
 GO_LDFLAGS += -X $(VERSION_PACKAGE).gitVersion=$(GIT_TAG) \
 	-X $(VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) \