Merge remote-tracking branch 'origin/superGroup' into superGroup

internal/demo/register/onboarding_process.go

@@ -1,6 +1,7 @@
 package register
 
 import (
+	"Open_IM/internal/api/manage"
 	"Open_IM/internal/rpc/msg"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
@@ -11,6 +12,7 @@ import (
 	commonPb "Open_IM/pkg/proto/sdk_ws"
 	"Open_IM/pkg/utils"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"math/rand"
@@ -35,6 +37,7 @@ func onboardingProcess(operationID, userID, userName string) {
 	log.NewInfo(operationID, utils.GetSelfFuncName(), groupIDList)
 	joinGroups(operationID, userID, userName, groupIDList)
 	log.NewInfo(operationID, utils.GetSelfFuncName(), "fineshed")
+	oaNotification(operationID, userID)
 }
 
 func createOrganizationUser(operationID, userID, userName string) error {
@@ -184,8 +187,40 @@ func onboardingProcessNotification(operationID, userID, groupID, userName string
 		SessionType: constant.GroupChatType,
 		OperationID: operationID,
 	}
+
 	// notification user join group
 	msg.Notification(notification)
+
+}
+
+func oaNotification(operationID, userID string) {
+	elem := manage.OANotificationElem{
+		NotificationName:    "入职通知",
+		NotificationFaceURL: "",
+		NotificationType:    1,
+		Text:                "欢迎你入职公司",
+		Url:                 "",
+		MixType:             0,
+		PictureElem:         manage.PictureElem{},
+		SoundElem:           manage.SoundElem{},
+		VideoElem:           manage.VideoElem{},
+		FileElem:            manage.FileElem{},
+		Ex:                  "",
+	}
+	bytes, err := json.Marshal(elem)
+	if err != nil {
+		return
+	}
+	sysNotification := &msg.NotificationMsg{
+		SendID:      config.Config.Manager.AppManagerUid[0],
+		RecvID:      userID,
+		Content:     bytes,
+		MsgFrom:     constant.SysMsgType,
+		ContentType: constant.OANotification,
+		SessionType: constant.NotificationChatType,
+		OperationID: operationID,
+	}
+	msg.Notification(sysNotification)
 }
 
 func randomEnglishName() string {
@@ -193,7 +228,6 @@ func randomEnglishName() string {
 		"feudal", "adverse", "exploit", "occupy", "solve", "amazing", "fantasy", "orchid", "spiky", "approve", "flap"}
 	rand.Seed(time.Now().UnixNano())
 	index := rand.Intn(len(l) - 1)
-	fmt.Println(index)
 	return l[index]
 }
 
@@ -201,6 +235,5 @@ func randomPosition() string {
 	l := []string{"Golang工程师", "前端工程师", "后端工程师", "产品经理", "测试开发工程师", "运维开发工程师"}
 	rand.Seed(time.Now().UnixNano())
 	index := rand.Intn(len(l) - 1)
-	fmt.Println(index)
 	return l[index]
 }