Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/WeChatController.java

@@ -130,10 +130,12 @@ public class WeChatController {
                 queryWrapper.eq(MceMbuser::getOpenid,openId).last("LIMIT 1");
                 MceMbuser one = mceMbuserService.getOne(queryWrapper);
                 if(one != null){
-                    String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX+"?openId="+one.getOpenid();
+                    //String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX+"?openId="+one.getOpenid();
+                    String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX;
                     response.sendRedirect(URLDecoder.decode(sendUrl, "UTF-8"));
                 }else{
-                    String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN+"?openId="+openId;
+                    //String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN+"?openId="+openId;
+                    String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN;
                     response.sendRedirect(URLDecoder.decode(sendUrl, "UTF-8"));
                 }
             }catch (IOException e){
@@ -166,11 +168,12 @@ public class WeChatController {
                     queryWrapper.eq(MceMbuser::getOpenid,openid).last("LIMIT 1");
                     MceMbuser one = mceMbuserService.getOne(queryWrapper);
                     if(one != null){
-
-                        String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX+"?openId="+one.getOpenid();
+                        //String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX+"?openId="+one.getOpenid();
+                        String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_INDEX;
                         response.sendRedirect(URLDecoder.decode(sendUrl, "UTF-8"));
                     }else{
-                        String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN+"?openId="+openid;
+                        //String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN+"?openId="+openid;
+                        String sendUrl = http+constant.call_back_domain+constant.WE_CHAT_LOGIN;
                         response.sendRedirect(URLDecoder.decode(sendUrl, "UTF-8"));
                     }