1. 请在views/rental/nodeDetail 页面添加出租设置功能 2. 一个租赁节点只能绑定一个钱包地址,添加验证和页面布局,请修改views/rental/nodeDetail 页面,并添加换绑功能。
This commit is contained in:
1 parent
624110e43c
commit
4b6ea31e6a
4 files changed
+163
No files matched your search
@@ -184,6 +184,29 @@ public class RentalController {
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/** 本人节点及绑定钱包详情,显式选列保护认证材料。 */
|
||||
@GetMapping("/node/{id}")
|
||||
@PreAuthorize("@ss.hasPermi('rent:portal:view')")
|
||||
public AjaxResult nodeDetail(@PathVariable long id) {
|
||||
Map<String, Object> node = store.one("SELECT id,node_no,name,status,connection_status,heartbeat_at FROM rent_node WHERE id=? AND user_id=?", id, user());
|
||||
require(node != null, "节点不存在或无权访问");
|
||||
if (node.get("heartbeat_at") != null) {
|
||||
node.put("heartbeat_at", time(node.get("heartbeat_at")).toEpochMilli());
|
||||
}
|
||||
// 按节点查询而非在全量钱包的第一页过滤;显式选列不输出挑战或签名。
|
||||
List<Map<String, Object>> wallets = store.rows("SELECT id,node_id,network,address,status,ownership_verified_at,"
|
||||
+ "energy_enabled,bandwidth_enabled,energy_retain_sun,bandwidth_retain_sun FROM rent_wallet WHERE node_id=? ORDER BY id", id);
|
||||
return AjaxResult.success(map("node", node, "wallets", wallets));
|
||||
}
|
||||
|
||||
/** 本人离线节点换绑,旧钱包历史关联与新地址合法性在事务内校验。 */
|
||||
@PostMapping("/wallet/{id}/rebind")
|
||||
@PreAuthorize("@ss.hasPermi('rent:wallet:bind')")
|
||||
public AjaxResult rebindWallet(@PathVariable long id, @RequestBody Map<String, Object> body) {
|
||||
provisioning.rebindWallet(id, body, user());
|
||||
return AjaxResult.success();
|
||||
}
|
||||
|
||||
/** 删除本人尚未完成所有权验证的待审核地址。 */
|
||||
@DeleteMapping("/wallet/{id}")
|
||||
@PreAuthorize("@ss.hasPermi('rent:wallet:bind')")
|
||||
|
||||
@@ -84,6 +84,9 @@ public class RentalProvisioning {
|
||||
require(
|
||||
number(node, "user_id") == actor && !"REVOKED".equals(text(node, "status")),
|
||||
"无节点权限");
|
||||
// 所有新增入口共用父节点行锁,串行校验,避免并发注册两个钱包。
|
||||
require(store.one("SELECT id FROM rent_wallet WHERE node_id=? LIMIT 1", nodeId) == null,
|
||||
"一个租赁节点只能绑定一个钱包地址,请使用换绑功能");
|
||||
String address = input(request, "address", 64);
|
||||
RentalOrders.address(address);
|
||||
row =
|
||||
@@ -157,6 +160,52 @@ public class RentalProvisioning {
|
||||
return wallet;
|
||||
}
|
||||
|
||||
/**
|
||||
* 换绑仅适用于无历史业务引用的钱包,禁止原地改变历史订单/任务中的资源所有者。
|
||||
* 与派单一致先锁钱包再锁节点;离线且没有任何预留后才允许变更。
|
||||
* 新地址必须重新验证及审核,原地址的签名、快照、权限和出租策略全部清空。
|
||||
*/
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void rebindWallet(long id, Map<String, Object> request, long actor) {
|
||||
Map<String, Object> wallet = ownedWallet(id, actor, true);
|
||||
long nodeId = number(wallet, "node_id");
|
||||
Map<String, Object> node = store.get("node", nodeId, true);
|
||||
require(!"REVOKED".equals(text(node, "status")), "节点已吊销,不能换绑");
|
||||
require("OFFLINE".equals(text(node, "connection_status")), "请先停止Agent,确认节点离线后换绑");
|
||||
require(store.rows("SELECT id FROM rent_wallet WHERE node_id=?", nodeId).size() == 1,
|
||||
"节点存在多个旧绑定,请先联系管理员处理,禁止自动覆盖");
|
||||
require(number(wallet, "energy_reserved_sun") == 0 && number(wallet, "bandwidth_reserved_sun") == 0,
|
||||
"钱包仍有资源预留,不能换绑");
|
||||
require(store.one("SELECT id FROM rent_order WHERE wallet_id=? LIMIT 1 FOR UPDATE", id) == null
|
||||
&& store.one("SELECT id FROM rent_task WHERE wallet_id=? LIMIT 1 FOR UPDATE", id) == null,
|
||||
"钱包存在历史或在途订单/任务,不能换绑,请为新地址注册新节点");
|
||||
require(text(wallet, "network").equals(network(input(request, "network", 16))),
|
||||
"换绑不能更改网络,请为其他网络注册新节点");
|
||||
String address = input(request, "address", 64);
|
||||
RentalOrders.address(address);
|
||||
require(!address.equals(text(wallet, "address")), "新地址不能与原地址相同");
|
||||
require(store.one("SELECT id FROM rent_wallet WHERE network=? AND address=?", text(wallet, "network"), address) == null,
|
||||
"该网络的钱包地址已被绑定");
|
||||
Map<String, Object> changes = new LinkedHashMap<>();
|
||||
for (String field : Arrays.asList("permission_id", "ownership_method", "ownership_challenge",
|
||||
"ownership_message", "ownership_signature", "ownership_verified_address", "challenge_issued_at",
|
||||
"challenge_expires_at", "challenge_consumed_at", "ownership_verified_at", "ownership_evidence",
|
||||
"snapshot_at", "snapshot_expires_at", "snapshot_block_height", "policy")) {
|
||||
changes.put(field, null);
|
||||
}
|
||||
for (String field : Arrays.asList("energy_available", "bandwidth_available", "energy_enabled", "bandwidth_enabled",
|
||||
"energy_delegatable_sun", "bandwidth_delegatable_sun", "energy_retain_sun", "bandwidth_retain_sun",
|
||||
"total_energy_limit", "total_energy_weight", "total_bandwidth_limit", "total_bandwidth_weight",
|
||||
"snapshot_min_block_height")) {
|
||||
changes.put(field, 0L);
|
||||
}
|
||||
changes.put("address", address);
|
||||
changes.put("status", "PENDING");
|
||||
store.update("wallet", id, changes);
|
||||
store.event("WALLET", id, "REBIND", actor,
|
||||
"换绑:" + text(wallet, "address") + " -> " + address + ";已清空验证、资源快照及出租设置");
|
||||
}
|
||||
|
||||
/**
|
||||
* 仅清理误添加的待验证地址,不删除已验证或已产生业务关联的钱包。
|
||||
* 与所有权验证共用钱包行锁,保证验证与删除不能同时成功;审计独立保留。
|
||||
|
||||
Reference in new issue
Block a user