Commit 5ece0bb1 by chamberone

fix: fix error

1 parent 1ccc1cb7
package com.dituhui.pea.user.controller; package com.dituhui.pea.user.controller;
import cn.hutool.core.util.ObjectUtil; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;
import com.dituhui.pea.common.Result; import com.dituhui.pea.common.Result;
import com.dituhui.pea.enums.RedisKeyGroup; import com.dituhui.pea.enums.RedisKeyGroup;
import com.dituhui.pea.enums.StatusCodeEnum; import com.dituhui.pea.enums.StatusCodeEnum;
import com.dituhui.pea.enums.ThirdPartyEnum; import com.dituhui.pea.enums.ThirdPartyEnum;
import com.dituhui.pea.pojo.*; import com.dituhui.pea.pojo.ThirdUserInfo;
import com.dituhui.pea.pojo.UserAuthInfo;
import com.dituhui.pea.pojo.UserInfo;
import com.dituhui.pea.pojo.UserLoginDTO;
import com.dituhui.pea.pojo.WebResult;
import com.dituhui.pea.user.IUser; import com.dituhui.pea.user.IUser;
import com.dituhui.pea.user.commom.RedisService; import com.dituhui.pea.user.commom.RedisService;
import com.dituhui.pea.user.service.UserService; import com.dituhui.pea.user.service.UserService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated; import cn.hutool.core.util.ObjectUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RestController;
/** /**
* 用户控制层 * 用户控制层
...@@ -35,7 +35,7 @@ public class UserController implements IUser { ...@@ -35,7 +35,7 @@ public class UserController implements IUser {
private RedisService redisService; private RedisService redisService;
public Result<?> userLogin(UserLoginDTO user) { public Result<?> userLogin(UserLoginDTO user) {
return userService.userLogin(user.getAccount(), user.getAccount()); return userService.userLogin(user.getAccount(), user.getPassword());
} }
public Result<?> getUserInfo(String token) { public Result<?> getUserInfo(String token) {
......
...@@ -11,8 +11,6 @@ import com.dituhui.pea.user.entity.UserEntity; ...@@ -11,8 +11,6 @@ import com.dituhui.pea.user.entity.UserEntity;
/** /**
* 用户表(User)表数据库访问层 * 用户表(User)表数据库访问层
* *
* @author zl
* @since 2020-12-09 15:34:42
*/ */
public interface UserDao extends JpaRepository<UserEntity, String>, JpaSpecificationExecutor<UserEntity>, public interface UserDao extends JpaRepository<UserEntity, String>, JpaSpecificationExecutor<UserEntity>,
CrudRepository<UserEntity, String> { CrudRepository<UserEntity, String> {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!