zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

userentity bug

Browse Source
This commit is contained in:
wangjinlei
2023-10-18 12:41:22 +08:00
parent 59f46eb2aa
commit 8f7f785ba9
21 changed files with 75 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/peanut/modules/app/controller/AppLoginController.java
View File

@@ -9,22 +9,13 @@
package com.peanut.modules.app.controller;
import com.peanut.common.utils.R;
import com.peanut.common.validator.ValidatorUtils;
import com.peanut.modules.app.form.LoginForm;
import com.peanut.modules.app.service.UserService;
import com.peanut.modules.app.utils.JwtUtils;
import com.peanut.modules.book.service.MyUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
/**
* APP登录授权
*
@@ -35,7 +26,7 @@ import java.util.Map;
@Api("APP登录接口")
public class AppLoginController {
@Autowired
private UserService userService;
private MyUserService userService;
@Autowired
private JwtUtils jwtUtils;

13
src/main/java/com/peanut/modules/app/controller/AppRegisterController.java
View File

@@ -9,21 +9,12 @@
package com.peanut.modules.app.controller;
import com.peanut.common.utils.R;
import com.peanut.common.validator.ValidatorUtils;
import com.peanut.modules.app.form.RegisterForm;
import com.peanut.modules.app.service.UserService;
import com.peanut.modules.book.service.MyUserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
/**
* 注册
*
@@ -34,7 +25,7 @@ import java.util.Date;
@Api("APP注册接口")
public class AppRegisterController {
@Autowired
private UserService userService;
private MyUserService userService;
// @PostMapping("register")
// @ApiOperation("注册")

4
src/main/java/com/peanut/modules/app/controller/AppTestController.java
View File

@@ -12,7 +12,7 @@ package com.peanut.modules.app.controller;
import com.peanut.common.utils.R;
import com.peanut.modules.app.annotation.Login;
import com.peanut.modules.app.annotation.LoginUser;
import com.peanut.modules.book.entity.UserEntity;
import com.peanut.modules.book.entity.MyUserEntity;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +33,7 @@ public class AppTestController {
@Login
@GetMapping("userInfo")
@ApiOperation("获取用户信息")
public R userInfo(@LoginUser UserEntity user){
public R userInfo(@LoginUser MyUserEntity user){
return R.ok().put("user", user);
}