From 1c462480924dd9bf3211b45f76b1d1708e60f833 Mon Sep 17 00:00:00 2001
From: duLingLing <dll19920503@qq.com>
Date: Thu, 28 Nov 2019 09:34:45 +0800
Subject: [PATCH] =?UTF-8?q?Add:=E5=AF=B9=E6=9E=81=E5=AE=A2=E5=95=86?=
 =?UTF-8?q?=E6=9C=8D=E6=8F=90=E4=BE=9B=E6=9F=A5=E8=AF=A2=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/utils/GeekLoginDESUtil.java    | 34 +++----------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/permission/utils/GeekLoginDESUtil.java b/src/main/java/au/com/royalpay/payment/manage/permission/utils/GeekLoginDESUtil.java
index a6b4b7e8a..019c16829 100644
--- a/src/main/java/au/com/royalpay/payment/manage/permission/utils/GeekLoginDESUtil.java
+++ b/src/main/java/au/com/royalpay/payment/manage/permission/utils/GeekLoginDESUtil.java
@@ -5,11 +5,7 @@ import java.security.SecureRandom;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sun.misc.BASE64Decoder;
-import sun.misc.BASE64Encoder;
+import org.apache.commons.codec.binary.Base64;
 
 /**
  * @Author DuLingLing
@@ -17,25 +13,19 @@ import sun.misc.BASE64Encoder;
  */
 public class GeekLoginDESUtil {
 
-    private static final Logger logger = LoggerFactory.getLogger(GeekLoginDESUtil.class);
-
     private static Key key;
     //设置秘钥key
-    private static String KEY_STR="myKey";
+    private static String KEY_STR="GEEKPAYMENT";
     private static String CHARSETNAME="UTF-8";
     private static String ALGORITHM="DES";
 
+
     static{
         try{
-            //生成DES算法对象
             KeyGenerator generator=KeyGenerator.getInstance(ALGORITHM);
-            //运用SHA1安全策略
             SecureRandom secureRandom=SecureRandom.getInstance("SHA1PRNG");
-            //设置上密钥种子
             secureRandom.setSeed(KEY_STR.getBytes());
-            //初始化基于SHA1的算法对象
             generator.init(secureRandom);
-            //生成密钥对象
             key=generator.generateKey();
             generator=null;
         }catch(Exception e){
@@ -49,19 +39,12 @@ public class GeekLoginDESUtil {
      * @return
      */
     public static String getEncryptString(String str){
-        //基于BASE64编码，接收byte[]并转换成String
-        BASE64Encoder base64Encoder=new BASE64Encoder();
         try {
-            // 按UTF8编码
             byte[] bytes = str.getBytes(CHARSETNAME);
-            // 获取加密对象
             Cipher cipher = Cipher.getInstance(ALGORITHM);
-            // 初始化密码信息
             cipher.init(Cipher.ENCRYPT_MODE, key);
-            // 加密
             byte[] doFinal = cipher.doFinal(bytes);
-            // byte[]to encode好的String并返回
-            return base64Encoder.encode(doFinal);
+            return Base64.encodeBase64String(doFinal);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
@@ -74,18 +57,11 @@ public class GeekLoginDESUtil {
      * @return
      */
     public static String getDecryptString(String str) {
-        // 基于BASE64编码，接收byte[]并转换成String
-        BASE64Decoder base64decoder = new BASE64Decoder();
         try {
-            // 将字符串decode成byte[]
-            byte[] bytes = base64decoder.decodeBuffer(str);
-            // 获取解密对象
+            byte[] bytes = Base64.decodeBase64(str);
             Cipher cipher = Cipher.getInstance(ALGORITHM);
-            // 初始化解密信息
             cipher.init(Cipher.DECRYPT_MODE, key);
-            // 解密
             byte[] doFinal = cipher.doFinal(bytes);
-            // 返回解密之后的信息
             return new String(doFinal, CHARSETNAME);
         } catch (Exception e) {
             throw new RuntimeException(e);