# 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 合并配置全量同步功能,解决如上冲突