From 82ff0f9874014eb3e734815eb978379a9bea38a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Tue, 23 Jun 2020 10:11:21 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
index 118bfe3..9f13ad6 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/utils/AesUtils.java
@@ -23,9 +23,10 @@
/**
* 加密方法
- * @param data 要加密的数据
- * @param key 加密key
- * @param iv 加密iv
+ *
+ * @param data 要加密的数据
+ * @param key 加密key
+ * @param iv 加密iv
* @return 加密的结果
* @throws Exception
*/
@@ -55,9 +56,10 @@
/**
* 解密方法
+ *
* @param data 要解密的数据
* @param key 解密key
- * @param iv 解密iv
+ * @param iv 解密iv
* @return 解密的结果
* @throws Exception
*/
@@ -69,7 +71,7 @@
IvParameterSpec ivspec = new IvParameterSpec(iv.getBytes());
cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec);
byte[] original = cipher.doFinal(encrypted1);
- String originalString = new String(original);
+ String originalString = new String(original).trim();
return originalString;
} catch (Exception e) {
e.printStackTrace();
@@ -89,6 +91,7 @@
/**
* 使用默认的key和iv解密
+ *
* @param data
* @return
* @throws Exception
--
Gitblit v1.8.0