From 07068656a2dce6e5fc9afc604b344c636774844c Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Fri, 1 May 2020 14:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=86=99=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E5=88=A0=E9=99=A4=E6=B3=A8=E9=87=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/system/index.go | 2 -- middleware/logger.go | 15 --------------- router/router.go | 1 + tools/logger.go | 2 +- tools/utils.go | 2 +- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/apis/system/index.go b/apis/system/index.go index 31c0134b..87d3b3ea 100644 --- a/apis/system/index.go +++ b/apis/system/index.go @@ -37,6 +37,4 @@ $(function(){ func HelloWorld(c *gin.Context){ c.Header("Content-Type", "text/html; charset=utf-8") c.String(200, INDEX) - - } diff --git a/middleware/logger.go b/middleware/logger.go index cecd147c..fc2f0b07 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -15,21 +15,6 @@ var logger = logrus.New() // 日志记录到文件 func LoggerToFile() gin.HandlerFunc { - ////写入文件 - //src, err := os.OpenFile(config2.LogConfig.Dir+"/", os.O_APPEND|os.O_WRONLY, os.ModeAppend) - //if err != nil { - // fmt.Println("err", err) - //} - // - ////设置输出 - //logger.Out = src - // - ////设置日志级别 - //logger.SetLevel(logrus.DebugLevel) - // - ////设置日志格式 - //logger.SetFormatter(&logrus.TextFormatter{}) - return func(c *gin.Context) { // 开始时间 startTime := time.Now() diff --git a/router/router.go b/router/router.go index af404731..f853f121 100644 --- a/router/router.go +++ b/router/router.go @@ -77,6 +77,7 @@ func InitRouter() *gin.Engine { auth := r.Group("/api/v1") auth.Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) { + auth.GET("/deptList", system.GetDeptList) auth.GET("/deptTree", system.GetDeptTree) auth.GET("/dept/:deptId", system.GetDept) diff --git a/tools/logger.go b/tools/logger.go index b01f24cc..179bfb82 100644 --- a/tools/logger.go +++ b/tools/logger.go @@ -16,7 +16,7 @@ func InitLogger() { case ModeProd: file, err := os.OpenFile(viper.GetString("logger.dir")+"/api-"+time.Now().Format("2006-01-02")+".log", os.O_WRONLY|os.O_APPEND|os.O_CREATE|os.O_SYNC, 0600) if err != nil { - log.Fatal("log init failed") + log.Fatalln("log init failed") } var info os.FileInfo diff --git a/tools/utils.go b/tools/utils.go index 4af394ff..ac0a5148 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -33,7 +33,7 @@ func Assert(condition bool, msg string, code ...int) { if len(code) > 0 { statusCode = code[0] } - panic("CustomErroe#" + strconv.Itoa(statusCode) + "#" + msg) + panic("CustomError#" + strconv.Itoa(statusCode) + "#" + msg) } }