解决包名错误导致报错、删除重复类，将base64改为apache-codec实现，兼容高版本jdk

aa51513

2021-05-15 c95ef735634d6af3221488b556be804274a5a95e

解决包名错误导致报错、删除重复类，将base64改为apache-codec实现，兼容高版本jdk

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

@@ -1,6 +1,5 @@
package com.java110.core.factory;

import sun.misc.BASE64Encoder;

import java.awt.Color;
import java.awt.Font;
@@ -14,6 +13,8 @@
import java.util.Random;

import javax.imageio.ImageIO;

import org.apache.commons.codec.binary.Base64;
/**
 * <p><b>ValidateCodeFactory Description:</b> (验证码生成)</p>
 * <b>DATE:</b> 2016年6月2日 下午3:53:34
@@ -23,7 +24,8 @@
    //使用到Algerian字体，系统里没有的话需要安装字体，字体只显示大写，去掉了1,0,i,o几个容易混淆的字符
    public static final String VERIFY_CODES = "23456789ABCDEFGHJKLMNPQRSTUVWXYZ";
    private static Random random = new Random();
    static BASE64Encoder encoder = new sun.misc.BASE64Encoder();
    
    private static Base64 base64 = new Base64();


    /**
@@ -180,7 +182,7 @@
        ImageIO.write(image, "jpg", baos);
        byte[] bytes = baos.toByteArray();

        return "data:image/jpeg;base64,"+encoder.encodeBuffer(bytes).trim();
        return "data:image/jpeg;base64,"+base64.encodeToString(bytes).trim();
    }

    private static Color getRandColor(int fc, int bc) {

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

@@ -6,11 +6,11 @@
import com.java110.utils.constant.WechatConstant;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.StringUtil;

import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.client.RestTemplate;
import sun.misc.BASE64Decoder;

import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
@@ -117,13 +117,13 @@

    public static String decryptS5(String sSrc, String encodingFormat, String sKey, String ivParameter) {
        try {
            BASE64Decoder decoder = new BASE64Decoder();
            byte[] raw = decoder.decodeBuffer(sKey);
            Base64 base64 = new Base64();
            byte[] raw = base64.decode(sKey);
            SecretKeySpec skeySpec = new SecretKeySpec(raw, "AES");
            IvParameterSpec iv = new IvParameterSpec(decoder.decodeBuffer(ivParameter));
            IvParameterSpec iv = new IvParameterSpec(base64.decode(ivParameter));
            Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
            cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
            byte[] myendicod = decoder.decodeBuffer(sSrc);
            byte[] myendicod = base64.decode(sSrc);
            byte[] original = cipher.doFinal(myendicod);
            String originalString = new String(original, encodingFormat);
            return originalString;

 java110-core/src/test/java/com/java110/core/proxy/ITestService.java

File was deleted

 java110-core/src/test/java/com/java110/core/proxy/ServiceInvocationHandler.java

File was deleted

 java110-core/src/test/java/com/java110/core/proxy/ServiceProxyFactory.java

File was deleted

 java110-utils/src/main/java/com/java110/utils/App.java

@@ -1,4 +1,4 @@
package com.java110.entity;
package com.java110.utils;

/**
 * Hello world!

 java110-utils/src/main/java/com/java110/utils/util/Base64Convert.java

@@ -1,12 +1,13 @@
package com.java110.utils.util;

import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;

import java.io.*;

import org.apache.commons.codec.binary.Base64;

public class Base64Convert {

    private static final Base64 base64 = new Base64();
	
    private void Base64Convert() {

    }
@@ -25,7 +26,7 @@
            byte[] bytes = new byte[in.available()];
            // 将文件中的内容读入到数组中
            in.read(bytes);
            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
            strBase64 = base64.encodeToString(bytes);      //将字节流数组转换为字符串
        } finally {
            if (in != null) {
                in.close();
@@ -45,7 +46,7 @@
    public static String byteToBase64(byte[] bytes)  {
        String strBase64 = null;
            // in.available()返回文件的字节长度
            strBase64 = new BASE64Encoder().encode(bytes);      //将字节流数组转换为字符串
            strBase64 = base64.encodeToString(bytes);      //将字节流数组转换为字符串
        return strBase64;
    }

@@ -61,7 +62,7 @@
     */
    public static byte[] base64ToByte(String strBase64) throws IOException {
        // 解码，然后将字节转换为文件
        byte[] bytes = new BASE64Decoder().decodeBuffer(strBase64);   //将字符串转换为byte数组
        byte[] bytes = base64.decode(strBase64);   //将字符串转换为byte数组
        return bytes;
    }
}

 pom.xml

@@ -498,7 +498,6 @@
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <version>3.8.1</version>
            <scope>test</scope>
        </dependency>
        <dependency>
@@ -529,7 +528,6 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-javadoc-plugin</artifactId>
                <version>2.10.4</version>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
@@ -540,7 +538,6 @@
            </plugin>
            <plugin>
                <artifactId>maven-source-plugin</artifactId>
                <version>3.0.1</version>
                <configuration>
                    <attach>true</attach>
                </configuration>