记录白条商户注册的渠道号，并在用户登录时和原来的登录信息一起存入redis，基本保持原有数据结构不变

pom.xml

@@ -257,7 +257,7 @@
         <dependency>
             <groupId>cn.quantgroup</groupId>
             <artifactId>xyqb-user-rpc-commons</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.1.1-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -5,37 +5,42 @@ import cn.quantgroup.motan.retbean.*;
 import cn.quantgroup.motan.service.UserMotanService;
 import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.xyqb.Constants;
+import cn.quantgroup.xyqb.controller.IBaseController;
 import cn.quantgroup.xyqb.entity.*;
 import cn.quantgroup.xyqb.entity.enumerate.*;
-import cn.quantgroup.xyqb.model.IdCardInfo;
-import cn.quantgroup.xyqb.model.IdType;
-import cn.quantgroup.xyqb.model.LoginProperties;
-import cn.quantgroup.xyqb.model.UserRet;
+import cn.quantgroup.xyqb.model.*;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
 import cn.quantgroup.xyqb.model.session.SessionStruct;
+import cn.quantgroup.xyqb.model.session.SessionValue;
 import cn.quantgroup.xyqb.repository.IUserRepository;
 import cn.quantgroup.xyqb.service.auth.IIdCardService;
+import cn.quantgroup.xyqb.service.http.IHttpService;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
 import cn.quantgroup.xyqb.service.sms.ISmsService;
 import cn.quantgroup.xyqb.service.user.*;
 import cn.quantgroup.xyqb.service.user.vo.UserDetailVO;
 import cn.quantgroup.xyqb.service.wechat.IWechatService;
+import cn.quantgroup.xyqb.session.XyqbSessionContextHolder;
 import cn.quantgroup.xyqb.util.PasswordUtil;
 import cn.quantgroup.xyqb.util.ValidationUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableMap;
 import com.weibo.api.motan.config.springsupport.annotation.MotanService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.util.List;
+import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
@@ -52,6 +57,10 @@ public class MotanUserServiceImpl implements UserMotanService {
     MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
   }
 
+
+  @Value("${xyqb.auth.url}")
+  private String xyqbAuthUrl;
+
   @Autowired
   private IIdCardService idCardService;
   @Autowired
