Skip to content

X
xyqb-user2
Commit c655e174 authored by 技术部—现金贷—曾丽宾's avatar 技术部—现金贷—曾丽宾
Browse files
Options

https:协议bug修改

parent 706a9a2f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
View file @ c655e174
...@@ -181,7 +181,7 @@ public class WeChatController implements IBaseController { ...@@ -181,7 +181,7 @@ public class WeChatController implements IBaseController {
extData = ""; extData = "";
} }
String protocol="http"; String protocol="http:";
LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData); LOGGER.info("从微信extdata版本接口进入：{}, extData:{}", schema, extData);
if (StringUtils.isEmpty(extData)) { if (StringUtils.isEmpty(extData)) {
...@@ -293,7 +293,7 @@ public class WeChatController implements IBaseController { ...@@ -293,7 +293,7 @@ public class WeChatController implements IBaseController {
return; return;
} }
protocol = extDataObj.getOrDefault("protocol", "http").toString(); protocol = extDataObj.getOrDefault("protocol", "http:").toString();
LOGGER.info("从微信登录extData中获得协议信息,protocol:{}", protocol); LOGGER.info("从微信登录extData中获得协议信息,protocol:{}", protocol);
Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString()); Long registerFrom = Long.valueOf(extDataObj.getOrDefault("registerFrom", "1").toString());
String redirect = (String) extDataObj.getOrDefault("redirect", "redirect"); String redirect = (String) extDataObj.getOrDefault("redirect", "redirect");
...@@ -357,7 +357,7 @@ public class WeChatController implements IBaseController { ...@@ -357,7 +357,7 @@ public class WeChatController implements IBaseController {
@RequestMapping("/receiveCode/{key}") @RequestMapping("/receiveCode/{key}")
public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) { public void receiveCodeNoRedirect(String code, @PathVariable(value = "key") String systemKey, HttpServletRequest request, HttpServletResponse response) {
String schema = request.getScheme(); String schema = request.getScheme();
String protocol="http"; String protocol="http:";
LOGGER.info("HTTP协议no redirect:" + schema); LOGGER.info("HTTP协议no redirect:" + schema);
// 从code获取token // 从code获取token
Merchant merchant = merchantService.findMerchantByName(systemKey); Merchant merchant = merchantService.findMerchantByName(systemKey);
...@@ -455,7 +455,7 @@ public class WeChatController implements IBaseController { ...@@ -455,7 +455,7 @@ public class WeChatController implements IBaseController {
private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom,String protocol) { private String assembleNormalRedirectUrl(Merchant merchant, Long registerFrom,String protocol) {
String domains=userUIAddr; String domains=userUIAddr;
if(protocol!=null&&protocol.equals("https")){ if(protocol!=null&&protocol.equals("https:")){
domains=userUIAddrS; domains=userUIAddrS;
} }
...@@ -475,7 +475,7 @@ public class WeChatController implements IBaseController { ...@@ -475,7 +475,7 @@ public class WeChatController implements IBaseController {
private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) { private String assembleWechatRedirectUrl(Merchant merchant, WechatUserInfo userInfo, Long registerFrom,String protocol) {
String domains=userUIAddr; String domains=userUIAddr;
if(protocol!=null&&protocol.equals("https")){ if(protocol!=null&&protocol.equals("https:")){
domains=userUIAddrS; domains=userUIAddrS;
} }
if ("baitiao".equals(merchant.getName())) { if ("baitiao".equals(merchant.getName())) {
......
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