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,7 +7,6 @@ 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;
@@ -46,19 +45,21 @@ public class WeixinController {
 
 
 
-    @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.POST)
+
+    @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.GET)
     @IgnoreUserToken
-    public String wxLogin(@RequestBody AuthDto authDto){
-        String redirec_url=authDto.getCallback();
-        log.info("-----微信wxLogin---redirec_url=="+redirec_url);
+    public String wxLogin(@RequestParam(value = "callback",defaultValue = "")String redirec_url,HttpServletRequest request){
         if (StringUtils.isBlank(redirec_url)){
             redirec_url="";
         }
+
+        redirec_url=request.getServerName()+"/"+redirec_url;
+        log.info("-----微信wxLogin---redirec_url=="+redirec_url);
         try {
         String encrypt_curr_url = Base64.encode(redirec_url.getBytes("utf-8"));
         redirec_url=url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
         String  oauth_api=redirec_url+"&code=111";//weixinService.getAuthorize(redirec_url);
-         log.info("-----微信wxLogin---oauth_api=="+oauth_api);
+         log.info("-----微信wxLogin---oauth_api=="+redirec_url);
          return  String.format("redirect:"+oauth_api);
         }catch (Exception e){
             e.printStackTrace();