Browse Source

修改项目中的base64

wangliang 4 năm trước cách đây
mục cha
commit
73aef996ed

+ 2 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/SysUser.java

@@ -8,9 +8,9 @@ import com.qmth.distributed.print.business.base.BaseEntity;
 import com.qmth.distributed.print.business.service.SysConfigService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Base64Util;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.validator.constraints.Length;
-import sun.misc.BASE64Encoder;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -98,8 +98,7 @@ public class SysUser extends BaseEntity implements Serializable {
         setUpdateTime(System.currentTimeMillis());
         SysConfigService sysConfigService = SpringContextHolder.getBean(SysConfigService.class);
         SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
-        BASE64Encoder encoder = new BASE64Encoder();
-        setPassword(encoder.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes()));
+        setPassword(Base64Util.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes()));
     }
 
     public void setUpdateInfo(Long userId) {

+ 2 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java

@@ -19,13 +19,13 @@ import com.qmth.distributed.print.business.service.*;
 import com.qmth.distributed.print.business.util.ConvertUtil;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.util.Base64Util;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.misc.BASE64Encoder;
 
 import javax.annotation.Resource;
 import java.security.NoSuchAlgorithmException;
@@ -112,8 +112,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public boolean resetPassword(Long id) throws NoSuchAlgorithmException {
         SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
-        BASE64Encoder encoder = new BASE64Encoder();
-        String md5Password = encoder.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes());
+        String md5Password = Base64Util.encode(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue().getBytes() : "123456".getBytes());
 
         SysUser user = this.getById(id);
         String oldPassword = user.getPassword();

+ 0 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncExaminationImportTemplateService.java

@@ -8,7 +8,6 @@ import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.TBTaskService;
-import com.qmth.distributed.print.business.templete.callback.CallbackCreatePdf;
 import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
 import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
@@ -16,7 +15,6 @@ import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
-import jdk.internal.dynalink.linker.LinkerServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

+ 2 - 3
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/GoogleBarCodeUtil.java

@@ -6,7 +6,7 @@ import com.google.zxing.WriterException;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.oned.Code128Writer;
-import sun.misc.BASE64Encoder;
+import com.qmth.teachcloud.common.util.Base64Util;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
@@ -172,8 +172,7 @@ public class GoogleBarCodeUtil {
         ByteArrayOutputStream os = new ByteArrayOutputStream();
         ImageIO.write(image, "png", os);
         byte[] imageBytes = os.toByteArray();
-        BASE64Encoder encoder = new BASE64Encoder();
-        String imageBase64 = encoder.encode(imageBytes);
+        String imageBase64 = Base64Util.encode(imageBytes);
         os.flush();
         os.close();
         return imageBase64;