From 8f59dc257c643599d3c1256dcaf18d2163a89e06 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Wed, 23 Feb 2022 16:21:42 +0800 Subject: [PATCH] #1494 fix --- modules/redis/redis_lock/lock.go | 4 ++-- routers/api/v1/api.go | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/redis/redis_lock/lock.go b/modules/redis/redis_lock/lock.go index 4dce04c88..0faed3237 100644 --- a/modules/redis/redis_lock/lock.go +++ b/modules/redis/redis_lock/lock.go @@ -18,14 +18,14 @@ func (lock *DistributeLock) Lock(lockKey string, expireTime time.Duration) bool } func (lock *DistributeLock) LockWithWait(lockKey string, expireTime time.Duration, waitTime time.Duration) bool { - start := time.Now().UnixMilli() + start := time.Now().Unix() * 1000 duration := waitTime.Milliseconds() for { isOk, _ := redis_client.Setnx(lockKey, "", expireTime) if isOk { return true } - if time.Now().UnixMilli()-start > duration { + if time.Now().Unix()*1000-start > duration { return false } time.Sleep(50 * time.Millisecond) diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index e1b5ceaee..b7f53c783 100755 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -999,6 +999,8 @@ func RegisterRoutes(m *macaron.Macaron) { m.Group("/from_wechat", func() { m.Get("/event", authentication.ValidEventSource) m.Post("/event", authentication.AcceptWechatEvent) + m.Get("/prd/event", authentication.ValidEventSource) + m.Post("/prd/event", authentication.AcceptWechatEvent) }) }, securityHeaders(), context.APIContexter(), sudo()) }