@@ -78,6 +87,8 @@ public class MotanUserServiceImpl implements UserMotanService {
   private IWechatService wechatService;
   @Autowired
   private IUserSpouseService userSpouseService;
+  @Autowired
+  private IHttpService httpService;
 
   @Override
   public UserSysResult<XUser> findUserByPhoneNo(String phoneNo) {
@@ -558,6 +569,48 @@ public class MotanUserServiceImpl implements UserMotanService {
     return null;
   }
 
+  @Override
+  public UserSysResult<XLoginInfo> getLoginInfo(String token) {
+    SessionStruct sessionStruct = XyqbSessionContextHolder.getXSessionFromRedis(token);
+    if(null != sessionStruct){
+      LoginInfo loginInfo = new LoginInfo();
+      loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
+      loginInfo.setToken(sessionStruct.getSid());
+      XLoginInfo xLoginInfo = new XLoginInfo();
+      xLoginInfo.setToken(token);
+      xLoginInfo.setUser(sessionStruct.getValues().getUser().toXUser());
+      LoginContext context = new LoginContext();
+      context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
+      context.setCreatedFrom(sessionStruct.getValues().getLoginProperties().getCreatedFrom());
+      context.setAppChannel(sessionStruct.getValues().getLoginProperties().getAppChannel());
+      context.setBtMerchantId(sessionStruct.getValues().getLoginProperties().getBtMerchantId());
+      xLoginInfo.setLoginContext(context);
+      return returnSuccessValue(xLoginInfo);
+    }else {
+      log.info("去向函谷关查询用户信息");
+      String checkUrl = xyqbAuthUrl+"/innerapi/is_login";
+      ImmutableMap<String, String> headMap = ImmutableMap.of("x-auth-token", token);
+      String response = httpService.get(checkUrl, headMap, null);
+      log.info("去向函谷关查询用户信息,response:[{}]",response);
+      JsonResult result = JSONObject.parseObject(response, JsonResult.class);
+      if (result == null || !"0000".equals(result.getCode()) || !"0000".equals(result.getBusinessCode())) {
+        return returnErrorValue("用户未登录");
+      }
+      String phoneNo = ((Map<String, String>) result.getData()).get("phoneNo");
+      User user = userService.findByPhoneWithCache(phoneNo);
+      XLoginInfo xLoginInfo = new XLoginInfo();
+      xLoginInfo.setToken(token);
+      xLoginInfo.setUser(user.toXUser());
+      LoginContext context = new LoginContext();
+      context.setChannelId(null);
+      context.setCreatedFrom(user.getRegisteredFrom());
+      context.setAppChannel("");
+      context.setBtMerchantId(null);
+      xLoginInfo.setLoginContext(context);
+      return returnSuccessValue(xLoginInfo);
+    }
+  }
+
   /**
    * 封装返回结果.
    *

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -47,7 +47,7 @@ public class AuthInfoController implements IBaseController {
   public JsonResult loginInfo() {
     SessionStruct sessionStruct = getCurrentSessionFromRedis();
     if(null != sessionStruct) {
-      log.info("从用户中心获取到了用户登录信息:phone:[{}]",sessionStruct.getValues().getUser().getPhoneNo());
+      log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo());
       LoginInfo loginInfo = new LoginInfo();
       loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
       loginInfo.setToken(sessionStruct.getSid());
@@ -55,6 +55,7 @@ public class AuthInfoController implements IBaseController {
       context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
       context.setCreatedFrom(sessionStruct.getValues().getLoginProperties().getCreatedFrom());
       context.setAppChannel(sessionStruct.getValues().getLoginProperties().getAppChannel());
+      context.setBtMerchantId(sessionStruct.getValues().getLoginProperties().getBtMerchantId());
       loginInfo.setLoginContext(context);
       return JsonResult.buildSuccessResult("", loginInfo);  //有ThreadLocal不释放的问题，不可再使用原来方式了
     }else {
@@ -82,6 +83,9 @@ public class AuthInfoController implements IBaseController {
       context.setChannelId(null);
       context.setCreatedFrom(user.getRegisteredFrom());
       context.setAppChannel("");
+      if(user.getRegisteredFrom() == 222L) {
+        context.setBtMerchantId(1L);
+      }
       loginInfo.setLoginContext(context);
       return JsonResult.buildSuccessResult("", loginInfo);
     }

src/main/java/cn/quantgroup/xyqb/model/session/LoginInfo.java

@@ -29,7 +29,7 @@ public class LoginInfo {
     private Long channelId;
     private Long createdFrom;
     private String appChannel;
-
+    private Long btMerchantId;
   }
 
 }

src/main/java/cn/quantgroup/xyqb/session/XyqbSessionContextHolder.java

@@ -78,6 +78,30 @@ public class XyqbSessionContextHolder {
     }
   }
 
+  public static SessionStruct getXSessionFromRedis(String token){
+    if (token == null || token.length() != 36) {
+      return null;
+    }
+    String result = redisTemplate.opsForValue().get(Constants.Session.USER_SESSION_CACHE + token);
+    if (StringUtils.isEmpty(result)) {
+      return null;
+    }
+    try {
+      SessionValue values = JSON.parseObject(result, SessionValue.class);
+
+      if (values == null) {
+        return null;
+      }
+      SessionStruct sessionStruct = new SessionStruct();
+      sessionStruct.setSid(token);
+      sessionStruct.setValues(values);
+      return sessionStruct;
+    }catch (Exception ex){
+      LOGGER.error("序列化session出错", ex);
+      return null;
+    }
+  }
+
   public static void releaseSession() {
     threadSession.remove();
   }