Ver Fonte

后:iam

dubch há 5 anos atrás
pai
commit
0e2c7decef

+ 9 - 4
src/dashoo.cn/backend/api/business/iamlogin/IamLoginService.go

@@ -24,8 +24,14 @@ func GetIamLoginService(xormEngine *xorm.Engine) *IamLoginService {
 }
 
 type iam struct {
-	UserAD string `json:"userAD"`
-	UserNo  string `json:"userNo"`
+	Msg string `json:"msg"`
+	Code  int `json:"code"`
+	Result  iamResult `json:"result"`
+
+}
+type iamResult struct {
+	UserAD string `json:"userName"`
+	UserNo  string `json:"accountName"`
 }
 
 func (s *IamLoginService) HandleIamLogin(appCode string, secret string, code string) iam {
@@ -47,10 +53,9 @@ func (s *IamLoginService) HandleIamLogin(appCode string, secret string, code str
 
 	body, _ := ioutil.ReadAll(resp.Body)
 	//iamString, _ := json.Marshal(body)
-	log.Println("resp.Body1= ", body)
+	log.Println("resp.Body= ", body)
 	var iamJson iam
 	json.Unmarshal(body, &iamJson)
 
-
 	return iamJson
 }

+ 7 - 4
src/dashoo.cn/backend/api/controllers/iamlogin/iamLogin.go

@@ -49,13 +49,16 @@ func (this *IamLoginController) IamLogin() {
 	var user userRole.Base_User
 
 	userName := ""
-	if iamJson.UserAD != "" {
-		userName = iamJson.UserAD
+	if iamJson.Code != 200 {
+		this.Abort("777" + iamJson.Msg)
+	}
+	if iamJson.Result.UserAD != "" {
+		userName = iamJson.Result.UserAD
 	} else {
-		if iamJson.UserNo != "" {
+		if iamJson.Result.UserNo != "" {
 			var userEntity userRole.Base_User
 			svc := userRole.GetUserService(utils.DBE)
-			svc.GetEntity (&userEntity, "UserNo = '" + iamJson.UserNo + "'")
+			svc.GetEntity (&userEntity, "UserNo = '" + iamJson.Result.UserNo + "'")
 			userName = userEntity.Username
 		}
 	}