Commit 49ce4e5d authored by hezhen's avatar hezhen

Merge branch 'master_activity' into dev

parents 8a063bda 2628afc0
...@@ -57,7 +57,7 @@ public class WeixinController { ...@@ -57,7 +57,7 @@ public class WeixinController {
try { try {
String encrypt_curr_url = Base64.encode(redirec_url.getBytes("utf-8")); String encrypt_curr_url = Base64.encode(redirec_url.getBytes("utf-8"));
redirec_url=url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url; redirec_url=url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
String oauth_api=redirec_url+"&code=111";//weixinService.getAuthorize(redirec_url); String oauth_api=weixinService.getAuthorize(redirec_url);//redirec_url+"&code=111";
log.info("-----微信wxLogin---oauth_api=="+redirec_url); log.info("-----微信wxLogin---oauth_api=="+redirec_url);
return String.format("redirect:"+oauth_api); return String.format("redirect:"+oauth_api);
}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