Skip to content

Commit

Permalink
Merge pull request lanyulei#124 from lanyulei/dev
Browse files Browse the repository at this point in the history
fix bug.
  • Loading branch information
lanyulei authored Dec 27, 2020
2 parents fb26634 + 785df57 commit a16a788
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 43 deletions.
47 changes: 5 additions & 42 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

```
Expand Down Expand Up @@ -111,48 +116,6 @@ QQ群:1127401830
<img class="no-margin" src="https://www.fdevops.com/wp-content/uploads/2020/07/1595075890-81595075871_.pic_hd.png" height="200px" >

------------------------------

感谢各位的打赏,你的支持,我的动力。所有打赏将作为项目维护成本。

微信:

| 昵称 | 金额 |
| :---- | :---- |
| 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) 授权
Expand Down
2 changes: 1 addition & 1 deletion apis/process/workOrder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
5 changes: 5 additions & 0 deletions handler/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a16a788

Please sign in to comment.