1.短信/钉钉通知return修改
2.任务时间表达式帮助链接改为本地地址 3.删除main SessionOn配置,改为app.conf配置
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
appname = PPGo_Job2
|
AppName = PPGo_Job2
|
||||||
httpport = 8080
|
HTTPPort = 8080
|
||||||
runmode = dev
|
RunMode = dev
|
||||||
|
SessionOn = true
|
||||||
|
|
||||||
version= V2.2
|
version= V2.2
|
||||||
|
|
||||||
|
|||||||
1
main.go
1
main.go
@@ -27,6 +27,5 @@ func init() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
beego.BConfig.WebConfig.Session.SessionOn = true
|
|
||||||
beego.Run()
|
beego.Run()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ func init() {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := m.SendDingtalk(); err != nil {
|
if err := m.SendDingtalk(); err != nil {
|
||||||
beego.Error("SendDingtalk:", err.Error())
|
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 {
|
for _, v := range s.Dingtalks {
|
||||||
|
|
||||||
@@ -80,19 +80,19 @@ func (s *Dingtalk) SendDingtalk() (string, error) {
|
|||||||
text.Content = s.Content
|
text.Content = s.Content
|
||||||
msg.Text = text
|
msg.Text = text
|
||||||
|
|
||||||
msgJson, err := json.Marshal(msg)
|
body, err := json.Marshal(msg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
return "", err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
url := fmt.Sprintf(DingtalkUrl, v)
|
url := fmt.Sprintf(DingtalkUrl, v)
|
||||||
res, err := libs.HttpPost(url, "application/json;charset=utf-8", bytes.NewBuffer(msgJson))
|
_, resErr := libs.HttpPost(url, "application/json;charset=utf-8", bytes.NewBuffer(body))
|
||||||
if err != nil {
|
if resErr != nil {
|
||||||
log.Println(err)
|
log.Println(resErr)
|
||||||
return "", err
|
return resErr
|
||||||
}
|
}
|
||||||
return res, err
|
return nil
|
||||||
}
|
}
|
||||||
return "", nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ func init() {
|
|||||||
if !ok {
|
if !ok {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if _, err := m.SendSms(); err != nil {
|
if err := m.SendSms(); err != nil {
|
||||||
beego.Error("SendSms:", err.Error())
|
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 {
|
for _, v := range s.Mobiles {
|
||||||
s.Param["mobile"] = v
|
s.Param["mobile"] = v
|
||||||
@@ -75,22 +75,22 @@ func (s *Sms) SendSms() (string, error) {
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println(err)
|
log.Println(err)
|
||||||
return "", err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
ajaxData := AjaxReturn{}
|
ajaxData := AjaxReturn{}
|
||||||
jsonErr := json.Unmarshal([]byte(res), &ajaxData)
|
jsonErr := json.Unmarshal([]byte(res), &ajaxData)
|
||||||
|
|
||||||
if jsonErr != nil {
|
if jsonErr != nil {
|
||||||
return "", jsonErr
|
return jsonErr
|
||||||
}
|
}
|
||||||
|
|
||||||
if ajaxData.Status != 200 {
|
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
<div class="layui-input-inline mw400">
|
<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="">
|
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="">
|
||||||
</div>
|
</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>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
|
|||||||
@@ -67,7 +67,7 @@
|
|||||||
<div class="layui-input-inline mw400">
|
<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}}">
|
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
|
||||||
</div>
|
</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>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
|
|||||||
@@ -66,7 +66,7 @@
|
|||||||
<div class="layui-input-inline mw400">
|
<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}}">
|
<input type="text" name="cron_spec" id="cron_spec" lay-verify="required" autocomplete="off" placeholder="时间表达式" class="layui-input" value="{{.task.CronSpec}}">
|
||||||
</div>
|
</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>
|
||||||
|
|
||||||
<div class="layui-form-item">
|
<div class="layui-form-item">
|
||||||
|
|||||||
Reference in New Issue
Block a user