From a84d5168ecf7f880cb2114dbf5fde5105167ddcb Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Fri, 9 Jun 2023 19:58:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/codec/DesUtils.java    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/codec/DesUtils.java b/common/src/main/java/com/jeesite/common/codec/DesUtils.java
index 8749cbcf..14880269 100644
--- a/common/src/main/java/com/jeesite/common/codec/DesUtils.java
+++ b/common/src/main/java/com/jeesite/common/codec/DesUtils.java
@@ -4,11 +4,11 @@
  */
 package com.jeesite.common.codec;
 
+import com.jeesite.common.lang.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import com.jeesite.common.lang.StringUtils;
-
 /**
  * DES加密解密工具
  * 加密：DesUtils.encode("admin","1,2,3");
@@ -17,23 +17,23 @@ import com.jeesite.common.lang.StringUtils;
  */
 public class DesUtils {
 
-	private static DesCore desCore = new DesCore();
+	private static final DesCore desCore = new DesCore();
 
 	/**
 	 * DES加密（secretKey代表3个key，用逗号分隔）
 	 */
 	public static String encode(String data, String secretKey) {
 		if (StringUtils.isBlank(data)){
-			return "";
+			return StringUtils.EMPTY;
 		}
-		if ("Base64".equals(secretKey)) {
+		if ("Base64".equalsIgnoreCase(secretKey)) {
 			return EncodeUtils.encodeBase64(data);
 		}
-		String[] ks = StringUtils.split(secretKey, ",");
+		String[] ks = StringUtils.split(secretKey, StringUtils.COMMA);
 		if (ks.length >= 3){
 			return desCore.strEnc(data, ks[0], ks[1], ks[2]);
 		}
-		return desCore.strEnc(data, secretKey, "", "");
+		return desCore.strEnc(data, secretKey, StringUtils.EMPTY, StringUtils.EMPTY);
 	}
 
 	/**
@@ -43,18 +43,18 @@ public class DesUtils {
 		if (StringUtils.isBlank(data)){
 			return "";
 		}
-		if ("Base64".equals(secretKey)) {
+		if ("Base64".equalsIgnoreCase(secretKey)) {
 			try {
 				return EncodeUtils.decodeBase64String(data);
 			}catch (IllegalArgumentException e) {
-				return "";
+				return StringUtils.EMPTY;
 			}
 		}
-		String[] ks = StringUtils.split(secretKey, ",");
+		String[] ks = StringUtils.split(secretKey, StringUtils.COMMA);
 		if (ks.length >= 3){
 			return desCore.strDec(data, ks[0], ks[1], ks[2]);
 		}
-		return desCore.strDec(data, secretKey, "", "");
+		return desCore.strDec(data, secretKey, StringUtils.EMPTY, StringUtils.EMPTY);
 	}
 
 	/**
@@ -69,7 +69,6 @@ public class DesUtils {
 		 * encrypt the string to string made up of hex return the encrypted string
 		 */
 		public String strEnc(String data, String firstKey, String secondKey, String thirdKey) {
-
 			int leng = data.length();
 			String encData = "";
 			List firstKeyBt = null, secondKeyBt = null, thirdKeyBt = null;