xuemingqiang/leanote
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
life
2015-03-31 16:56:26 +08:00
parent 5fae5dd10e
commit f959694b0f
18 changed files with 34 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/service/UserService.go
View File

@ -119,10 +119,7 @@ func (this *UserService) GetUserInfo(userId string) info.User {
func (this *UserService) GetUserInfoByEmail(email string) info.User {
user := info.User{}
db.GetByQ(db.Users, bson.M{"Email": email}, &user)
<<<<<<< HEAD
=======
// Logo路径问题, 有些有http: 有些没有
>>>>>>> dev-life
this.setUserLogo(&user)
return user
}
@ -131,10 +128,7 @@ func (this *UserService) GetUserInfoByUsername(username string) info.User {
user := info.User{}
username = strings.ToLower(username)
db.GetByQ(db.Users, bson.M{"Username": username}, &user)
<<<<<<< HEAD
=======
// Logo路径问题, 有些有http: 有些没有
>>>>>>> dev-life
this.setUserLogo(&user)
return user
}