diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java
index 19708f67..22f3d0ee 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/lock/DatabaseLockService.java
@@ -4,14 +4,11 @@ import com.github.kfcfans.powerjob.common.utils.CommonUtils;
 import com.github.kfcfans.powerjob.common.utils.NetUtils;
 import com.github.kfcfans.powerjob.server.persistence.core.model.OmsLockDO;
 import com.github.kfcfans.powerjob.server.persistence.core.repository.OmsLockRepository;
-import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 基于数据库实现的分布式锁
@@ -26,35 +23,27 @@ public class DatabaseLockService implements LockService {
     @Resource
     private OmsLockRepository omsLockRepository;
 
-    private Map<String, AtomicInteger> lockName2FailedTimes = Maps.newConcurrentMap();
-    private static final int MAX_FAILED_NUM = 5;
-
     @Override
     public boolean lock(String name, long maxLockTime) {
 
-        AtomicInteger failedCount = lockName2FailedTimes.computeIfAbsent(name, ignore -> new AtomicInteger(0));
         OmsLockDO newLock = new OmsLockDO(name, NetUtils.getLocalHost(), maxLockTime);
         try {
             omsLockRepository.saveAndFlush(newLock);
-            failedCount.set(0);
             return true;
-        }catch (DataIntegrityViolationException ignore) {
-        }catch (Exception e) {
+        } catch (DataIntegrityViolationException ignore) {
+        } catch (Exception e) {
             log.warn("[DatabaseLockService] write lock to database failed, lockName = {}.", name, e);
         }
 
-        // 连续失败一段时间，需要判断是否为锁释放失败的情况
-        if (failedCount.incrementAndGet() > MAX_FAILED_NUM) {
+        OmsLockDO omsLockDO = omsLockRepository.findByLockName(name);
+        long lockedMillions = System.currentTimeMillis() - omsLockDO.getGmtCreate().getTime();
 
-            OmsLockDO omsLockDO = omsLockRepository.findByLockName(name);
-            long lockedMillions = System.currentTimeMillis() - omsLockDO.getGmtCreate().getTime();
-            if (lockedMillions > omsLockDO.getMaxLockTime()) {
+        // 锁超时，强制释放锁并重新尝试获取
+        if (lockedMillions > omsLockDO.getMaxLockTime()) {
 
-                log.warn("[DatabaseLockService] The lock({}) already timeout, will be deleted now.", omsLockDO);
-                unlock(name);
-            } else {
-                failedCount.set(0);
-            }
+            log.warn("[DatabaseLockService] The lock[{}] already timeout, will be unlocked now.", omsLockDO);
+            unlock(name);
+            return lock(name, maxLockTime);
         }
         return false;
     }