Skip to content

C
cloud-platform
Commit e2f32dbc authored by hezhen's avatar hezhen
Browse files
Options

Merge branch 'master_activity' into base-modify

parents 36416a4d 8e5524d3
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/WeixinController.java
View file @ e2f32dbc
...@@ -84,9 +84,11 @@ public class WeixinController { ...@@ -84,9 +84,11 @@ public class WeixinController {
} }
params=callback.split("_"); params=callback.split("_");
Integer activityId=0; Integer activityId=0;
String auto=null;
if (params.length>1){ if (params.length>1){
callback=params[0]; callback=params[0];
activityId=Integer.parseInt(params[1]); activityId=Integer.parseInt(params[1]);
auto="1";
} }
log.info("-----微信回调userInfo---key=="+key+"----activityId==="+activityId+"----callback==="+callback); log.info("-----微信回调userInfo---key=="+key+"----activityId==="+activityId+"----callback==="+callback);
userBiz.authUser(code,key,activityId,request); userBiz.authUser(code,key,activityId,request);
...@@ -94,6 +96,9 @@ public class WeixinController { ...@@ -94,6 +96,9 @@ public class WeixinController {
if (StringUtils.isNotBlank(key)){ if (StringUtils.isNotBlank(key)){
callback+="&key="+key; callback+="&key="+key;
} }
if (StringUtils.isNotBlank(auto)){
callback+="&a=1";
}
log.info("callback===" + callback); log.info("callback===" + callback);
return String.format("redirect:"+callback); return String.format("redirect:"+callback);
}catch (Exception e){ }catch (Exception e){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment