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

Lines changed: 62 additions & 48 deletions

‎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
}

0 commit comments

Comments
 (0)