Merge branch 'master' of http://47.105.106.177:66/root/sup-server

src/main/java/com/supServer/project/controller/UserController.java

@@ -12,11 +12,13 @@ import com.supServer.framework.web.domain.AjaxResult;
 import com.supServer.project.entity.UserInfo;
 import com.supServer.project.entity.vo.ForgotPasswordVo;
 import com.supServer.project.entity.vo.UserResetPwdVo;
+import com.supServer.project.mapper.UserInfoMapper;
 import com.supServer.project.service.SmsService;
 import com.supServer.project.service.UserInfoService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCrypt;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -63,6 +65,10 @@ public class UserController {
         if(userInfo.getAccountStatus().equals("3")){
             return AjaxResult.error("当前账号已注销");
         }
+        String oldPassword = BCrypt.hashpw(loginBody.getPassword(), userInfo.getPassword());
+        if (!oldPassword.equals(userInfo.getPassword())) {
+            return AjaxResult.error("密码错误");
+        }
         //AesUtil.decode(loginBody.getUserName()),AesUtil.decode(loginBody.getPassword()),loginBody.getCode(),loginBody.getUuid(),loginBody.getType()
         String token = userLoginService.login(loginBody.getUserName(),loginBody.getPassword(),loginBody.getCode(),loginBody.getUuid());
         AjaxResult ajax = AjaxResult.success();

src/main/java/com/supServer/project/service/impl/UserInfoServiceImpl.java

@@ -112,7 +112,7 @@ public class UserInfoServiceImpl implements UserInfoService {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         UserInfo userInfoToken = loginUser.getUser();
         // 查询最新的数据
-        UserInfo userInfo = userInfoMapper.selectUserByUserName(userInfoToken.getUserName());
+        UserInfo userInfo = userInfoMapper.selectUserByUserName(userInfoToken.getPhone());
         // 原密码
         String oldPassword = BCrypt.hashpw(userInfoVo.getOldPassword(), userInfo.getPassword());
         if (!oldPassword.equals(userInfo.getPassword())) {