Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

1098226878

2021-09-08 d31920a1233ab14cdd5e33756bb1b0e3ed235e66

 java110-core/src/main/java/com/java110/core/factory/AuthenticationFactory.java

old mode 100644
new mode 100755
@@ -11,12 +11,15 @@
import com.auth0.jwt.interfaces.DecodedJWT;
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;

@@ -24,17 +27,11 @@
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.InvalidParameterException;
import java.security.Key;
import java.security.KeyFactory;
import java.security.KeyPair;
import java.security.KeyPairGenerator;
import java.security.MessageDigest;
import java.security.PrivateKey;
import java.security.PublicKey;
import java.security.*;
import java.security.spec.PKCS8EncodedKeySpec;
import java.security.spec.X509EncodedKeySpec;
import java.util.Base64;
@@ -65,6 +62,64 @@
     * 默认编码
     */
    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 "";
    }

    // 解密
    public static String AesDecrypt(String sSrc, String sKey) {
        try {
            // 判断Key是否正确
            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解密
            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;
        }
    }


    /**
@@ -380,6 +435,32 @@
    }

    /**
     * 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
@@ -536,7 +617,7 @@
//        PrivateKey privateKey = keyPair.getPrivate();
//        System.out.println("私钥：" + new String(Base64.getEncoder().encode(privateKey.getEncoded())));

        System.out.printf("passwdMd5 " + passwdMd5("wuxw2015"));
        System.out.printf("passwdMd5 " + passwdMd5("397301"));

    }