Merge branch 'master_activity' into base-modify

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

@@ -3,7 +3,6 @@ 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.xxfc.platform.summit.service.WeixinService;
 import com.xxfc.platform.summit.vo.UserInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -49,7 +48,7 @@ public class WeixinController {
         String encrypt_curr_url = Base64.encode(redirec_url);
         redirec_url=url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
         String  oauth_api=weixinService.getAuthorize(redirec_url);
-        return  String.format("redirect%s",oauth_api);
+        return  String.format("redirect:"+oauth_api);
     }
 
     /**
@@ -86,7 +85,7 @@ public class WeixinController {
         session.setAttribute(frontSessionKey, encode);
         callback =Base64.encode(callback);
         log.error("callback===" + callback);
-        return  String.format("redirect%s",callback);
+        return  String.format("redirect:"+callback);
     }