Commit 7c7dd367 authored by lidecai15948775315's avatar lidecai15948775315

去除过期方法

parent 78b5ee9a
...@@ -6,6 +6,8 @@ import java.io.FileOutputStream; ...@@ -6,6 +6,8 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Arrays;
import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import com.archser.aserver.interceptor.JwtInterceptor; import com.archser.aserver.interceptor.JwtInterceptor;
...@@ -22,8 +24,6 @@ import com.jfinal.kit.Ret; ...@@ -22,8 +24,6 @@ import com.jfinal.kit.Ret;
import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.tx.Tx; import com.jfinal.plugin.activerecord.tx.Tx;
import com.jfinal.upload.UploadFile; import com.jfinal.upload.UploadFile;
import sun.misc.BASE64Decoder;
import sun.misc.BASE64Encoder;
/** /**
* 应用全局设置 * 应用全局设置
...@@ -136,10 +136,8 @@ public class SettingController extends Controller { ...@@ -136,10 +136,8 @@ public class SettingController extends Controller {
e.printStackTrace(); e.printStackTrace();
} }
// 对字节数组Base64编码 // 对字节数组Base64编码
BASE64Encoder encoder = new BASE64Encoder();
// 返回Base64编码过的字节数组字符串 // 返回Base64编码过的字节数组字符串
return encoder.encode(Objects.requireNonNull(data)); return Arrays.toString(Base64.getEncoder().encode(Objects.requireNonNull(data)));
// System.out.println("本地图片转换Base64:" + encoder.encode(Objects.requireNonNull(data)));
} }
// public void logoUrl() { // public void logoUrl() {
// String val = null; // String val = null;
...@@ -281,10 +279,10 @@ public class SettingController extends Controller { ...@@ -281,10 +279,10 @@ public class SettingController extends Controller {
private boolean Base64ToImange(String logoUrl, String filePath) { private boolean Base64ToImange(String logoUrl, String filePath) {
if (logoUrl == null) // 图像数据为空 if (logoUrl == null) // 图像数据为空
return false; return false;
BASE64Decoder decoder = new BASE64Decoder();
try { try {
// Base64解码 // Base64解码
byte[] bytes = decoder.decodeBuffer(logoUrl); // byte[] bytes = decoder.decodeBuffer(logoUrl);
byte[] bytes = Base64.getDecoder().decode(logoUrl);
for (int i = 0; i < bytes.length; ++i) { for (int i = 0; i < bytes.length; ++i) {
if (bytes[i] < 0) {// 调整异常数据 if (bytes[i] < 0) {// 调整异常数据
bytes[i] += 256; bytes[i] += 256;
......
...@@ -4,11 +4,7 @@ import com.jfinal.upload.UploadFile; ...@@ -4,11 +4,7 @@ import com.jfinal.upload.UploadFile;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.inject.Inject; import javax.inject.Inject;
import com.archser.aserver.model.Organ; import com.archser.aserver.model.Organ;
...@@ -21,7 +17,6 @@ import com.jfinal.kit.Ret; ...@@ -21,7 +17,6 @@ import com.jfinal.kit.Ret;
import com.jfinal.plugin.activerecord.Db; import com.jfinal.plugin.activerecord.Db;
import com.jfinal.plugin.activerecord.Record; import com.jfinal.plugin.activerecord.Record;
import com.jfinal.plugin.redis.Redis; import com.jfinal.plugin.redis.Redis;
import sun.misc.BASE64Encoder;
/** /**
* 用户相关操作 * 用户相关操作
...@@ -204,9 +199,7 @@ public class UserController extends Controller { ...@@ -204,9 +199,7 @@ public class UserController extends Controller {
public String image2Base64(byte[] image) { public String image2Base64(byte[] image) {
BASE64Encoder encoder = new BASE64Encoder(); return String.valueOf(Base64.getEncoder().encode(image));
String base64Str = encoder.encode(image);
return base64Str;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment