Merge branch 'master_activity' into dev

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

@@ -42,23 +42,24 @@ public class WeixinController {
 
     @Value("${wx.url}")
     private String  url;
+    ;
+
 
 
 
     @RequestMapping(value ="/app/unauth/wxLogin",method = RequestMethod.GET)
     @IgnoreUserToken
-    public String index(@RequestParam(value = "redirec_url",defaultValue = "")String redirec_url,
-                        @RequestParam(value = "key",defaultValue = "")String key){
-        log.info("-----微信wxLogin---redirec_url=="+redirec_url+"-----key===="+key);
-        if (StringUtils.isBlank(redirec_url)||StringUtils.isBlank(key)){
+    public String wxLogin(@RequestParam(value = "callback",defaultValue = "")String redirec_url){
+        if (StringUtils.isBlank(redirec_url)){
             redirec_url="";
         }
+        log.info("-----微信wxLogin---redirec_url=="+redirec_url);
         try {
         String encrypt_curr_url = Base64.encode(redirec_url.getBytes("utf-8"));
-        encrypt_curr_url+=","+key;
         redirec_url=url+"?" + WECHAT_AUTOLOGIN_CALLBACKURL_KEY+ "=" + encrypt_curr_url;
-        String  oauth_api=weixinService.getAuthorize(redirec_url);
-        return  String.format("redirect:"+oauth_api);
+        String  oauth_api=redirec_url+"&code=111";//weixinService.getAuthorize(redirec_url);
+         log.info("-----微信wxLogin---oauth_api=="+redirec_url);
+         return  String.format("redirect:"+oauth_api);
         }catch (Exception e){
             e.printStackTrace();
             log.info("网络异常===" + e.getMessage());
@@ -76,6 +77,8 @@ public class WeixinController {
     public String getUserInformation(String code, String callback, HttpServletRequest request) {
         log.info("-----微信回调userInfo---code=="+code+"----redirec_url==="+callback);
         try {
+            callback =new String(Base64.decode(callback), "utf-8");
+            log.info("-----微信回调----callback==="+callback);
             String [] params=callback.split(",");
             String key=null;
             if (params.length>1){
@@ -92,7 +95,6 @@ public class WeixinController {
             }
             log.info("-----微信回调userInfo---key=="+key+"----activityId==="+activityId+"----callback==="+callback);
             userBiz.authUser(code,key,activityId,request);
-            //callback =new String(Base64.decode(callback), "utf-8");
             if (StringUtils.isNotBlank(key)){
                 callback+="&key="+key;
             }