From 2173b372f336d0bd703162d8b6cadecaf9bd0b03 Mon Sep 17 00:00:00 2001 From: sunty <suntianyu0923@163.com> Date: 星期三, 24 七月 2019 15:37:34 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.14:10010/r/webserver --- controllers/fileController.go | 10 ++++------ controllers/user.go | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/controllers/fileController.go b/controllers/fileController.go index a5bc403..8aa82b6 100644 --- a/controllers/fileController.go +++ b/controllers/fileController.go @@ -249,12 +249,10 @@ field, _, err1 := uploadFileReturnAddr(file, filename, tableId) //extNames = append(extNames, field) - if err1 != nil { - if field == "" { - failList = append(failList, filename+"涓婁紶澶辫触,"+err1.Error()) - } else { - successList = append(successList, filename+"鍔犲叆搴曞簱澶辫触,"+err1.Error()) - } + if err1 != nil || field == "" { + failList = append(failList, filename) + } else { + successList = append(successList, filename) } } addResult["successList"] = successList diff --git a/controllers/user.go b/controllers/user.go index 9212b41..0f0b1e2 100644 --- a/controllers/user.go +++ b/controllers/user.go @@ -2,7 +2,6 @@ import ( "basic.com/dbapi.git" - "fmt" "github.com/gin-gonic/gin" "net/http" "time" @@ -67,7 +66,6 @@ func (controller UserController) Current(c *gin.Context) { authDriver := auth.GenerateAuthDriver() user := (*authDriver).User(c) - fmt.Println("current:",user) if user !=nil { c.JSON(http.StatusOK,user) } else { -- Gitblit v1.8.0