diff --git a/utils/log/log.go b/utils/log/log.go index 5295c7f..8c00181 100644 --- a/utils/log/log.go +++ b/utils/log/log.go @@ -2,6 +2,7 @@ package log import ( "github.com/spf13/viper" + "io/ioutil" "leit.com/LAPP_CHEERSSON_BACKEND/utils" "os" "strings" @@ -39,6 +40,16 @@ func folder(model outputDriver) error { return err } +func Read(model string, _fileName string) []byte { + fileName := _fileName + "." + loggerConfig.Config[model].Filetype + path := loggerConfig.Config[model].Filename + "/" + fileName + bytes, err := ioutil.ReadFile(path) + if err != nil { + return nil + } + return bytes +} + /** 写入文件 */ diff --git a/web/controllers/common/CommonUploadPic.rest.go b/web/controllers/common/CommonUploadPic.rest.go index 47301ba..56ef84b 100644 --- a/web/controllers/common/CommonUploadPic.rest.go +++ b/web/controllers/common/CommonUploadPic.rest.go @@ -9,6 +9,7 @@ import ( "leit.com/LAPP_CHEERSSON_BACKEND/global" "leit.com/LAPP_CHEERSSON_BACKEND/task" "leit.com/LAPP_CHEERSSON_BACKEND/utils" + logUtils "leit.com/LAPP_CHEERSSON_BACKEND/utils/log" "leit.com/LAPP_CHEERSSON_BACKEND/web/middleware/jwts" "leit.com/LAPP_CHEERSSON_BACKEND/web/supports" "strings" @@ -37,6 +38,17 @@ func RegisterEmpinfo(party router.Party, path string) { }) } +//读取日志 +func RegisterReadLog(party router.Party, path string) { + party.Get(path+"/{model:string}"+"/{fileName:string}", func(ctx iris.Context) { + + model := ctx.Params().GetString("model") + fileName := ctx.Params().GetString("fileName") + data := logUtils.Read(model, fileName) + ctx.Write(data) + }) +} + /****************************************************************************** * * @Function Name : RegisterUploadMustPic diff --git a/web/controllers/common/common.go b/web/controllers/common/common.go index 7c6a803..4b618d8 100644 --- a/web/controllers/common/common.go +++ b/web/controllers/common/common.go @@ -32,7 +32,10 @@ func RegisterRoutes() { RegisterOrg(org, "/list") empinfo := party.Party("/empinfo") RegisterEmpinfo(empinfo, "/list") + log := party.Party("/log") + RegisterReadLog(log, "/read") }) + } /****************************************************************************** diff --git a/web/middleware/middleware.go b/web/middleware/middleware.go index 4d175b8..d12e3da 100644 --- a/web/middleware/middleware.go +++ b/web/middleware/middleware.go @@ -14,7 +14,7 @@ type Middleware struct { func ServeHTTP(ctx iris.Context) { path := ctx.Path() // 过滤静态资源、login接口、首页等...不需要验证 - if checkURL(path) || strings.Contains(path, "/public") { + if checkURL(path) || strings.Contains(path, "/public") || strings.Contains(path, "/admin/common/log/read") { ctx.Next() return } diff --git a/web/supports/simple_response.go b/web/supports/simple_response.go index a34c0d7..e5ca35f 100644 --- a/web/supports/simple_response.go +++ b/web/supports/simple_response.go @@ -64,11 +64,12 @@ func Ok(ctx iris.Context, msg string, data interface{}) { } type SJ struct { - CODE interface{} `json:"code"` - MSG interface{} `json:"msg"` - DATA interface{} `json:"data"` + CODE interface{} `json:"code"` + MSG interface{} `json:"msg"` + DATA interface{} `json:"data"` } -func OkString(ctx iris.Context, msg string, data interface{}){ + +func OkString(ctx iris.Context, msg string, data interface{}) { ctx.StatusCode(iris.StatusOK) s := SJ{ CODE: iris.StatusOK,