From 96da65b8e49f7f0cfc6f3ef04f1c8049c2e38fe9 Mon Sep 17 00:00:00 2001
From: Guoqs <autumn.g@foxmail.com>
Date: Wed, 27 Mar 2024 15:23:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8utils?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thirdparty/lianlian/util/SignUtils.java   | 116 ------------------
 .../platform/ThirdPartyPlatformService.java   |   2 +-
 2 files changed, 1 insertion(+), 117 deletions(-)
 delete mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java
deleted file mode 100644
index d7a325bb9..000000000
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/util/SignUtils.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.jsowell.thirdparty.lianlian.util;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.util.*;
-
-public class SignUtils {
-
-	private static String UTF_8 = "UTF-8";
-
-	/**
-	 * 使用<code>secret</code>对paramValues按以下算法进行签名： <br/>
-	 * uppercase(hex(sha1(secretkey1value1key2value2...secret))
-	 *
-	 * @param paramValues
-	 *            参数列表
-	 * @param secret
-	 * @return
-	 */
-	public static String sign(Map<String, String> paramValues, String secret) {
-		return sign(paramValues, null, secret);
-	}
-
-	/**
-	 * 对paramValues进行签名，其中ignoreParamNames这些参数不参与签名
-	 * 
-	 * @param paramValues
-	 * @param ignoreParamNames
-	 * @param secret
-	 * @return
-	 */
-	public static String sign(Map<String, String> paramValues, List<String> ignoreParamNames, String secret) {
-		try {
-			StringBuilder sb = new StringBuilder();
-			List<String> paramNames = new ArrayList<String>(paramValues.size());
-			paramNames.addAll(paramValues.keySet());
-			if (ignoreParamNames != null && ignoreParamNames.size() > 0) {
-				for (String ignoreParamName : ignoreParamNames) {
-					paramNames.remove(ignoreParamName);
-				}
-			}
-			Collections.sort(paramNames);
-
-			sb.append(secret);
-			for (String paramName : paramNames) {
-				sb.append(paramName).append(paramValues.get(paramName));
-			}
-			sb.append(secret);
-			System.out.println("原始的签名：" + sb.toString());
-			byte[] sha1Digest = getSHA1Digest(sb.toString());
-			System.out.println("sha-1的二进制码：" + String.valueOf(sha1Digest));
-			return byte2hex(sha1Digest);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	public static String utf8Encoding(String value, String sourceCharsetName) {
-		try {
-			return new String(value.getBytes(sourceCharsetName), UTF_8);
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalArgumentException(e);
-		}
-	}
-
-	private static byte[] getSHA1Digest(String data) throws IOException {
-		byte[] bytes = null;
-		try {
-			MessageDigest md = MessageDigest.getInstance("SHA-1");
-			bytes = md.digest(data.getBytes(UTF_8));
-		} catch (GeneralSecurityException gse) {
-			throw new IOException(gse.getMessage())	;
-		}
-		return bytes;
-	}
-
-	//    private static byte[] getMD5Digest(String data) throws IOException {
-	//        byte[] bytes = null;
-	//        try {
-	//            MessageDigest md = MessageDigest.getInstance("MD5");
-	//            bytes = md.digest(data.getBytes(UTF_8));
-	//        } catch (GeneralSecurityException gse) {
-	//            throw new IOException(gse.getMessage());
-	//        }
-	//        return bytes;
-	//    }
-
-	/**
-	 * 二进制转十六进制字符串
-	 *
-	 * @param bytes
-	 * @return
-	 */
-	private static String byte2hex(byte[] bytes) {
-		StringBuilder sign = new StringBuilder();
-		for (int i = 0; i < bytes.length; i++) {
-			String hex = Integer.toHexString(bytes[i] & 0xFF);
-			if (hex.length() == 1) {
-				sign.append("0");
-			}
-			sign.append(hex.toUpperCase());
-		}
-		System.out.println("最终的签名：" + sign);
-		return sign.toString();
-	}
-
-	public static String getUUID() {
-		UUID uuid = UUID.randomUUID();
-		return uuid.toString().toUpperCase();
-	}
-	
-
-
-}
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/ThirdPartyPlatformService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/ThirdPartyPlatformService.java
index a46c0c833..c50cbfd78 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/ThirdPartyPlatformService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/ThirdPartyPlatformService.java
@@ -434,7 +434,7 @@ public interface ThirdPartyPlatformService {
 
     /**
      * 校验签名
-     * @param operatorID 组织机构代码
+     * @param operatorID 平台标识 组织机构代码
      * @param data 参数内容
      * @param timeStamp 时间戳
      * @param seq 自增序列