ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

to_upstream #1

Closed
mountain wants to merge 12 commits from ws:to_upstream into master
pull from: ws:to_upstream
merge into: ayo:master
Conversation 0 Commits 12 Files Changed 7 +294 -21
6 changed files with 294 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e4b4cf0862 - Show all commits

12
core/service.go
View File

@ -360,6 +360,18 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
return return
} }
found, err := sh.mongoClient.FindOne(CollectionLink, bson.M{"platform": newType, "uid": newId}, options.FindOne())
if err != nil {
logger.Error("link failed. FindOne err:", err)
w.WriteHeader(http.StatusInternalServerError)
return
}
if found != nil {
logger.Println("link failed. already have service account: ", r.URL.Query())
w.Write([]byte(`{"alreadylink":true}`))
return
}
createtime := primitive.NewDateTimeFromTime(time.Now().UTC()) createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
link, err := sh.mongoClient.FindOneAndUpdate(CollectionLink, bson.M{ link, err := sh.mongoClient.FindOneAndUpdate(CollectionLink, bson.M{
"platform": newType, "platform": newType,