diff --git a/controller/visitor.go b/controller/visitor.go index b6b5421..230abfa 100644 --- a/controller/visitor.go +++ b/controller/visitor.go @@ -10,55 +10,55 @@ import ( "strconv" ) -//func PostVisitor(c *gin.Context) { -// name := c.PostForm("name") -// avator := c.PostForm("avator") -// toId := c.PostForm("to_id") -// id := c.PostForm("id") -// refer := c.PostForm("refer") -// city := c.PostForm("city") -// client_ip := c.PostForm("client_ip") -// if name == "" || avator == "" || toId == "" || id == "" || refer == "" || city == "" || client_ip == "" { -// c.JSON(200, gin.H{ -// "code": 400, -// "msg": "error", -// }) -// return -// } -// kefuInfo := models.FindUser(toId) -// if kefuInfo.ID == 0 { -// c.JSON(200, gin.H{ -// "code": 400, -// "msg": "用户不存在", -// }) -// return -// } -// models.CreateVisitor(name, avator, c.ClientIP(), toId, id, refer, city, client_ip) +// func PostVisitor(c *gin.Context) { +// name := c.PostForm("name") +// avator := c.PostForm("avator") +// toId := c.PostForm("to_id") +// id := c.PostForm("id") +// refer := c.PostForm("refer") +// city := c.PostForm("city") +// client_ip := c.PostForm("client_ip") +// if name == "" || avator == "" || toId == "" || id == "" || refer == "" || city == "" || client_ip == "" { +// c.JSON(200, gin.H{ +// "code": 400, +// "msg": "error", +// }) +// return +// } +// kefuInfo := models.FindUser(toId) +// if kefuInfo.ID == 0 { +// c.JSON(200, gin.H{ +// "code": 400, +// "msg": "用户不存在", +// }) +// return +// } +// models.CreateVisitor(name, avator, c.ClientIP(), toId, id, refer, city, client_ip) // -// userInfo := make(map[string]string) -// userInfo["uid"] = id -// userInfo["username"] = name -// userInfo["avator"] = avator -// msg := TypeMessage{ -// Type: "userOnline", -// Data: userInfo, -// } -// str, _ := json.Marshal(msg) -// kefuConns := kefuList[toId] -// if kefuConns != nil { -// for k, kefuConn := range kefuConns { -// log.Println(k, "xxxxxxxx") -// kefuConn.WriteMessage(websocket.TextMessage, str) +// userInfo := make(map[string]string) +// userInfo["uid"] = id +// userInfo["username"] = name +// userInfo["avator"] = avator +// msg := TypeMessage{ +// Type: "userOnline", +// Data: userInfo, +// } +// str, _ := json.Marshal(msg) +// kefuConns := kefuList[toId] +// if kefuConns != nil { +// for k, kefuConn := range kefuConns { +// log.Println(k, "xxxxxxxx") +// kefuConn.WriteMessage(websocket.TextMessage, str) +// } // } +// c.JSON(200, gin.H{ +// "code": 200, +// "msg": "ok", +// }) // } -// c.JSON(200, gin.H{ -// "code": 200, -// "msg": "ok", -// }) -//} func PostVisitorLogin(c *gin.Context) { ipcity := tools.ParseIp(c.ClientIP()) - avator:="" + avator := "" userAgent := c.GetHeader("User-Agent") if tools.IsMobile(userAgent) { avator = "/static/images/1.png" @@ -77,13 +77,21 @@ func PostVisitorLogin(c *gin.Context) { city string name string ) + if ipcity != nil { + city = ipcity.CountryName + ipcity.RegionName + ipcity.CityName - name = ipcity.CountryName + ipcity.RegionName + ipcity.CityName + "网友" + name = ipcity.CountryName + ipcity.RegionName + ipcity.CityName } else { city = "未识别地区" name = "匿名网友" } + if city == "本机地址本机地址" { + name = "local address" + } + if ipcity.CountryName == "本机地址本机地址" { + name = "local visitor" + } client_ip := c.ClientIP() extra := c.PostForm("extra") extraJson := tools.Base64Decode(extra) diff --git a/static/templates/chat_main.html b/static/templates/chat_main.html index a50279b..82f8350 100644 --- a/static/templates/chat_main.html +++ b/static/templates/chat_main.html @@ -1,9 +1,9 @@ - +
-确定删除吗?
-Confirm deletion?
+