From 83e562e01f12bb65b0e1d833bfb2f95003295c8f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 25 四月 2023 14:00:08 +0800
Subject: [PATCH] optimize upload vedio ftp way
---
service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java | 101 ++++++++++++++++++++++++++++++++------------------
1 files changed, 65 insertions(+), 36 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
index 66d9a36..b73e06f 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
@@ -19,21 +19,20 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.properties.WechatAuthProperties;
import com.java110.api.smo.payment.adapt.IPayAdapt;
-import com.java110.core.factory.ChinaUmsFactory;
+import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.PlutusFactory;
import com.java110.core.factory.WechatFactory;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.utils.cache.MappingCache;
+import com.java110.utils.constant.MappingConstant;
import com.java110.utils.constant.WechatConstant;
-import com.java110.utils.util.DateUtil;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.bouncycastle.util.encoders.Base64;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
@@ -53,6 +52,7 @@
//寰俊鏀粯
public static final String PAY_UNIFIED_ORDER_URL = "https://api.plutuspay.com/open/v2/jsPay";
+ public static final String PAY_UNIFIED_ORDER_NATIVE_URL = "https://api.plutuspay.com/open/v2/preCreate";
private static final String VERSION = "1.0";
@@ -92,7 +92,7 @@
logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
- double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
+ double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue(MappingConstant.ENV_DOMAIN,"HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
JSONObject resMap = null;
@@ -103,24 +103,24 @@
resMap = this.java110UnifieldOrder(outRestTemplate, feeName, orderNum, tradeType, payAmount, openId, smallWeChatDto, notifyUrl);
}
- if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
- resultMap.putAll(JSONObject.toJavaObject(resMap, Map.class));
- resultMap.put("sign",resultMap.get("paySign"));
- } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
- resultMap.put("appId", smallWeChatDto.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("partnerid", smallWeChatDto.getMchId());
- resultMap.put("prepayid", resMap.getString("session_id"));
- //resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
- } else if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
- resultMap.put("prepayId", resMap.getString("session_id"));
- resultMap.put("codeUrl", resMap.getString("qr_code"));
- }
- resultMap.put("code", "0");
- resultMap.put("msg", "涓嬪崟鎴愬姛");
- logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
+ if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
+ resultMap.putAll(JSONObject.toJavaObject(resMap, Map.class));
+ resultMap.put("sign", resultMap.get("paySign"));
+ } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
+ resultMap.put("appId", smallWeChatDto.getAppId());
+ resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
+ resultMap.put("nonceStr", PayUtil.makeUUID(32));
+ resultMap.put("partnerid", smallWeChatDto.getMchId());
+ resultMap.put("prepayid", resMap.getString("session_id"));
+ //resultMap.put("signType", "MD5");
+ resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
+ } else if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+ resultMap.put("prepayId", resMap.getString("session_id"));
+ resultMap.put("codeUrl", resMap.getString("qr_code"));
+ }
+ resultMap.put("code", "0");
+ resultMap.put("msg", "涓嬪崟鎴愬姛");
+ logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
// } else {
// resultMap.put("code", resMap.getString("errCode"));
// resultMap.put("msg", resMap.getString("errMsg"));
@@ -153,7 +153,7 @@
paramMap.put("openId", openid);
paramMap.put("sn", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("outTradeId", orderNum);
- if(OwnerAppUserDto.APP_TYPE_WECHAT_MINA.equals(tradeType)){
+ if (OwnerAppUserDto.APP_TYPE_WECHAT_MINA.equals(tradeType)) {
paramMap.put("isMiniProgram", true);
}
paramMap.put("tradeAmount", PayUtil.moneyToIntegerStr(payAmount));
@@ -161,37 +161,66 @@
paramMap.put("notifyUrl", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + paramMap.toJSONString());
+ String privateKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PRIVATE_KEY");
+ String devId = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "PLUTUS_DEV_ID");
- String param = PlutusFactory.Encryption(paramMap.toJSONString());
+ String param = PlutusFactory.Encryption(paramMap.toJSONString(), privateKey, smallWeChatDto.getPayPassword(), devId);
System.out.println(param);
-
- String str = PlutusFactory.post(wechatAuthProperties.getWxPayUnifiedOrder(), param);
+ String str = "";
+ if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+ str = PlutusFactory.post(PAY_UNIFIED_ORDER_NATIVE_URL, param);
+ } else {
+ str = PlutusFactory.post(PAY_UNIFIED_ORDER_URL, param);
+ }
System.out.println(str);
JSONObject json = JSON.parseObject(str);
String signature = json.getString("signature");
String content = json.getString("content");
+ String publicKey = CommunitySettingFactory.getRemark(smallWeChatDto.getObjId(), "PLUTUS_PUBLIC_KEY");
//楠岀
- Boolean verify = PlutusFactory.verify256(content, Base64.decode(signature));
+ Boolean verify = PlutusFactory.verify256(content, Base64.decode(signature), publicKey);
//楠岀鎴愬姛
if (!verify) {
throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
}
- //瑙ｅ瘑
- byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
- //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
- String paramOut = new String(bb);
+ //瑙ｅ瘑
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), smallWeChatDto.getPayPassword());
+ //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
+ String paramOut = new String(bb);
- JSONObject paramObj = JSONObject.parseObject(paramOut);
+ JSONObject paramObj = JSONObject.parseObject(paramOut);
logger.debug("缁熶竴涓嬪崟杩斿洖" + paramOut);
- if (paramObj.getString("paramObj") != "00") {
- throw new IllegalArgumentException("鏀粯澶辫触"+paramObj.getString("error"));
+ if (!"00".equals(paramObj.getString("status"))) {
+ throw new IllegalArgumentException("鏀粯澶辫触" + paramObj.getString("error"));
}
- return paramObj.getJSONObject("payInfo");
+ if (WechatAuthProperties.TRADE_TYPE_NATIVE.equals(tradeType)) {
+ paramObj.put("code", 0);
+ return paramObj;
+ } else {
+ return paramObj.getJSONObject("payInfo");
+ }
+ }
+
+ public static void main(String[] args) {
+ String str = "{\n" +
+ " \"code\": 0,\n" +
+ " \"msg\": null,\n" +
+ " \"content\": \"UUVA4Zh6r0ZzZT1xik2VphAIACe0sNY0awk6do5uiWuOVgqq+4zVAEHTySOjhw5DEcMPIstWJIU7mJrUnm/3GCXq8T49YUFTH+JDJ11jwVUsiuu9HjS3I3bucYMM4xqrvnovqq0VEbP5mRJQY7pECtTa2KikB0wb7bB2hwrsOMJv/Ml2KRPXN59Xt0t42xbP0wxclkgg3iCrPEX79sfer12+wwCKFo028CqN4l/xFN4TelbCiEO35n5Aq+c3k+TzlE6FWJGJDfhu62WGpIOMugUwbNgbuVnmGb92Q5K6/OnTX4oAuOoE0C06jvEOjjiiOMpB2CsEwPAkhnWppu/yIAjZpjVbBEenjcE5Y6UiqCRhlzFVcPEgjIxR6/iuSxRn4KNKcSzeXxzhG5zXtdfHRDsMhbVLNZS6aTvTYLnC2oK9LexU4pomOyu9ZISmApiE2XmgIuzNx8FRrpcuEY5Uh29Y/yNoZghuAaKeqrFevVdzEdr9b+mQOk/CA6vAXxYi4UG1WGsQrAW72puUSWSo3gk9YhC5NYscKR2P3VYcVGsTpTsKxNw84A6tP9o3ubNdAMGFw9Gjjsw+iZlgTkvD6RmWRkgJ1nZcPn8uAw5t6ShMl2+PAZLfHAQbJjYd3y/lznff8tMv8ee50SJgDD07pHqaZXSaikJ1rTGKzB/NEDJFctmE2X18pvynu4Q9pwDhDMOOgKg6TCRqcaEDW+kqpg2+jO7/KnGabmAtO/ryW2p7VDbQpa3dEP05L/KliVsIYX4pQq6f8IunmxsBIs2cIHREI4HqH52OXSms3aHyKxgrEkABF79+teeCqE/YDhwg07/DcmHVkiIrPuo2qj2x+yS4/hMCxLsQhtoH3e1BK8U=\",\n" +
+ " \"signature\": \"alnaEdVgctJkB0O2Qch1CtLUZS5qwr/pwSDFVoLqg6COCz3NAoKNhkPT7p1Ls4uaHq/j7cbG/XrHt0GQQ8UM+2z+DexheHZDG/qILpP4uI3Gkj8ER9z+yR2eGePoLh97WKCf09F/VqRL6Df9OJvPGw/R4rvbtTK85hXv7IxlPlx496/V4nokJumT3Ixb6j932vz1G4d3Jmeq8euvbpS5js6Ikq2p6XEFgAJUUODdmzp5ESch53vMzcV4P7Xsph/qtYLBls68B2b0xtyXusd0RfFTN7u5Ht9tsMki6SJbUEye+uxN2jdb/OjMDGpvpZFO0oozK5NnDNQFyOpafZICGA==\" }";
+ JSONObject json = JSON.parseObject(str);
+
+ String signature = json.getString("signature");
+ String content = json.getString("content");
+ //瑙ｅ瘑
+ byte[] bb = PlutusFactory.decrypt(Base64.decode(content), "5475734f75736368496d565678494a6b");
+ //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
+ String paramOut = new String(bb);
+ System.out.println(paramOut);
}
--
Gitblit v1.8.0