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