Remove useless code

This commit is contained in:
iyear 2021-06-17 20:20:09 +08:00
parent 2390200f55
commit cc0440055a
4 changed files with 22 additions and 17 deletions

View File

@ -80,7 +80,6 @@ func BotStart() {
bot.Start()
}
func MakeHandle() {
fmt.Println("Make Handlers……")
//所有用户
bot.Handle("/start", bStart)
bot.Handle("/my", bMy)

View File

@ -60,7 +60,6 @@ func bMy(m *tb.Message) {
func bMyInlineBtn(c *tb.Callback) {
var u *model.Client
model.DB.Where("id = ?", c.Data).First(&u)
fmt.Println(u.ID)
bot.Send(c.Message.Chat,
fmt.Sprintf("信息\n别名%s\nms_id: %s\nclient_id: %s\nclient_secret: %s\n最近更新时间: %s",
u.Alias,

View File

@ -7,10 +7,6 @@ import (
"os"
)
func Println(a ...interface{}) {
return
}
// 日志切割设置
func getLogWriter() zapcore.WriteSyncer {
lumberJackLogger := &lumberjack.Logger{

View File

@ -38,15 +38,17 @@ var client = &http.Client{}
func init() {
client.Timeout = 10 * time.Second
tp := http.DefaultTransport.(*http.Transport).Clone()
//TODO
//https://gocn.vip/topics/11970
//DefaultMaxIdleConnsPerHost 设置的太小就会导致一个问题,
//在大量请求的情况下去访问特定的 host 的时候,长连接会退化成短链接.
tp.MaxIdleConns = 0
tp.TLSHandshakeTimeout = 20 * time.Second
tp.MaxIdleConnsPerHost = 50
tp.ResponseHeaderTimeout = 20 * time.Second
//to avoid "context deadline exceeded (Client.Timeout exceeded while awaiting headers)"
//https://cloud.tencent.com/developer/article/1529840
tp.IdleConnTimeout = 5 * time.Second
tp.IdleConnTimeout = 20 * time.Second
tp.ExpectContinueTimeout = 20 * time.Second
client.Transport = tp
}
@ -99,7 +101,7 @@ func (c *Client) GetTokenWithCode(code string) (error error) {
}
//return access_token and new refresh token
func (c *Client) getToken() (access string) {
func (c *Client) getToken() (accessToken string, error error) {
var r http.Request
r.ParseForm()
r.Form.Add("client_id", c.ClientId)
@ -112,32 +114,36 @@ func (c *Client) getToken() (access string) {
//fmt.Println(body)
req, err := http.NewRequest("POST", msApiUrl+"/common/oauth2/v2.0/token", body)
if err != nil {
return ""
return "", err
}
resp, err := client.Do(req)
if err != nil {
return ""
return "", err
}
defer resp.Body.Close()
content, err := ioutil.ReadAll(resp.Body)
if err != nil {
return ""
return "", err
}
if gjson.Get(string(content), "token_type").String() == "Bearer" {
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(), nil
}
return ""
return "", errors.New(gjson.Get(string(content), "error").String())
}
// GetUserInfo Get User's Information
func (c *Client) GetUserInfo() (json string, error error) {
var accessToken string
req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me", nil)
if err != nil {
return "", err
}
req.Header.Set("Authorization", c.getToken())
accessToken, err = c.getToken()
if err != nil {
return "", err
}
req.Header.Set("Authorization", accessToken)
resp, err := client.Do(req)
if err != nil {
return "", err
@ -156,11 +162,16 @@ func (c *Client) GetUserInfo() (json string, error error) {
}
func (c *Client) GetOutlookMails() error {
var accessToken string
req, err := http.NewRequest("GET", msGraUrl+"/v1.0/me/messages", nil)
if err != nil {
return err
}
req.Header.Set("Authorization", c.getToken())
accessToken, err = c.getToken()
if err != nil {
return err
}
req.Header.Set("Authorization", accessToken)
resp, err := client.Do(req)
if err != nil {
return err