From 09016138a5b24e4175dc192ea28f022c1419cea7 Mon Sep 17 00:00:00 2001 From: "1340691923@qq.com" <1340691923@qq.com> Date: Tue, 8 Mar 2022 14:23:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/app.go | 1 - cmd/init_app/main.go | 2 ++ cmd/manager/main.go | 2 ++ cmd/sinker/geoip/geoip.go | 4 ++-- cmd/sinker/main.go | 2 ++ .../service/consumer_data/report_accpet_status.go | 10 ++++++---- platform-basic-libs/service/meta_data/meta_data.go | 8 -------- platform-basic-libs/service/pannel/pannel_service.go | 4 ++-- vue/src/views/app/index.vue | 2 +- 9 files changed, 17 insertions(+), 18 deletions(-) diff --git a/application/app.go b/application/app.go index 2bd7770..decd6fd 100644 --- a/application/app.go +++ b/application/app.go @@ -149,7 +149,6 @@ func(this *App) RunManager() { }() } - func(this *App) WaitForExitSign(exitFunc ...func()) { c := make(chan os.Signal, 1) signal.Notify(c, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP) diff --git a/cmd/init_app/main.go b/cmd/init_app/main.go index b5a4643..47923a5 100644 --- a/cmd/init_app/main.go +++ b/cmd/init_app/main.go @@ -48,6 +48,8 @@ func main() { panic(err) } + defer app.Close() + kafka.Init() ck.Init() mysql.Init() diff --git a/cmd/manager/main.go b/cmd/manager/main.go index 226e653..e5f4c50 100644 --- a/cmd/manager/main.go +++ b/cmd/manager/main.go @@ -51,6 +51,8 @@ func main() { panic(err) } + defer app.Close() + app.RunManager() app.WaitForExitSign(func() { diff --git a/cmd/sinker/geoip/geoip.go b/cmd/sinker/geoip/geoip.go index 67dd4c6..0d4710d 100644 --- a/cmd/sinker/geoip/geoip.go +++ b/cmd/sinker/geoip/geoip.go @@ -76,13 +76,13 @@ func (this *Geoip2) GetAreaFromIP(rawIP string) (province, city string, err erro ip := net.ParseIP(rawIP) if ip == nil { logs.Logger.Error("net.ParseIP", zap.String("can't parse ip", rawIP)) - return "", "", nil + return "未知", "未知", nil } err = this.mmdb.Lookup(ip, &res) if err != nil { logs.Logger.Error("this.mmdb.Lookup", zap.String("err", err.Error())) - return "", "", nil + return "未知", "未知", nil } if len(res.Subdivisions) > 0 { diff --git a/cmd/sinker/main.go b/cmd/sinker/main.go index 022e545..8035341 100644 --- a/cmd/sinker/main.go +++ b/cmd/sinker/main.go @@ -82,6 +82,8 @@ func main() { panic(err) } + defer app.Close() + geoip2, err := geoip.NewGeoip(geoip.GeoipMmdbByte) if err != nil { diff --git a/platform-basic-libs/service/consumer_data/report_accpet_status.go b/platform-basic-libs/service/consumer_data/report_accpet_status.go index 8cf8fc5..8f6995d 100644 --- a/platform-basic-libs/service/consumer_data/report_accpet_status.go +++ b/platform-basic-libs/service/consumer_data/report_accpet_status.go @@ -27,8 +27,10 @@ type ReportAcceptStatus struct { flushInterval int } -const FailStatus = 0 -const SuccessStatus = 1 +const ( + FailStatus = 0 + SuccessStatus = 1 +) func NewReportAcceptStatus(batchSize int, flushInterval int) *ReportAcceptStatus { logs.Logger.Info("NewReportAcceptStatus", zap.Int("batchSize", batchSize), zap.Int("flushInterval", flushInterval)) @@ -49,7 +51,7 @@ func NewReportAcceptStatus(batchSize int, flushInterval int) *ReportAcceptStatus func (this *ReportAcceptStatus) Flush() (err error) { this.bufferMutex.Lock() - if len(this.buffer)==0{ + if len(this.buffer) == 0 { this.bufferMutex.Unlock() return nil } @@ -88,7 +90,7 @@ func (this *ReportAcceptStatus) Flush() (err error) { } else { len := len(this.buffer) if len > 0 { - logs.Logger.Info("入库数据状态成功", zap.String("所花时间", time.Now().Sub(startNow).String()), zap.Int("数据长度为", len)) + logs.Logger.Info("入库数据状态成功", zap.String("所花时间", time.Now().Sub(startNow).String()), zap.Int("数据长度为", len)) } } stmt.Close() diff --git a/platform-basic-libs/service/meta_data/meta_data.go b/platform-basic-libs/service/meta_data/meta_data.go index 2d676a4..21bddf4 100644 --- a/platform-basic-libs/service/meta_data/meta_data.go +++ b/platform-basic-libs/service/meta_data/meta_data.go @@ -275,14 +275,6 @@ FROM (select * from meta_attr_relation where app_id = ?) mu INNER JOIN (select * from meta_event where appid = ? ) e ON e.event_name = mu.event_name INNER JOIN (select * from attribute where app_id = ? and (status = 1 or attribute_type = 1) and attribute_source = 2 and attribute_name not in ('xwl_part_event','xwl_part_date','xwl_kafka_offset') ) a ON a.attribute_name = mu.event_attr ` - type eventNameAndTheAttr struct { - EventNameDesc string `json:"event_name_desc" db:"event_name_desc"` - EventName string `json:"event_name" db:"event_name"` - AttributeName string `json:"attribute_name" db:"attribute_name"` - AttributeDesc string `json:"attribute_desc" db:"attribute_desc"` - DataType string `json:"data_type" db:"data_type"` - AttributeType string `json:"attribute_type" db:"attribute_type"` - } err = db.Sqlx.Select(&eventNameAndTheAttrList, getEventNameAndTheAttrSql, appid, appid, appid) if err != nil { diff --git a/platform-basic-libs/service/pannel/pannel_service.go b/platform-basic-libs/service/pannel/pannel_service.go index c6c5f70..510aba4 100644 --- a/platform-basic-libs/service/pannel/pannel_service.go +++ b/platform-basic-libs/service/pannel/pannel_service.go @@ -145,13 +145,13 @@ func (this *PannelService) GetPannelList(managerUid int32, appid int) (res []Pan p1.id AS folder_id, ifnull(p2.report_tables,'') as report_tables , ifnull(p2.id,0)as pannel_id, - ifnull(p2.pannel_name,'') as pannel_name,ifnull(p2.create_by,0) as create_by,ifnull(FIND_IN_SET(?,p2.managers),0) as folder_type,ifnull(p2.managers,'') as managers + ifnull(p2.pannel_name,'') as pannel_name,ifnull(p1.create_by,0) as create_by,ifnull(FIND_IN_SET(?,p2.managers),0) as folder_type,ifnull(p2.managers,'') as managers FROM pannel_folder p1 LEFT JOIN pannel p2 ON p1.id = p2.folder_id WHERE - (p2.create_by = ? OR FIND_IN_SET(?,p2.managers) or isnull(p2.create_by)) and appid= ?` + (p1.create_by = ? OR FIND_IN_SET(?,p2.managers) ) and appid= ?` err = db.Sqlx.Select(&res, sql, managerUid, managerUid, managerUid, appid) diff --git a/vue/src/views/app/index.vue b/vue/src/views/app/index.vue index b67f3bc..bb05f69 100644 --- a/vue/src/views/app/index.vue +++ b/vue/src/views/app/index.vue @@ -453,7 +453,7 @@ export default { async init() { const userListRes = await userList() if (userListRes) { - for (var v of userListRes.data) { + for (let v of userListRes.data) { this.userConfig[v.id] = v.realname this.allUserConfig.push( {