diff --git a/README.md b/README.md index 5c9e5c849..d4f3b5cc7 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Distributed Configuration Management Platform(分布式配置管理平台) disconf.git branches and Maven version: -- dev(develop branch): 2.6.26-SNAPSHOT -- master(stable branch):2.6.26 +- dev(develop branch): 2.6.27-SNAPSHOT +- master(stable branch):2.6.27 - [更新日志](https://github.com/knightliao/disconf/wiki/updates) 在Maven Central Repository里查看 [com.baidu.disconf](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.baidu.disconf%22 ) @@ -40,7 +40,7 @@ disconf.git branches and Maven version: [查看大图](http://ww1.sinaimg.cn/mw1024/60c9620fgw1eu5ltt9uglj20ia0j0tbo.jpg) -### 当前版本(2.6.26)功能特点 ## +### 当前版本(2.6.27)功能特点 ## - **支持配置(配置项+配置文件)的分布式化管理** - **配置发布统一化** @@ -121,7 +121,7 @@ Disconf为应用方提供了三个工具, com.baidu.disconf disconf-client - 2.6.26 + 2.6.27 ### disconf-web 使用 ### diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 3d5395cff..c33e3e3e7 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -10,7 +10,7 @@ com.baidu.disconf disconf-base - 2.6.26 + 2.6.27 ../ diff --git a/disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgrBean.java b/disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgrBean.java index 285d656f1..f3b599068 100644 --- a/disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgrBean.java +++ b/disconf-client/src/main/java/com/baidu/disconf/client/DisconfMgrBean.java @@ -62,7 +62,7 @@ public void setScanPackage(String scanPackage) { @Override public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; + return Ordered.HIGHEST_PRECEDENCE + 1; } /** diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index 5a4bb44db..bedd546f0 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -14,7 +14,7 @@ com.baidu.disconf disconf-base ../ - 2.6.26 + 2.6.27 diff --git a/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml b/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml index 08e12d95a..d8fc54515 100644 --- a/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml +++ b/disconf-demos/disconf-spring-boot-demo/disconf-spring-boot-core/pom.xml @@ -32,7 +32,7 @@ com.baidu.disconf disconf-client - 2.6.26 + 2.6.27 ch.qos.logback diff --git a/disconf-demos/disconf-standalone-demo/pom.xml b/disconf-demos/disconf-standalone-demo/pom.xml index c683e0449..22de1b0c7 100644 --- a/disconf-demos/disconf-standalone-demo/pom.xml +++ b/disconf-demos/disconf-standalone-demo/pom.xml @@ -11,7 +11,7 @@ com.baidu.disconf disconf-client - 2.6.26 + 2.6.27 diff --git a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml index bcb86af3c..62db7c7a3 100644 --- a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml +++ b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml @@ -11,7 +11,7 @@ com.baidu.disconf disconf-client - 2.6.26 + 2.6.27 diff --git a/disconf-tool/pom.xml b/disconf-tool/pom.xml index 1718fe432..7c93c19a5 100644 --- a/disconf-tool/pom.xml +++ b/disconf-tool/pom.xml @@ -4,7 +4,7 @@ com.baidu.disconf disconf-base - 2.6.26 + 2.6.27 disconf-tool ${disconf-tool.version} diff --git a/disconf-web/html/assets/js/newconfigfile.js b/disconf-web/html/assets/js/newconfigfile.js index ef2103c48..a81351e3f 100644 --- a/disconf-web/html/assets/js/newconfigfile.js +++ b/disconf-web/html/assets/js/newconfigfile.js @@ -243,7 +243,7 @@ $("#uploadChoice").on( "envId": envId, "version": version, "fileContent": fileContent, - "fileName": fileName, + "fileName": fileName } }).done(function (data) { $("#error").removeClass("hide"); diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml index bfc70f439..acc87ff28 100644 --- a/disconf-web/pom.xml +++ b/disconf-web/pom.xml @@ -12,7 +12,7 @@ com.baidu.disconf disconf-base - 2.6.26 + 2.6.27 ../ diff --git a/pom.xml b/pom.xml index fbb68c77b..e62de0f59 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.baidu.disconf disconf-base - 2.6.26 + 2.6.27 pom @@ -46,9 +46,9 @@ ${project.basedir}/src/main/resources - 2.6.26 - 2.6.26 - 2.6.26 + 2.6.27 + 2.6.27 + 2.6.27