diff --git a/common/zconst/consts.go b/common/zconst/consts.go new file mode 100644 index 0000000..f894311 --- /dev/null +++ b/common/zconst/consts.go @@ -0,0 +1 @@ +package zconst diff --git a/common/zconst/vars.go b/common/zconst/vars.go new file mode 100644 index 0000000..fe94ea2 --- /dev/null +++ b/common/zconst/vars.go @@ -0,0 +1,5 @@ +package zconst + +var ( + AppName = "" +) diff --git a/common/zlog/ali-log.go b/common/zlog/ali-log.go new file mode 100644 index 0000000..43cd044 --- /dev/null +++ b/common/zlog/ali-log.go @@ -0,0 +1,40 @@ +package zlog + +import ( + "apigame/util/util-lx/lxalilog" + "fmt" + "github.com/astaxie/beego" + lalilog "github.com/lixu-any/go-tools/ali/log" +) + +func InitAliLog(appName string) { + + //初始化阿里云日志 + logm, _ := beego.AppConfig.GetSection("alilog") + lxalilog.InitAliLog(lxalilog.MapAlilogConfig{ + Endpoint: logm["endpoint"], + AccessKeyId: logm["accesskeyid"], + AccessKeySecret: logm["accesskeysecret"], + Project: logm["project"], + AppNaame: appName, + On: logm["on"], + Debug: logm["debug"], + TableError: "api_code_merge", + TableDebug: logm["tabledebug"], + Env: beego.AppConfig.String("env"), + }) + + lalilog.InitAliLog(lalilog.MapAlilogConfig{ + Endpoint: logm["endpoint"], + AccessKeyId: logm["accesskeyid"], + AccessKeySecret: logm["accesskeysecret"], + Project: logm["project"], + On: logm["on"], + Debug: logm["debug"], + TableError: logm["tableerror"], + TableDebug: logm["tabledebug"], + Env: beego.AppConfig.String("env"), + }) + + fmt.Println(appName + " alilog init success") +} diff --git a/common/zlog/log.go b/common/zlog/log.go new file mode 100644 index 0000000..b55c4f6 --- /dev/null +++ b/common/zlog/log.go @@ -0,0 +1,21 @@ +package zlog + +import ( + "apigame/common/zconst" + "apigame/util/util-lx/lxbeego" + "fmt" + "github.com/astaxie/beego" +) + +func Init() { + + // 初始化日志文件 + logconfig, _ := beego.AppConfig.GetSection("log") + logconfig["filename"] = logconfig["path"] + "api.log" + + if err := lxbeego.Inits(logconfig); err != nil { + fmt.Println("lxbeelog.Inits Error::" + err.Error()) + } + + fmt.Println(zconst.AppName + " beelog init success") +} diff --git a/common/zredis/index.go b/common/zredis/index.go new file mode 100644 index 0000000..23520bc --- /dev/null +++ b/common/zredis/index.go @@ -0,0 +1 @@ +package zredis diff --git a/dto/inits.go b/dto/inits.go index 5a2717a..25d5330 100644 --- a/dto/inits.go +++ b/dto/inits.go @@ -2,28 +2,15 @@ package dto import ( "apigame/service/constd" - "apigame/util/util-lx/lxalilog" - "apigame/util/util-lx/lxbeego" "apigame/util/util-lx/lxmysql" "fmt" "github.com/astaxie/beego" - lalilog "github.com/lixu-any/go-tools/ali/log" ) func Inits() (err error) { appname := beego.AppConfig.String("appname") - // 初始化日志文件 - logconfig, _ := beego.AppConfig.GetSection("log") - logconfig["filename"] = logconfig["path"] + "api.log" - - if err = lxbeego.Inits(logconfig); err != nil { - fmt.Println("lxbeelog.Inits Error::" + err.Error()) - } - - fmt.Println(appname + " beelog init success") - ////初始化Redis //redisconfig, _ := beego.AppConfig.GetSection("redis") //var mredisconfig lxredis.MapRedisConfig @@ -63,8 +50,6 @@ func Inits() (err error) { fmt.Println(appname + " dbs::" + conn.Name + " init success") } - initAlilog(appname) - //// 初始化数数打点 //_ = thinkingdata.InitThinkData() // @@ -75,35 +60,3 @@ func Inits() (err error) { return } - -func initAlilog(appname string) { - - //初始化阿里云日志 - logm, _ := beego.AppConfig.GetSection("alilog") - lxalilog.InitAliLog(lxalilog.MapAlilogConfig{ - Endpoint: logm["endpoint"], - AccessKeyId: logm["accesskeyid"], - AccessKeySecret: logm["accesskeysecret"], - Project: logm["project"], - AppNaame: appname, - On: logm["on"], - Debug: logm["debug"], - TableError: "api_code_merge", - TableDebug: logm["tabledebug"], - Env: beego.AppConfig.String("env"), - }) - - lalilog.InitAliLog(lalilog.MapAlilogConfig{ - Endpoint: logm["endpoint"], - AccessKeyId: logm["accesskeyid"], - AccessKeySecret: logm["accesskeysecret"], - Project: logm["project"], - On: logm["on"], - Debug: logm["debug"], - TableError: logm["tableerror"], - TableDebug: logm["tabledebug"], - Env: beego.AppConfig.String("env"), - }) - - fmt.Println(appname + " alilog init success") -} diff --git a/main.go b/main.go index 2905266..f9d5126 100644 --- a/main.go +++ b/main.go @@ -1,6 +1,8 @@ package main import ( + "apigame/common/zconst" + "apigame/common/zlog" "apigame/dto" _ "apigame/routers" "apigame/service/cardholder" @@ -27,10 +29,21 @@ func main() { beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" } + Init() + + beego.Run() +} + +func Init() { + + zconst.AppName = beego.AppConfig.String("appname") + + zlog.Init() + _ = dto.Inits() + zlog.InitAliLog(zconst.AppName) + // 初始化配置 cardholder.Init() - - beego.Run() } -- libgit2 0.21.0