|
|
@@ -47,12 +47,12 @@ func (this *TokenController) Post() {
|
|
|
this.ServeJSON()
|
|
|
} else {
|
|
|
if svc.VerifyUser3DES(user4CreateToken.Username, user4CreateToken.Password, &user) {
|
|
|
- if user4CreateToken.Username!="yanshi"{
|
|
|
- sql := " UserName='" + user4CreateToken.Username + "'"
|
|
|
+ if user4CreateToken.Username != "yanshi" {
|
|
|
+ //sql := " UserName='" + user4CreateToken.Username + "'"
|
|
|
var baseUser userRole.Base_User
|
|
|
- svc.GetEntity(&baseUser,sql)
|
|
|
- res:=utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseUser.Id),utils.DOMAIN)
|
|
|
- if len(res)<=0{
|
|
|
+ svc.DBE.Table("Base_User").Where("UserName=?", user4CreateToken.Username).Get(&baseUser)
|
|
|
+ res := utils.RBAC.GetRolesForUserInDomain("uid_"+strconv.Itoa(baseUser.Id), utils.DOMAIN)
|
|
|
+ if len(res) <= 0 {
|
|
|
this.Abort("777")
|
|
|
}
|
|
|
}
|
|
|
@@ -71,11 +71,12 @@ func (this *TokenController) Post() {
|
|
|
this.ServeJSON()
|
|
|
} else {
|
|
|
var registerUser register.OilCorporateInfo
|
|
|
- sql := " BINARY UserName='" + user4CreateToken.Username + "' and BINARY UserPass='"+user4CreateToken.Password+"'"
|
|
|
- svc.GetEntity(®isterUser,sql)
|
|
|
- if registerUser.UserName!=""{
|
|
|
+ //sql := " BINARY UserName='" + user4CreateToken.Username + "' and BINARY UserPass='"+user4CreateToken.Password+"'"
|
|
|
+ svc.DBE.Table("OilCorporateInfo").Where("BINARY UserName=?", user4CreateToken.Username).
|
|
|
+ Where("BINARY UserPass=?", user4CreateToken.Password).Get(®isterUser)
|
|
|
+ if registerUser.UserName != "" {
|
|
|
this.Abort("777")
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
this.Abort("401")
|
|
|
}
|
|
|
}
|