From d31920a1233ab14cdd5e33756bb1b0e3ed235e66 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期三, 08 九月 2021 12:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java |  432 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 351 insertions(+), 81 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java b/java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java
old mode 100644
new mode 100755
index d7e92a2..70cad92
--- a/java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java
@@ -9,101 +9,316 @@
 import com.auth0.jwt.exceptions.JWTVerificationException;
 import com.auth0.jwt.interfaces.Claim;
 import com.auth0.jwt.interfaces.DecodedJWT;
-import com.java110.common.cache.JWTCache;
-import com.java110.common.cache.MappingCache;
-import com.java110.common.constant.CommonConstant;
-import com.java110.common.constant.MappingConstant;
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.NoAuthorityException;
-import com.java110.common.util.DateUtil;
-import com.java110.common.util.StringUtil;
-
+import com.java110.core.context.ApiDataFlow;
 import com.java110.core.context.DataFlow;
+import com.java110.dto.reportData.ReportDataDto;
+import com.java110.dto.reportData.ReportDataHeaderDto;
+import com.java110.utils.cache.JWTCache;
+import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.MappingConstant;
+import com.java110.utils.constant.ResponseConstant;
+import com.java110.utils.exception.NoAuthorityException;
+import com.java110.utils.util.Base64Convert;
+import com.java110.utils.util.StringUtil;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import javax.crypto.Cipher;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.DESKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.UnsupportedEncodingException;
 import java.security.*;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
