From fe59012c49d3ce9bbf59cf845fbc6de1ff42ab42 Mon Sep 17 00:00:00 2001 From: knightliao Date: Mon, 26 Oct 2015 15:17:44 +0800 Subject: [PATCH 1/4] re --- disconf-web/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml index bfc70f439..49ac38f4c 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-SNAPSHOT ../ From 912a5caad2c915b7ada54bcd3b6f09ee7c035208 Mon Sep 17 00:00:00 2001 From: knightliao Date: Mon, 26 Oct 2015 16:29:46 +0800 Subject: [PATCH 2/4] fix html bug --- disconf-client/pom.xml | 2 +- disconf-core/pom.xml | 2 +- .../disconf-spring-boot-core/pom.xml | 2 +- disconf-demos/disconf-standalone-demo/pom.xml | 2 +- disconf-demos/disconf-standalone-dubbo-demo/pom.xml | 2 +- disconf-tool/pom.xml | 2 +- disconf-web/html/assets/js/newconfigfile.js | 6 +++++- pom.xml | 8 ++++---- 8 files changed, 15 insertions(+), 11 deletions(-) diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 3d5395cff..7559722c4 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-SNAPSHOT ../ diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index 5a4bb44db..24e16a261 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-SNAPSHOT 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..5ed4fe01e 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-SNAPSHOT ch.qos.logback diff --git a/disconf-demos/disconf-standalone-demo/pom.xml b/disconf-demos/disconf-standalone-demo/pom.xml index c683e0449..73060c876 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-SNAPSHOT diff --git a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml index bcb86af3c..4d2fbab80 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-SNAPSHOT diff --git a/disconf-tool/pom.xml b/disconf-tool/pom.xml index 1718fe432..f6d26d712 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-SNAPSHOT disconf-tool ${disconf-tool.version} diff --git a/disconf-web/html/assets/js/newconfigfile.js b/disconf-web/html/assets/js/newconfigfile.js index f6ceb0b19..a81351e3f 100644 --- a/disconf-web/html/assets/js/newconfigfile.js +++ b/disconf-web/html/assets/js/newconfigfile.js @@ -211,6 +211,10 @@ $("#uploadChoice").on( 'click', function (e) { + if (version == '自定义版本') { + version = $('#selfversion_value').val(); + } + $("#error").addClass("hide"); var fileName = $("#fileName").val(); @@ -239,7 +243,7 @@ $("#uploadChoice").on( "envId": envId, "version": version, "fileContent": fileContent, - "fileName": fileName, + "fileName": fileName } }).done(function (data) { $("#error").removeClass("hide"); diff --git a/pom.xml b/pom.xml index fbb68c77b..0f6f0ba7e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.baidu.disconf disconf-base - 2.6.26 + 2.6.27-SNAPSHOT pom @@ -46,9 +46,9 @@ ${project.basedir}/src/main/resources - 2.6.26 - 2.6.26 - 2.6.26 + 2.6.27-SNAPSHOT + 2.6.27-SNAPSHOT + 2.6.27-SNAPSHOT From 8f13d50962998d4736928de389ffc5565705a81b Mon Sep 17 00:00:00 2001 From: knightliao Date: Mon, 26 Oct 2015 17:52:04 +0800 Subject: [PATCH 3/4] fix bean order bug --- .../src/main/java/com/baidu/disconf/client/DisconfMgrBean.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } /** From a0cc7947fb52b2a6e05a2656d33b3ad6ffe05360 Mon Sep 17 00:00:00 2001 From: knightliao Date: Mon, 26 Oct 2015 17:56:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20bean=20order=20=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++---- disconf-client/pom.xml | 2 +- disconf-core/pom.xml | 2 +- .../disconf-spring-boot-core/pom.xml | 2 +- disconf-demos/disconf-standalone-demo/pom.xml | 2 +- disconf-demos/disconf-standalone-dubbo-demo/pom.xml | 2 +- disconf-tool/pom.xml | 2 +- disconf-web/pom.xml | 2 +- pom.xml | 8 ++++---- 9 files changed, 15 insertions(+), 15 deletions(-) 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 7559722c4..c33e3e3e7 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -10,7 +10,7 @@ com.baidu.disconf disconf-base - 2.6.27-SNAPSHOT + 2.6.27 ../ diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index 24e16a261..bedd546f0 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -14,7 +14,7 @@ com.baidu.disconf disconf-base ../ - 2.6.27-SNAPSHOT + 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 5ed4fe01e..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.27-SNAPSHOT + 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 73060c876..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.27-SNAPSHOT + 2.6.27 diff --git a/disconf-demos/disconf-standalone-dubbo-demo/pom.xml b/disconf-demos/disconf-standalone-dubbo-demo/pom.xml index 4d2fbab80..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.27-SNAPSHOT + 2.6.27 diff --git a/disconf-tool/pom.xml b/disconf-tool/pom.xml index f6d26d712..7c93c19a5 100644 --- a/disconf-tool/pom.xml +++ b/disconf-tool/pom.xml @@ -4,7 +4,7 @@ com.baidu.disconf disconf-base - 2.6.27-SNAPSHOT + 2.6.27 disconf-tool ${disconf-tool.version} diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml index 49ac38f4c..acc87ff28 100644 --- a/disconf-web/pom.xml +++ b/disconf-web/pom.xml @@ -12,7 +12,7 @@ com.baidu.disconf disconf-base - 2.6.27-SNAPSHOT + 2.6.27 ../ diff --git a/pom.xml b/pom.xml index 0f6f0ba7e..e62de0f59 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.baidu.disconf disconf-base - 2.6.27-SNAPSHOT + 2.6.27 pom @@ -46,9 +46,9 @@ ${project.basedir}/src/main/resources - 2.6.27-SNAPSHOT - 2.6.27-SNAPSHOT - 2.6.27-SNAPSHOT + 2.6.27 + 2.6.27 + 2.6.27