From 39cd3ca3fa1537ebfdf5be0e87b1212522ab5a93 Mon Sep 17 00:00:00 2001 From: weiye Date: Tue, 24 Mar 2020 18:19:11 +0800 Subject: [PATCH] #60 --- .../main/java/com/wugui/datax/admin/util/AESUtil.java | 4 ++-- .../java/com/wugui/datax/admin/util/JSONUtils.java | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/util/AESUtil.java b/datax-admin/src/main/java/com/wugui/datax/admin/util/AESUtil.java index d7fd4dff..9a86f61d 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/util/AESUtil.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/util/AESUtil.java @@ -57,7 +57,7 @@ public class AESUtil { return new Base64().encodeToString(result); // 加密 } } catch (Exception e) { - log.error("content encrypt error {0}",e); + log.error("content encrypt error {}",e.getMessage()); } return null; } @@ -81,7 +81,7 @@ public class AESUtil { return new String(result); // 解密 } } catch (Exception e) { - log.error("content decrypt error {0}",e); + log.error("content decrypt error {}",e.getMessage()); } return null; } diff --git a/datax-admin/src/main/java/com/wugui/datax/admin/util/JSONUtils.java b/datax-admin/src/main/java/com/wugui/datax/admin/util/JSONUtils.java index 7e9d30cb..fea427a7 100644 --- a/datax-admin/src/main/java/com/wugui/datax/admin/util/JSONUtils.java +++ b/datax-admin/src/main/java/com/wugui/datax/admin/util/JSONUtils.java @@ -40,8 +40,15 @@ public class JSONUtils { public static JSONObject decrypt(String content, String key) { JSONObject writer = JSONObject.parseObject(JSONObject.parseObject(content).getString(key)); JSONObject writerParams = JSONObject.parseObject(writer.getString("parameter")); - writerParams.put("username", AESUtil.decrypt(writerParams.getString("username"))); - writerParams.put("password", AESUtil.decrypt(writerParams.getString("password"))); + + String dUsername = AESUtil.decrypt(writerParams.getString("username")); + String username = dUsername == null ? writerParams.getString("username") : dUsername; + writerParams.put("username", username); + + String dPassword = AESUtil.decrypt(writerParams.getString("password")); + String password = dPassword == null ? writerParams.getString("password") : dPassword; + writerParams.put("password", password); + writer.put("parameter", writerParams); return writer; }