From 34f3dff0c02265285c3a20d3ac9a42e0e5b41845 Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Tue, 17 Aug 2021 10:30:11 +0800
Subject: [PATCH] update

---
 dsSzxy/.idea/workspace.xml                    | 38 +--------
 .../ImRelateController/ImRelateController.go  | 85 ++++++++++++++++++-
 .../ImRelate/ImRelateDao/ImRelateDao.go       | 25 ++++++
 dsSzxy/Config/Config.ini                      |  3 +
 dsSzxy/Utils/ConfigUtil/ConfigUtil.go         |  6 ++
 5 files changed, 119 insertions(+), 38 deletions(-)

diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index d96a8538..65f4c20c 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -2,45 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="19c8c37d-a056-451c-a29d-fb612b9a3e2f" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Business/FileRelate/FileRelateController/FileReleateController.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Business/FileRelate/FileRelateDao/FileReleateDao.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/CheckHandler.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitDateTime.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitEmail.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitEmpty.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitFloatRange.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitIdCard.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitIntRange.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitLength.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/CheckHandler/LimitTel.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Handler/ParameterHandler.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Model/Res.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Templates/config" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Templates/struct.go.tpl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Tools/ModelKit.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Tools/XltraSwag.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Utils/CommonUtil/SwaggerUtil.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Utils/SqlKit/Selector.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/Utils/SqlKit/SqlKit.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/docs/docs.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/docs/docs.go.template" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/docs/swagger.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/docs/swagger.yaml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_clouddisk_tree.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_clouddisk_tree_file.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_dm_system.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_file.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_file_type.go" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/models/t_zhxy_file_type_ext.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateController/ImRelateController.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" beforeDir="false" afterPath="$PROJECT_DIR$/Business/ImRelate/ImRelateDao/ImRelateDao.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Config/Config.ini" beforeDir="false" afterPath="$PROJECT_DIR$/Config/Config.ini" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Router/Router.go" beforeDir="false" afterPath="$PROJECT_DIR$/Router/Router.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/CommonUtil/CommonUtil.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.mod" beforeDir="false" afterPath="$PROJECT_DIR$/go.mod" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/go.sum" beforeDir="false" afterPath="$PROJECT_DIR$/go.sum" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/main.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Utils/ConfigUtil/ConfigUtil.go" beforeDir="false" afterPath="$PROJECT_DIR$/Utils/ConfigUtil/ConfigUtil.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
index a8fa9f25..7abfdb34 100644
--- a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
+++ b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
@@ -2,6 +2,7 @@ package ImRelateController
 
 import (
 	"dsSzxy/Business/ImRelate/ImRelateDao"
+	"dsSzxy/Utils/ConfigUtil"
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"net/http"
@@ -12,6 +13,8 @@ func Routers(r *gin.RouterGroup) {
 	rr := r.Group("/imRelate")
 	rr.POST("/sendTxtMsg", sendTxtMsg)
 	rr.POST("/sendImgMsg", sendImgMsg)
+	rr.POST("/sendFileMsg", sendFileMsg)
+	rr.POST("/sendVideoMsg", sendVideoMsg)
 }
 
 /**
@@ -33,12 +36,22 @@ func sendTxtMsg(c *gin.Context) {
 	contentJsonObj, _ := json.Marshal(m)
 	contentJsonStr := string(contentJsonObj)
 
-	err := ImRelateDao.SendRongYunMsg(sendType, fromId, toId, "RC:TxtMsg", contentJsonStr)
-	if err != nil {
+	sendErr := ImRelateDao.SendRongYunMsg(sendType, fromId, toId, "RC:TxtMsg", contentJsonStr)
+	if sendErr != nil {
 		c.JSON(http.StatusOK, gin.H{"success": false, "info": "发送消息失败！"})
 		return
 	}
 
+	cm := map[string]string{"name": "中华人民共和国1234", "country": "China", "age": "21", "date": "2021-08-17"}
+	bodyJsonObj, _ := json.Marshal(cm)
+	bodyString := string(bodyJsonObj)
+
+	saveErr := ImRelateDao.SaveChatRecord("chat_record", bodyString)
+	if saveErr != nil {
+		c.JSON(http.StatusOK, gin.H{"success": false, "info": "聊天记录保存失败！"})
+		return
+	}
+
 	c.JSON(http.StatusOK, gin.H{"success": true, "info": "发送消息成功！"})
 }
 
@@ -73,3 +86,71 @@ func sendImgMsg(c *gin.Context) {
 
 	c.JSON(http.StatusOK, gin.H{"success": true, "info": "发送消息成功！"})
 }
+
+/**
+功能：发送融云文件消息
+作者：吴缤
+日期：2021-08-16
+*/
+func sendFileMsg(c *gin.Context) {
+	//发送方Id。
+	fromId := c.PostForm("fromId")
+	//接收方Id。
+	toId := c.PostForm("toId")
+	//发送类型 p：单聊 g：群聊
+	sendType := c.PostForm("sendType")
+	//文件名
+	fileName := c.PostForm("fileName")
+	//文件大小
+	fileSize := c.PostForm("fileSize")
+	//文件类型
+	fileType := c.PostForm("fileType")
+	//文件URL
+	fileUrl := c.PostForm("fileUrl")
+
+	m := map[string]string{"name": fileName, "size": fileSize, "type": fileType, "fileUrl": fileUrl}
+	contentJsonObj, _ := json.Marshal(m)
+	contentJsonStr := string(contentJsonObj)
+
+	err := ImRelateDao.SendRongYunMsg(sendType, fromId, toId, "RC:FileMsg", contentJsonStr)
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{"success": false, "info": "发送消息失败！"})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"success": true, "info": "发送消息成功！"})
+}
+
+/**
+功能：发送融云视频消息
+作者：吴缤
+日期：2021-08-16
+*/
+func sendVideoMsg(c *gin.Context) {
+	//发送方Id。
+	fromId := c.PostForm("fromId")
+	//接收方Id。
+	toId := c.PostForm("toId")
+	//发送类型 p：单聊 g：群聊
+	sendType := c.PostForm("sendType")
+	//视频URL
+	videoUrl := c.PostForm("videoUrl")
+	//视频缩略图base64编码
+	thumbBase64 := ConfigUtil.VideoThumb
+	//视频大小
+	videoSize := c.PostForm("videoSize")
+	//视频名称
+	fileName := c.PostForm("fileName")
+
+	m := map[string]string{"sightUrl": videoUrl, "content": thumbBase64, "duration": "60", "size": videoSize, "name": fileName}
+	contentJsonObj, _ := json.Marshal(m)
+	contentJsonStr := string(contentJsonObj)
+
+	err := ImRelateDao.SendRongYunMsg(sendType, fromId, toId, "RC:FileMsg", contentJsonStr)
+	if err != nil {
+		c.JSON(http.StatusOK, gin.H{"success": false, "info": "发送消息失败！"})
+		return
+	}
+
+	c.JSON(http.StatusOK, gin.H{"success": true, "info": "发送消息成功！"})
+}
diff --git a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
index f93be1fd..7cccc83d 100644
--- a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
+++ b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
@@ -3,6 +3,7 @@ package ImRelateDao
 import (
 	"dsSzxy/Utils/CommonUtil"
 	"dsSzxy/Utils/ConfigUtil"
+	"dsSzxy/Utils/EsUtil"
 	ssdb "dsSzxy/Utils/SsdbUtil"
 	"errors"
 	"fmt"
@@ -39,6 +40,10 @@ func GetPersonAvatar(personId string, identityId string, w string, h string) str
 	return avatar
 }
 
