diff options
| author | doufenghu <[email protected]> | 2019-03-12 13:50:53 +0800 |
|---|---|---|
| committer | doufenghu <[email protected]> | 2019-03-12 13:50:53 +0800 |
| commit | 5900b299ea660abd8b79a0553938d725418064b6 (patch) | |
| tree | f8e3300a4d99da07e34d4c24536abaf6f7436b8c /src/main/java/com/nis/util/Constants.java | |
| parent | 2858a6c47c048b9a6f2b7c03f84946e193b69963 (diff) | |
| parent | 536e5b887a206908ae2edeb093f564ba2dc1362d (diff) | |
# Conflicts:
# src/main/java/com/nis/util/JedisUtils.java
# src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
# src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
# src/main/resources/nis.properties
合并配置全量同步功能，解决如上冲突
Diffstat (limited to 'src/main/java/com/nis/util/Constants.java')
| -rw-r--r-- | src/main/java/com/nis/util/Constants.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 193ac00..a9c343d 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -223,9 +223,13 @@ public final class Constants { /**
- * redis分布式锁超时时间,默认五分钟,3000秒
+ * redis分布式锁超时时间,默认五分钟,300秒
*/
- public static final Long REDISLOCKTIME=Configurations.getLongProperty("redisLockTime", 3000);
+ public static final Long REDISLOCKTIME=Configurations.getLongProperty("redisLockTime", 300);
+ /**
+ * 全量数据同步分布式锁时间,默认两个小时
+ */
+ public static final Long CONFIGSYNCLOCKTIME=Configurations.getLongProperty("configSyncLockTime", 7200);
/**
* 获取redis分布式锁失败后的尝试获取锁的次数,每次失败暂停一秒钟后再次尝试
*/
|