From 5ad4339e14dab01256048b98e29fe341ec3eb64d Mon Sep 17 00:00:00 2001 From: linxiaozhi Date: Fri, 15 Feb 2019 17:17:47 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9F=AD=E4=BF=A1/=E9=92=89=E9=92=89?= =?UTF-8?q?=E9=80=9A=E7=9F=A5return=E4=BF=AE=E6=94=B9=202.=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=B8=AE?= =?UTF-8?q?=E5=8A=A9=E9=93=BE=E6=8E=A5=E6=94=B9=E4=B8=BA=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=203.=E5=88=A0=E9=99=A4main=20SessionOn?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=94=B9=E4=B8=BAapp.conf=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/app.conf | 7 ++++--- main.go | 1 - notify/dingtalk.go | 20 ++++++++++---------- notify/sms.go | 14 +++++++------- views/task/add.html | 2 +- views/task/copy.html | 2 +- views/task/edit.html | 2 +- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/conf/app.conf b/conf/app.conf index c049d03..bf71c81 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -1,6 +1,7 @@ -appname = PPGo_Job2 -httpport = 8080 -runmode = dev +AppName = PPGo_Job2 +HTTPPort = 8080 +RunMode = dev +SessionOn = true version= V2.2 diff --git a/main.go b/main.go index 40cfaae..63f4f79 100644 --- a/main.go +++ b/main.go @@ -27,6 +27,5 @@ func init() { } func main() { - beego.BConfig.WebConfig.Session.SessionOn = true beego.Run() } diff --git a/notify/dingtalk.go b/notify/dingtalk.go index f9e5543..43da8fb 100644 --- a/notify/dingtalk.go +++ b/notify/dingtalk.go @@ -48,7 +48,7 @@ func init() { if !ok { return } - if _, err := m.SendDingtalk(); err != nil { + if err := m.SendDingtalk(); err != nil { beego.Error("SendDingtalk:", err.Error()) } } @@ -71,7 +71,7 @@ func SendDingtalkToChan(dingtalks []string, content string) bool { } } -func (s *Dingtalk) SendDingtalk() (string, error) { +func (s *Dingtalk) SendDingtalk() error { for _, v := range s.Dingtalks { @@ -80,19 +80,19 @@ func (s *Dingtalk) SendDingtalk() (string, error) { text.Content = s.Content msg.Text = text - msgJson, err := json.Marshal(msg) + body, err := json.Marshal(msg) if err != nil { log.Println(err) - return "", err + return err } url := fmt.Sprintf(DingtalkUrl, v) - res, err := libs.HttpPost(url, "application/json;charset=utf-8", bytes.NewBuffer(msgJson)) - if err != nil { - log.Println(err) - return "", err + _, resErr := libs.HttpPost(url, "application/json;charset=utf-8", bytes.NewBuffer(body)) + if resErr != nil { + log.Println(resErr) + return resErr } - return res, err + return nil } - return "", nil + return nil } diff --git a/notify/sms.go b/notify/sms.go index 3364b6b..974f39c 100644 --- a/notify/sms.go +++ b/notify/sms.go @@ -44,7 +44,7 @@ func init() { if !ok { return } - if _, err := m.SendSms(); err != nil { + if err := m.SendSms(); err != nil { beego.Error("SendSms:", err.Error()) } } @@ -67,7 +67,7 @@ func SendSmsToChan(mobiles []string, param map[string]string) bool { } } -func (s *Sms) SendSms() (string, error) { +func (s *Sms) SendSms() error { for _, v := range s.Mobiles { s.Param["mobile"] = v @@ -75,22 +75,22 @@ func (s *Sms) SendSms() (string, error) { if err != nil { log.Println(err) - return "", err + return err } ajaxData := AjaxReturn{} jsonErr := json.Unmarshal([]byte(res), &ajaxData) if jsonErr != nil { - return "", jsonErr + return jsonErr } if ajaxData.Status != 200 { - return "", errors.Errorf("msg %s", ajaxData.Message) + return errors.Errorf("msg %s", ajaxData.Message) } - return res, nil + return nil } - return "", nil + return nil } diff --git a/views/task/add.html b/views/task/add.html index 30f2ecc..883bef7 100644 --- a/views/task/add.html +++ b/views/task/add.html @@ -66,7 +66,7 @@
-
+
diff --git a/views/task/copy.html b/views/task/copy.html index dd60499..861af4a 100644 --- a/views/task/copy.html +++ b/views/task/copy.html @@ -67,7 +67,7 @@
-
+
diff --git a/views/task/edit.html b/views/task/edit.html index 76af59a..0615558 100644 --- a/views/task/edit.html +++ b/views/task/edit.html @@ -66,7 +66,7 @@
-
+