app相关代码优化

nafmii-app/src/main/java/org/nafmii/app/user/controller/UserController.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.nafmii.app.user.dto.LoginDto;
 import org.nafmii.app.user.dto.RegisterDto;
+import org.nafmii.app.user.param.LoginParam;
+import org.nafmii.app.user.param.RegisterParam;
 import org.nafmii.app.user.service.UserService;
 import org.nafmii.app.user.vo.UserVO;
 import org.nafmii.common.response.ApiResponse;
@@ -12,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+
 /**
  * @author:zhoujh
  * @Function:TODO
@@ -24,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("app/nafmii/user")
 @Api(tags = "2.0.1", description = "用户登陆注册操作操作【zjh】")
 public class UserController {
-    @Autowired
+    @Resource
     private UserService userService;
 
     @ApiOperation( value = "模拟用户登陆",notes = "模拟用户登陆")
@@ -38,17 +42,16 @@ public class UserController {
     @ApiOperation( value = "app用户注册接口",notes = "app用户注册接口")
     @PostMapping("/register")
     @ResponseBody
-    public ApiResponse register (@RequestBody RegisterDto registerDto){
-        ApiResponse register = userService.register(registerDto);
+    public ApiResponse register (@RequestBody RegisterParam registerParam){
+        ApiResponse register = userService.register(registerParam);
         return register;
     }
 
     @ApiOperation( value = "app用户登陆接口（密码加验证码）",notes = "app用户登陆接口（密码加验证码）")
     @PostMapping("/userLogin")
     @ResponseBody
-    public ApiResponse<UserVO> login (@RequestBody @Validated LoginDto loginDto){
-        Long userId = RequestUtils.getUserId();
-        ApiResponse<UserVO> login = userService.userLogin(loginDto);
+    public ApiResponse<UserVO> login (@RequestBody @Validated LoginParam loginParam){
+        ApiResponse<UserVO> login = userService.userLogin(loginParam);
         return login;
     }
 

nafmii-app/src/main/java/org/nafmii/app/user/param/LoginParam.java

+package org.nafmii.app.user.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author:zhoujh
+ * @Function:TODO
+ * @date 2021/4/26 16:41
+ * @ClassName:
+ * @version:
+ * @remark:
+ */
+@Data
+@ApiModel("app用户登陆参数对象")
+public class LoginParam {
+
+    @NotNull(message = "手机号或登录账号不能为空")
+    @ApiModelProperty("手机号/登录账号")
+    private String phone;
+
+    @ApiModelProperty("登陆密码")
+    private String loginPwd;
+
+    @ApiModelProperty("验证码")
+    private String code;
+
+    @NotNull(message = "登陆方式不能为空")
+    @ApiModelProperty("登陆方式0密码1验证码")
+    private String type;
+}

nafmii-app/src/main/java/org/nafmii/app/user/param/RegisterParam.java

+package org.nafmii.app.user.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author:zhoujh
+ * @Function:TODO
+ * @date 2021/4/26 13:39
+ * @ClassName:
+ * @version:
+ * @remark:
+ */
+@Data
+@ApiModel("app用户注册参数对象")
+public class RegisterParam {
+    @NotNull(message = "手机号或登录账号不能为空")
+    @ApiModelProperty("手机号/登录账号")
+    private String phone;
+
+    @ApiModelProperty("头像图片地址")
+    private String headPicture;
+
+    @NotNull(message = "验证码不能为空")
+    @ApiModelProperty("验证码")
+    private String code;
+
+    @NotNull(message = "注册密码不能为空")
+    @ApiModelProperty("登陆密码")
+    private String loginPwd;
+
+    @NotNull(message = "确认密码不能为空")
+    @ApiModelProperty("确认密码")
+    private String confirmPwd;
+
+
+
+}

nafmii-app/src/main/java/org/nafmii/app/user/service/UserService.java

@@ -2,6 +2,8 @@ package org.nafmii.app.user.service;
 
 import org.nafmii.app.user.dto.LoginDto;
 import org.nafmii.app.user.dto.RegisterDto;
+import org.nafmii.app.user.param.LoginParam;
+import org.nafmii.app.user.param.RegisterParam;
 import org.nafmii.app.user.vo.UserVO;
 import org.nafmii.common.response.ApiResponse;
 
@@ -17,7 +19,7 @@ public interface UserService {
     //模拟用户登陆接口
     ApiResponse<UserVO> login();
     //app注册接口
-    ApiResponse register(RegisterDto registerDto);
+    ApiResponse register(RegisterParam registerParam);
     //用户登陆接口
-    ApiResponse<UserVO> userLogin(LoginDto loginDto);
+    ApiResponse<UserVO> userLogin(LoginParam loginParam);
 }

nafmii-app/src/main/java/org/nafmii/app/user/service/impl/UserServiceImpl.java

@@ -6,11 +6,14 @@ import org.nafmii.app.user.dao.AppUserMapper;
 import org.nafmii.app.user.dto.LoginDto;
 import org.nafmii.app.user.dto.RegisterDto;
 import org.nafmii.app.user.entity.AppUserPO;
+import org.nafmii.app.user.param.LoginParam;
+import org.nafmii.app.user.param.RegisterParam;
 import org.nafmii.app.user.service.UserService;
 import org.nafmii.app.user.vo.UserAndRoleVo;
 import org.nafmii.app.user.vo.UserVO;
 import org.nafmii.common.constant.HttpClientHeaderEnum;
 import org.nafmii.common.exception.BusinessException;
+import org.nafmii.common.param.BeanTransferUtils;
 import org.nafmii.common.response.ApiResponse;
 import org.nafmii.common.utils.GuavaUtil;
 import org.nafmii.common.utils.JwtUtils;
@@ -88,11 +91,12 @@ public class UserServiceImpl implements UserService {
 
     /**
      * app用户注册接口
-     * @param registerDto
-     * @return
+     * @param  registerParam
+     * @return ApiResponse
      */
     @Override
-    public ApiResponse register(RegisterDto registerDto) {
+    public ApiResponse register(RegisterParam registerParam) {
+        RegisterDto registerDto = BeanTransferUtils.transfer(registerParam, RegisterDto.class);
         //查询用户信息通过手机号
         UserVO userVO = appUserMapper.selectByPhone(registerDto.getPhone());
         if (null != userVO){
@@ -135,11 +139,12 @@ public class UserServiceImpl implements UserService {
 
     /**
      * 用户登陆接口
-     * @param loginDto
+     * @param loginParam
      * @return
      */
     @Override
-    public ApiResponse<UserVO> userLogin(LoginDto loginDto) {
+    public ApiResponse<UserVO> userLogin(LoginParam loginParam) {
+        LoginDto loginDto = BeanTransferUtils.transfer(loginParam, LoginDto.class);
         UserVO userVo = new UserVO();
         long EXPIRITION = 1000 * 60 * 60 * 24 * 7;
         //首先判断登陆方式