From a79c20840d05ededc078e94ce5b2ae95c621d5bd Mon Sep 17 00:00:00 2001
From: kgdxpr <kgdxpr@163.com>
Date: Mon, 13 Sep 2021 10:04:29 +0800
Subject: [PATCH] update

---
 dsSzxy/.idea/workspace.xml                    |  2 ++
 .../ImRelateController/ImRelateController.go  |  2 +-
 .../ImRelate/ImRelateDao/ImRelateDao.go       | 26 +++++++++----------
 dsSzxy/Config/Config.ini                      |  2 +-
 dsSzxy/Utils/ConfigUtil/ConfigUtil.go         |  2 +-
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml
index 691ef33c..97a88748 100644
--- a/dsSzxy/.idea/workspace.xml
+++ b/dsSzxy/.idea/workspace.xml
@@ -5,6 +5,8 @@
       <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$/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 0b80bf68..ad0004db 100644
--- a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
+++ b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go
@@ -209,7 +209,7 @@ func SyncRongYunUser(c *gin.Context) {
 }
 
 /**
-功能：保存聊天记录
+功能：创建群组
 作者：吴缤
 日期：2021-08-23
 */
diff --git a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
index 3e654a09..6063a9b6 100644
--- a/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
+++ b/dsSzxy/Business/ImRelate/ImRelateDao/ImRelateDao.go
@@ -128,7 +128,7 @@ func GetPersonAvatarUrl(fileId string, extension string, serverLocation string)
 	if serverLocation == "1" {
 		url = fmt.Sprintf("https://image.edusoa.com/down/Material/%s/%s.%s?x-image-process=image/resize,w_72,h_72/quality,q_100", fileId[0:2], fileId, extension)
 	} else {
-		url = fmt.Sprintf("%s/dsideal_yy/html/thumb/Material/%s/%s.%s@72w_72h_100Q_1x.png", ConfigUtil.DsidealYy, fileId[0:2], fileId, extension)
+		url = fmt.Sprintf("%s/dsideal_yy/html/thumb/Material/%s/%s.%s@72w_72h_100Q_1x.png", "http://"+ConfigUtil.DsidealYy, fileId[0:2], fileId, extension)
 	}
 	return url
 }
