|
@@ -38,37 +38,9 @@ public class WeixinPayController extends Controller {
|
|
|
this.getResponse().setHeader("Access-Control-Allow-Credentials", Boolean.TRUE.toString());
|
|
|
String asString = this.getPara("out_trade_no");
|
|
|
String bbString = this.getPara("appId");
|
|
|
-
|
|
|
-// String ip = IpKit.getRealIp(getRequest());
|
|
|
-// if (StrKit.isBlank(ip)) {
|
|
|
-// ip = "127.0.0.1";
|
|
|
-// }
|
|
|
+ String ccString = this.getPara("openid");
|
|
|
|
|
|
- String codeString = "";
|
|
|
- WeixinService wService = ServiceFactory.getService(WeixinService.class);
|
|
|
ApiConfigKit.setThreadLocalAppId(bbString);
|
|
|
- String code = this.getPara("code");
|
|
|
- if (code == null) {
|
|
|
- System.out.println(ApiConfigKit.getApiConfig().getAppId());
|
|
|
- System.out.println(getRequest().getRequestURL().toString());
|
|
|
- String url;
|
|
|
- try {
|
|
|
- url = wService.getCodeUrl2(ApiConfigKit.getApiConfig().getAppId(), getRequest().getRequestURL().toString() + "?appId=" + ApiConfigKit.getApiConfig().getAppId() + "&out_trade_no=" + asString);
|
|
|
- this.redirect(url);
|
|
|
-
|
|
|
- } catch (UnsupportedEncodingException e) {
|
|
|
- // TODO Auto-generated catch block
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
- return;
|
|
|
- }else {
|
|
|
- codeString = this.getPara("code");
|
|
|
-// ip = this.getPara("ip");
|
|
|
- }
|
|
|
- SnsAccessToken snsAccessToken = wService.getWebAccessToken(ApiConfigKit.getApiConfig().getAppId(), ApiConfigKit.getApiConfig().getAppSecret(), codeString);
|
|
|
-
|
|
|
- // openId,采用 网页授权获取 access_token API:SnsAccessTokenApi获取
|
|
|
- String openId = snsAccessToken.getOpenid();
|
|
|
|
|
|
// 统一下单文档地址:https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_1
|
|
|
|
|
@@ -88,7 +60,7 @@ public class WeixinPayController extends Controller {
|
|
|
params.put("trade_type", TradeType.JSAPI.name());
|
|
|
params.put("nonce_str", System.currentTimeMillis() / 1000 + "");
|
|
|
params.put("notify_url", notify_url);
|
|
|
- params.put("openid", openId);
|
|
|
+ params.put("openid", ccString);
|
|
|
|
|
|
String sign = PaymentKit.createSign(params, paternerKey);
|
|
|
params.put("sign", sign);
|