修改 小程序登录接口

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -205,7 +205,6 @@ public class UserServiceImpl implements UserService {
                 user.setStatus((byte) 0);
                 user.setLastLoginTime(new Date());
                 user.setLastLoginIp(IpUtil.client(request));
-                user.setShareUserId(dto.getShareUserId());
                 userDao.insert(user);
 
                 FavoritesRequestDto favoritesRequestDto = new FavoritesRequestDto();

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java

@@ -3,6 +3,7 @@ package com.wwdz.ch.wx.web;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.JacksonUtil;
 import com.wwdz.ch.core.util.ResponseUtil;
 import com.wwdz.ch.db.domain.UserAccountObsolete;
 import com.wwdz.ch.db.service.DtsAccountService;
@@ -90,27 +91,49 @@ public class WxUserController {
 
     @ApiOperation(value = "微信登录")
     @PostMapping("/loginByWx")
-    public Result loginByWx(@RequestBody UserRequestDto dto, HttpServletRequest request) {
-        logger.info("【请求开始】微信登录,请求参数,wxLoginInfo:{}", JSONObject.toJSONString(dto));
+    public Result loginByWx(@RequestBody String kl_data, HttpServletRequest request) {
+        logger.info("【请求开始】微信登录,请求参数,kl_data:{}", kl_data);
+        String code = JacksonUtil.parseString(kl_data, "code");
+        if (StringUtils.isBlank(code)) {
+            return Result.failed("授权码不能为空");
+        }
+
+        UserRequestDto dto = new UserRequestDto();
+        dto.setCode(code);
         return userService.loginByWx(dto, request);
     }
 
     @ApiOperation(value = "登录手机验证码")
     @PostMapping("/loginRegCaptcha")
-    public Object registerCaptcha(@RequestBody UserRequestDto dto) {
-        logger.info("【请求开始】请求验证码,请求参数，mobile:{}", dto.getMobile());
-
-        if (StringUtils.isBlank(dto.getMobile())) {
+    public Object registerCaptcha(@RequestBody String kl_data) {
+        logger.info("【请求开始】请求登录手机验证码,请求参数,kl_data:{}", kl_data);
+        String mobile = JacksonUtil.parseString(kl_data, "mobile");
+        if (StringUtils.isBlank(mobile)) {
             return Result.failed("手机号不能为空");
         }
+
+        UserRequestDto dto = new UserRequestDto();
+        dto.setMobile(mobile);
         dto.setSmsType(CacheCodeEnum.SmsTypeEnum.LOGIN.getCode());
         return userService.regCaptcha(dto);
     }
 
     @ApiOperation(value = "手机验证码登录")
     @PostMapping("/loginByMobile")
-    public Result loginByMobile(@RequestBody UserRequestDto dto, HttpServletRequest request) {
-        logger.info("【请求开始】手机号登录,请求参数,userRequestDto:{}", JSONObject.toJSONString(dto));
+    public Result loginByMobile(@RequestBody String kl_data, HttpServletRequest request) {
+        logger.info("【请求开始】手机号登录,请求参数,kl_data:{}", kl_data);
+        String mobile = JacksonUtil.parseString(kl_data, "mobile");
+        String smsCode = JacksonUtil.parseString(kl_data, "smsCode");
+        if (StringUtils.isBlank(mobile)) {
+            return Result.failed("手机号不能为空");
+        }
+        if (StringUtils.isBlank(smsCode)) {
+            return Result.failed("验证码不能为空");
+        }
+
+        UserRequestDto dto = new UserRequestDto();
+        dto.setMobile(mobile);
+        dto.setSmsCode(smsCode);
         return userService.loginByMobile(dto, request);
     }