re

knightliao · Oct 26, 2015 · 4843cea · 4843cea
2 parents a812bc7 + a0cc794
commit 4843cea
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git 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为应用方提供了三个工具，
     <dependency>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-client</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27</version>
     </dependency>
 
 ### disconf-web 使用 ###

diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27</version>
         <relativePath>../</relativePath>
     </parent>
 

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
@@ -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
@@ -14,7 +14,7 @@
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
         <relativePath>../</relativePath>
-        <version>2.6.26</version>
+        <version>2.6.27</version>
     </parent>
 
     <licenses>

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
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27</version>
             <exclusions>
                 <exclusion>
                     <groupId>ch.qos.logback</groupId>

diff --git a/disconf-demos/disconf-standalone-demo/pom.xml b/disconf-demos/disconf-standalone-demo/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27</version>
         </dependency>
 
         <dependency>

diff --git a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml
@@ -11,7 +11,7 @@
         <dependency>
             <groupId>com.baidu.disconf</groupId>
             <artifactId>disconf-client</artifactId>
-            <version>2.6.26</version>
+            <version>2.6.27</version>
         </dependency>
 
         <dependency>

diff --git a/disconf-tool/pom.xml b/disconf-tool/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27</version>
     </parent>
     <artifactId>disconf-tool</artifactId>
     <version>${disconf-tool.version}</version>

diff --git 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
@@ -12,7 +12,7 @@
     <parent>
         <groupId>com.baidu.disconf</groupId>
         <artifactId>disconf-base</artifactId>
-        <version>2.6.26</version>
+        <version>2.6.27</version>
         <relativePath>../</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.baidu.disconf</groupId>
     <artifactId>disconf-base</artifactId>
-    <version>2.6.26</version>
+    <version>2.6.27</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -46,9 +46,9 @@
         <project.build.offline.sourceDir>${project.basedir}/src/main/resources</project.build.offline.sourceDir>
 
         <!-- 模块版本号 -->
-        <disconf-core.version>2.6.26</disconf-core.version>
-        <disconf-client.version>2.6.26</disconf-client.version>
-        <disconf-tool.version>2.6.26</disconf-tool.version>
+        <disconf-core.version>2.6.27</disconf-core.version>
+        <disconf-client.version>2.6.27</disconf-client.version>
+        <disconf-tool.version>2.6.27</disconf-tool.version>
     </properties>
 
     <dependencyManagement>