rainerosion/E5BotForSQLite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix client EOF error

Browse Source
This commit is contained in:
iyear 2021-06-15 09:59:22 +08:00
parent 6d142803cc
commit a1e68cdc5c
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
model/client.go
View File

@ -1,6 +1,7 @@
package model package model
import ( import (
"fmt"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"io/ioutil" "io/ioutil"
@ -10,7 +11,7 @@ import (
) )
type Client struct { type Client struct {
TgId int64 `gorm:"unique;not null"` TgId int64 `gorm:"not null"`
RefreshToken string `gorm:"not null"` RefreshToken string `gorm:"not null"`
MsId string `gorm:"unique;primaryKey;not null"` MsId string `gorm:"unique;primaryKey;not null"`
Uptime int64 `gorm:"autoUpdateTime;not null"` Uptime int64 `gorm:"autoUpdateTime;not null"`
@ -43,7 +44,7 @@ func GetMSRegisterAppUrl() string {
return appUrl return appUrl
} }
//return access_token and refresh_token // GetTokenWithCode return access_token and refresh_token
func (c *Client) GetTokenWithCode(code string) (error error) { func (c *Client) GetTokenWithCode(code string) (error error) {
var r http.Request var r http.Request
client := &http.Client{} client := &http.Client{}
@ -59,6 +60,11 @@ func (c *Client) GetTokenWithCode(code string) (error error) {
if err != nil { if err != nil {
return err return err
} }
//prevents the connection from being re-used
////https://stackoverflow.com/questions/17714494/golang-http-request-results-in-eof-errors-when-making-multiple-requests-successi
req.Close = true
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return err return err
@ -92,6 +98,7 @@ func (c *Client) getToken() (access string) {
if err != nil { if err != nil {
return "" return ""
} }
req.Close = true
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
return "" return ""
@ -101,8 +108,6 @@ func (c *Client) getToken() (access string) {
if err != nil { if err != nil {
return "" return ""
} }
//fmt.Println(string(content))
//fmt.Println(gjson.Get(string(content), "access_token").String())
if gjson.Get(string(content), "token_type").String() == "Bearer" { if gjson.Get(string(content), "token_type").String() == "Bearer" {
c.RefreshToken = gjson.Get(string(content), "refresh_token").String() c.RefreshToken = gjson.Get(string(content), "refresh_token").String()
return gjson.Get(string(content), "access_token").String() return gjson.Get(string(content), "access_token").String()
@ -110,13 +115,16 @@ func (c *Client) getToken() (access string) {
return "" return ""
} }
//Get User's Information // GetUserInfo Get User's Information
func (c *Client) GetUserInfo() (json string, error error) { func (c *Client) GetUserInfo() (json string, error error) {
client := http.Client{} client := http.Client{}
req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me", nil) req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me", nil)
if err != nil { if err != nil {
return "", err return "", err
} }
req.Close = true
req.Header.Set("Authorization", c.getToken()) req.Header.Set("Authorization", c.getToken())
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {
@ -124,6 +132,7 @@ func (c *Client) GetUserInfo() (json string, error error) {
} }
defer resp.Body.Close() defer resp.Body.Close()
content, err := ioutil.ReadAll(resp.Body) content, err := ioutil.ReadAll(resp.Body)
fmt.Println(string(content))
if err != nil { if err != nil {
return "", err return "", err
} }
@ -137,10 +146,10 @@ func (c *Client) GetUserInfo() (json string, error error) {
func (c *Client) GetOutlookMails() error { func (c *Client) GetOutlookMails() error {
client := http.Client{} client := http.Client{}
req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me/messages", nil) req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me/messages", nil)
if err != nil { if err != nil {
return err return err
} }
req.Close = true
req.Header.Set("Authorization", c.getToken()) req.Header.Set("Authorization", c.getToken())
resp, err := client.Do(req) resp, err := client.Do(req)
if err != nil { if err != nil {