Skip to content

Commit 750e8fd

Browse files
committed
fix ...
1 parent 3942c5f commit 750e8fd

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

main.go

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"bufio"
55
"encoding/json"
66
"fmt"
7+
"io/ioutil"
78
"math/rand"
89
"net/http"
910
"net/url"
@@ -210,9 +211,17 @@ func sendMessage(name, text string) {
210211
"text": {"*甲骨文通知*\n名称: " + name + "\n" + "内容: " + text},
211212
}
212213
cli := http.Client{Timeout: 10 * time.Second}
213-
_, err := cli.PostForm(tg_url, urlValues)
214+
resp, err := cli.PostForm(tg_url, urlValues)
214215
if err != nil {
215-
printYellow("Telegram 消息提醒发送失败" + err.Error())
216+
printYellow("Telegram 消息提醒发送失败: " + err.Error())
217+
return
218+
}
219+
if resp.StatusCode != 200 {
220+
body, err := ioutil.ReadAll(resp.Body)
221+
if err == nil {
222+
bodyStr := string(body)
223+
printYellow("Telegram 消息提醒发送失败: " + bodyStr)
224+
}
216225
}
217226
}
218227

@@ -240,31 +249,23 @@ func launchInstance(node *Node) {
240249
printYellow("正在尝试新建实例......")
241250
out, err := exec.Command(cmd, args...).CombinedOutput()
242251
ret := string(out)
243-
// 防止 Ctrl + C 取消误报
244-
if Cancel {
245-
return
246-
}
247252
if err != nil && out == nil {
248-
text = "抢购失败, " + err.Error() + "\n" + ret
253+
text = "出现异常: " + err.Error()
249254
printRed(text)
250255
sendMessage(node.Name, text)
251256
return
252257
}
253-
254258
pos := strings.Index(ret, "{")
255259
if pos != -1 {
256260
ret = ret[pos:]
257261
}
258-
259262
var result Result
260263
err = json.Unmarshal([]byte(ret), &result)
261264
if err != nil {
262-
text = "抢购失败, " + "\n" + ret
265+
text = "出现异常: " + ret
263266
printRed(text)
264-
sendMessage(node.Name, text)
265-
return
267+
continue
266268
}
267-
268269
switch result.Status {
269270
case "500", "429":
270271
printNone(result.Message)
@@ -295,14 +296,11 @@ func random(min, max int) int {
295296
return rand.Intn(max-min) + min
296297
}
297298

298-
var Cancel bool = false
299-
300299
func setCloseHandler() {
301300
c := make(chan os.Signal)
302301
signal.Notify(c, os.Interrupt, syscall.SIGTERM)
303302
go func() {
304303
<-c
305-
Cancel = true
306304
fmt.Printf("\033[1;33;40m%s\033[0m\n", "已停止")
307305
if name != "" {
308306
sendMessage(name, "已停止")

0 commit comments

Comments
 (0)