+func GetPersonName(personId string, identityId string) string {
+	return ""
+}
+
 /**
 功能：发送融云消息
 作者：吴缤
@@ -106,3 +111,23 @@ func SendRongYunMsg(sendType string, fromId string, toId string, objectName stri
 
 	return nil
 }
+
+/**
+功能：保存聊天记录到ES
+作者：吴缤
+日期：2021-08-17
+*/
+func SaveChatRecord(indexName string, bodyString string) error {
+	esClient := EsUtil.EsClient
+	CTX := EsUtil.CTX
+
+	_, err := esClient.Index().
+		Index(indexName).
+		Id(CommonUtil.GetUUID()).
+		BodyString(bodyString).
+		Do(CTX)
+	if err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/dsSzxy/Config/Config.ini b/dsSzxy/Config/Config.ini
index 7d81ac29..7f3155db 100644
--- a/dsSzxy/Config/Config.ini
+++ b/dsSzxy/Config/Config.ini
@@ -62,5 +62,8 @@ path = /usr/local/dsMin/dsSzxy/files/
 #config_path = /usr/local/tomcat7/webapps/dsideal_yy/WEB-INF/classes/config.properties
 config_path = c:/1/config.properties
 
+[videoThumb]
+thumb = data:image/jpeg;base64,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
+
 
 
diff --git a/dsSzxy/Utils/ConfigUtil/ConfigUtil.go b/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
index 3f2a64c7..580422a3 100644
--- a/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
+++ b/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
@@ -63,6 +63,9 @@ var (
 
 	//kafka地址
 	KafkaAddrs string
+
+	//视频缩略图
+	VideoThumb string
 )
 
 //cookie中的SessionId名称
@@ -153,6 +156,9 @@ func init() {
 
 	//kafka地址
 	KafkaAddrs = iniParser.GetString("kafka", "addr")
+
+	//视频缩略图
+	VideoThumb = iniParser.GetString("videoThumb", "thumb")
 }
 
 type IniParser struct {