From 6d836a1f2918534e99d80554f6631b8f95a3d300 Mon Sep 17 00:00:00 2001
From: wangshuai <iyuki0430@msn.com>
Date: Tue, 29 Sep 2020 13:43:17 +0800
Subject: [PATCH] 'commit'

---
 .../Account/AccountOpenAPI/AccountOpenAPI.go  | 70 +++++++++++++------
 1 file changed, 50 insertions(+), 20 deletions(-)

diff --git a/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go b/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go
index 40752a5e..2746b30e 100644
--- a/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go
+++ b/dsSupport/MyModel/Account/AccountOpenAPI/AccountOpenAPI.go
@@ -24,11 +24,11 @@ type CurrentUserInfo struct {
 	Signature string `json:"signature" example:"海纳百川，有容乃大"`
 	Title string `json:"title" example:"大数据专家"`
 	Group string `json:"group" example:"东北师大理想股份有限公司-数智创新中心"`
-	Tags string `json:"tags" example:"[{key:0,label:大数据},{key:1,label:人工智能},{key:2,label:物联网},{key:3,label:架构},{key:4,label:数据分析},{key:5,label:海纳百川}]"`
+	Tags []map[string]interface{} `json:"tags" example:"[{key:0,label:大数据},{key:1,label:人工智能},{key:2,label:物联网},{key:3,label:架构},{key:4,label:数据分析},{key:5,label:海纳百川}]"`
 	NotifyCount int `json:"notifyCount" example:"12"`
 	UnreadCount int `json:"unreadCount" example:"11"`
 	Country string `json:"country" example:"China"`
-	Geographic string `json:"geographic" example:"{province:{label:吉林省,key:130000},city:{label:长春市,key:130000}}"`
+	Geographic map[string]interface{} `json:"geographic" example:"{province:{label:吉林省,key:130000},city:{label:长春市,key:130000}}"`
 	Address string `json:"address" example:"净月开发区"`
 	Phone string `json:"phone" example:"400-0400-662"`
 }
@@ -90,26 +90,56 @@ func Login(c *gin.Context) {
 func CurrentUser(c *gin.Context) {
 
 	success, _ := AccountService.CurrentUser()
+	tags := make([]map[string]interface{}, 6)
+	tags[0] = make(map[string]interface{}, 1)
+	tags[0]["key"] = 0
+	tags[0]["label"] = "大数据"
+	tags[1] = make(map[string]interface{}, 2)
+	tags[1]["key"] = 1
+	tags[1]["label"] = "人工智能"
+	tags[2] = make(map[string]interface{}, 3)
+	tags[2]["key"] = 2
+	tags[2]["label"] = "物联网"
+	tags[3] = make(map[string]interface{}, 4)
+	tags[3]["key"] = 3
+	tags[3]["label"] = "架构"
+	tags[4] = make(map[string]interface{}, 5)
+	tags[4]["key"] = 4
+	tags[4]["label"] = "数据分析"
+	tags[5] = make(map[string]interface{}, 6)
+	tags[5]["key"] = 5
+	tags[5]["label"] = "海纳百川"
+
+	geographic := make(map[string]interface{})
+
+	geographic["province"] = make(map[string]interface{})
+	province := make(map[string]interface{})
+	province["label"] = "吉林省"
+	province["key"] = "130000"
+	geographic["province"] = province
+
+	geographic["city"] = make(map[string]interface{})
+	city := make(map[string]interface{})
+	city["label"] = "长春市"
+	city["key"] = "130000"
+	geographic["city"] = city
 
 	if success {
-		c.JSON(http.StatusOK, gin.H{
-			"status" : "ok",
-			"message" : CurrentUserInfo{
-				Name: "管理员",
-				Avatar: "admin.png",
-				Userid: "00000001",
-				Email: "admin@edusoa.com",
-				Signature: "海纳百川，有容乃大",
-				Title: "大数据专家",
-				Group: "东北师大理想股份有限公司-数智创新中心",
-				Tags: "[{key:0,label:大数据},{key:1,label:人工智能},{key:2,label:物联网},{key:3,label:架构},{key:4,label:数据分析},{key:5,label:海纳百川}]",
-				NotifyCount: 12,
-				UnreadCount: 11,
-				Country: "China",
-				Geographic: "{province:{label:吉林省,key:130000},city:{label:长春市,key:130000}}",
-				Address: "净月开发区",
-				Phone: "400-0400-662",
-			},
+		c.JSON(http.StatusOK, CurrentUserInfo{
+			Name: "管理员",
+			Avatar: "admin.png",
+			Userid: "00000001",
+			Email: "admin@edusoa.com",
+			Signature: "海纳百川，有容乃大",
+			Title: "大数据专家",
+			Group: "东北师大理想股份有限公司-数智创新中心",
+			Tags: tags,
+			NotifyCount: 12,
+			UnreadCount: 11,
+			Country: "China",
+			Geographic: geographic,
+			Address: "净月开发区",
+			Phone: "400-0400-662",
 		})
 
 		return