diff --git a/docs/rental/topup-payment.md b/docs/rental/topup-payment.md new file mode 100644 index 0000000..89ae777 --- /dev/null +++ b/docs/rental/topup-payment.md @@ -0,0 +1,75 @@ +# 租赁资金账户在线充值 + +资金账户详情页新增「在线充值」和充值记录。用户只需选择账户网络、填写 USDT 金额,不需要输入支付 API 凭证。NILE 测试资产与主网资产严格隔离,充值不会跨网络增加余额。 + +## 部署与数据库 + +1. 支付服务数据库执行 `sql/payment_topup_upgrade.sql`,为 `orders` 增加 `payment_network`。此列是新版支付实体必需字段,即使暂不启用在线充值也须执行。脚本为一次性迁移,重复执行前先检查字段。 +2. 租赁服务数据库执行 `sql/rent_topup_init.sql`,新增 `rent_topup_order` 与 `rent_topup_notify`,不删除历史表或数据。 +3. 同步部署新版支付后端、租赁后端和前端。两套后端可以部署在同一个应用实例,也可以独立部署。 +4. 在支付平台创建应用及有效 API 凭证,准备该应用对应的 RSA 公钥文件,确保支付钱包池有可分配地址,并将 `payment.checkout-url` 设置为真实 HTTPS 收银台地址。 + +`rent_topup_order` 保存用户、账户、网络、请求幂等号、支付单号、金额、收款地址、支付通道公钥快照、状态、补偿租约和最终链上事件。`rent_topup_notify` 保存已经通过 RSA 验签的通知摘要和事件,不保存 Secret、私钥或原始签名。余额与流水继续复用 `rent_account`、`rent_ledger`。 + +## application-rental.yml 配置 + +配置位于 `rental.payment`,默认关闭。以下是环境变量示例,替换域名和凭证后再启用: + +```properties +RENT_PAYMENT_ENABLED=true +RENT_PAYMENT_NILE_ENABLED=true +RENT_PAYMENT_NILE_BASE_URL=https://pay.example.com +RENT_PAYMENT_NILE_API_KEY=<支付应用API_KEY> +RENT_PAYMENT_NILE_API_SECRET=<支付应用API_SECRET> +RENT_PAYMENT_NILE_PUBLIC_KEY=file:/opt/ruoyi/keys/nile-payment-public.pem +RENT_PAYMENT_NILE_NOTIFY_URL=https://rent.example.com/api/rental/payment/notify/NILE +RENT_PAYMENT_NILE_MIN_AMOUNT=1.00 +RENT_PAYMENT_NILE_MAX_AMOUNT=10000.00 + +RENT_PAYMENT_MAINNET_ENABLED=false +RENT_PAYMENT_MAINNET_BASE_URL=https://pay.example.com +RENT_PAYMENT_MAINNET_API_KEY=<主网支付应用API_KEY> +RENT_PAYMENT_MAINNET_API_SECRET=<主网支付应用API_SECRET> +RENT_PAYMENT_MAINNET_PUBLIC_KEY=file:/opt/ruoyi/keys/mainnet-payment-public.pem +RENT_PAYMENT_MAINNET_NOTIFY_URL=https://rent.example.com/api/rental/payment/notify/MAINNET +RENT_PAYMENT_MAINNET_MIN_AMOUNT=1.00 +RENT_PAYMENT_MAINNET_MAX_AMOUNT=10000.00 +``` + +`BASE_URL` 是外部可访问的后端基地址,适配器追加 `/api/v1/order/create-transaction` 和 `/api/v1/order/query`。如果反向代理有路径前缀,基地址需要包含此前缀。`NOTIFY_URL` 必须是支付服务能访问的完整 HTTPS 地址,通道名使用大写。RSA 公钥不是 TLS 证书,也不是租赁应用凭证;应使用支付应用配置中对应的公钥。自签 TLS 证书需要导入运行租赁服务的 JVM 信任库,不能通过关闭证书验证处理。 + +可选超时配置:`RENT_PAYMENT_CONNECT_TIMEOUT_MS=5000`、`RENT_PAYMENT_READ_TIMEOUT_MS=15000`、`RENT_PAYMENT_RECONCILE_MS=15000`。单次支付 HTTP 总时限为 30 秒。后台核对需要现有 `rental.rpc` 正常可用及对应网络的 USDT 合约配置。 + +在途订单保存 API Key、公钥、基地址快照,但不保存 API Secret。存在未完成充值时应保持对应通道旧凭证有效;本实现不支持通过覆盖配置无缝轮换在途 Secret,应先完成在途核对再轮换。停止某网络通道也会暂停该网络的支付查询。 + +## 业务流程与资金安全 + +1. 登录用户创建充值,服务端校验账户归属、ACTIVE 状态、网络、金额上下限和最多两位小数;以 `user_id + client_request_no` 幂等落库。 +2. 在数据库事务外调用项目支付加密协议,明文业务参数包含 `network=NILE/MAINNET`、`amount_currency=USDT`,避免充值金额被业务币汇率转换。未传币种的原支付客户端继续使用原汇率逻辑。 +3. 展示真实支付地址、准确金额、二维码、倒计时和收银台链接。每笔充值使用 `rent:<充值单号>` 支付用户标识,隔离支付金额槽位;因此需要持续补充或维护支付钱包池容量。 +4. 支付通知必须通过 `X-Payment-Api-Key` 和 `X-Payment-Rsa-Signature` 验证,仅保存通知收件箱并返回纯文本 `ok`,不会直接修改余额。通知缺失时后台主动查单仍可完成充值。 +5. 后台比较支付查询结果的订单号、交易号、网络、地址和金额,随后独立核验对应网络的已确认 USDT Transfer 日志、时间窗口、金额、收款人和交易执行结果。仅链上核验成功才可入账。 +6. 同一事务内锁定充值单及资金账户,写入 TOPUP 流水、增加可用余额、标记 CREDITED。人工和自动充值共享 `TOPUP:::` 幂等键,避免重复入账。多实例补偿使用数据库租约与所有者校验,过期任务不能回写终态。 + +支付新订单保存网络快照,扫描按订单网络选择节点;历史 NULL 网络订单继续使用原全局网络配置。历史 NULL 数据不能凭猜测批量回填。 + +## 接口与状态 + +登录接口复用 `rent:portal:view` 权限,不新增菜单: + +| 方法 | 路径 | 用途 | +| --- | --- | --- | +| POST | `/rental/topup/create` | 请求体:`network`、字符串 `amount`、唯一 `client_request_no` | +| GET | `/rental/topup/list?network=NILE&page=1` | 当前用户指定网络记录,每页 20 条 | +| GET | `/rental/topup/{topup_no}` | 当前用户充值详情 | +| POST | `/api/rental/payment/notify/{channel}` | 支付 RSA 通知,channel 为 NILE 或 MAINNET | + +支付查单接口增加 `network`、`payment_address`、`payment_amount`、`expiration_time` 字段,保留原有响应字段。创建接口新增可选 `network`、`amount_currency=USDT` 参数,所有参数仍须进入 SecureClient 加密与认证。 + +状态流转:CREATING → WAITING_PAYMENT → VERIFYING → CREDITED。创建响应不确定进入 CREATE_UNKNOWN 并使用原单号重试;支付端明确过期进入 EXPIRED。订单数据不一致、账户冻结、转账已通过其他入口入账进入 MANUAL_REVIEW。暂时网络异常和链上确认不足继续后台补偿,不生成新支付订单。浏览器关闭不影响后台核对。 + +运维可以在数据库只读检查 `topup_no/status/query_attempts/last_error/next_query_at`、支付订单及 TOPUP 流水。MANUAL_REVIEW 为人工处理终态,当前没有专用人工审核页面;不得直接改余额或删除幂等流水。确认原因并完成业务审核后,由受控运维流程恢复核对或按既有人工充值流程处理,恢复前须核对原链上事件是否已入账。 + +## 验证范围 + +隔离测试使用 H2 事务和可控支付/链上适配器,覆盖通知验签、重复请求、超时补偿、双网络金额核对、冻结账户、共享幂等键、并发补偿及租约接管。测试不会访问真实支付账户、修改线上数据库或广播交易。上线前仍需在 NILE 配置真实支付通道完成端到端验收。 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/task/TronPaymentTask.java b/ruoyi-admin/src/main/java/com/ruoyi/task/TronPaymentTask.java index eda60e3..e63da30 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/task/TronPaymentTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/task/TronPaymentTask.java @@ -40,12 +40,12 @@ public class TronPaymentTask { @Scheduled(fixedDelay = 10000L) public void scan() { - ITronService tron; + ITronService tron = null; try { tron = tronServiceProvider.getCurrentService(); } catch (RuntimeException e) { - log.warn("无法读取 TRON 全局网络配置,跳过本轮支付扫描:{}", e.getMessage()); - return; + log.warn("无法读取 TRON 全局网络配置,仅跳过未保存网络的历史订单扫描:{}", e.getMessage()); + // 新订单自带网络,不因旧全局配置缺失阻断新支付订单。 } for (UsdtOrdersPlus order : orders.list(new LambdaQueryWrapper() .eq(UsdtOrdersPlus::getStatus, 1) @@ -53,8 +53,11 @@ public class TronPaymentTask { .or().eq(UsdtOrdersPlus::getBlockTransactionId, "")))) { if (order.getToken() == null || order.getActualAmount() == null) continue; try { + ITronService orderTron = order.getPaymentNetwork() == null ? tron + : tronServiceProvider.getServiceForNetwork(order.getPaymentNetwork()); + if (orderTron == null) continue; JSONArray data = chainDataClient.queryConfirmedTrc20Transactions( - tron, order.getToken(), 200); + orderTron, order.getToken(), 200); for (int i = 0; i < data.size(); i++) { JSONObject tx = data.getJSONObject(i); if (!order.getToken().equals(tx.getString("to"))) continue; @@ -81,7 +84,7 @@ public class TronPaymentTask { } catch (Exception e) { // 单笔订单查询失败不能中断其他订单,日志中禁止输出凭证和钱包私钥。 log.error(e.getMessage(), e); - log.warn("查询 TRON 支付交易失败,订单ID={},网络={}", order.getId(), tron.type()); + log.warn("查询 TRON 支付交易失败,订单ID={},网络={}", order.getId(), order.getPaymentNetwork()); } } } diff --git a/ruoyi-admin/src/main/resources/application-rental.yml b/ruoyi-admin/src/main/resources/application-rental.yml index 364cfe6..0cbc9cb 100644 --- a/ruoyi-admin/src/main/resources/application-rental.yml +++ b/ruoyi-admin/src/main/resources/application-rental.yml @@ -5,6 +5,30 @@ rental: master-key: ${RENT_MASTER_KEY:ZA+5tLy20rbLxsMEvVm7Ow9hl2qtAPD3nmiK1Tf52NA=} master-key-version: ${RENT_MASTER_KEY_VERSION:v1} confirmations: ${RENT_CONFIRMATIONS:19} + payment: + # 新增表见sql/rent_topup_init.sql;支付库先执行sql/payment_topup_upgrade.sql。 + enabled: ${RENT_PAYMENT_ENABLED:false} + connect-timeout-ms: ${RENT_PAYMENT_CONNECT_TIMEOUT_MS:5000} + read-timeout-ms: ${RENT_PAYMENT_READ_TIMEOUT_MS:15000} + reconcile-interval-ms: ${RENT_PAYMENT_RECONCILE_MS:15000} + nile: + enabled: ${RENT_PAYMENT_NILE_ENABLED:false} + base-url: ${RENT_PAYMENT_NILE_BASE_URL:} + api-key: ${RENT_PAYMENT_NILE_API_KEY:} + api-secret: ${RENT_PAYMENT_NILE_API_SECRET:} + rsa-public-key-location: ${RENT_PAYMENT_NILE_PUBLIC_KEY:} + notify-url: ${RENT_PAYMENT_NILE_NOTIFY_URL:} + min-amount: ${RENT_PAYMENT_NILE_MIN_AMOUNT:1.00} + max-amount: ${RENT_PAYMENT_NILE_MAX_AMOUNT:10000.00} + mainnet: + enabled: ${RENT_PAYMENT_MAINNET_ENABLED:false} + base-url: ${RENT_PAYMENT_MAINNET_BASE_URL:} + api-key: ${RENT_PAYMENT_MAINNET_API_KEY:} + api-secret: ${RENT_PAYMENT_MAINNET_API_SECRET:} + rsa-public-key-location: ${RENT_PAYMENT_MAINNET_PUBLIC_KEY:} + notify-url: ${RENT_PAYMENT_MAINNET_NOTIFY_URL:} + min-amount: ${RENT_PAYMENT_MAINNET_MIN_AMOUNT:1.00} + max-amount: ${RENT_PAYMENT_MAINNET_MAX_AMOUNT:10000.00} rpc: nile: ${RENT_NILE_RPC:https://nile.trongrid.io} mainnet: ${RENT_MAINNET_RPC:https://api.trongrid.io} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index e239b77..fff7dc9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -141,6 +141,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/system/config/setVerifyStatus").permitAll() .antMatchers("/api/v1/wallet/**").permitAll() .antMatchers("/api/v1/order/**").permitAll() + .antMatchers(HttpMethod.POST, "/api/rental/payment/notify/*").permitAll() .antMatchers("/api/v1/payout/**").permitAll() // 租赁商户及节点另用四域HMAC认证;绝不共用支付MD5签名。 .antMatchers("/api/rental/v1/**", "/node/v1/socket").permitAll() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PaymentApiController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/PaymentApiController.java index d118242..1e922d1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/PaymentApiController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/PaymentApiController.java @@ -53,6 +53,10 @@ public class PaymentApiController { result.put("trade_id", order.getTradeId()); result.put("status", order.getStatus()); result.put("transaction_id", order.getBlockTransactionId()); + result.put("network", order.getPaymentNetwork()); + result.put("payment_amount", order.getActualAmount()); + result.put("payment_address", order.getToken()); + result.put("expiration_time", order.getCreatedAt().getTime() + 600000L); if (Long.valueOf(2L).equals(order.getStatus())) { result.put("signed_redirect_url", paymentRedirectService.buildSignedRedirectUrl(order, request.getApiKey())); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java index a8924f9..faa1e1c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtOrdersPlus.java @@ -27,6 +27,10 @@ public class UsdtOrdersPlus implements Serializable /** 主键 */ @TableId(type = IdType.INPUT) private Long id; + /** 支付创建时锁定网络;历史NULL订单兼容全局网络。 */ + private String paymentNetwork; + public String getPaymentNetwork() { return paymentNetwork; } + public void setPaymentNetwork(String paymentNetwork) { this.paymentNetwork = paymentNetwork; } /** 订单号 */ @Excel(name = "订单号") private String tradeId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PaymentOrderCreateResult.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PaymentOrderCreateResult.java index 3e41c26..271443a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PaymentOrderCreateResult.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/PaymentOrderCreateResult.java @@ -15,6 +15,7 @@ public class PaymentOrderCreateResult { @JsonProperty("payment_amount") private BigDecimal paymentAmount; @JsonProperty("expiration_time") + @com.fasterxml.jackson.annotation.JsonFormat(shape = com.fasterxml.jackson.annotation.JsonFormat.Shape.NUMBER) private Date expirationTime; /** 商户可引导用户访问的公共收银台地址。 */ private String url; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java index 7cadcbd..2dc0e11 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalChain.java @@ -298,6 +298,34 @@ public class RentalChain { return ApiWrapper.toHex(ApiWrapper.parseAddress(address)); } + /** 自动充值定位唯一匹配日志;不信任支付平台传入的日志索引,兼用人工充值去重键。 */ + public Map paymentTransfer(String network, String txId, String address, + BigDecimal expected, long createdAt, long expiresAt) { + require(txId.matches("[0-9a-fA-F]{64}"), "支付交易哈希无效"); + JsonNode receipt = call(network, "/walletsolidity/gettransactioninfobyid", map("value", txId)); + long timestamp = receipt.path("blockTimeStamp").asLong(-1); + require(timestamp >= createdAt - 5000 && timestamp <= expiresAt, "支付交易不在订单有效期内"); + JsonNode logs = receipt.path("log"); + require(logs.isArray() && logs.size() <= 512, "支付交易日志缺失或过多"); + int selected = -1; + String contract = hexAddress(tronServices.getServiceForNetwork(network).contractAddress()).substring(2); + for (int index = 0; index < logs.size(); index++) { + JsonNode entry = logs.get(index); + if (contract.equalsIgnoreCase(entry.path("address").asText()) + && entry.path("topics").size() == 3 + && "ddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef".equalsIgnoreCase(entry.path("topics").get(0).asText()) + && entry.path("topics").get(2).asText().toLowerCase(Locale.ROOT).endsWith(hexAddress(address).substring(2).toLowerCase(Locale.ROOT)) + && new BigDecimal(new java.math.BigInteger(entry.path("data").asText(), 16)).movePointLeft(6).compareTo(expected) == 0) { + require(selected < 0, "同交易存在多笔匹配充值,需要人工核对"); + selected = index; + } + } + require(selected >= 0, "未找到匹配的USDT充值日志"); + Map result = transfer(network, txId, selected, address, expected); + result.put("log_index", selected); + return result; + } + /** * 人工充值/付款依据必须由配置网络的USDT Transfer日志独立核对。 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentClient.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentClient.java new file mode 100644 index 0000000..5d51c88 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentClient.java @@ -0,0 +1,80 @@ +package com.ruoyi.system.rental; + +import static com.ruoyi.system.rental.RentalValues.*; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.ruoyi.system.security.RsaKeyUtil; +import com.ruoyi.system.security.SecureClient; +import okhttp3.*; +import org.springframework.core.io.ResourceLoader; +import org.springframework.stereotype.Component; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.security.Signature; +import java.util.Base64; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import com.ruoyi.system.service.PaymentSignatureService; + +/** 支付HTTP适配器:复用项目混合加密SDK;不允许重定向携带支付认证材料。 */ +@Component +public class RentalPaymentClient { + private final ObjectMapper json; + private final RentalPaymentProperties properties; + private final ResourceLoader resources; + public RentalPaymentClient(ObjectMapper json, RentalPaymentProperties properties, ResourceLoader resources) { + this.json = json.copy().enable(com.fasterxml.jackson.databind.DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS); + this.properties = properties; + this.resources = resources; + } + public String publicKey(RentalPaymentProperties.Channel channel) throws Exception { + try (InputStream input = resources.getResource(channel.getRsaPublicKeyLocation()).getInputStream()) { + java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int size; + while ((size = input.read(buffer)) != -1) { + require(output.size() + size <= 16384, "支付公钥文件过大"); + output.write(buffer, 0, size); + } + String pem = new String(output.toByteArray(), StandardCharsets.UTF_8); + RsaKeyUtil.loadPublicKey(pem); + return pem; + } + } + public Map call(Map order, String operation) throws Exception { + RentalPaymentProperties.Channel channel = properties.channel(text(order, "network")); + require(properties.isEnabled() && channel.isEnabled(), "支付充值尚未启用"); + require(channel.getApiKey().equals(text(order, "payment_api_key")) + && !channel.getApiSecret().isEmpty(), "在途充值凭证已变化,请保留旧通道配置后核对"); + Map parameters = map("order_id", text(order, "topup_no")); + if ("create-transaction".equals(operation)) { + parameters.putAll(map("amount", amount(order, "requested_amount").setScale(2).toPlainString(), + "amount_currency", "USDT", "network", text(order, "network"), + "walletUserName", "rent:" + text(order, "topup_no"), "notify_url", text(order, "notify_url"))); + } + Object encrypted = SecureClient.encrypt(text(order, "payment_api_key"), channel.getApiSecret(), + RsaKeyUtil.loadPublicKey(text(order, "payment_public_key")), parameters); + OkHttpClient client = new OkHttpClient.Builder() + .connectTimeout(properties.getConnectTimeoutMs(), TimeUnit.MILLISECONDS) + .readTimeout(properties.getReadTimeoutMs(), TimeUnit.MILLISECONDS) + .callTimeout(30, TimeUnit.SECONDS).followRedirects(false).followSslRedirects(false) + .retryOnConnectionFailure(false).build(); + Request request = new Request.Builder().url(text(order, "payment_base_url") + "/api/v1/order/" + operation) + .post(RequestBody.create(MediaType.parse("application/json"), json.writeValueAsString(encrypted))).build(); + try (Response response = client.newCall(request).execute()) { + Map result = json.readValue(RentalHttp.body(response), new TypeReference>() { }); + require(number(result, "code") == 200 && result.get("data") instanceof Map, "支付请求未成功,请稍后核对"); + return (Map) result.get("data"); + } + } + /** RSA验签使用项目既有参数规范化规则,不使用租赁HMAC或浏览器跳转结果。 */ + public boolean verify(Map order, Map payload, String key, String signature) { + try { + if (!text(order, "payment_api_key").equals(key) || signature == null) return false; + Signature verifier = Signature.getInstance("SHA256withRSA"); + verifier.initVerify(RsaKeyUtil.loadPublicKey(text(order, "payment_public_key"))); + verifier.update(PaymentSignatureService.canonicalText(payload).getBytes(StandardCharsets.UTF_8)); + return verifier.verify(Base64.getDecoder().decode(signature)); + } catch (Exception exception) { return false; } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentProperties.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentProperties.java new file mode 100644 index 0000000..2a19336 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalPaymentProperties.java @@ -0,0 +1,58 @@ +package com.ruoyi.system.rental; + +import java.math.BigDecimal; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** 支付通道配置只保存在服务器;禁止输出配置对象或向浏览器返回凭证。 */ +@Component +@ConfigurationProperties(prefix = "rental.payment") +public class RentalPaymentProperties { + private boolean enabled; + private int connectTimeoutMs = 5000; + private int readTimeoutMs = 15000; + private Channel nile = new Channel(); + private Channel mainnet = new Channel(); + public boolean isEnabled() { return enabled; } + public void setEnabled(boolean value) { enabled = value; } + public int getConnectTimeoutMs() { return connectTimeoutMs; } + public void setConnectTimeoutMs(int value) { connectTimeoutMs = value; } + public int getReadTimeoutMs() { return readTimeoutMs; } + public void setReadTimeoutMs(int value) { readTimeoutMs = value; } + public Channel getNile() { return nile; } + public void setNile(Channel value) { nile = value; } + public Channel getMainnet() { return mainnet; } + public void setMainnet(Channel value) { mainnet = value; } + public Channel channel(String network) { + RentalValues.network(network); + return "NILE".equals(network) ? nile : mainnet; + } + + /** 每个网络独立启用;支付应用公钥以Spring Resource路径从外部文件加载。 */ + public static class Channel { + private boolean enabled; + private String baseUrl = ""; + private String apiKey = ""; + private String apiSecret = ""; + private String rsaPublicKeyLocation = ""; + private String notifyUrl = ""; + private BigDecimal minAmount = new BigDecimal("1.00"); + private BigDecimal maxAmount = new BigDecimal("10000.00"); + public boolean isEnabled() { return enabled; } + public void setEnabled(boolean value) { enabled = value; } + public String getBaseUrl() { return baseUrl; } + public void setBaseUrl(String value) { baseUrl = value; } + public String getApiKey() { return apiKey; } + public void setApiKey(String value) { apiKey = value; } + public String getApiSecret() { return apiSecret; } + public void setApiSecret(String value) { apiSecret = value; } + public String getRsaPublicKeyLocation() { return rsaPublicKeyLocation; } + public void setRsaPublicKeyLocation(String value) { rsaPublicKeyLocation = value; } + public String getNotifyUrl() { return notifyUrl; } + public void setNotifyUrl(String value) { notifyUrl = value; } + public BigDecimal getMinAmount() { return minAmount; } + public void setMinAmount(BigDecimal value) { minAmount = value; } + public BigDecimal getMaxAmount() { return maxAmount; } + public void setMaxAmount(BigDecimal value) { maxAmount = value; } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java index 7dcf333..20659cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalQueries.java @@ -89,6 +89,10 @@ public class RentalQueries { args.toArray()); for (Map row : rows) { row.remove("api_secret"); + row.remove("payment_api_key"); + row.remove("payment_public_key"); + row.remove("payment_base_url"); + row.remove("lease_token"); row.remove("ownership_signature"); row.remove("ownership_challenge"); row.remove("ownership_message"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalStore.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalStore.java index 41dbdca..2cebd9a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalStore.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalStore.java @@ -25,6 +25,7 @@ public class RentalStore { "package", "user_package", "account", + "topup_order", "order", "task", "transaction", diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopupController.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopupController.java new file mode 100644 index 0000000..be4d582 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopupController.java @@ -0,0 +1,69 @@ +package com.ruoyi.system.rental; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +/** + * 本人充值入口与支付通知入口分离;通知仅按支付应用RSA公钥认证。 + */ +@RestController +public class RentalTopupController { + private final RentalTopups topups; + private final ObjectMapper json; + + public RentalTopupController(RentalTopups topups, ObjectMapper json) { + this.topups = topups; + this.json = json; + } + + @PostMapping("/rental/topup/create") + @PreAuthorize("@ss.hasPermi('rent:portal:view')") + public AjaxResult create(@RequestBody Map body) throws Exception { + return AjaxResult.success(topups.create(SecurityUtils.getUserId(), body)); + } + + @GetMapping("/rental/topup/list") + @PreAuthorize("@ss.hasPermi('rent:portal:view')") + public AjaxResult list(@RequestParam String network, @RequestParam(defaultValue = "1") int page) { + return AjaxResult.success(topups.list(SecurityUtils.getUserId(), network, page)); + } + + @GetMapping("/rental/topup/{no}") + @PreAuthorize("@ss.hasPermi('rent:portal:view')") + public AjaxResult detail(@PathVariable String no) { + return AjaxResult.success(topups.detail(SecurityUtils.getUserId(), no)); + } + + @PostMapping(value = "/api/rental/payment/notify/{channel}", consumes = "application/json", produces = "text/plain") + public ResponseEntity notify(@PathVariable String channel, HttpServletRequest request) { + try { + // 只读取一次流,兼容RuoYi可重复读取包装器,512KiB原始字节上限。 + java.io.InputStream input = request.getInputStream(); + java.io.ByteArrayOutputStream output = new java.io.ByteArrayOutputStream(); + byte[] buffer = new byte[4096]; + int count; + while ((count = input.read(buffer)) != -1) { + RentalValues.require(output.size() + count <= RentalJson.MAX_HTTP_BODY_BYTES, "支付通知过大"); + output.write(buffer, 0, count); + } + String body = java.nio.charset.StandardCharsets.UTF_8.newDecoder() + .onMalformedInput(java.nio.charset.CodingErrorAction.REPORT) + .decode(java.nio.ByteBuffer.wrap(output.toByteArray())).toString(); + RentalJson.bounded(body, RentalJson.MAX_HTTP_BODY_BYTES); + Map payload = json.readValue(body, new TypeReference>() { + }); + topups.notify(channel, payload, request.getHeader("X-Payment-Api-Key"), request.getHeader("X-Payment-Rsa-Signature")); + return ResponseEntity.ok("ok"); + } catch (Exception exception) { + return ResponseEntity.status(400).body("invalid notification"); + } + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopups.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopups.java new file mode 100644 index 0000000..f9ec8bc --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalTopups.java @@ -0,0 +1,248 @@ +package com.ruoyi.system.rental; + +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.support.TransactionTemplate; + +import java.math.BigDecimal; +import java.net.URI; +import java.util.*; + +import static com.ruoyi.system.rental.RentalValues.*; + +/** + * 充值编排:本地单先落库,外部HTTP/RPC均在事务外,账务与终态同事务。 + * 数据库租约防止多实例同时执行;HTTP超时用原单号重试,绝不生成替代支付单。 + */ +@Service +public class RentalTopups { + private final RentalStore store; + private final RentalFunds funds; + private final RentalChain chain; + private final RentalPaymentProperties config; + private final RentalPaymentClient payment; + private final TransactionTemplate tx; + + public RentalTopups(RentalStore store, RentalFunds funds, RentalChain chain, + RentalPaymentProperties config, RentalPaymentClient payment, PlatformTransactionManager manager) { + this.store = store; + this.funds = funds; + this.chain = chain; + this.config = config; + this.payment = payment; + this.tx = new TransactionTemplate(manager); + } + + public Map create(long user, Map request) throws Exception { + String network = network(input(request, "network", 16)); + String clientNo = input(request, "client_request_no", 64); + BigDecimal value = money(request.get("amount")); + require(value.signum() > 0 && value.stripTrailingZeros().scale() <= 2, "充值金额必须为正数且最多两位小数"); + RentalPaymentProperties.Channel channel = config.channel(network); + require(config.isEnabled() && channel.isEnabled(), "该网络暂未启用在线充值"); + require(value.compareTo(channel.getMinAmount()) >= 0 && value.compareTo(channel.getMaxAmount()) <= 0, + "充值金额超出通道允许范围"); + URI base = URI.create(channel.getBaseUrl()); + URI notify = URI.create(channel.getNotifyUrl()); + require("https".equalsIgnoreCase(base.getScheme()) && base.getHost() != null + && base.getUserInfo() == null && base.getQuery() == null && base.getFragment() == null, + "支付服务必须配置合法HTTPS基地址"); + require("https".equalsIgnoreCase(notify.getScheme()) && notify.getHost() != null + && notify.getUserInfo() == null && notify.getQuery() == null && notify.getFragment() == null + && channel.getNotifyUrl().length() <= 128, "支付回调地址配置无效"); + require(!channel.getApiKey().isEmpty() && !channel.getApiSecret().isEmpty(), "支付通道缺少应用凭证"); + String pem = payment.publicKey(channel); + Map saved = tx.execute(status -> { + Map account = store.one("SELECT * FROM rent_account WHERE user_id=? AND network=? FOR UPDATE", user, network); + require(account != null && "ACTIVE".equals(text(account, "status")), "请先开通正常的网络资金账户"); + Map existing = store.one("SELECT * FROM rent_topup_order WHERE user_id=? AND client_request_no=?", user, clientNo); + if (existing != null) { + require(network.equals(text(existing, "network")) && amount(existing, "requested_amount").compareTo(value) == 0, + "相同充值请求号的网络或金额不一致"); + return existing; + } + long id = store.insert("topup_order", map("topup_no", UUID.randomUUID().toString().replace("-", ""), + "user_id", user, "account_id", account.get("id"), "network", network, "client_request_no", clientNo, + "requested_amount", value, "payment_channel", network, "payment_api_key", channel.getApiKey(), + "payment_public_key", pem, "payment_base_url", channel.getBaseUrl().replaceAll("/+$", ""), + "notify_url", channel.getNotifyUrl(), "status", "CREATING", "next_query_at", now())); + return store.get("topup_order", id, false); + }); + reconcile(number(saved, "id")); + return detail(user, text(saved, "topup_no")); + } + + public Map detail(long user, String no) { + Map row = store.one("SELECT * FROM rent_topup_order WHERE user_id=? AND topup_no=?", user, no); + require(row != null, "充值订单不存在"); + return view(row); + } + + public List> list(long user, String network, int page) { + network(network); + require(page >= 1 && page <= 10000, "分页参数无效"); + List> result = new ArrayList<>(); + for (Map row : store.rows("SELECT * FROM rent_topup_order WHERE user_id=? AND network=? ORDER BY id DESC LIMIT 20 OFFSET ?", + user, network, (page - 1) * 20)) + result.add(view(row)); + return result; + } + + private Map view(Map row) { + // 明确响应白名单,不把支付凭证、回调地址、公钥或内部错误发送给浏览器。 + Map result = new LinkedHashMap<>(); + for (String key : Arrays.asList("topup_no", "network", "requested_amount", "payment_amount", "credited_amount", + "payment_address", "checkout_url", "status", "transaction_id")) + result.put(key, row.get(key)); + for (String key : Arrays.asList("expires_at", "created_at", "credited_at")) { + result.put(key, row.get(key) == null ? null : time(row.get(key)).toEpochMilli()); + } + return result; + } + + /** + * 只有验签后才持久化收件箱;支付通知不直接更改余额。 + */ + public void notify(String channel, Map payload, String key, String signature) { + network(channel); + String no = input(payload, "order_id", 32); + tx.execute(status -> { + Map order = store.one("SELECT * FROM rent_topup_order WHERE topup_no=? FOR UPDATE", no); + require(order != null && channel.equals(text(order, "network")), "通知订单或通道不匹配"); + require(payment.verify(order, payload, key, signature), "支付通知认证失败"); + String trade = input(payload, "trade_id", 64); + require(text(order, "payment_trade_id").isEmpty() || trade.equals(text(order, "payment_trade_id")), "通知交易号不符"); + require(number(payload, "status") == 2 && text(payload, "transaction_id").matches("[0-9a-fA-F]{64}"), "通知支付结果无效"); + String hash = RentalCrypto.sha256(com.ruoyi.system.service.PaymentSignatureService.canonicalText(payload)); + if (store.one("SELECT id FROM rent_topup_notify WHERE notification_hash=?", hash) == null) { + store.execute("INSERT INTO rent_topup_notify(notification_hash,topup_no,payment_trade_id,transaction_id,payment_status,status,created_at,updated_at) VALUES(?,?,?,?,2,'PENDING',?,?)", + hash, no, trade, text(payload, "transaction_id"), now(), now()); + } + return null; + }); + } + + @Scheduled(fixedDelayString = "${rental.payment.reconcile-interval-ms:15000}") + public void tick() { + if (!config.isEnabled()) return; + for (Map row : store.rows("SELECT id FROM rent_topup_order WHERE status IN ('CREATING','CREATE_UNKNOWN','WAITING_PAYMENT','VERIFYING') AND next_query_at<=? ORDER BY next_query_at LIMIT 20", now())) { + reconcile(number(row, "id")); + } + } + + public void reconcile(long id) { + // 一个HTTP请求最多30秒,租约180秒覆盖创建/查询及有界链上核验。 + String lease = UUID.randomUUID().toString().replace("-", ""); + if (store.execute("UPDATE rent_topup_order SET lease_token=?,next_query_at=?,query_attempts=query_attempts+1 WHERE id=? AND next_query_at<=? AND status IN ('CREATING','CREATE_UNKNOWN','WAITING_PAYMENT','VERIFYING')", + lease, after(180), id, now()) != 1) return; + try { + Map order = store.get("topup_order", id, false); + if (text(order, "payment_trade_id").isEmpty()) { + Map created = payment.call(order, "create-transaction"); + require(text(order, "topup_no").equals(text(created, "order_id")), "支付订单号不符"); + require(amount(created, "payment_amount").compareTo(amount(order, "requested_amount")) == 0, "支付实际金额不符"); + RentalOrders.address(input(created, "payment_address", 64)); + Object expiration = created.get("expiration_time"); + Date expires = new com.fasterxml.jackson.databind.ObjectMapper().convertValue(expiration, Date.class); + require(expires != null, "支付有效期缺失"); + String checkout = input(created, "url", 1024); + URI checkoutUri = URI.create(checkout); + require("https".equalsIgnoreCase(checkoutUri.getScheme()) && checkoutUri.getHost() != null + && checkoutUri.getUserInfo() == null, "支付收银台需使用HTTPS"); + tx.execute(status -> { + updateOwned(id, lease, map("payment_trade_id", input(created, "trade_id", 64), + "payment_address", text(created, "payment_address"), "payment_amount", amount(created, "payment_amount"), + "checkout_url", checkout, "expires_at", java.time.LocalDateTime.ofInstant(expires.toInstant(), java.time.ZoneOffset.UTC), + "status", "WAITING_PAYMENT")); + return null; + }); + order = store.get("topup_order", id, false); + } + Map result = payment.call(order, "query"); + if (!text(order, "topup_no").equals(text(result, "order_id")) + || !text(order, "payment_trade_id").equals(text(result, "trade_id")) + || !text(order, "network").equals(text(result, "network")) + || !text(order, "payment_address").equals(text(result, "payment_address")) + || amount(order, "payment_amount").compareTo(amount(result, "payment_amount")) != 0) { + updateOwned(id, lease, map("status", "MANUAL_REVIEW", "last_error", "支付订单的网络、金额、地址或交易号不一致")); + return; + } + if (number(result, "status") == 3) { + updateOwned(id, lease, map("status", "EXPIRED", "last_error", null)); + return; + } + if (number(result, "status") != 2) { + updateOwned(id, lease, map("status", "WAITING_PAYMENT", "next_query_at", after(15), "last_error", null)); + return; + } + updateOwned(id, lease, map("status", "VERIFYING")); + String txId = input(result, "transaction_id", 64); + Map proof = chain.paymentTransfer(text(order, "network"), txId, + text(order, "payment_address"), amount(order, "payment_amount"), time(order.get("created_at")).toEpochMilli(), + time(order.get("expires_at")).toEpochMilli()); + tx.execute(status -> { + Map current = store.get("topup_order", id, true); + require(lease.equals(text(current, "lease_token")), "充值核对租约已被接管"); + credit(id, txId, proof); + return null; + }); + } catch (Exception exception) { + // 不输出支付响应、配置、签名或异常原文;保留原单号用于后台补偿。 + Map row = store.get("topup_order", id, false); + if (!Arrays.asList("CREDITED", "MANUAL_REVIEW", "EXPIRED").contains(text(row, "status"))) { + updateOwned(id, lease, map("status", text(row, "payment_trade_id").isEmpty() ? "CREATE_UNKNOWN" : "VERIFYING", + "next_query_at", after(60), "last_error", "支付或链上核验暂未完成,后台将使用原单号继续核对")); + } + } + } + + /** + * 行锁内核对租约,防止多实例接管后,过期任务覆盖新状态或已入账终态。 + */ + private void updateOwned(long id, String lease, Map values) { + tx.execute(status -> { + Map current = store.get("topup_order", id, true); + if (lease.equals(text(current, "lease_token")) + && !Arrays.asList("CREDITED", "MANUAL_REVIEW", "EXPIRED").contains(text(current, "status"))) { + store.update("topup_order", id, values); + } + return null; + }); + } + + /** + * 终态、余额与不可变流水原子提交,复用人工充值的链上事件幂等键。 + */ + public void credit(long id, String txId, Map proof) { + tx.execute(status -> { + Map row = store.get("topup_order", id, true); + if ("CREDITED".equals(text(row, "status"))) return null; + require("VERIFYING".equals(text(row, "status")), "充值单状态不可入账"); + Map account = store.get("account", number(row, "account_id"), true); + if (!"ACTIVE".equals(text(account, "status"))) { + manual(id, "账户已冻结,请人工核对已付款充值"); + return null; + } + require(number(account, "user_id") == number(row, "user_id") && text(account, "network").equals(text(row, "network")), "充值账户归属不符"); + String reference = text(proof, "reference"); + require(reference.equals(text(row, "network") + ":" + txId.toLowerCase(Locale.ROOT) + ":" + number(proof, "log_index")), "充值证明引用不符"); + Map used = store.one("SELECT * FROM rent_ledger WHERE business_key=?", "TOPUP:" + reference); + if (used != null) { + manual(id, "该链上转账已入账,请人工核对原充值记录"); + return null; + } + BigDecimal value = amount(row, "payment_amount"); + funds.post(number(row, "account_id"), "TOPUP:" + reference, "TOPUP", value, ZERO, ZERO, ZERO, + null, null, null, 0, reference, "支付接口充值 " + text(row, "topup_no")); + store.update("topup_order", id, map("status", "CREDITED", "credited_amount", value, "credited_at", now(), + "transaction_id", txId.toLowerCase(Locale.ROOT), "log_index", number(proof, "log_index"), "last_error", null)); + store.execute("UPDATE rent_topup_notify SET status='DONE',updated_at=? WHERE topup_no=?", now(), text(row, "topup_no")); + return null; + }); + } + + private void manual(long id, String reason) { + store.update("topup_order", id, map("status", "MANUAL_REVIEW", "last_error", reason)); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java index 3638656..dca3587 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/PaymentOrderOpenApiService.java @@ -41,7 +41,7 @@ import java.util.regex.Pattern; public class PaymentOrderOpenApiService { private static final long ORDER_TTL_MILLIS = 10L * 60L * 1000L; private static final Pattern PARAMETER_PATTERN = Pattern.compile( - "(?:^|&)(amount|notify_url|order_id|redirect_url|walletUserName)="); + "(?:^|&)(amount|notify_url|order_id|redirect_url|walletUserName|network|amount_currency)="); private static final List REQUIRED_PARAMETERS = Arrays.asList( "amount", "notify_url", "order_id", "walletUserName"); private static final DefaultRedisScript RELEASE_SCRIPT = new DefaultRedisScript( @@ -58,6 +58,7 @@ public class PaymentOrderOpenApiService { /** 对外创建订单成功后返回的公共收银台入口。 */ @Value("${payment.checkout-url:http://192.168.3.103/public/usdtCheckout}") private String checkoutUrl; + @Autowired private TronServiceProvider tronServiceProvider; @Transactional(rollbackFor = Exception.class) public PaymentOrderCreateResult createOrder(DecryptResult request) { @@ -67,7 +68,12 @@ public class PaymentOrderOpenApiService { String notifyUrl = required(parameters, "notify_url"); String redirectUrl = trimToNull(parameters.get("redirect_url")); BigDecimal amount = parseAmount(required(parameters, "amount")); - BigDecimal actualAmount = convertToUsdt(amount); + boolean usdt = "USDT".equals(parameters.get("amount_currency")); + if (parameters.containsKey("amount_currency") && !usdt) throw new CustomException("不支持的金额币种"); + BigDecimal actualAmount = usdt ? amount.setScale(2, RoundingMode.UNNECESSARY) : convertToUsdt(amount); + String network = parameters.get("network"); + if (network == null) network = "nile".equals(tronServiceProvider.getCurrentService().type()) ? "NILE" : "MAINNET"; + if (!("NILE".equals(network) || "MAINNET".equals(network))) throw new CustomException("支付网络无效"); validate(orderId, walletUserName, notifyUrl, redirectUrl); // 锁定应用,使同一应用下的钱包领取和商户订单幂等检查串行执行。 @@ -82,6 +88,12 @@ public class PaymentOrderOpenApiService { if (!Objects.equals(existingOrder.getAppId(), request.getAppId())) { throw new CustomException("商户订单号已存在"); } + if (existingOrder.getActualAmount().compareTo(actualAmount) != 0 + || (existingOrder.getPaymentNetwork() != null && !Objects.equals(existingOrder.getPaymentNetwork(), network)) + || !Objects.equals(existingOrder.getWalletUserName(), walletUserName) + || !Objects.equals(existingOrder.getNotifyUrl(), notifyUrl)) { + throw new CustomException("同一支付单号参数不一致"); + } return result(existingOrder); } @@ -103,6 +115,7 @@ public class PaymentOrderOpenApiService { UsdtOrdersPlus order = new UsdtOrdersPlus(); order.setTradeId(tradeId); + order.setPaymentNetwork(network); order.setOrderId(orderId); order.setAmount(amount); order.setActualAmount(actualAmount); @@ -248,7 +261,7 @@ public class PaymentOrderOpenApiService { throw new CustomException("业务参数不能重复"); } } - if (!values.keySet().containsAll(REQUIRED_PARAMETERS) || values.size() > 5) { + if (!values.keySet().containsAll(REQUIRED_PARAMETERS) || values.size() > 7) { throw new CustomException("业务参数不完整或包含不支持的参数"); } return values; diff --git a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml index 28c99e7..b35d62f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UsdtOrdersMapper.xml @@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"