Merge branch 'whole_new' of http://120.27.238.55:7000/r/exchange into whole...

xiaoyong931011

2021-02-26 18aab7d6156b93d65c1b18809d924cbb214d737a

 src/main/java/com/xcong/excoin/common/LoginUserUtils.java

@@ -1,7 +1,12 @@
package com.xcong.excoin.common;

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.exception.GlobalException;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.SpringContextHolder;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpRequest;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -35,8 +40,14 @@
    }

    public static void resetAppLoginUser(MemberEntity memberEntity) {
        Authentication authentication = new UsernamePasswordAuthenticationToken(memberEntity, getAppLoginUserToken(), new ArrayList<>());
        SecurityContextHolder.getContext().setAuthentication(authentication);
        String token = getAppLoginUserToken();
        RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
        String jsonStr = redisUtils.getString(AppContants.PC_LOGIN_PREFIX + token);
        if (StrUtil.isNotBlank(jsonStr)) {
            redisUtils.set(AppContants.PC_LOGIN_PREFIX + token, JSONObject.toJSONString(memberEntity));
        } else {
            redisUtils.set(AppContants.APP_LOGIN_PREFIX + token, JSONObject.toJSONString(memberEntity));
        }
    }

    /**
@@ -58,7 +69,7 @@

    public static boolean isBrowser(HttpServletRequest request) {
        String userAgent = request.getHeader("user-agent");
        if (userAgent.toLowerCase().contains("mobile") || userAgent.toLowerCase().contains("okhttp")) {
        if (userAgent.toLowerCase().contains("mobile") || userAgent.contains("CFNetwork") || userAgent.toLowerCase().contains("okhttp")) {
            return false;
        }
        return true;