小程序登录修改

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -40,7 +40,8 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 				.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js"
 						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode",
 						"/officialAccountCallback/**",
-						"/imCallback/**", "/wx/category/**", "/wx/consignSale/**",  "/wx/item/**"
+						"/imCallback/**", "/wx/category/**"
+					//	"/wx/consignSale/**",  "/wx/item/**"
 					/*	"/wx/officialAccount/**",
 						"/wx/item/**",
 						"/wx/aiAssistant/**",

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

@@ -196,7 +196,7 @@ public class UserServiceImpl implements UserService {
 
 
     @Override
-    public Result finishLogin(UserRequestDto dto, HttpServletRequest request) {
+    public Result finishLogin(UserRequestDto dto) {
         Map<String, Object> result = new HashMap<>();
         // 先登出其他
         userTokenManager.removeToken(dto.getUserId());
@@ -206,11 +206,12 @@ public class UserServiceImpl implements UserService {
         userToken.setSessionKey(UUID.randomUUID().toString().replace("-", ""));
         result.put("token", dto.getToken());
         result.put("tokenExpire", userToken.getExpireTime().toString());
-
+        result.put("isInvited", true);
         User user = userDao.queryById(dto.getUserId());
         // 缓存用户信息
         String userKey = MessageFormat.format(CacheCodeConstants.USER_INFO_KEY, user.getId());
         redisUtil.set(userKey, user, 2 * 60 * 60);
+        logger.info("【请求结束】登录信息初始化成功, 响应结果:{}", JSONObject.toJSONString(result));
         return Result.success(result);
     }
 
@@ -350,12 +351,12 @@ public class UserServiceImpl implements UserService {
             logger.info("【请求结束】用户修改昵称成功");
 
             //修改后的昵称同步到IM
-            Result synResult = chatUserApi.importUser(user);
+           /* Result synResult = chatUserApi.importUser(user);
             if (synResult.getSuccess()) {
                 logger.info("用户id:{}, 修改后的昵称同步到IM成功",  user.getId());
             } else {
                 logger.error("用户id:{}, 修改后的昵称同步到IM失败 :{}", user.getId(), synResult.getErrmsg());
-            }
+            }*/
             return Result.success();
         } catch (Exception e) {
             logger.error("用户修改昵称失败", e);

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/UserService.java

@@ -28,10 +28,9 @@ public interface UserService {
      * 调用玩物得志登录接口成功后通知
      *
      * @param dto
-     * @param request
      * @return
      */
-    Result finishLogin(UserRequestDto dto, HttpServletRequest request);
+    Result finishLogin(UserRequestDto dto);
 
 
     /**

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

@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.web;
 
 
 import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.type.Result;
 import com.wwdz.ch.db.dto.request.InviteRecordRequestDto;
 import com.wwdz.ch.wx.constant.CacheCodeConstants;
@@ -38,12 +39,14 @@ public class WxUserController {
 
 
 
-
     @ApiOperation(value = "调用玩物得志登录接口成功后通知")
     @PostMapping("/finishLogin")
-    public Result finishLogin(@RequestBody UserRequestDto dto, HttpServletRequest request) {
+    public Result finishLogin(@RequestBody UserRequestDto dto) {
         logger.info("【请求开始】调用玩物得志登录接口成功后通知,请求参数:{}", JSON.toJSONString(dto));
-        return userService.finishLogin(dto, request);
+        if (dto.getUserId() == null || StringUtils.isBlank(dto.getToken())) {
+            return Result.failed(ResultCode.PARAM_ERROR.getMessage());
+        }
+        return userService.finishLogin(dto);
     }