From f2f24791990e0a107ef313a1a835c192e5977943 Mon Sep 17 00:00:00 2001 From: lstoars Date: Tue, 18 Aug 2015 13:43:03 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=8A=A0=E5=AF=86key=E7=9A=84bug;2.=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=9A=8F=E6=9C=BA=E5=AF=86=E7=A0=81=E7=9A=84main?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/alibaba/druid/filter/config/ConfigFilter.java | 2 +- .../java/com/alibaba/druid/filter/config/ConfigTools.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java index fc8535b772..13a9c74927 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java @@ -215,7 +215,7 @@ public class ConfigFilter extends FilterAdapter { public PublicKey getPublicKey(Properties connectinProperties, Properties configFileProperties) { String key = null; if (configFileProperties != null) { - configFileProperties.getProperty(CONFIG_KEY); + key = configFileProperties.getProperty(CONFIG_KEY); } if (StringUtils.isEmpty(key) && connectinProperties != null) { diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java b/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java index 407c66a4c8..158bb69742 100644 --- a/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java +++ b/src/main/java/com/alibaba/druid/filter/config/ConfigTools.java @@ -46,8 +46,11 @@ public class ConfigTools { public static final String DEFAULT_PUBLIC_KEY_STRING = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKHGwq7q2RmwuRgKxBypQHw0mYu4BQZ3eMsTrdK8E6igRcxsobUC7uT0SoxIjl1WveWniCASejoQtn/BY6hVKWsCAwEAAQ=="; public static void main(String[] args) throws Exception { - String password = args[0]; - System.out.println(encrypt(password)); + String password = args[0]; + String[] arr = genKeyPair(512); + System.out.println("privateKey:" + arr[0]); + System.out.println("publicKey:" + arr[1]); + System.out.println("password:" + encrypt(arr[0], password)); } public static String decrypt(String cipherText) throws Exception {