Commit 23365f26 authored by xiaoyu's avatar xiaoyu
Browse files

Merge remote-tracking branch 'origin/dev' into dev

parents 16768448 5ffcacb3
...@@ -160,4 +160,4 @@ jeepay ...@@ -160,4 +160,4 @@ jeepay
微信扫码加入交流群,或添加微信号:`jiquanltd` 邀请进群 微信扫码加入交流群,或添加微信号:`jiquanltd` 邀请进群
![Jeepay微信交流群](http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/wx_qun_702.png "Jeepay微信交流群") ![Jeepay微信交流群](http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/wx_qun_705.png "Jeepay微信交流群")
...@@ -65,7 +65,7 @@ public class WxpayChannelUserService implements IChannelUserService { ...@@ -65,7 +65,7 @@ public class WxpayChannelUserService implements IChannelUserService {
oauth2Url = DEFAULT_OAUTH_URL; oauth2Url = DEFAULT_OAUTH_URL;
} }
return String.format(oauth2Url + "?appid=%s&scope=snsapi_base&state=&redirect_uri=%s", appId, callbackUrlEncode); return String.format(oauth2Url + "?appid=%s&scope=snsapi_base&state=&redirect_uri=%s&response_type=code#wechat_redirect", appId, callbackUrlEncode);
} }
@Override @Override
......
...@@ -77,7 +77,7 @@ public class WxpayV3Util { ...@@ -77,7 +77,7 @@ public class WxpayV3Util {
} }
public static JSONObject queryOrderV3(String url, WxPayConfig wxPayConfig) throws WxPayException { public static JSONObject queryOrderV3(String url, WxPayConfig wxPayConfig) throws WxPayException {
String response = getV3(url, wxPayConfig); String response = getV3(PAY_BASE_URL + url, wxPayConfig);
return JSON.parseObject(response); return JSON.parseObject(response);
} }
...@@ -169,7 +169,7 @@ public class WxpayV3Util { ...@@ -169,7 +169,7 @@ public class WxpayV3Util {
throw wxPayException; throw wxPayException;
} }
} catch (Exception e) { } catch (Exception e) {
log.error("\n【异常信息】:{}", url, e.getMessage()); log.error("\n【异常信息】:{},e={}", url, e.getMessage());
throw (e instanceof WxPayException) ? (WxPayException) e : new WxPayException(e.getMessage(), e); throw (e instanceof WxPayException) ? (WxPayException) e : new WxPayException(e.getMessage(), e);
} finally { } finally {
httpGet.releaseConnection(); httpGet.releaseConnection();
......
Supports Markdown
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