4 Commits

Author SHA1 Message Date
doufenghu
5900b299ea Merge branch 'Release-1.3-rc1' into develop
# 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

合并配置全量同步功能,解决如上冲突
2019-03-12 13:50:53 +08:00
doufenghu
9c8dd6853c Merge remote-tracking branch 'origin/Release-1.3' into Release-1.3 2018-11-07 10:14:32 +08:00
doufenghu
629399f18a fix(配置文件)增加开发环境,清除中文空格问题 2018-10-08 11:29:57 +08:00
doufenghu
f6b5ef7b94 idea 开发环境 2018-06-12 10:11:27 +08:00