|
@@ -7,6 +7,7 @@ import com.platform.yijia.pojo.*;
|
|
import com.platform.yijia.service.*;
|
|
import com.platform.yijia.service.*;
|
|
import com.platform.yijia.utils.CodeMsg;
|
|
import com.platform.yijia.utils.CodeMsg;
|
|
import com.platform.yijia.utils.CryptUtil;
|
|
import com.platform.yijia.utils.CryptUtil;
|
|
|
|
+import com.platform.yijia.utils.DESUtils;
|
|
import com.platform.yijia.utils.ResultData;
|
|
import com.platform.yijia.utils.ResultData;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.ibatis.annotations.Param;
|
|
import org.apache.ibatis.annotations.Param;
|
|
@@ -67,16 +68,10 @@ public class PosMachineController {
|
|
if(sysUser.getStatus().equals("0")){
|
|
if(sysUser.getStatus().equals("0")){
|
|
String password = sysUser.getPassword();
|
|
String password = sysUser.getPassword();
|
|
String webPassword = loginBody.getPassword(); //前端传来加密码
|
|
String webPassword = loginBody.getPassword(); //前端传来加密码
|
|
-// System.out.println(webPassword);
|
|
|
|
-// System.out.println(pwd);
|
|
|
|
-// //解密
|
|
|
|
-// byte[] bytes = CryptUtil.desedeDecrypt(Base64.getDecoder().decode(password), Base64.getDecoder().decode(pwd));
|
|
|
|
-// //转换为字符串
|
|
|
|
-// webPassword = Base64.getEncoder().encodeToString(bytes);
|
|
|
|
-// System.out.println(webPassword);
|
|
|
|
|
|
+ String ps= DESUtils.decrypt(webPassword, pwd);
|
|
BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
|
|
BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
|
|
//密码加密判断已加密密码是否与真实密码相同
|
|
//密码加密判断已加密密码是否与真实密码相同
|
|
- boolean matches = bCryptPasswordEncoder.matches(webPassword, password);
|
|
|
|
|
|
+ boolean matches = bCryptPasswordEncoder.matches(ps, password);
|
|
if(matches){
|
|
if(matches){
|
|
SysUser s = new SysUser();
|
|
SysUser s = new SysUser();
|
|
s.setNickName(sysUser.getNickName());
|
|
s.setNickName(sysUser.getNickName());
|