diff --git a/docs/resource-rental.md b/docs/resource-rental.md index 566ce73..587a2d0 100644 --- a/docs/resource-rental.md +++ b/docs/resource-rental.md @@ -22,6 +22,8 @@ rental: ## 保存平台配置 +管理员可在 `USDTmanage/usdtConfig` 全局配置页的“资源租赁平台”页签管理连接、租赁策略与费用上限,查看当前部署启用状态和最近100条版本记录。修改保存为新版本;API Key和Secret均不回显,修改时留空沿用原凭据。新增平台/网络必须填写完整凭据。页面操作沿用 `system:usdtConfig:edit` 权限。 + 使用已登录管理员的 `system:usdtConfig:edit` 权限调用 `POST /system/chain-resources/config`。凭据为只写字段,后端加密入库;每次保存新增配置版本,原订单始终使用其 `config_id`,切换平台不会重购原单。不要把实际密钥写入文档、命令行或日志。 自有平台请求示例(占位符须在受控配置客户端中替换): diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceRentalController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceRentalController.java index 04f5259..3be6fec 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceRentalController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/ResourceRentalController.java @@ -114,13 +114,36 @@ public class ResourceRentalController { } private void requireEnabled() { if (!service.enabled()) throw new CustomException("资源租赁尚未启用"); } + /** 只返回非敏感列;即使管理员也不能读出凭据明文或密文。 */ + @PreAuthorize("@ss.hasPermi('system:usdtConfig:edit')") + @GetMapping("/config") + public AjaxResult configurations() { + Map result = new LinkedHashMap<>(); + result.put("enabled", service.enabled()); + result.put("provider", rentalProperties.getProvider()); + result.put("rows", store.jdbc().queryForList("select id,provider_code,network,base_url,energy_period,bandwidth_period,duration_seconds," + + "energy_step,bandwidth_step,max_order_cost,max_execution_cost,currency,enabled,created_at " + + "from usdt_resource_rental_config order by id desc limit 100")); + return AjaxResult.success(result); + } + + @org.springframework.beans.factory.annotation.Autowired + private ResourceRentalProperties rentalProperties; + /** 配置采用新增版本,原订单始终引用原config_id。没有日志注解,避免记录明文凭证请求。 */ @PreAuthorize("@ss.hasPermi('system:usdtConfig:edit')") @PostMapping("/config") public AjaxResult configure(@RequestBody ConfigRequest request) { + // 编辑同一平台/网络时可沿用旧密文;页面不需要、更不能获得旧凭据。 + Map previous = request.sourceId == null ? null : store.one( + "select * from usdt_resource_rental_config where id=? and provider_code=? and network=?", + request.sourceId, request.provider, request.network); if (!Arrays.asList("INTERNAL", "DUIYA").contains(request.provider) || !Arrays.asList("NILE", "MAINNET").contains(request.network) - || request.apiKey == null || request.apiKey.isEmpty() || request.apiSecret == null || request.apiSecret.isEmpty() + || previous == null && (request.apiKey == null || request.apiKey.trim().isEmpty() || request.apiSecret == null || request.apiSecret.trim().isEmpty()) + || "DUIYA".equals(request.provider) && !"MAINNET".equals(request.network) + || request.energyPeriod == null || request.energyPeriod.length() > 32 || request.energyPeriod.trim().isEmpty() + || request.bandwidthPeriod == null || request.bandwidthPeriod.length() > 32 || request.bandwidthPeriod.trim().isEmpty() || request.energyStep <= 0 || request.bandwidthStep <= 0 || request.durationSeconds <= 0 || request.maxOrderCost == null || request.maxOrderCost.signum() <= 0 || request.maxExecutionCost == null || request.maxExecutionCost.compareTo(request.maxOrderCost) < 0) { @@ -131,7 +154,9 @@ public class ResourceRentalController { String currency = "INTERNAL".equals(request.provider) ? "USDT" : "TRX"; try { store.jdbc().update("insert into usdt_resource_rental_config(provider_code,network,base_url,api_key_cipher,api_secret_cipher,energy_period,bandwidth_period,duration_seconds,energy_step,bandwidth_step,max_order_cost,max_execution_cost,currency) values(?,?,?,?,?,?,?,?,?,?,?,?,?)", - request.provider, request.network, request.baseUrl, crypto.encrypt(request.apiKey), crypto.encrypt(request.apiSecret), + request.provider, request.network, request.baseUrl, + request.apiKey == null || request.apiKey.isEmpty() ? previous.get("api_key_cipher") : crypto.encrypt(request.apiKey), + request.apiSecret == null || request.apiSecret.isEmpty() ? previous.get("api_secret_cipher") : crypto.encrypt(request.apiSecret), request.energyPeriod, request.bandwidthPeriod, request.durationSeconds, request.energyStep, request.bandwidthStep, request.maxOrderCost, request.maxExecutionCost, currency); return AjaxResult.success("资源平台配置已保存为新版本"); @@ -140,6 +165,7 @@ public class ResourceRentalController { public static class PrepareRequest { public Map maximums; } public static class ConfigRequest { + public Long sourceId; public String provider, network, baseUrl; @com.fasterxml.jackson.annotation.JsonProperty(access = com.fasterxml.jackson.annotation.JsonProperty.Access.WRITE_ONLY) public String apiKey; diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/chain/resource/ResourceRentalServiceTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/chain/resource/ResourceRentalServiceTest.java index 7d3c698..d2f2e2f 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/chain/resource/ResourceRentalServiceTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/chain/resource/ResourceRentalServiceTest.java @@ -33,7 +33,8 @@ public class ResourceRentalServiceTest { @Before public void setup() throws Exception { DriverManagerDataSource data = new DriverManagerDataSource("jdbc:h2:mem:resource" + System.nanoTime() - + ";MODE=MySQL;DATABASE_TO_UPPER=false;DB_CLOSE_DELAY=-1", "sa", ""); + // H2 1.4的并发LOB复制存在缺陷;小型测试JSON内联保存,仍保留真实事务及唯一索引。 + + ";MODE=MySQL;DATABASE_TO_UPPER=false;DB_CLOSE_DELAY=-1;MAX_LENGTH_INPLACE_LOB=100000", "sa", ""); DataSourceTransactionManager manager = new DataSourceTransactionManager(data); store = new ResourceLeaseStore(data, manager); for (String file : Arrays.asList("resource_rental.sql", "chain_executor.sql")) { @@ -153,6 +154,29 @@ public class ResourceRentalServiceTest { } private Map preparation() { return store.byBusiness(command.businessKey); } + + @Test + public void configurationEditCreatesVersionWithoutExposingOrReplacingCredentials() throws Exception { + com.ruoyi.system.controller.ResourceRentalController controller = new com.ruoyi.system.controller.ResourceRentalController(service, null, store, null); + Field properties = controller.getClass().getDeclaredField("rentalProperties"); + properties.setAccessible(true); + properties.set(controller, new ResourceRentalProperties()); + Map original = store.one("select * from usdt_resource_rental_config"); + com.ruoyi.system.controller.ResourceRentalController.ConfigRequest request = new com.ruoyi.system.controller.ResourceRentalController.ConfigRequest(); + request.sourceId = ((Number) original.get("id")).longValue(); + request.provider = "INTERNAL"; request.network = "NILE"; request.baseUrl = "https://new.example.invalid"; + request.apiKey = ""; request.apiSecret = ""; + request.maxOrderCost = BigDecimal.TEN; request.maxExecutionCost = new BigDecimal("20"); + controller.configure(request); + assertEquals(2, store.jdbc().queryForObject("select count(*) from usdt_resource_rental_config", Integer.class).intValue()); + Map latest = store.one("select * from usdt_resource_rental_config order by id desc limit 1"); + assertEquals(original.get("api_key_cipher"), latest.get("api_key_cipher")); + assertEquals(original.get("api_secret_cipher"), latest.get("api_secret_cipher")); + String response = store.encode(controller.configurations()); + assertFalse(response.contains("cipher")); + assertFalse(response.contains("api_secret")); + assertEquals("https://example.invalid", original.get("base_url")); + } private ChainCommand command(String key, String address) { ChainCommand value = new ChainCommand(); value.businessKey = key; value.address = address; value.tokenIndex = "0";