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/resources | |
| 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/resources')
| -rw-r--r-- | src/main/resources/nis.properties | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 8706107..328d4ad 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -219,7 +219,13 @@ isOpenLogCountAndLast=true #redis分布式锁超时时间,默认五分钟,3000秒
redisLockTime=3000
#获取redis分布式锁失败后的尝试获取锁的次数,每次失败暂停一秒钟后再次尝试
-redisRetryNum=500
+redisRetryNum=5
+
+#定时检测界面和服务的配置是否需要同步的定时任务间隔
+syncUiAndServiceConfigCron=0/10 * * * * ?
+#全量数据同步分布式锁时间,默认两个小时
+configSyncLockTime=7200
+
#ip定位库的地址
#ipLocationLibraryPath=/usr/local/ipLocalLibraay/Kazakhstan.mmdb
ipLocationLibraryPath=C:\\ipLocation\\Kazakhstan.mmdb
|