From 78d059bf2dc958d18595ba6b3357dd90cacdcbcb Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 9 Apr 2016 23:15:50 +0800 Subject: [PATCH 1/9] using 2.6.33.snapshot --- README.md | 2 +- disconf-client/pom.xml | 2 +- disconf-core/pom.xml | 2 +- disconf-web/pom.xml | 2 +- pom.xml | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index fc4d5e57a..07dc4e823 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ https://github.com/knightliao/disconf-demos-java disconf.git branches and Maven version: -- dev(develop branch): 2.6.32 +- dev(develop branch): 2.6.33-SNAPSHOT - master(stable branch)：2.6.32 - [更新日志](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 ) diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index 8784aad1b..d9c8aa1cf 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -10,7 +10,7 @@ com.baidu.disconf disconf-base - 2.6.32 + 2.6.33-SNAPSHOT diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index 20731f537..fb6dec9da 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -13,7 +13,7 @@ com.baidu.disconf disconf-base - 2.6.32 + 2.6.33-SNAPSHOT diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml index c7edb9400..9d1f9234b 100644 --- a/disconf-web/pom.xml +++ b/disconf-web/pom.xml @@ -12,7 +12,7 @@ com.baidu.disconf disconf-base - 2.6.32 + 2.6.33-SNAPSHOT diff --git a/pom.xml b/pom.xml index e6579d2bc..6f68257f9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.baidu.disconf disconf-base - 2.6.32 + 2.6.33-SNAPSHOT pom @@ -25,9 +25,9 @@ - 2.6.32 - 2.6.32 - 2.6.32 + 2.6.33-SNAPSHOT + 2.6.33-SNAPSHOT + 2.6.33-SNAPSHOT UTF-8 From 2fe074c8b897158595b0f9b523cbd4bfa414bc31 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 23 Apr 2016 14:32:03 +0800 Subject: [PATCH 2/9] re --- .../disconf/web/service/config/service/impl/ConfigMgrImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java b/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java index 94aa3d7b6..cf9843d60 100644 --- a/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java +++ b/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java @@ -188,7 +188,7 @@ public ConfListVo transfer(Config input) { ConfListVo configListVo = convert(input, appNameString, envName, zkDisconfData); // 列表操作不要显示值, 为了前端显示快速(只是内存里操作) - if (!myFetchZk || !getErrorMessage) { + if (!myFetchZk && !getErrorMessage) { // 列表 value 设置为 "" configListVo.setValue(""); From 4f480e7b2389815c169ab5678a513180d0d3ddf8 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 30 Apr 2016 20:20:39 +0800 Subject: [PATCH 3/9] re --- .../disconf/web/service/config/service/impl/ConfigMgrImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java b/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java index cf9843d60..86a58bd04 100644 --- a/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java +++ b/disconf-web/src/main/java/com/baidu/disconf/web/service/config/service/impl/ConfigMgrImpl.java @@ -424,7 +424,7 @@ public String updateItemValue(Long configId, String value) { // String toEmails = appMgr.getEmails(config.getAppId()); - if (applicationPropertyConfig.isEmailMonitorOn() == true) { + if (applicationPropertyConfig.isEmailMonitorOn()) { boolean isSendSuccess = logMailBean.sendHtmlEmail(toEmails, " config update", DiffUtils.getDiff(CodeUtils.unicodeToUtf8(oldValue), value, From 5e6829410d923f82abbc80ff9f419e450dcf8789 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 30 Apr 2016 20:23:28 +0800 Subject: [PATCH 4/9] re --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67cedff8d..4b59f8351 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Disconf的功能特点描述图： com.baidu.disconf disconf-client - 2.6.31 + 2.6.32 ### server: disconf-web 使用 ### From bd2d5e64d121c7d28a0ed0e06527acbd64ee7802 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 7 May 2016 01:11:43 +0800 Subject: [PATCH 5/9] remove not use jar --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index 6f68257f9..c3c672f75 100644 --- a/pom.xml +++ b/pom.xml @@ -122,12 +122,6 @@ 1.2.1 - - commons-httpclient - commons-httpclient - 3.1 - - commons-io commons-io From a4c79d1f3cab7de00d4d6dd84eb694ce9e635025 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 7 May 2016 01:14:38 +0800 Subject: [PATCH 6/9] small change --- .../com/baidu/disconf/core/common/utils/ClassLoaderUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java b/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java index aff340f99..35de0b2f0 100644 --- a/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java +++ b/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java @@ -42,7 +42,7 @@ private ClassLoaderUtil() { // 如果是jar包内的，则返回当前路径 if (classPath.contains(".jar!")) { - LOGGER.warn("using config file inline jar!"); + LOGGER.warn("using config file inline jar!" + classPath); classPath = System.getProperty("user.dir"); } From 935baaa4a46221ca100acc5b54b16f614304f147 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 7 May 2016 13:39:38 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=9C=A8=E6=9C=AA=E5=8F=91=E7=8E=B0classpa?= =?UTF-8?q?th=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E5=B0=86?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E8=B7=AF=E5=BE=84=E5=8A=A0=E5=85=A5classpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/common/utils/ClassLoaderUtil.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java b/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java index 35de0b2f0..ab7b14b7d 100644 --- a/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java +++ b/disconf-core/src/main/java/com/baidu/disconf/core/common/utils/ClassLoaderUtil.java @@ -1,5 +1,8 @@ package com.baidu.disconf.core.common.utils; +import java.io.File; +import java.net.URL; +import java.net.URLClassLoader; import java.net.URLDecoder; import org.slf4j.Logger; @@ -20,7 +23,6 @@ public final class ClassLoaderUtil { private static ClassLoader loader = Thread.currentThread().getContextClassLoader(); private ClassLoaderUtil() { - } // @@ -44,16 +46,42 @@ private ClassLoaderUtil() { if (classPath.contains(".jar!")) { LOGGER.warn("using config file inline jar!" + classPath); classPath = System.getProperty("user.dir"); + + // + addCurrentWorkingDir2Classpath(classPath); } } catch (Exception e) { LOGGER.warn("cannot get classpath using getResource(), now using user.dir"); classPath = System.getProperty("user.dir"); + + // + addCurrentWorkingDir2Classpath(classPath); } LOGGER.info("classpath: {}", classPath); } + /** + * only support 1.7 or higher + * http://stackoverflow.com/questions/252893/how-do-you-change-the-classpath-within-java + */ + private static void addCurrentWorkingDir2Classpath(String path2Added) { + + // Add the conf dir to the classpath + // Chain the current thread classloader + URLClassLoader urlClassLoader; + try { + urlClassLoader = new URLClassLoader(new URL[] {new File(path2Added).toURI().toURL()}, + loader); + // Replace the thread classloader - assumes + // you have permissions to do so + Thread.currentThread().setContextClassLoader(urlClassLoader); + } catch (Exception e) { + LOGGER.warn(e.toString()); + } + } + public static String getClassPath() { return classPath; } From 72841f7e6ae84ff4683360da6357ebdf8513826f Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 7 May 2016 13:44:13 +0800 Subject: [PATCH 8/9] new version --- disconf-client/pom.xml | 2 +- disconf-core/pom.xml | 2 +- disconf-web/pom.xml | 2 +- pom.xml | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/disconf-client/pom.xml b/disconf-client/pom.xml index d9c8aa1cf..d94b61085 100644 --- a/disconf-client/pom.xml +++ b/disconf-client/pom.xml @@ -10,7 +10,7 @@ com.baidu.disconf disconf-base - 2.6.33-SNAPSHOT + 2.6.33 diff --git a/disconf-core/pom.xml b/disconf-core/pom.xml index fb6dec9da..f44e4f914 100644 --- a/disconf-core/pom.xml +++ b/disconf-core/pom.xml @@ -13,7 +13,7 @@ com.baidu.disconf disconf-base - 2.6.33-SNAPSHOT + 2.6.33 diff --git a/disconf-web/pom.xml b/disconf-web/pom.xml index 9d1f9234b..76d8c07b2 100644 --- a/disconf-web/pom.xml +++ b/disconf-web/pom.xml @@ -12,7 +12,7 @@ com.baidu.disconf disconf-base - 2.6.33-SNAPSHOT + 2.6.33 diff --git a/pom.xml b/pom.xml index c3c672f75..9d21f217e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.baidu.disconf disconf-base - 2.6.33-SNAPSHOT + 2.6.33 pom @@ -25,9 +25,9 @@ - 2.6.33-SNAPSHOT - 2.6.33-SNAPSHOT - 2.6.33-SNAPSHOT + 2.6.33 + 2.6.33 + 2.6.33 UTF-8 From 1f267f297f5994651e78cbeacf46487522f52156 Mon Sep 17 00:00:00 2001 From: knightliao Date: Sat, 7 May 2016 13:59:56 +0800 Subject: [PATCH 9/9] re --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4b59f8351..f40849d17 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ https://github.com/knightliao/disconf-demos-java disconf.git branches and Maven version: - dev(develop branch): 2.6.33-SNAPSHOT -- master(stable branch)：2.6.32 +- master(stable branch)：2.6.33 - [更新日志](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 ) @@ -99,7 +99,7 @@ Disconf的功能特点描述图： com.baidu.disconf disconf-client - 2.6.32 + 2.6.33 ### server: disconf-web 使用 ###