@@ -337,7 +337,7 @@ func GetPersonNameAvatar(fromId string, toId string, sendType string) (fromName,
 日期：2021-09-06
 */
 func GetServerLocation() string {
-	url := ConfigUtil.DsidealYy + "/dsideal_yy/golbal/getValueByKey"
+	url := "http://" + ConfigUtil.DsidealYy + "/dsideal_yy/golbal/getValueByKey"
 	req := httplib.Get(url)
 	req.Param("key", "common.server.location")
 	resStr, err := req.String()
@@ -353,7 +353,7 @@ func GetServerLocation() string {
 }
 
 func GetPersonList(bureauId string, orgId string, queryChild string, bUse string, personName string, queryBureauChild string, pageNumber string, pageSize string) (string, error) {
-	req := httplib.Get(fmt.Sprintf("%s/dsideal_yy/admin/new_base/personInfo_GetPersonInfoList", ConfigUtil.DsidealYy))
+	req := httplib.Get(fmt.Sprintf("%s/dsideal_yy/admin/new_base/personInfo_GetPersonInfoList", "http://"+ConfigUtil.DsidealYy))
 
 	req.Param("bureau_id", bureauId)
 	req.Param("org_id", orgId)
@@ -391,7 +391,7 @@ func GetPersonList(bureauId string, orgId string, queryChild string, bUse string
 日期：2021-09-09
 */
 func SaveGroup(groupName string, personIdCookie string, identityIdCookie string, tokenCookie string, qAccessTokenCookie string) (string, error) {
-	req := httplib.Post(fmt.Sprintf("%s/dsideal_yy/ypt/group/saveGroup", ConfigUtil.DsidealYy))
+	req := httplib.Post(fmt.Sprintf("%s/dsideal_yy/ypt/group/saveGroup", "http://"+ConfigUtil.DsidealYy))
 
 	req.Param("group_name", groupName)
 	req.Param("group_desc", "")
@@ -407,25 +407,25 @@ func SaveGroup(groupName string, personIdCookie string, identityIdCookie string,
 		Name:   "person_id",
 		Value:  personIdCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "identity_id",
 		Value:  identityIdCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "token",
 		Value:  tokenCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "q_access_token",
 		Value:  qAccessTokenCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 
 	resStr, err := req.String()
@@ -449,7 +449,7 @@ func SaveGroup(groupName string, personIdCookie string, identityIdCookie string,
 日期：2021-09-09
 */
 func AddGroupMember(groupId string, personList string, personIdCookie string, identityIdCookie string, tokenCookie string, qAccessTokenCookie string) error {
-	req := httplib.Post(fmt.Sprintf("%s/dsideal_yy/ypt/group/addMember", ConfigUtil.DsidealYy))
+	req := httplib.Post(fmt.Sprintf("%s/dsideal_yy/ypt/group/addMember", "http://"+ConfigUtil.DsidealYy))
 
 	req.Param("groupId", groupId)
 	req.Param("pids", personList)
@@ -459,25 +459,25 @@ func AddGroupMember(groupId string, personList string, personIdCookie string, id
 		Name:   "person_id",
 		Value:  personIdCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "identity_id",
 		Value:  identityIdCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "token",
 		Value:  tokenCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 	req.SetCookie(&http.Cookie{
 		Name:   "q_access_token",
 		Value:  qAccessTokenCookie,
 		Path:   "/",
-		Domain: "10.10.14.199",
+		Domain: ConfigUtil.DsidealYy,
 	})
 
 	resStr, err := req.String()
diff --git a/dsSzxy/Config/Config.ini b/dsSzxy/Config/Config.ini
index c20b3fef..bf679a2d 100644
--- a/dsSzxy/Config/Config.ini
+++ b/dsSzxy/Config/Config.ini
@@ -66,4 +66,4 @@ config_path = c:/1/config.properties
 thumb = data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNjI5NDQ3MDA4MTUxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDE1MTIgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE5MzU3IiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgd2lkdGg9IjIyLjE0ODQzNzUiIGhlaWdodD0iMTUiPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT48L2RlZnM+PHBhdGggZD0iTTY2LjU2MjEzMiAxNDMuMzI1MzU3bTE2OS4wODMxMTcgMGwzNTAuOTE3NiAwcTE2OS4wODMxMTcgMCAxNjkuMDgzMTE3IDE2OS4wODMxMTdsMCAzNTAuOTE3NnEwIDE2OS4wODMxMTctMTY5LjA4MzExNyAxNjkuMDgzMTE3bC0zNTAuOTE3NiAwcS0xNjkuMDgzMTE3IDAtMTY5LjA4MzExNy0xNjkuMDgzMTE3bDAtMzUwLjkxNzZxMC0xNjkuMDgzMTE3IDE2OS4wODMxMTctMTY5LjA4MzExN1oiIGZpbGw9IiNGRkM4OEIiIG9wYWNpdHk9Ii40IiBwLWlkPSIxOTM1OCI+PC9wYXRoPjxwYXRoIGQ9Ik04ODkuMjgwMjg1IDQ1MC4xMjMyM0w2MjYuODU3MTY3IDI5OC4zODE5NzFBNDMuNjA5NjczIDQzLjYwOTY3MyAwIDAgMCA1NjEuMDYwMTE3IDMzNi4zODEwNDN2MzAyLjk3MjQ2M2E0My4zNTQ2NDUgNDMuMzU0NjQ1IDAgMCAwIDY1LjI4Njk5NSAzNy43NDQwNDRsMjYyLjQyMzExOC0xNTEuNDg2MjMyYTQzLjM1NDY0NSA0My4zNTQ2NDUgMCAwIDAgMC41MTAwNTUtNzUuNDg4MDg4eiIgZmlsbD0iI0ZGQzg4QiIgcC1pZD0iMTkzNTkiPjwvcGF0aD48cGF0aCBkPSJNOTkuNzE1Njg0IDc3MC40Mzc1NTFtLTk5LjcxNTY4NCAwYTk5LjcxNTY4NCA5OS43MTU2ODQgMCAxIDAgMTk5LjQzMTM2OSAwIDk5LjcxNTY4NCA5OS43MTU2ODQgMCAxIDAtMTk5LjQzMTM2OSAwWiIgZmlsbD0iI0ZGQzg4QiIgcC1pZD0iMTkzNjAiPjwvcGF0aD48cGF0aCBkPSJNMTM4My4yNjgyMTUgNDIxLjMwNTE0Mm0tNTguNDAxMjU4IDBhNTguNDAxMjU4IDU4LjQwMTI1OCAwIDEgMCAxMTYuODAyNTE2IDAgNTguNDAxMjU4IDU4LjQwMTI1OCAwIDEgMC0xMTYuODAyNTE2IDBaIiBmaWxsPSIjRkZDODhCIiBwLWlkPSIxOTM2MSI+PC9wYXRoPjxwYXRoIGQ9Ik0yNDEuMjU1ODUgMG0xNjkuMDgzMTE3IDBsNjM3LjU2ODMxNSAwcTE2OS4wODMxMTcgMCAxNjkuMDgzMTE3IDE2OS4wODMxMTdsMCA2MzcuNTY4MzE0cTAgMTY5LjA4MzExNy0xNjkuMDgzMTE3IDE2OS4wODMxMTdsLTYzNy41NjgzMTUgMHEtMTY5LjA4MzExNyAwLTE2OS4wODMxMTctMTY5LjA4MzExN2wwLTYzNy41NjgzMTRxMC0xNjkuMDgzMTE3IDE2OS4wODMxMTctMTY5LjA4MzExN1oiIGZpbGw9IiNGRkM4OEIiIHAtaWQ9IjE5MzYyIj48L3BhdGg+PHBhdGggZD0iTTg4OS4yODAyODUgNDUwLjEyMzIzTDYyNi44NTcxNjcgMjk4LjM4MTk3MUE0My42MDk2NzMgNDMuNjA5NjczIDAgMCAwIDU2MS4wNjAxMTcgMzM2LjM4MTA0M3YzMDIuOTcyNDYzYTQzLjM1NDY0NSA0My4zNTQ2NDUgMCAwIDAgNjUuMjg2OTk1IDM3Ljc0NDA0NGwyNjIuNDIzMTE4LTE1MS40ODYyMzJhNDMuMzU0NjQ1IDQzLjM1NDY0NSAwIDAgMCAwLjUxMDA1NS03NS40ODgwODh6IiBmaWxsPSIjRkZGRkZGIiBwLWlkPSIxOTM2MyI+PC9wYXRoPjwvc3ZnPg==
 
 [dsideal_yy]
-path = "http://10.10.14.199"
+domain = "10.10.14.199"
diff --git a/dsSzxy/Utils/ConfigUtil/ConfigUtil.go b/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
index 889e9fc8..71ce6661 100644
--- a/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
+++ b/dsSzxy/Utils/ConfigUtil/ConfigUtil.go
@@ -164,7 +164,7 @@ func init() {
 	VideoThumb = iniParser.GetString("videoThumb", "thumb")
 
 	//云平台地址
-	DsidealYy = iniParser.GetString("dsideal_yy", "path")
+	DsidealYy = iniParser.GetString("dsideal_yy", "domain")
 }
 
 type IniParser struct {