From bd78e9c7c8ee512558989a54a1fba81dc4e84d6c Mon Sep 17 00:00:00 2001 From: Admover Date: Thu, 17 Dec 2020 10:50:00 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E7=BD=91=E5=85=B3?= =?UTF-8?q?=E6=9C=AA=E5=A4=84=E7=90=86=E5=AE=8C=E6=89=80=E6=9C=89=E5=B9=B6?= =?UTF-8?q?=E8=A1=8C=E4=BB=BB=E5=8A=A1=E6=97=B6=EF=BC=8C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81=EF=BC=8C=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E5=8F=91=E9=80=81=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/process/workOrder.go | 2 +- pkg/service/handle.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/process/workOrder.go b/apis/process/workOrder.go index ee97670..22a615d 100644 --- a/apis/process/workOrder.go +++ b/apis/process/workOrder.go @@ -148,7 +148,7 @@ func ProcessWorkOrder(c *gin.Context) { params.Tpls, // 工单数据更新 ) if err != nil { - app.Error(c, -1, nil, fmt.Sprintf("处理工单失败，%v", err.Error())) + app.Error(c, -1, err, fmt.Sprintf("处理工单失败，%v", err.Error())) return } diff --git a/pkg/service/handle.go b/pkg/service/handle.go index 3000148..4702a42 100644 --- a/pkg/service/handle.go +++ b/pkg/service/handle.go @@ -876,7 +876,7 @@ func (h *Handle) HandleWorkOrder( h.tx.Commit() // 提交事务 // 发送通知 - if len(noticeList) > 0 { + if len(noticeList) > 0 && h.updateValue["state"] != nil { stateList := make([]interface{}, 0) for _, v := range h.updateValue["state"].([]map[string]interface{}) { stateList = append(stateList, v) From 81520df35db694239c2047fdd3ba2df21027d321 Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Sun, 27 Dec 2020 19:58:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E8=A2=AB=E7=A6=81=E7=94=A8=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=99=BB=E9=99=86BUG,=20fix=20#120?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- handler/auth.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/handler/auth.go b/handler/auth.go index fc6667e..b773fca 100644 --- a/handler/auth.go +++ b/handler/auth.go @@ -141,6 +141,11 @@ func Authenticator(c *gin.Context) (interface{}, error) { user, role, e := loginVal.GetUser() if e == nil { _, _ = loginLog.Create() + + if user.Status == "1" { + return nil, errors.New("用户已被禁用。") + } + return map[string]interface{}{"user": user, "role": role}, nil } else { loginLog.Status = "1" From 192b03bac61c018b1008623c348e20d117a6915c Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Sun, 27 Dec 2020 20:18:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=E5=A2=9E=E5=8A=A0=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E6=95=99=E7=A8=8B=E4=BB=8B=E7=BB=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 47 +++++------------------------------------------ 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/README.md b/README.md index 222e02c..1b5f3a8 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,11 @@ 文档: [https://www.fdevops.com/docs/ferry](https://www.fdevops.com/docs/ferry-tutorial-document/introduction) +视频教程（由群内好友<稳定>提供，非常感谢。）： + +* ferry工单系统需要的软件准备 https://www.bilibili.com/video/BV1sA411s7jE +* ferry源代码下载后第一次运行 https://www.bilibili.com/video/BV1oy4y1v7LR + 官网：[http://ferry.fdevops.com](http://ferry.fdevops.com) ``` @@ -111,48 +116,6 @@ QQ群：1127401830 ------------------------------- - -感谢各位的打赏，你的支持，我的动力。所有打赏将作为项目维护成本。 - -微信： - -| 昵称 | 金额 | -| :---- | :---- | -| KAKA | 100元 | -| 劉鑫 | 30元 | -| *锋 | 30元 | -| 老白@天智 | 20元 | -| J*f | 20元 | -| 吻住，我们能赢 | 10.24元 | -| LJ | 10元 | -| Super_z | 10元 | -| T*i | 10元 | -| *伟 | 10元 | -| *郎 | 8元 | -| *上 | 5元 | -| *Sam . Chai | 5元 | -| *悟 | 3元 | -| 王* | 1元 | -| p*i | 1元 | -| S*R | 1元 | - -支付宝： - -| 昵称 | 金额 | -| :---- | :---- | -|**宝 |66元| -|**英 |10元| -|**华 |5元| -|*城 |1元| - -其他： - -| 昵称 | 金额 | -| :---- | :---- | -|五色花 |20元| -|everstar_l |10元| - ## 鸣谢 特别感谢 [JetBrains](https://www.jetbrains.com/?from=ferry) 为本开源项目提供免费的 [IntelliJ GoLand](https://www.jetbrains.com/go/?from=ferry) 授权 From 785df57abfa549c8400ba3212cd340dd3a750153 Mon Sep 17 00:00:00 2001 From: "Mr. Lan" Date: Sun, 27 Dec 2020 20:42:11 +0800 Subject: [PATCH 4/4] fix: fix bug. --- pkg/service/handle.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/service/handle.go b/pkg/service/handle.go index 4702a42..3000148 100644 --- a/pkg/service/handle.go +++ b/pkg/service/handle.go @@ -876,7 +876,7 @@ func (h *Handle) HandleWorkOrder( h.tx.Commit() // 提交事务 // 发送通知 - if len(noticeList) > 0 && h.updateValue["state"] != nil { + if len(noticeList) > 0 { stateList := make([]interface{}, 0) for _, v := range h.updateValue["state"].([]map[string]interface{}) { stateList = append(stateList, v)