Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java

 package com.xxfc.platform.summit.controller;
 
 import cn.hutool.core.codec.Base64;
-import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.summit.biz.ActivityBmBiz;
 import com.xxfc.platform.summit.biz.UserBiz;
 import com.xxfc.platform.summit.constant.RedisKey;
-import com.xxfc.platform.summit.entity.ActivityBm;
-import com.xxfc.platform.summit.entity.User;
 import com.xxfc.platform.summit.service.WXjsService;
 import com.xxfc.platform.summit.service.WeixinService;
-import com.xxfc.platform.summit.vo.UserInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 /**
  * @author Administrator
@@ -83,8 +77,11 @@ public class WeixinController {
         log.info("-----微信回调userInfo---code=="+code+"----redirec_url==="+callback);
         try {
             String [] params=callback.split(",");
-            String key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
+            String key=null;
+            if (params.length>1){
                 callback=params[0];
+                key= RedisKey.CONSTANT_CODE_PREFIX+params[1];
+            }
             log.info("-----微信回调userInfo---key=="+key+"----callback==="+callback);
             userBiz.authUser(code,key,request);
             //callback =new String(Base64.decode(callback), "utf-8");
@@ -99,6 +96,7 @@ public class WeixinController {
 
     }
 
+
     /**
      * 微信分享
      * @param url