Merge branch 'refs/heads/feat-login-website'
This commit is contained in:
commit
19fc0fc69a
|
|
@ -900,7 +900,7 @@ func handleThirdPartyCallback(c *gin.Context) {
|
||||||
log.Println("state is empty,stateID=", stateID)
|
log.Println("state is empty,stateID=", stateID)
|
||||||
} else {
|
} else {
|
||||||
//json解析
|
//json解析
|
||||||
log.Println("stateStr:", stateStr, "\tcode:", code)
|
//log.Println("stateStr:", stateStr, "\tcode:", code)
|
||||||
var state proto.ThirdPartyLoginState
|
var state proto.ThirdPartyLoginState
|
||||||
err := json.Unmarshal([]byte(stateStr), &state)
|
err := json.Unmarshal([]byte(stateStr), &state)
|
||||||
log.Println("handle callback state:", stateStr, "\tcode:", code)
|
log.Println("handle callback state:", stateStr, "\tcode:", code)
|
||||||
|
|
|
||||||
|
|
@ -595,6 +595,7 @@ func GetMicroSoftAccessTokenByCode(code string, redirectURI string, clientID str
|
||||||
log.Println("microsoft response err:", err2)
|
log.Println("microsoft response err:", err2)
|
||||||
return resp, err2
|
return resp, err2
|
||||||
}
|
}
|
||||||
|
log.Println("microsoft response content:", string(respBytes))
|
||||||
err = json.Unmarshal(respBytes, &resp)
|
err = json.Unmarshal(respBytes, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("microsoft response decode err:", err, " response content:", string(respBytes))
|
log.Println("microsoft response decode err:", err, " response content:", string(respBytes))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue