Merge branch 'tuoyun' into superGroup

# Conflicts:
#	internal/push/logic/push_to_client.go

deploy_k8s/admin_cms/admin_cms.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 
@@ -15,5 +16,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config", "/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/api/api.Dockerfile

@@ -2,6 +2,7 @@ FROM ubuntu
 
 # 设置固定的项目路径
 ENV WORKDIR /Open-IM-Server
+ENV CMDDIR $WORKDIR/cmd
 ENV CONFIG_NAME $WORKDIR/config/config.yaml
 
 # 将可执行文件复制到目标目录
@@ -14,5 +15,5 @@ RUN mkdir $WORKDIR/logs $WORKDIR/config $WORKDIR/script && \
 VOLUME ["/Open-IM-Server/logs","/Open-IM-Server/config","/Open-IM-Server/script"]
 
 
-WORKDIR $WORKDIR
+WORKDIR $CMDDIR
-CMD ./cmd/main
+CMD ./main

deploy_k8s/api/deployment.yaml

@@ -16,7 +16,7 @@ spec:
       containers:
       - name: api
         image: openim/api:v2.0.10k
-        # imagePullPolicy: Always
+        imagePullPolicy: Always
         ports:
         - containerPort: 10002
         volumeMounts:
@@ -42,3 +42,4 @@ spec:
       targetPort: 10002
   selector:
     app: api
+  type: NodePort  

deploy_k8s/cms_api/deployment.yaml

@@ -42,3 +42,4 @@ spec:
       targetPort: 10006
   selector:
     app: cms-api
+  type: NodePort  

deploy_k8s/demo/deployment.yaml

@@ -42,3 +42,4 @@ spec:
       targetPort: 10004
   selector:
     app: demo    
+  type: NodePort   

deploy_k8s/msg_gateway/deployment.yaml

@@ -45,5 +45,6 @@ spec:
       targetPort: ws-port
   selector:
     app: msg-gateway
+  type: NodePort   
 
     

deploy_k8s/sdk_server/deployment.yaml

@@ -49,5 +49,6 @@ spec:
       targetPort: 10003
   selector:
     app: sdk-server
+  type: NodePort   
 
     

internal/push/logic/push_to_client.go

@@ -71,6 +71,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 		}
 		if err := db.DB.HandleSignalInfo(pushMsg.OperationID, pushMsg.MsgData); err != nil {
 			log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), err.Error(), pushMsg.MsgData)
+			return
 		}
 		//Use offline push messaging
 		var UIDList []string
@@ -138,9 +139,7 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 		} else {
 			log.NewDebug(pushMsg.OperationID, "offline push return result is ", pushResult, pushMsg.MsgData)
 		}
-
 	}
-
 }
 
 func MsgToSuperGroupUser(pushMsg *pbPush.PushMsgReq) {