Merge branch 'master_activity' into base-modify

xx-summit/xx-summit-api/src/main/java/com/xxfc/platform/summit/dto/AuthDto.java

+package com.xxfc.platform.summit.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ */
+@Data
+public class AuthDto {
+    private String callback;
+}

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

@@ -7,6 +7,7 @@ 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.dto.AuthDto;
 import com.xxfc.platform.summit.service.WXjsService;
 import com.xxfc.platform.summit.service.WeixinService;
 import lombok.extern.slf4j.Slf4j;
@@ -45,9 +46,10 @@ public class WeixinController {
 
 
 
-    @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.GET)
+    @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.POST)
     @IgnoreUserToken
-    public String wxLogin(@RequestParam(value = "callback",defaultValue = "")String redirec_url){
+    public String wxLogin(@RequestBody AuthDto authDto){
+        String redirec_url=authDto.getCallback();
         log.info("-----微信wxLogin---redirec_url=="+redirec_url);
         if (StringUtils.isBlank(redirec_url)){
             redirec_url="";