移除调试用的日志

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -174,8 +174,8 @@ public class WeChatController {
      * @return
      */
     @RequestMapping("/receiveCode/{key}/{redirect}")
-    public void receiveCode(String code, @PathVariable(value = "key") String systemKey, @PathVariable String redirect, HttpServletResponse response) {
-        LOGGER.info("微信登录:redirect{}" + redirect);
+    public void receiveCode(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, @PathVariable String redirect, HttpServletResponse response) {
+        String schema = request.getScheme();
         // 从code获取token
         Merchant merchant = merchantService.findMerchantByName(systemKey);
 
@@ -215,7 +215,7 @@ public class WeChatController {
         }
         // 已经关联了用户
         // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl = createUserSession(user, merchant, redirect);
+        String redirectUrl = createUserSession(user, merchant, redirect, schema);
         response.setHeader("Location", redirectUrl);
         response.setStatus(301);
     }
@@ -227,8 +227,8 @@ public class WeChatController {
      * @return
      */
     @RequestMapping("/receiveCode/{key}")
-    public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletResponse response) {
-        LOGGER.info("微信登录:key{}", systemKey);
+    public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
+        String schema = request.getScheme();
         // 从code获取token
         Merchant merchant = merchantService.findMerchantByName(systemKey);
 
@@ -268,31 +268,35 @@ public class WeChatController {
         }
         // 已经关联了用户
         // create session, 登进去，该怎么玩怎么玩。
-        String redirectUrl = createUserSession(user, merchant, "");
+        String redirectUrl = createUserSession(user, merchant, "", schema);
         response.setHeader("Location", redirectUrl);
         response.setStatus(301);
     }
 
-    private String createUserSession(User user, Merchant merchant, String redirect) {
+    private String createUserSession(User user, Merchant merchant, String redirect, String schema) {
+        String url = "http://passport.xyqb.com";
+        if("https".equals(schema)) {
+            url = "https://passport.xyqb.com";
+        }
         if(StringUtils.isEmpty(redirect) || "redirect".equals(redirect)) {
             LOGGER.info("微信登录:redirect为null,走正常流程.");
             if ("baitiao".equals(merchant.getName())) {
-                return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO);
+                return loginInWechatWithSessionCreated(user, merchant, "cashTarget5", Constants.Channel.BAITIAO, schema);
             } else {
-                return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L);
+                return loginInWechatWithSessionCreated(user, merchant, "cashTarget4", 1L, schema);
             }
         } else if("local".equals(redirect)){
             LOGGER.info("微信登录:redirect不为null,创建session跳到指定前端页面.");
             AuthBean authBean = sessionService.createSession(Constants.Channel.WECHAT, Constants.Channel.WECHAT, "", user, merchant);
-            LOGGER.info("微信登录:跳转地址{}", userUIAddr + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
-            return userUIAddr + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken();
+            LOGGER.info("微信登录:跳转地址{}", url + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken());
+            return url + "/weixin/callback?phoneNo=" + user.getPhoneNo() + "&token=" + authBean.getToken();
         }
         return null;
     }
 
-    private String loginInWechatWithSessionCreated(User user, Merchant merchant, String target, Long channelId) {
+    private String loginInWechatWithSessionCreated(User user, Merchant merchant, String target, Long channelId, String url) {
         AuthBean authBean = sessionService.createSession(channelId, Constants.Channel.WECHAT, "", user, merchant);
-        return userUIAddr + "/landing?token=" + authBean.getToken() + "&registerFrom=198&channelId=" + channelId +"&key=" + merchant.getName() +"&target=" + target;
+        return url + "/landing?token=" + authBean.getToken() + "&registerFrom=198&channelId=" + channelId +"&key=" + merchant.getName() +"&target=" + target;
     }
 
     private void redirectWechatLoginUrlWithoutLogin(HttpServletResponse response, Merchant merchant, WechatUserInfo userInfo) {