-import java.util.*;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 
 /**
- *
  * 閴存潈宸ュ巶绫�
  * Created by wuxw on 2018/4/23.
  */
 public class AuthenticationFactory {
 
+    private final static String PASSWD_SALT = "hc@java110";
     /**
-     * md5绛惧悕
+     * 鍋忕Щ鍙橀噺锛屽浐瀹氬崰8浣嶅瓧鑺�
+     */
+    private final static String IV_PARAMETER = "12345678";
+    /**
+     * 瀵嗛挜绠楁硶
+     */
+    private static final String ALGORITHM = "DES";
+    /**
+     * 鍔犲瘑/瑙e瘑绠楁硶-宸ヤ綔妯″紡-濉厖妯″紡
+     */
+    private static final String CIPHER_ALGORITHM = "DES/CBC/PKCS5Padding";
+    /**
+     * 榛樿缂栫爜
+     */
+    private static final String CHARSET = "utf-8";
+
+
+    // 鍔犲瘑
+    public static String AesEncrypt(String sSrc, String sKey) {
+        try {
+            if (sKey == null) {
+                System.out.print("Key涓虹┖null");
+                return null;
+            }
+            // 鍒ゆ柇Key鏄惁涓�16浣�
+            if (sKey.length() != 16) {
+                System.out.print("Key闀垮害涓嶆槸16浣�");
+                return null;
+            }
+            byte[] raw = sKey.getBytes("utf-8");
+            SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");//"绠楁硶/妯″紡/琛ョ爜鏂瑰紡"
+            cipher.init(Cipher.ENCRYPT_MODE, skeySpec);
+            byte[] encrypted = cipher.doFinal(sSrc.getBytes("utf-8"));
+
+            return Base64Convert.byteToBase64(encrypted);//姝ゅ浣跨敤BASE64鍋氳浆鐮佸姛鑳斤紝鍚屾椂鑳借捣鍒�2娆″姞瀵嗙殑浣滅敤銆�
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    // 瑙e瘑
+    public static String AesDecrypt(String sSrc, String sKey) {
+        try {
+            // 鍒ゆ柇Key鏄惁姝g‘
+            if (sKey == null) {
+                System.out.print("Key涓虹┖null");
+                return null;
+            }
+            // 鍒ゆ柇Key鏄惁涓�16浣�
+            if (sKey.length() != 16) {
+                System.out.print("Key闀垮害涓嶆槸16浣�");
+                return null;
+            }
+            byte[] raw = sKey.getBytes("utf-8");
+            SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
+            Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+            cipher.init(Cipher.DECRYPT_MODE, skeySpec);
+            byte[] encrypted1 = Base64Convert.base64ToByte(sSrc);//鍏堢敤base64瑙e瘑
+            try {
+                byte[] original = cipher.doFinal(encrypted1);
+                String originalString = new String(original, "utf-8");
+                return originalString;
+            } catch (Exception e) {
+                System.out.println(e.toString());
+                return null;
+            }
+        } catch (Exception ex) {
+            System.out.println(ex.toString());
+            return null;
+        }
+    }
+
+
+    /**
+     * 鐢熸垚key
+     *
+     * @param password
+     * @return
+     * @throws Exception
+     */
+    private static Key generateKey(String password) throws Exception {
+        DESKeySpec dks = new DESKeySpec(password.getBytes(CHARSET));
+        SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(ALGORITHM);
+        return keyFactory.generateSecret(dks);
+    }
+
+
+    /**
+     * DES鍔犲瘑瀛楃涓�
+     *
+     * @param password 鍔犲瘑瀵嗙爜锛岄暱搴︿笉鑳藉灏忎簬8浣�
+     * @param data     寰呭姞瀵嗗瓧绗︿覆
+     * @return 鍔犲瘑鍚庡唴瀹�
+     */
+    public static String encrypt(String password, String data) {
+        if (password == null || password.length() < 8) {
+            throw new RuntimeException("鍔犲瘑澶辫触锛宬ey涓嶈兘灏忎簬8浣�");
+        }
+        if (data == null)
+            return null;
+        try {
+            Key secretKey = generateKey(password);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv);
+            byte[] bytes = cipher.doFinal(data.getBytes(CHARSET));
+
+            //JDK1.8鍙婁互涓婂彲鐩存帴浣跨敤Base64锛孞DK1.7鍙婁互涓嬪彲浠ヤ娇鐢˙ASE64Encoder
+            //Android骞冲彴鍙互浣跨敤android.util.Base64
+            return new String(Base64.getEncoder().encode(bytes));
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return data;
+        }
+    }
+
+    /**
+     * DES瑙e瘑瀛楃涓�
+     *
+     * @param password 瑙e瘑瀵嗙爜锛岄暱搴︿笉鑳藉灏忎簬8浣�
+     * @param data     寰呰В瀵嗗瓧绗︿覆
+     * @return 瑙e瘑鍚庡唴瀹�
+     */
+    public static String decrypt(String password, String data) {
+        if (password == null || password.length() < 8) {
+            throw new RuntimeException("鍔犲瘑澶辫触锛宬ey涓嶈兘灏忎簬8浣�");
+        }
+        if (data == null)
+            return null;
+        try {
+            Key secretKey = generateKey(password);
+            Cipher cipher = Cipher.getInstance(CIPHER_ALGORITHM);
+            IvParameterSpec iv = new IvParameterSpec(IV_PARAMETER.getBytes(CHARSET));
+            cipher.init(Cipher.DECRYPT_MODE, secretKey, iv);
+            return new String(cipher.doFinal(Base64.getDecoder().decode(data.getBytes(CHARSET))), CHARSET);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return data;
+        }
+    }
+
+    /**
+     * 鐢ㄦ埛瀵嗙爜 md5绛惧悕
+     *
      * @param inStr
      * @return
      */
-    public static String md5(String inStr) throws NoAuthorityException{
+    public static String passwdMd5(String inStr) throws NoAuthorityException {
+        return md5(md5(inStr + PASSWD_SALT));
+    }
+
+    /**
+     * md5绛惧悕
+     *
+     * @param inStr
+     * @return
+     */
+    public static String md5(String inStr) throws NoAuthorityException {
         try {
             return DigestUtils.md5Hex(inStr.getBytes("UTF-8"));
         } catch (UnsupportedEncodingException e) {
-            throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"MD5绛惧悕杩囩▼涓嚭鐜伴敊璇�");
+            throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "MD5绛惧悕杩囩▼涓嚭鐜伴敊璇�");
         }
     }
 
     /**
      * dataFlow 瀵硅薄绛惧悕
+     *
      * @param dataFlow
      * @return
      */
-    public static String dataFlowMd5(DataFlow dataFlow) throws NoAuthorityException{
-        if(dataFlow == null){
-            throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"MD5绛惧悕杩囩▼涓嚭鐜伴敊璇�");
+    public static String dataFlowMd5(DataFlow dataFlow) throws NoAuthorityException {
+        if (dataFlow == null) {
+            throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "MD5绛惧悕杩囩▼涓嚭鐜伴敊璇�");
         }
-        String reqInfo = dataFlow.getTransactionId() +dataFlow.getAppId();
-        reqInfo +=  ((dataFlow.getReqBusiness() == null || dataFlow.getReqBusiness().size() == 0)
-                                            ?dataFlow.getReqData() :dataFlow.getReqBusiness().toJSONString());
+        String reqInfo = dataFlow.getTransactionId() + dataFlow.getAppId();
+        reqInfo += ((dataFlow.getReqBusiness() == null || dataFlow.getReqBusiness().size() == 0)
+                ? dataFlow.getReqData() : dataFlow.getReqBusiness().toJSONString());
+        reqInfo += dataFlow.getAppRoutes().get(0).getSecurityCode();
+        return md5(reqInfo);
+    }
+
+    public static String SHA1Encode(String sourceString) {
+        String resultString = null;
+        try {
+            resultString = new String(sourceString);
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            resultString = byte2hexString(md.digest(resultString.getBytes()));
+        } catch (Exception localException) {
+        }
+        return resultString;
+    }
+
+
+    public static final String byte2hexString(byte[] bytes) {
+        StringBuffer buf = new StringBuffer(bytes.length * 2);
+        for (int i = 0; i < bytes.length; i++) {
+            if ((bytes[i] & 0xFF) < 16) {
+                buf.append("0");
+            }
+            buf.append(Long.toString(bytes[i] & 0xFF, 16));
+        }
+        return buf.toString().toUpperCase();
+    }
+
+    /**
+     * dataFlow 瀵硅薄绛惧悕
+     *
+     * @param dataFlow
+     * @return
+     */
+    public static String apiDataFlowMd5(ApiDataFlow dataFlow) throws NoAuthorityException {
+        if (dataFlow == null) {
+            throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "MD5绛惧悕杩囩▼涓嚭鐜伴敊璇�");
+        }
+        String reqInfo = dataFlow.getTransactionId() + dataFlow.getRequestTime() + dataFlow.getAppId();
+        String url = dataFlow.getRequestHeaders().get("REQUEST_URL");
+        String param = "";
+        if (url.indexOf("?") > 0) {
+            param = url.substring(url.indexOf("?"));
+        }
+        //,DELETE
+        reqInfo += "GET".equals(dataFlow.getRequestHeaders().get(CommonConstant.HTTP_METHOD)) ?
+                param : dataFlow.getReqData();
         reqInfo += dataFlow.getAppRoutes().get(0).getSecurityCode();
         return md5(reqInfo);
     }
 
     /**
      * md5鍔犲瘑
+     *
      * @param transactionId 娴佹按
-     * @param appId 搴旂敤ID
-     * @param businesses 鍐呭
+     * @param appId         搴旂敤ID
+     * @param businesses    鍐呭
      * @return
      */
