Commit 5bcdc36a by chamberone

fix: fix null error

1 parent 8471d110
...@@ -13,7 +13,6 @@ import com.dituhui.pea.enums.ThirdPartyEnum; ...@@ -13,7 +13,6 @@ import com.dituhui.pea.enums.ThirdPartyEnum;
import com.dituhui.pea.pojo.ThirdUserInfo; import com.dituhui.pea.pojo.ThirdUserInfo;
import com.dituhui.pea.pojo.UserAuthInfo; import com.dituhui.pea.pojo.UserAuthInfo;
import com.dituhui.pea.pojo.UserInfo; import com.dituhui.pea.pojo.UserInfo;
import com.dituhui.pea.pojo.UserLoginDTO;
import com.dituhui.pea.pojo.UserLoginParam; import com.dituhui.pea.pojo.UserLoginParam;
import com.dituhui.pea.pojo.WebResult; import com.dituhui.pea.pojo.WebResult;
import com.dituhui.pea.user.IUser; import com.dituhui.pea.user.IUser;
...@@ -35,10 +34,13 @@ public class UserController implements IUser { ...@@ -35,10 +34,13 @@ public class UserController implements IUser {
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@Override
public Result<?> userLogin(UserLoginParam user) { public Result<?> userLogin(UserLoginParam user) {
System.out.println(user.toString());
return userService.userLogin(user.getAccount(), user.getPassword()); return userService.userLogin(user.getAccount(), user.getPassword());
} }
@Override
public Result<?> getUserInfo(String token) { public Result<?> getUserInfo(String token) {
return userService.getUserInfo(token); return userService.getUserInfo(token);
} }
......
...@@ -60,7 +60,6 @@ public class UserService { ...@@ -60,7 +60,6 @@ public class UserService {
public Result<?> userLogin(String account, String password) { public Result<?> userLogin(String account, String password) {
UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password)); UserEntity user = userDao.findByAccountAndPassword(account, SecureUtil.md5(password));
System.out.println(account + " : " + password + " : " + SecureUtil.md5(password));
log.info("{}:{}:{}:{}", account, password, SecureUtil.md5(password), user); log.info("{}:{}:{}:{}", account, password, SecureUtil.md5(password), user);
if (null != user) { if (null != user) {
// 生成token // 生成token
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!