Merge branch 'master' of http://192.168.1.14:10010/r/webserver
| | |
|---|
| | | field, _, err1 := uploadFileReturnAddr(file, filename, tableId) |
|---|
| | | //extNames = append(extNames, field) |
|---|
| | | |
|---|
| | | if err1 != nil { |
|---|
| | | if field == "" { |
|---|
| | | failList = append(failList, filename+"上传失败,"+err1.Error()) |
|---|
| | | if err1 != nil || field == "" { |
|---|
| | | failList = append(failList, filename) |
|---|
| | | } else { |
|---|
| | | successList = append(successList, filename+"加入底库失败,"+err1.Error()) |
|---|
| | | } |
|---|
| | | successList = append(successList, filename) |
|---|
| | | } |
|---|
| | | } |
|---|
| | | addResult["successList"] = successList |
|---|
| | |
|---|
| | | |
|---|
| | | import ( |
|---|
| | | "basic.com/dbapi.git" |
|---|
| | | "fmt" |
|---|
| | | "github.com/gin-gonic/gin" |
|---|
| | | "net/http" |
|---|
| | | "time" |
|---|
| | |
|---|
| | | 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 { |
|---|
