Merge branch '20200710_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20200710_xt_api_new_branch

controllers/verify_login_controller.go

@@ -89,21 +89,14 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 
 	} else {
 		token := this.GetString("token")
-		utils.TraceLog("token: %v", token)
 		if len(token) == 0 {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return
 		}
 
 		ip := utils.GetIP(this.Ctx.Request)
-		fmt.Println("ip是什么", ip)
 		sessionID := this.Ctx.GetCookie("s")
-		fmt.Println("sessionID", sessionID)
-		utils.TraceLog("Request: %v", this.Ctx.Request)
-		utils.TraceLog("cookie session id: %v", sessionID)
 		adminUserInfo, err, errCode := service.VerifyToken(token, ip, sessionID)
-		fmt.Println("错误是什么", err)
-		fmt.Println("errCode是什么", errCode)
 		if err != nil {
 			if errCode == 903 { // 未创建应用
 				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNeverCreateTypeApp)
@@ -147,7 +140,6 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 			var didRegistedForMall bool = false
 
 			tempInfo, _ := service.GetOrgInfoTemplate(curOrg.Id)
-			fmt.Println("teimpInfo", tempInfo)
 			template_info := map[string]interface{}{
 				"id":          tempInfo.ID,
 				"org_id":      tempInfo.OrgId,

service/verify_login_token_service.go

@@ -113,7 +113,6 @@ func VerifyToken(token string, ip string, sessionID string) (*AdminUserInfo, err
 	values.Set("session_id", sessionID)
 
 	resp, requestErr := http.PostForm(api, values)
-	fmt.Println("resp", resp)
 	if requestErr != nil {
 		utils.ErrorLog("请求验证 sso token 接口失败: %v", requestErr)
 		return nil, requestErr, 0
@@ -125,12 +124,12 @@ func VerifyToken(token string, ip string, sessionID string) (*AdminUserInfo, err
 		return nil, ioErr, 0
 	}
 	var respJSON map[string]interface{}
-	utils.InfoLog(string(body))
+
 	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
 		utils.ErrorLog("验证 sso token 接口返回数据解析JSON失败: %v", err)
 		return nil, err, 0
 	}
-	fmt.Println(respJSON)
+
 
 	if respJSON["state"].(float64) != 1 {
 		msg := respJSON["msg"].(string)