1.短信/钉钉通知return修改

2.任务时间表达式帮助链接改为本地地址
3.删除main SessionOn配置,改为app.conf配置
This commit is contained in:
linxiaozhi
2019-02-15 17:17:47 +08:00
parent 49a404d6b6
commit 5ad4339e14
7 changed files with 24 additions and 24 deletions

View File

@@ -1,6 +1,7 @@
appname = PPGo_Job2
httpport = 8080
runmode = dev
AppName = PPGo_Job2
HTTPPort = 8080
RunMode = dev
SessionOn = true
version= V2.2

View File

@@ -27,6 +27,5 @@ func init() {
}
func main() {
beego.BConfig.WebConfig.Session.SessionOn = true
beego.Run()
}

View File

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

View File

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

View File

@@ -66,7 +66,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="">
</div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">

View File

@@ -67,7 +67,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
</div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">

View File

@@ -66,7 +66,7 @@
<div class="layui-input-inline mw400">
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
</div>
<div class="layui-form-mid layui-word-aux"><a href="http://www.haodaquan.com/129" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
<div class="layui-form-mid layui-word-aux"><a href="/help" target="_blank"><i class="fa fa-question-circle" aria-hidden="true"></i></a></div>
</div>
<div class="layui-form-item">