diff --git a/API/User.go b/API/User.go index 76ca1f4..0386115 100644 --- a/API/User.go +++ b/API/User.go @@ -79,7 +79,6 @@ func LoginUser(c *gin.Context) { "", DB.SDevice{ c.Request.Header.Get("DeviceId"), - c.Request.Host, c.Request.Header.Get("Mac"), c.Request.Header.Get("UDID"), c.Request.Header.Get("SystemVersion"), @@ -135,27 +134,27 @@ func RegisterDevice(c *gin.Context) { c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin")) c.Header("Access-Control-Allow-Credentials", "true") - selected := bson.M{} - var SDevice *DB.SDevice - selected["DeviceId"] = c.Request.Header.Get("DeviceId") - DB.CDevice.Find(selected).One(&SDevice) - - if SDevice == nil { - Device := DB.SDevice{ - c.Request.Header.Get("DeviceId"), - c.Request.Host, - c.Request.Header.Get("Mac"), - c.Request.Header.Get("UDID"), - c.Request.Header.Get("SystemVersion"), - c.Request.Header.Get("SystemModel"), - c.Request.Header.Get("AppVersion"), - c.Request.Header.Get("AppVersion"), - c.Request.Header.Get("DeviceToken"), - } - - DB.CDevice.Insert(Device) + if c.Request.Header.Get("DeviceId") == "" { + c.JSON(200, tools.ResponseError{ + 1, + "DeviceId不正确", + }) + return } + DB.CDevice.Upsert( + bson.M{"DeviceId":c.Request.Header.Get("DeviceId")}, + bson.M{"$set": bson.M{ + "Mac":c.Request.Header.Get("Mac"), + "UDID":c.Request.Header.Get("UDID"), + "SystemType":c.Request.Header.Get("SystemType"), + "SystemVersion":c.Request.Header.Get("SystemVersion"), + "SystemModel":c.Request.Header.Get("SystemModel"), + "AppVersion":c.Request.Header.Get("AppVersion"), + "DeviceToken":c.Request.Header.Get("DeviceToken"), + }}, + ) + c.JSON(200, tools.ResponseSeccess{ 0, "ok", diff --git a/API/UserLog.go b/API/UserLog.go index 6597e58..c4ce8bd 100644 --- a/API/UserLog.go +++ b/API/UserLog.go @@ -4,6 +4,7 @@ import ( "encoding/json" "github.com/aarongao/tools" "github.com/gin-gonic/gin" + "gopkg.in/mgo.v2/bson" "letu/DB" "time" ) @@ -34,6 +35,14 @@ func UserLog(c *gin.Context) { c.Header("Access-Control-Allow-Origin", c.Request.Header.Get("Origin")) c.Header("Access-Control-Allow-Credentials", "true") + if c.Request.Header.Get("DeviceId") == "" { + c.JSON(200, tools.ResponseError{ + 1, + "DeviceId不正确", + }) + return + } + var Location DB.SLocation json.Unmarshal([]byte(c.PostForm("Location")), &Location) @@ -46,10 +55,10 @@ func UserLog(c *gin.Context) { time.Now().Unix(), Location, c.PostForm("Remarks"), + c.Request.Host, c.PostForm("Source"), DB.SDevice{ c.Request.Header.Get("DeviceId"), - c.Request.Host, c.Request.Header.Get("Mac"), c.Request.Header.Get("UDID"), c.Request.Header.Get("SystemVersion"), @@ -60,6 +69,19 @@ func UserLog(c *gin.Context) { }, }) + DB.CDevice.Upsert( + bson.M{"DeviceId": c.Request.Header.Get("DeviceId")}, + bson.M{"$set": bson.M{ + "Mac": c.Request.Header.Get("Mac"), + "UDID": c.Request.Header.Get("UDID"), + "SystemType": c.Request.Header.Get("SystemType"), + "SystemVersion": c.Request.Header.Get("SystemVersion"), + "SystemModel": c.Request.Header.Get("SystemModel"), + "AppVersion": c.Request.Header.Get("AppVersion"), + "DeviceToken": c.Request.Header.Get("DeviceToken"), + }}, + ) + c.JSON(200, tools.ResponseSeccess{ 0, "ok", diff --git a/DB/db.go b/DB/db.go index 333bc2c..ffc57d4 100644 --- a/DB/db.go +++ b/DB/db.go @@ -69,15 +69,14 @@ type STopMenus struct { } type SDevice struct { - DeviceId string `bson:"DeviceId" json:"DeviceId"` - Ip string `bson:"Ip" json:"Ip"` - Mac string `bson:"Mac" json:"Mac"` - UDID string `bson:"UDID" json:"UDID"` - SystemType string `bson:"SystemType" json:"SystemType"` //ios,android - SystemVersion string `bson:"SystemVersion" json:"SystemVersion"` //系统版本 - SystemModel string `bson:"SystemModel" json:"SystemModel"` //机型 - AppVersion string `bson:"AppVersion" json:"AppVersion"` //app版本 - DeviceToken string `bson:"DeviceToken" json:"DeviceToken"` //用于推送的token + DeviceId string `bson:"DeviceId" json:"DeviceId"` + Mac string `bson:"Mac" json:"Mac"` + UDID string `bson:"UDID" json:"UDID"` + SystemType string `bson:"SystemType" json:"SystemType"` //ios,android + SystemVersion string `bson:"SystemVersion" json:"SystemVersion"` //系统版本 + SystemModel string `bson:"SystemModel" json:"SystemModel"` //机型 + AppVersion string `bson:"AppVersion" json:"AppVersion"` //app版本 + DeviceToken string `bson:"DeviceToken" json:"DeviceToken"` //用于推送的token } type SUserLog struct { @@ -89,8 +88,9 @@ type SUserLog struct { DateTime int64 `bson:"DateTime" json:"DateTime"` //时间戳 Location SLocation `bson:"Location" json:"Location"` //位置 Remarks string `bson:"Remarks" json:"Remarks"` //备注 - Source string `bson:"Source" json:"Source"` //来源 - Device SDevice `bson:"Device" json:"Device"` //设备信息 + Ip string `bson:"Ip" json:"Ip"` + Source string `bson:"Source" json:"Source"` //来源 + Device SDevice `bson:"Device" json:"Device"` //设备信息 } type SSystemLog struct { UserId string `bson:"UserId" json:"UserId"` // 用户ID diff --git a/Lib/DelayMessage/delaymessage.go b/Lib/DelayMessage/delaymessage.go index 03c0d03..6868905 100644 --- a/Lib/DelayMessage/delaymessage.go +++ b/Lib/DelayMessage/delaymessage.go @@ -3,7 +3,6 @@ package DelayMessage import ( "encoding/json" "fmt" - "github.com/aliyun/alibaba-cloud-sdk-go/services/push" "github.com/pkg/errors" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" @@ -143,16 +142,16 @@ func Callback(key *bson.ObjectId, message *Message) { } else if message.Type == 1 { // 推送app消息 - client, err := push.NewClientWithAccessKey("cn-hangzhou", "28332889", "4c0b32d5fd0822a9de703e177798e8ca") - - request := push.CreatePushMessageToiOSRequest() - request.Scheme = "https" - - response, err := client.PushMessageToiOS(request) - if err != nil { - fmt.Print(err.Error()) - } - fmt.Printf("response is %#v\n", response) + //client, err := push.NewClientWithAccessKey("cn-hangzhou", "28332889", "4c0b32d5fd0822a9de703e177798e8ca") + // + //request := push.CreatePushMessageToiOSRequest() + //request.Scheme = "https" + // + //response, err := client.PushMessageToiOS(request) + //if err != nil { + // fmt.Print(err.Error()) + //} + //fmt.Printf("response is %#v\n", response) } json, _ := json.Marshal(message) diff --git a/README.md b/README.md index 5b64141..f77169d 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | Specification | Value | |-----|-----| | API Version | 1.0.0 | -| BasePath | https://letu.api.imagchina.com | +| BasePath | 正式 leyoutu.st-i.com.cn | 测试 letu.api.imagchina.com | diff --git a/main.go b/main.go index 251f92a..ba9b37d 100644 --- a/main.go +++ b/main.go @@ -17,7 +17,7 @@ import ( // @APIVersion 1.0.0 // @APITitle 乐游图后端接口文档 -// @BasePath https://letu.api.imagchina.com +// @BasePath 正式 leyoutu.st-i.com.cn | 测试 letu.api.imagchina.com func main() { // 读取配置文件 -- libgit2 0.21.0