Skip to content

Commit ade6469

Browse files
NekotoxinNekotoxin
authored
fix: support lower go version(1.15) (beego#599)
* fix: support lower go version(1.15) * fix: support lower go version(1.15) * fix: support lower go version(1.15)
1 parent 5f8924e commit ade6469

19 files changed

+62
-48
lines changed

‎idp/adfs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"crypto/tls"
2020
"encoding/json"
2121
"fmt"
22-
"io"
22+
"io/ioutil"
2323
"net/http"
2424
"net/url"
2525
"time"
@@ -88,7 +88,7 @@ func (idp *AdfsIdProvider) GetToken(code string) (*oauth2.Token, error) {
8888
if err != nil {
8989
return nil, err
9090
}
91-
data, err := io.ReadAll(resp.Body)
91+
data, err := ioutil.ReadAll(resp.Body)
9292
if err != nil {
9393
return nil, err
9494
}

‎idp/baidu.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"context"
1919
"encoding/json"
2020
"fmt"
21-
"io"
21+
"io/ioutil"
2222
"net/http"
2323

2424
"golang.org/x/oauth2"
@@ -97,7 +97,7 @@ func (idp *BaiduIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
9797
return nil, err
9898
}
9999

100-
data, err := io.ReadAll(resp.Body)
100+
data, err := ioutil.ReadAll(resp.Body)
101101
if err != nil {
102102
return nil, err
103103
}

‎idp/casdoor.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package idp
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io"
2120
"io/ioutil"
2221
"net/http"
2322
"net/url"
@@ -133,7 +132,7 @@ func (idp *CasdoorIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error
133132
return nil, err
134133
}
135134

136-
data, err := io.ReadAll(resp.Body)
135+
data, err := ioutil.ReadAll(resp.Body)
137136
if err != nil {
138137
return nil, err
139138
}

‎idp/dingtalk.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"encoding/json"
1919
"fmt"
2020
"io"
21+
"io/ioutil"
2122
"net/http"
2223
"strings"
2324
"time"
@@ -143,7 +144,7 @@ func (idp *DingTalkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, erro
143144
return nil, err
144145
}
145146

146-
data, err := io.ReadAll(resp.Body)
147+
data, err := ioutil.ReadAll(resp.Body)
147148
if err != nil {
148149
return nil, err
149150
}
@@ -178,7 +179,7 @@ func (idp *DingTalkIdProvider) postWithBody(body interface{}, url string) ([]byt
178179
if err != nil {
179180
return nil, err
180181
}
181-
data, err := io.ReadAll(resp.Body)
182+
data, err := ioutil.ReadAll(resp.Body)
182183
if err != nil {
183184
return nil, err
184185
}

‎idp/gitee.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"encoding/json"
2020
"fmt"
2121
"io"
22+
"io/ioutil"
2223
"net/http"
2324
"net/url"
2425
"strconv"
@@ -92,7 +93,7 @@ func (idp *GiteeIdProvider) GetToken(code string) (*oauth2.Token, error) {
9293
if err != nil {
9394
return nil, err
9495
}
95-
rbs, err := io.ReadAll(resp.Body)
96+
rbs, err := ioutil.ReadAll(resp.Body)
9697
if err != nil {
9798
return nil, err
9899
}

‎idp/github.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package idp
1717
import (
1818
"context"
1919
"encoding/json"
20-
"io"
20+
"io/ioutil"
2121
"net/http"
2222
"strconv"
2323
"time"
@@ -172,7 +172,7 @@ func (idp *GithubIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
172172

173173
defer resp.Body.Close()
174174

175-
body, err := io.ReadAll(resp.Body)
175+
body, err := ioutil.ReadAll(resp.Body)
176176
if err != nil {
177177
return nil, err
178178
}

‎idp/gitlab.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package idp
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io"
20+
"io/ioutil"
2121
"net/http"
2222
"net/url"
2323
"strconv"
@@ -85,7 +85,7 @@ func (idp *GitlabIdProvider) GetToken(code string) (*oauth2.Token, error) {
8585
return nil, err
8686
}
8787

88-
data, err := io.ReadAll(resp.Body)
88+
data, err := ioutil.ReadAll(resp.Body)
8989
if err != nil {
9090
return nil, err
9191
}
@@ -209,7 +209,7 @@ func (idp *GitlabIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
209209
return nil, err
210210
}
211211

212-
data, err := io.ReadAll(resp.Body)
212+
data, err := ioutil.ReadAll(resp.Body)
213213
if err != nil {
214214
return nil, err
215215
}

‎idp/google.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"encoding/json"
2020
"errors"
2121
"fmt"
22-
"io"
22+
"io/ioutil"
2323
"net/http"
2424

2525
"golang.org/x/oauth2"
@@ -95,7 +95,7 @@ func (idp *GoogleIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error)
9595
}
9696

9797
defer resp.Body.Close()
98-
body, err := io.ReadAll(resp.Body)
98+
body, err := ioutil.ReadAll(resp.Body)
9999
if err != nil {
100100
return nil, err
101101
}

‎idp/infoflow_internal.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package idp
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io"
20+
"io/ioutil"
2121
"net/http"
2222

2323
"golang.org/x/oauth2"
@@ -69,7 +69,7 @@ func (idp *InfoflowInternalIdProvider) GetToken(code string) (*oauth2.Token, err
6969
return nil, err
7070
}
7171

72-
data, err := io.ReadAll(resp.Body)
72+
data, err := ioutil.ReadAll(resp.Body)
7373
if err != nil {
7474
return nil, err
7575
}
@@ -147,7 +147,7 @@ func (idp *InfoflowInternalIdProvider) GetUserInfo(token *oauth2.Token) (*UserIn
147147
return nil, err
148148
}
149149

150-
data, err := io.ReadAll(resp.Body)
150+
data, err := ioutil.ReadAll(resp.Body)
151151
if err != nil {
152152
return nil, err
153153
}
@@ -165,7 +165,7 @@ func (idp *InfoflowInternalIdProvider) GetUserInfo(token *oauth2.Token) (*UserIn
165165
return nil, err
166166
}
167167

168-
data, err = io.ReadAll(resp.Body)
168+
data, err = ioutil.ReadAll(resp.Body)
169169
if err != nil {
170170
return nil, err
171171
}

‎idp/infoflow_third_party.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"encoding/json"
1919
"fmt"
2020
"io"
21+
"io/ioutil"
2122
"net/http"
2223
"strings"
2324
"time"
@@ -143,7 +144,7 @@ func (idp *InfoflowIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, erro
143144
return nil, err
144145
}
145146

146-
data, err := io.ReadAll(resp.Body)
147+
data, err := ioutil.ReadAll(resp.Body)
147148
if err != nil {
148149
return nil, err
149150
}
@@ -161,7 +162,7 @@ func (idp *InfoflowIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, erro
161162
return nil, err
162163
}
163164

164-
data, err = io.ReadAll(resp.Body)
165+
data, err = ioutil.ReadAll(resp.Body)
165166
if err != nil {
166167
return nil, err
167168
}
@@ -196,7 +197,7 @@ func (idp *InfoflowIdProvider) postWithBody(body interface{}, url string) ([]byt
196197
if err != nil {
197198
return nil, err
198199
}
199-
data, err := io.ReadAll(resp.Body)
200+
data, err := ioutil.ReadAll(resp.Body)
200201
if err != nil {
201202
return nil, err
202203
}

‎idp/lark.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ package idp
1717
import (
1818
"encoding/json"
1919
"io"
20+
"io/ioutil"
2021
"net/http"
2122
"strings"
2223
"time"
@@ -168,7 +169,7 @@ func (idp *LarkIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
168169
req.Header.Set("Authorization", "Bearer "+token.AccessToken)
169170

170171
resp, err := idp.Client.Do(req)
171-
data, err = io.ReadAll(resp.Body)
172+
data, err = ioutil.ReadAll(resp.Body)
172173
err = resp.Body.Close()
173174
if err != nil {
174175
return nil, err
@@ -200,7 +201,7 @@ func (idp *LarkIdProvider) postWithBody(body interface{}, url string) ([]byte, e
200201
if err != nil {
201202
return nil, err
202203
}
203-
data, err := io.ReadAll(resp.Body)
204+
data, err := ioutil.ReadAll(resp.Body)
204205
if err != nil {
205206
return nil, err
206207
}

‎idp/linkedin.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"encoding/json"
1919
"fmt"
2020
"io"
21+
"io/ioutil"
2122
"net/http"
2223
"net/url"
2324
"strings"
@@ -84,7 +85,7 @@ func (idp *LinkedInIdProvider) GetToken(code string) (*oauth2.Token, error) {
8485
if err != nil {
8586
return nil, err
8687
}
87-
rbs, err := io.ReadAll(resp.Body)
88+
rbs, err := ioutil.ReadAll(resp.Body)
8889
if err != nil {
8990
return nil, err
9091
}
@@ -322,7 +323,7 @@ func (idp *LinkedInIdProvider) GetUrlRespWithAuthorization(url, token string) ([
322323
}
323324
}(resp.Body)
324325

325-
bs, err := io.ReadAll(resp.Body)
326+
bs, err := ioutil.ReadAll(resp.Body)
326327
if err != nil {
327328
return nil, err
328329
}

‎idp/qq.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"encoding/json"
1919
"errors"
2020
"fmt"
21-
"io"
21+
"io/ioutil"
2222
"net/http"
2323
"net/url"
2424
"regexp"
@@ -75,7 +75,7 @@ func (idp *QqIdProvider) GetToken(code string) (*oauth2.Token, error) {
7575
}
7676

7777
defer resp.Body.Close()
78-
tokenContent, err := io.ReadAll(resp.Body)
78+
tokenContent, err := ioutil.ReadAll(resp.Body)
7979

8080
re := regexp.MustCompile("token=(.*?)&")
8181
matched := re.FindAllStringSubmatch(string(tokenContent), -1)
@@ -145,7 +145,7 @@ func (idp *QqIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
145145
}
146146

147147
defer resp.Body.Close()
148-
openIdBody, err := io.ReadAll(resp.Body)
148+
openIdBody, err := ioutil.ReadAll(resp.Body)
149149

150150
re := regexp.MustCompile("\"openid\":\"(.*?)\"}")
151151
matched := re.FindAllStringSubmatch(string(openIdBody), -1)
@@ -161,7 +161,7 @@ func (idp *QqIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo, error) {
161161
}
162162

163163
defer resp.Body.Close()
164-
userInfoBody, err := io.ReadAll(resp.Body)
164+
userInfoBody, err := ioutil.ReadAll(resp.Body)
165165
if err != nil {
166166
return nil, err
167167
}

‎idp/wecom_internal.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package idp
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io"
20+
"io/ioutil"
2121
"net/http"
2222
"time"
2323

@@ -72,7 +72,7 @@ func (idp *WeComInternalIdProvider) GetToken(code string) (*oauth2.Token, error)
7272
return nil, err
7373
}
7474

75-
data, err := io.ReadAll(resp.Body)
75+
data, err := ioutil.ReadAll(resp.Body)
7676
if err != nil {
7777
return nil, err
7878
}
@@ -122,7 +122,7 @@ func (idp *WeComInternalIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo,
122122
return nil, err
123123
}
124124

125-
data, err := io.ReadAll(resp.Body)
125+
data, err := ioutil.ReadAll(resp.Body)
126126
if err != nil {
127127
return nil, err
128128
}
@@ -143,7 +143,7 @@ func (idp *WeComInternalIdProvider) GetUserInfo(token *oauth2.Token) (*UserInfo,
143143
return nil, err
144144
}
145145

146-
data, err = io.ReadAll(resp.Body)
146+
data, err = ioutil.ReadAll(resp.Body)
147147
if err != nil {
148148
return nil, err
149149
}

‎idp/wecom_third_party.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"encoding/json"
1919
"fmt"
2020
"io"
21+
"io/ioutil"
2122
"net/http"
2223
"strings"
2324
"time"
@@ -194,7 +195,7 @@ func (idp *WeComIdProvider) postWithBody(body interface{}, url string) ([]byte,
194195
if err != nil {
195196
return nil, err
196197
}
197-
data, err := io.ReadAll(resp.Body)
198+
data, err := ioutil.ReadAll(resp.Body)
198199
if err != nil {
199200
return nil, err
200201
}

‎idp/weibo.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
"encoding/json"
2020
"fmt"
2121
"io"
22+
"io/ioutil"
2223
"net/http"
2324
"net/url"
2425
"strconv"
@@ -91,7 +92,7 @@ func (idp *WeiBoIdProvider) GetToken(code string) (*oauth2.Token, error) {
9192
return
9293
}
9394
}(resp.Body)
94-
bs, err := io.ReadAll(resp.Body)
95+
bs, err := ioutil.ReadAll(resp.Body)
9596
if err != nil {
9697
return nil, err
9798
}

0 commit comments

Comments
 (0)