Merge branch 'JIWOO'
This commit is contained in:
commit
a154dd69f6
@ -1,11 +1,9 @@
|
|||||||
package seed.utils;
|
package seed.utils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Base64;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import sun.misc.BASE64Decoder;
|
|
||||||
import sun.misc.BASE64Encoder;
|
|
||||||
|
|
||||||
public class SeedKISA {
|
public class SeedKISA {
|
||||||
|
|
||||||
private static final String CHARACTER_SET = "UTF-8";
|
private static final String CHARACTER_SET = "UTF-8";
|
||||||
@ -155,8 +153,10 @@ public class SeedKISA {
|
|||||||
byte[] tempByte = null;
|
byte[] tempByte = null;
|
||||||
|
|
||||||
if(isDecode){
|
if(isDecode){
|
||||||
BASE64Decoder base64Dec = new BASE64Decoder();
|
/*BASE64Decoder base64Dec = new BASE64Decoder();*/
|
||||||
tempByte = base64Dec.decodeBuffer(nomal);
|
/*tempByte = base64Dec.decodeBuffer(nomal);*/
|
||||||
|
Base64.Decoder base64Dec = Base64.getDecoder();
|
||||||
|
tempByte = base64Dec.decode(nomal);
|
||||||
}else{
|
}else{
|
||||||
tempByte = nomal.getBytes(CHARACTER_SET);
|
tempByte = nomal.getBytes(CHARACTER_SET);
|
||||||
}
|
}
|
||||||
@ -244,8 +244,10 @@ public class SeedKISA {
|
|||||||
String retStr = null;
|
String retStr = null;
|
||||||
|
|
||||||
if(isEncode){
|
if(isEncode){
|
||||||
BASE64Encoder base64Enc = new BASE64Encoder();
|
/*BASE64Encoder base64Enc = new BASE64Encoder();
|
||||||
retStr = base64Enc.encode(resultByte);
|
retStr = base64Enc.encode(resultByte);*/
|
||||||
|
Base64.Decoder base64Dec = Base64.getDecoder();
|
||||||
|
retStr = Base64.getEncoder().encodeToString(resultByte);
|
||||||
}else{
|
}else{
|
||||||
retStr = new String(resultByte, CHARACTER_SET);
|
retStr = new String(resultByte, CHARACTER_SET);
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user