Merge branch 'master_activity' into base-modify

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

@@ -84,9 +84,11 @@ public class WeixinController {
             }
              params=callback.split("_");
             Integer activityId=0;
+            String auto=null;
             if (params.length>1){
                 callback=params[0];
                 activityId=Integer.parseInt(params[1]);
+                auto="1";
             }
             log.info("-----微信回调userInfo---key=="+key+"----activityId==="+activityId+"----callback==="+callback);
             userBiz.authUser(code,key,activityId,request);
@@ -94,6 +96,9 @@ public class WeixinController {
             if (StringUtils.isNotBlank(key)){
                 callback+="&key="+key;
             }
+            if (StringUtils.isNotBlank(auto)){
+                callback+="&a=1";
+            }
             log.info("callback===" + callback);
             return  String.format("redirect:"+callback);
         }catch (Exception e){