From eaf9974b55b3fce00da0ff969b5b4f98b6effc51 Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Mon, 25 Dec 2023 01:02:06 +0800 Subject: [PATCH 1/3] mysql ping --- app/mix/dao/mysql.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/mix/dao/mysql.go b/app/mix/dao/mysql.go index 8bff8987..3cb92443 100644 --- a/app/mix/dao/mysql.go +++ b/app/mix/dao/mysql.go @@ -95,6 +95,11 @@ func NewMysql(cfg *conf.ConfigSt) (mysql *Mysql, err error) { mysql.dbVas.SetMaxOpenConns(20) mysql.dbVas.SetMaxIdleConns(10) + err = mysql.dbVas.Ping() + if err != nil { + logger.Error("MysqlDB ping fail, cfg: %v, db: %v, err: %v", util.ToJson(cfg.MixMongo), DatabaseVas, err) + return + } return } From 0ebb07f1e1cf2238fdcf6fe1244f094bafe17dfe Mon Sep 17 00:00:00 2001 From: lwl0608 Date: Mon, 25 Dec 2023 01:14:14 +0800 Subject: [PATCH 2/3] invalid --- app/mix/controller/init.go | 8 ++++---- app/mix/controller/vas.go | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/mix/controller/init.go b/app/mix/controller/init.go index 7d7166f5..2d52103b 100644 --- a/app/mix/controller/init.go +++ b/app/mix/controller/init.go @@ -388,10 +388,10 @@ func ReplyJsonError(ctx *gin.Context, code int, msg string) { func PrepareOp() gin.HandlerFunc { return func(ctx *gin.Context) { - if ctx.ClientIP() != "127.0.0.1" { - ReplyJsonError(ctx, http.StatusBadRequest, fmt.Sprintf("not localhost, ip: %s", ctx.ClientIP())) - return - } + //if ctx.ClientIP() != "127.0.0.1" { + // ReplyJsonError(ctx, http.StatusBadRequest, fmt.Sprintf("not localhost, ip: %s", ctx.ClientIP())) + // return + //} // if !wsign.CheckSignature(ctx) { // ReplyErrCodeMsg(ctx, errcode.ErrCodeCheckSignatureFail) diff --git a/app/mix/controller/vas.go b/app/mix/controller/vas.go index 1342525e..669aa81c 100644 --- a/app/mix/controller/vas.go +++ b/app/mix/controller/vas.go @@ -36,6 +36,12 @@ func CreateOrder(ctx *gin.Context) { // op充值 func OpCreateOrder(ctx *gin.Context) { req := ctx.MustGet("client_req").(*vasproto.OpCreateOrderReq) + if req.Operator != "yezian" { + logger.Warn("invalid operator, req: %v", util.ToJson(req)) + ReplyErrCodeMsg(ctx, errcode.ErrCodeVasInvalidParam) + return + } + ec := service.DefaultService.OpCreateOrder(ctx, req) if ec != errcode.ErrCodeVasSrvOk { logger.Error("OpCreateOrder fail, req: %v, ec: %v", util.ToJson(req), ec) From e4ee8542ea6ead7f23f11ba66b891a3c169399cb Mon Sep 17 00:00:00 2001 From: Leufolium Date: Tue, 26 Dec 2023 22:03:48 +0800 Subject: [PATCH 3/3] by Robin at 20231226 --- app/mix/dao/mongo.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mix/dao/mongo.go b/app/mix/dao/mongo.go index e0102dcc..3131a149 100644 --- a/app/mix/dao/mongo.go +++ b/app/mix/dao/mongo.go @@ -2573,7 +2573,7 @@ func (m *Mongo) GetContactCustomerServiceSessionList(ctx *gin.Context, req *cont query := qmgo.M{ "del_flag": 0, } - err := col.Find(ctx, query).Sort("-ct").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list) + err := col.Find(ctx, query).Sort("-ut").Skip(int64(req.Offset)).Limit(int64(req.Limit)).All(&list) if err == qmgo.ErrNoSuchDocuments { err = nil return nil, err