-    public static String md5(String transactionId,String appId,String businesses,String code){
-        return md5(transactionId+appId+businesses+code).toLowerCase();
+    public static String md5(String transactionId, String appId, String businesses, String code) {
+        return md5(transactionId + appId + businesses + code).toLowerCase();
     }
 
     /**
      * 娣诲姞 sign
+     *
      * @param dataFlow
      * @param responseJson
      */
-    public static void putSign(DataFlow dataFlow,JSONObject responseJson){
+    public static void putSign(DataFlow dataFlow, JSONObject responseJson) {
         JSONObject orders = responseJson.getJSONObject("orders");
         JSONArray business = responseJson.getJSONArray("business");
-        if(dataFlow == null || dataFlow.getAppRoutes() == null || dataFlow.getAppRoutes().size() == 0 || StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) {
+        if (dataFlow == null || dataFlow.getAppRoutes() == null || dataFlow.getAppRoutes().size() == 0 || StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) {
             /*orders.put("sign", AuthenticationFactory.md5(orders.getString("transactionId"), orders.getString("responseTime"),
                     business.toJSONString(), MappingCache.getValue(MappingConstant.KEY_DEFAULT_SECURITY_CODE)));*/
-            orders.put("sign","");
-        }else {
+            orders.put("sign", "");
+        } else {
             orders.put("sign", AuthenticationFactory.md5(orders.getString("transactionId"), orders.getString("responseTime"),
-                    business == null ?"":business.toJSONString(), dataFlow.getAppRoutes().get(0).getSecurityCode()));
+                    business == null ? "" : business.toJSONString(), dataFlow.getAppRoutes().get(0).getSecurityCode()));
         }
     }
 
     /**
      * 娣诲姞 sign
+     *
      * @param dataFlow
      * @param headers
      */
-    public static void putSign(DataFlow dataFlow,Map<String,String> headers){
-        if(dataFlow == null || dataFlow.getAppRoutes() == null || dataFlow.getAppRoutes().size() == 0 || StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) {
-            headers.put("resSign","");
-        }else {
+    public static void putSign(DataFlow dataFlow, Map<String, String> headers) {
+        if (dataFlow == null || dataFlow.getAppRoutes() == null || dataFlow.getAppRoutes().size() == 0 || StringUtil.isNullOrNone(dataFlow.getAppRoutes().get(0).getSecurityCode())) {
+            headers.put("resSign", "");
+        } else {
             headers.put("resSign", AuthenticationFactory.md5(dataFlow.getTransactionId(), headers.get("responseTime"),
                     dataFlow.getResData(), dataFlow.getAppRoutes().get(0).getSecurityCode()));
         }
@@ -112,6 +327,7 @@
 
     /**
      * 鍔犲瘑
+     *
      * @param data
      * @param publicKey
      * @param keySize
@@ -119,8 +335,7 @@
      * @throws Exception
      */
     public static byte[] encrypt(byte[] data, PublicKey publicKey, int keySize)
-            throws Exception
-    {
+            throws Exception {
         Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1PADDING", "BC");
         cipher.init(Cipher.ENCRYPT_MODE, publicKey);
 
@@ -134,7 +349,7 @@
             byte[] buf;
             if (inputLen - offSet > blockSize) {
                 buf = cipher.doFinal(data, offSet, blockSize);
-            }else {
+            } else {
                 buf = cipher.doFinal(data, offSet, inputLen - offSet);
             }
             out.write(buf, 0, buf.length);
@@ -148,6 +363,7 @@
 
     /**
      * 瑙e瘑
+     *
      * @param data
      * @param privateKey
      * @param keySize
@@ -155,8 +371,7 @@
      * @throws Exception
      */
     public static byte[] decrypt(byte[] data, PrivateKey privateKey, int keySize)
-            throws Exception
-    {
+            throws Exception {
         Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1PADDING", "BC");
         cipher.init(Cipher.DECRYPT_MODE, privateKey);
         int blockSize = keySize >> 3;
@@ -175,19 +390,19 @@
 
     /**
      * 鍔犺浇鍏挜
+     *
      * @param keyData
      * @return
      * @throws Exception
      */
     public static PublicKey loadPubKey(String keyData)
-            throws Exception
-    {
+            throws Exception {
         return loadPemPublicKey(keyData, "RSA");
     }
 
     /**
      * 鍔犺浇绉侀挜
-
+     *
      * @param keyData
      * @return
      * @throws Exception
@@ -198,14 +413,14 @@
 
     /**
      * 鍔犺浇绉侀挜
+     *
      * @param privateKeyPem
      * @param algorithm
      * @return
      * @throws Exception
      */
     public static PrivateKey loadPrivateKeyPkcs8(String privateKeyPem, String algorithm)
-            throws Exception
-    {
+            throws Exception {
         String privateKeyData = privateKeyPem.replace("-----BEGIN PRIVATE KEY-----", "");
         privateKeyData = privateKeyData.replace("-----END PRIVATE KEY-----", "");
         privateKeyData = privateKeyData.replace("\n", "");
@@ -220,15 +435,41 @@
     }
 
     /**
+     * md5绛惧悕
+     *
+     * @param reportDataDto
+     * @return
+     */
+    public static void authReportDataSign(ReportDataDto reportDataDto, String code) throws NoAuthorityException {
+        ReportDataHeaderDto reportDataHeaderDto = reportDataDto.getReportDataHeaderDto();
+        if (reportDataHeaderDto == null) {
+            throw new IllegalArgumentException("鍙傛暟閿欒");
+        }
+        String newSign = md5(reportDataHeaderDto.getTranId() + reportDataHeaderDto.getReqTime() + reportDataDto.getReportDataBodyDto().toJSONString() + code).toLowerCase();
+        if (!newSign.equals(reportDataHeaderDto.getSign())) {
+            throw new IllegalArgumentException("绛惧悕澶辫触");
+        }
+    }
+
+    public static void generatorReportDataSign(ReportDataDto reportDataDto, String code) {
+        ReportDataHeaderDto reportDataHeaderDto = reportDataDto.getReportDataHeaderDto();
+        if (reportDataHeaderDto == null) {
+            throw new IllegalArgumentException("鍙傛暟閿欒");
+        }
+        String newSign = md5(reportDataHeaderDto.getTranId() + reportDataHeaderDto.getReqTime() + reportDataDto.getReportDataBodyDto().toJSONString() + code).toLowerCase();
+        reportDataHeaderDto.setSign(newSign);
+    }
+
+    /**
      * 鍔犺浇鍏挜
+     *
      * @param publicPemData
      * @param algorithm
      * @return
      * @throws Exception
      */
     public static PublicKey loadPemPublicKey(String publicPemData, String algorithm)
-            throws Exception
-    {
+            throws Exception {
         String publicKeyPEM = publicPemData.replace("-----BEGIN PUBLIC KEY-----", "");
 
         publicKeyPEM = publicKeyPEM.replace("-----END PUBLIC KEY-----", "");
@@ -236,7 +477,7 @@
         publicKeyPEM = publicKeyPEM.replace("\n", "");
         publicKeyPEM = publicKeyPEM.replace("\r", "");
 
-        byte[] decoded =Base64.getDecoder().decode(publicKeyPEM.getBytes());
+        byte[] decoded = Base64.getDecoder().decode(publicKeyPEM.getBytes());
 
         X509EncodedKeySpec spec = new X509EncodedKeySpec(decoded);
         KeyFactory keyFactory = KeyFactory.getInstance(algorithm);
@@ -245,20 +486,21 @@
     }
 
     //鐢熸垚瀵嗛挜瀵�
-    private static KeyPair genKeyPair(int keyLength) throws Exception{
-        KeyPairGenerator keyPairGenerator=KeyPairGenerator.getInstance("RSA");
+    private static KeyPair genKeyPair(int keyLength) throws Exception {
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA");
         keyPairGenerator.initialize(1024);
         return keyPairGenerator.generateKeyPair();
     }
 
     /**
      * 鐢ㄦ埛瀵嗙爜
+     *
      * @param userPwd
      * @return
      */
-    public static String md5UserPassword(String userPwd){
+    public static String md5UserPassword(String userPwd) {
         String userPasswordSecret = MappingCache.getValue(MappingConstant.KEY_USER_PASSWORD_SECRET);
-        if(StringUtil.isNullOrNone(userPasswordSecret)){
+        if (StringUtil.isNullOrNone(userPasswordSecret)) {
             userPasswordSecret = CommonConstant.DEFAULT_USER_PWD_SECRET;
         }
         return md5(md5(userPwd + userPasswordSecret));
@@ -266,47 +508,49 @@
 
     /**
      * 鍒涘缓token
+     *
      * @return
      */
-    public static String createAndSaveToken(Map<String,String> info) throws Exception{
+    public static String createAndSaveToken(Map<String, String> info) throws Exception {
 
-        if(!info.containsKey(CommonConstant.LOGIN_USER_ID)){
-            throw new InvalidParameterException("鍙傛暟涓病鏈夊寘鍚細"+CommonConstant.LOGIN_USER_ID);
+        if (!info.containsKey(CommonConstant.LOGIN_USER_ID)) {
+            throw new InvalidParameterException("鍙傛暟涓病鏈夊寘鍚細" + CommonConstant.LOGIN_USER_ID);
         }
 
-        String jdi = UUID.randomUUID().toString().replace("-","");
+        String jdi = UUID.randomUUID().toString().replace("-", "");
         String jwtSecret = MappingCache.getValue(MappingConstant.KEY_JWT_SECRET);
-        if(StringUtil.isNullOrNone(jwtSecret)){
+        if (StringUtil.isNullOrNone(jwtSecret)) {
             jwtSecret = CommonConstant.DEFAULT_JWT_SECRET;
         }
         Algorithm algorithm = Algorithm.HMAC256(jwtSecret);
-        JWTCreator.Builder jwt= JWT.create();
-        for(String key:info.keySet()){
-            if(CommonConstant.LOGIN_USER_ID.equals(key)){
+        JWTCreator.Builder jwt = JWT.create();
+        for (String key : info.keySet()) {
+            if (CommonConstant.LOGIN_USER_ID.equals(key)) {
                 continue;
             }
-            jwt.withClaim(key,info.get(key));
+            jwt.withClaim(key, info.get(key));
         }
         String expireTime = MappingCache.getValue(MappingConstant.KEY_JWT_EXPIRE_TIME);
-        if(StringUtil.isNullOrNone(expireTime)){
+        if (StringUtil.isNullOrNone(expireTime)) {
             expireTime = CommonConstant.DEFAULT_JWT_EXPIRE_TIME;
         }
         //淇濆瓨token Id
-        JWTCache.setValue(jdi,info.get(CommonConstant.LOGIN_USER_ID),Integer.parseInt(expireTime));
+        JWTCache.setValue(jdi, info.get(CommonConstant.LOGIN_USER_ID), Integer.parseInt(expireTime));
         jwt.withIssuer("java110");
         jwt.withJWTId(jdi);
         return jwt.sign(algorithm);
     }
 
     /**
-     * 鏍¢獙Token
+     * 鍒犻櫎Token
+     *
      * @param token
      * @return
      * @throws Exception
      */
-    public static Map<String, String> verifyToken(String token) throws Exception{
+    public static void deleteToken(String token) throws Exception {
         String jwtSecret = MappingCache.getValue(MappingConstant.KEY_JWT_SECRET);
-        if(StringUtil.isNullOrNone(jwtSecret)){
+        if (StringUtil.isNullOrNone(jwtSecret)) {
             jwtSecret = CommonConstant.DEFAULT_JWT_SECRET;
         }
         Algorithm algorithm = Algorithm.HMAC256(jwtSecret);
@@ -315,22 +559,45 @@
         String jdi = jwt.getId();
         //淇濆瓨token Id
         String userId = JWTCache.getValue(jdi);
-        if(StringUtil.isNullOrNone(userId)){
+        if (!StringUtil.isNullOrNone(userId)) { //璇存槑redis涓璲di 宸茬粡澶辨晥
+            JWTCache.removeValue(jdi);
+        }
+    }
+
+    /**
+     * 鏍¢獙Token
+     *
+     * @param token
+     * @return
+     * @throws Exception
+     */
+    public static Map<String, String> verifyToken(String token) throws Exception {
+        String jwtSecret = MappingCache.getValue(MappingConstant.KEY_JWT_SECRET);
+        if (StringUtil.isNullOrNone(jwtSecret)) {
+            jwtSecret = CommonConstant.DEFAULT_JWT_SECRET;
+        }
+        Algorithm algorithm = Algorithm.HMAC256(jwtSecret);
+        JWTVerifier verifier = JWT.require(algorithm).withIssuer("java110").build();
+        DecodedJWT jwt = verifier.verify(token);
+        String jdi = jwt.getId();
+        //淇濆瓨token Id
+        String userId = JWTCache.getValue(jdi);
+        if (StringUtil.isNullOrNone(userId)) {
             throw new JWTVerificationException("鐢ㄦ埛杩樻湭鐧诲綍");
         }
         String expireTime = MappingCache.getValue(MappingConstant.KEY_JWT_EXPIRE_TIME);
-        if(StringUtil.isNullOrNone(expireTime)){
+        if (StringUtil.isNullOrNone(expireTime)) {
             expireTime = CommonConstant.DEFAULT_JWT_EXPIRE_TIME;
         }
         //鍒锋柊杩囨椂鏃堕棿
-        JWTCache.resetExpireTime(jdi,Integer.parseInt(expireTime));
+        JWTCache.resetExpireTime(jdi, Integer.parseInt(expireTime));
         Map<String, Claim> claims = jwt.getClaims();
         // Add the claim to request header
-        Map<String,String> paramOut = new HashMap<String, String>();
-        for(String key : claims.keySet()){
-            paramOut.put(key,claims.get(key).asString());
+        Map<String, String> paramOut = new HashMap<String, String>();
+        for (String key : claims.keySet()) {
+            paramOut.put(key, claims.get(key).asString());
         }
-        paramOut.put(CommonConstant.LOGIN_USER_ID,userId);
+        paramOut.put(CommonConstant.LOGIN_USER_ID, userId);
         return paramOut;
     }
 
@@ -338,20 +605,23 @@
     /***********************************JWT start***************************************/
 
 
-
     /***********************************JWT end***************************************/
-    public static void main(String[] args) throws Exception{
-        KeyPair keyPair=genKeyPair(1024);
+    public static void main(String[] args) throws Exception {
+//        KeyPair keyPair = genKeyPair(1024);
+//
+//        //鑾峰彇鍏挜锛屽苟浠ase64鏍煎紡鎵撳嵃鍑烘潵
+//        PublicKey publicKey = keyPair.getPublic();
+//        System.out.println("鍏挜锛�" + new String(Base64.getEncoder().encode(publicKey.getEncoded())));
+//
+//        //鑾峰彇绉侀挜锛屽苟浠ase64鏍煎紡鎵撳嵃鍑烘潵
+//        PrivateKey privateKey = keyPair.getPrivate();
+//        System.out.println("绉侀挜锛�" + new String(Base64.getEncoder().encode(privateKey.getEncoded())));
 
-        //鑾峰彇鍏挜锛屽苟浠ase64鏍煎紡鎵撳嵃鍑烘潵
-        PublicKey publicKey=keyPair.getPublic();
-        System.out.println("鍏挜锛�"+new String(Base64.getEncoder().encode(publicKey.getEncoded())));
-
-        //鑾峰彇绉侀挜锛屽苟浠ase64鏍煎紡鎵撳嵃鍑烘潵
-        PrivateKey privateKey=keyPair.getPrivate();
-        System.out.println("绉侀挜锛�"+new String(Base64.getEncoder().encode(privateKey.getEncoded())));
+        System.out.printf("passwdMd5 " + passwdMd5("397301"));
 
     }
+
+
 }
 
 

--
Gitblit v1.8.0