Merge pull request 'fix-20231226-Robin-BUG0001' (#7) from fix-20231226-Robin-BUG0001 into test
Reviewed-on: #7
This commit is contained in:
commit
fa94f04873
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -2575,7 +2575,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
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue