Merge remote-tracking branch 'origin/master'

doum

17 小时以前 a76e2318dd2731ff713df6e262396a9175d029f7

 server/dmmall_web/src/main/java/com/doumee/api/web/ApiController.java

@@ -57,6 +57,9 @@
    public GoodsorderService goodsorderService;

    @Autowired
    public SearchHistoryService searchHistoryService;

    @Autowired
    public ShopService shopService;

    @Autowired
@@ -145,6 +148,9 @@
    @Autowired
    public FundService fundService;

    @Autowired
    public InviteRecordService inviteRecordService;


    /**
     * 得到request对象
@@ -155,6 +161,14 @@
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        return request;
    }

    protected String getToken() {
        Object obj = this.getRequest().getAttribute(JwtTokenUtil.HEADER_KEY);
        return obj != null ? (String) obj : null;
    }



    /**
     * 获取用户ID
     *