red-future/ppgo_job
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.新增微信通知方式

Browse Source 
2.通知模板变量更改
3.删除沉余sql
4.readme.md更新
This commit is contained in:
linxiaozhi
2019-02-17 07:07:33 +08:00
parent 34a3de6cfd
commit e392e4c12e
21 changed files with 201 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/admin.go
View File

@@ -59,6 +59,7 @@ func (self *AdminController) Edit() {
row["phone"] = Admin.Phone
row["email"] = Admin.Email
row["dingtalk"] = Admin.Dingtalk
row["wechat"] = Admin.Wechat
row["role_ids"] = Admin.RoleIds
self.Data["admin"] = row
@@ -95,6 +96,7 @@ func (self *AdminController) AjaxSave() {
Admin.Phone = strings.TrimSpace(self.GetString("phone"))
Admin.Email = strings.TrimSpace(self.GetString("email"))
Admin.Dingtalk = strings.TrimSpace(self.GetString("dingtalk"))
Admin.Wechat = strings.TrimSpace(self.GetString("wechat"))
Admin.RoleIds = strings.TrimSpace(self.GetString("roleids"))
Admin.UpdateTime = time.Now().Unix()
Admin.UpdateId = self.userId
@@ -128,6 +130,7 @@ func (self *AdminController) AjaxSave() {
Admin.Phone = strings.TrimSpace(self.GetString("phone"))
Admin.Email = strings.TrimSpace(self.GetString("email"))
Admin.Dingtalk = strings.TrimSpace(self.GetString("dingtalk"))
Admin.Wechat = strings.TrimSpace(self.GetString("wechat"))
Admin.RoleIds = strings.TrimSpace(self.GetString("roleids"))
Admin.UpdateTime = time.Now().Unix()
Admin.UpdateId = self.userId
@@ -207,6 +210,7 @@ func (self *AdminController) Table() {
row["phone"] = v.Phone
row["email"] = v.Email
row["dingtalk"] = v.Dingtalk
row["wechat"] = v.Wechat
row["role_ids"] = v.RoleIds
row["create_time"] = beego.Date(time.Unix(v.CreateTime, 0), "Y-m-d H:i:s")
row["update_time"] = beego.Date(time.Unix(v.UpdateTime, 0), "Y-m-d H:i:s")

5
controllers/notify_tpl.go
View File

@@ -59,7 +59,7 @@ func (self *NotifyTplController) AjaxSave() {
notifyTpl.Type = models.NotifyTplTypeDefault
notifyTpl.Status, _ = self.GetInt("status")
if notifyTpl.TplType == 1 {
if notifyTpl.TplType == 1 || notifyTpl.TplType == 3 {
m := make(map[string]string)
err := json.Unmarshal([]byte(notifyTpl.Content), &m)
if err != nil {
@@ -85,7 +85,7 @@ func (self *NotifyTplController) AjaxSave() {
notifyTpl.Content = strings.TrimSpace(self.GetString("content"))
notifyTpl.Status, _ = self.GetInt("status")
if notifyTpl.TplType == 1 {
if notifyTpl.TplType == 1 || notifyTpl.TplType == 3 {
m := make(map[string]string)
err := json.Unmarshal([]byte(notifyTpl.Content), &m)
if err != nil {
@@ -137,6 +137,7 @@ func (self *NotifyTplController) Table() {
"邮件",
"信息",
"钉钉",
"微信",
}
self.pageSize = limit

2
controllers/user.go
View File

@@ -30,6 +30,7 @@ func (self *UserController) Edit() {
row["phone"] = Admin.Phone
row["email"] = Admin.Email
row["dingtalk"] = Admin.Dingtalk
row["wechat"] = Admin.Wechat
self.Data["admin"] = row
self.display()
}
@@ -46,6 +47,7 @@ func (self *UserController) AjaxSave() {
Admin.Phone = strings.TrimSpace(self.GetString("phone"))
Admin.Email = strings.TrimSpace(self.GetString("email"))
Admin.Dingtalk = strings.TrimSpace(self.GetString("dingtalk"))
Admin.Wechat = strings.TrimSpace(self.GetString("wechat"))
resetPwd := self.GetString("reset_pwd")
if resetPwd == "1" {