diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java index eb05dc7..db96939 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java @@ -38,4 +38,9 @@ public @interface Log * 是否保存请求的参数 */ public boolean isSaveRequestData() default true; + + /** + * 是否保存响应结果。返回一次性凭据或其他敏感数据的接口必须关闭。 + */ + public boolean isSaveResponseData() default true; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 7e180ab..1d211f2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -92,8 +92,11 @@ public class LogAspect // 请求的地址 String ip = IpUtils.getIpAddr(ServletUtils.getRequest()); operLog.setOperIp(ip); - // 返回参数 - operLog.setJsonResult(JSON.toJSONString(jsonResult)); + // 返回一次性凭据或敏感数据的接口可通过注解显式禁止保存响应体。 + if (controllerLog.isSaveResponseData()) + { + operLog.setJsonResult(JSON.toJSONString(jsonResult)); + } operLog.setOperUrl(ServletUtils.getRequest().getRequestURI()); if (loginUser != null) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtConfigController.java index 34338b4..b25176b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtConfigController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/controller/UsdtConfigController.java @@ -21,6 +21,9 @@ import com.ruoyi.system.domain.UsdtConfigPlus; import com.ruoyi.system.service.IUsdtConfigService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.exception.CustomException; +import com.ruoyi.system.domain.dto.UsdtConfigCreateRequest; +import com.ruoyi.system.domain.dto.UsdtConfigRotateRequest; /** * 全局配置Controller @@ -34,6 +37,32 @@ public class UsdtConfigController extends BaseController { @Autowired private IUsdtConfigService usdtConfigService; + + /** + * 首次创建全局配置和钱包加密信封。 + * 助记词只在本接口成功响应中返回一次,必须由管理员立即离线备份。 + */ + @PreAuthorize("@ss.hasPermi('system:usdtConfig:add')") + @Log(title = "首次创建全局钱包配置", businessType = BusinessType.INSERT, + isSaveRequestData = false, isSaveResponseData = false) + @PostMapping("/initialize") + public AjaxResult initialize(@RequestBody UsdtConfigCreateRequest request) + { + return AjaxResult.success(usdtConfigService.createInitialConfig(request)); + } + + /** + * 轮换配置密码。该操作不会更换助记词、主钱包地址或子钱包派生关系。 + */ + @PreAuthorize("@ss.hasPermi('system:usdtConfig:edit')") + @Log(title = "轮换全局钱包配置密码", businessType = BusinessType.UPDATE, + isSaveRequestData = false) + @PutMapping("/{id}/rotate-password") + public AjaxResult rotatePassword(@PathVariable("id") Long id, + @RequestBody UsdtConfigRotateRequest request) + { + return AjaxResult.success(usdtConfigService.rotateConfigurationPassword(id, request)); + } @PreAuthorize("@ss.hasPermi('system:usdtConfig:getByIds')") @PostMapping("/getByIds") public AjaxResult getByIds(@RequestBody Ids ids) @@ -80,21 +109,35 @@ public class UsdtConfigController extends BaseController * 新增全局配置 */ @PreAuthorize("@ss.hasPermi('system:usdtConfig:add')") - @Log(title = "全局配置", businessType = BusinessType.INSERT) + @Log(title = "全局配置", businessType = BusinessType.INSERT, isSaveRequestData = false) @PostMapping public AjaxResult add(@RequestBody UsdtConfig usdtConfig) { - return toAjax(usdtConfigService.insertUsdtConfig(usdtConfig)); + throw new CustomException("请使用首次创建接口初始化全局配置"); } /** * 修改全局配置 */ @PreAuthorize("@ss.hasPermi('system:usdtConfig:edit')") - @Log(title = "全局配置", businessType = BusinessType.UPDATE) + @Log(title = "全局配置", businessType = BusinessType.UPDATE, isSaveRequestData = false) @PutMapping public AjaxResult edit(@RequestBody UsdtConfig usdtConfig) { + // 普通编辑只允许修改业务参数;钱包信封和主地址必须走专用初始化/轮换流程。 + usdtConfig.setVersion(null); + usdtConfig.setEncryptionAlgorithm(null); + usdtConfig.setPasswordKdf(null); + usdtConfig.setIterations(null); + usdtConfig.setEncryptedMnemonic(null); + usdtConfig.setMnemonicNonce(null); + usdtConfig.setEncryptedDek(null); + usdtConfig.setDekNonce(null); + usdtConfig.setKeySalt(null); + usdtConfig.setPasswordSalt(null); + usdtConfig.setPasswordHash(null); + usdtConfig.setRotatedAt(null); + usdtConfig.setTokenAddress(null); return toAjax(usdtConfigService.updateUsdtConfig(usdtConfig)); } @@ -108,4 +151,4 @@ public class UsdtConfigController extends BaseController { return toAjax(usdtConfigService.deleteUsdtConfigByIds(ids)); } -} \ No newline at end of file +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfig.java index 136b102..1632073 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfig.java @@ -3,6 +3,7 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -50,31 +51,31 @@ public class UsdtConfig extends BaseEntity private Long iterations; /** AES-GCM 加密后的助记词密文,Base64;禁止保存明文助记词 */ - @Excel(name = "AES-GCM 加密后的助记词密文,Base64;禁止保存明文助记词") + @JsonIgnore private String encryptedMnemonic; /** 助记词 AES-GCM nonce,Base64,通常为 12 字节 */ - @Excel(name = "助记词 AES-GCM nonce,Base64,通常为 12 字节") + @JsonIgnore private String mnemonicNonce; /** 由 KEK 包装后的 DEK,Base64;禁止保存明文 DEK */ - @Excel(name = "由 KEK 包装后的 DEK,Base64;禁止保存明文 DEK") + @JsonIgnore private String encryptedDek; /** DEK AES-GCM nonce,Base64,通常为 12 字节 */ - @Excel(name = "DEK AES-GCM nonce,Base64,通常为 12 字节") + @JsonIgnore private String dekNonce; /** 配置密码派生 KEK 使用的 salt,Base64 */ - @Excel(name = "配置密码派生 KEK 使用的 salt,Base64") + @JsonIgnore private String keySalt; /** 配置密码校验哈希使用的独立 salt,Base64 */ - @Excel(name = "配置密码校验哈希使用的独立 salt,Base64") + @JsonIgnore private String passwordSalt; /** PBKDF2 配置密码校验值,Base64;不是可逆密码 */ - @Excel(name = "PBKDF2 配置密码校验值,Base64;不是可逆密码") + @JsonIgnore private String passwordHash; /** 最近一次配置密码轮换时间 */ @@ -264,13 +265,7 @@ public class UsdtConfig extends BaseEntity .append("encryptionAlgorithm", getEncryptionAlgorithm()) .append("passwordKdf", getPasswordKdf()) .append("iterations", getIterations()) - .append("encryptedMnemonic", getEncryptedMnemonic()) - .append("mnemonicNonce", getMnemonicNonce()) - .append("encryptedDek", getEncryptedDek()) - .append("dekNonce", getDekNonce()) - .append("keySalt", getKeySalt()) - .append("passwordSalt", getPasswordSalt()) - .append("passwordHash", getPasswordHash()) + .append("walletEnvelope", "") .append("rotatedAt", getRotatedAt()) .append("trxNum", getTrxNum()) .append("tokenAddress", getTokenAddress()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfigPlus.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfigPlus.java index 503b678..656afd1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfigPlus.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UsdtConfigPlus.java @@ -3,6 +3,7 @@ package com.ruoyi.system.domain; import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.annotation.Excel; @@ -45,25 +46,25 @@ public class UsdtConfigPlus implements Serializable @Excel(name = "PBKDF2 迭代次数;轮换时按当前安全策略更新") private Long iterations; /** AES-GCM 加密后的助记词密文,Base64;禁止保存明文助记词 */ - @Excel(name = "AES-GCM 加密后的助记词密文,Base64;禁止保存明文助记词") + @JsonIgnore private String encryptedMnemonic; /** 助记词 AES-GCM nonce,Base64,通常为 12 字节 */ - @Excel(name = "助记词 AES-GCM nonce,Base64,通常为 12 字节") + @JsonIgnore private String mnemonicNonce; /** 由 KEK 包装后的 DEK,Base64;禁止保存明文 DEK */ - @Excel(name = "由 KEK 包装后的 DEK,Base64;禁止保存明文 DEK") + @JsonIgnore private String encryptedDek; /** DEK AES-GCM nonce,Base64,通常为 12 字节 */ - @Excel(name = "DEK AES-GCM nonce,Base64,通常为 12 字节") + @JsonIgnore private String dekNonce; /** 配置密码派生 KEK 使用的 salt,Base64 */ - @Excel(name = "配置密码派生 KEK 使用的 salt,Base64") + @JsonIgnore private String keySalt; /** 配置密码校验哈希使用的独立 salt,Base64 */ - @Excel(name = "配置密码校验哈希使用的独立 salt,Base64") + @JsonIgnore private String passwordSalt; /** PBKDF2 配置密码校验值,Base64;不是可逆密码 */ - @Excel(name = "PBKDF2 配置密码校验值,Base64;不是可逆密码") + @JsonIgnore private String passwordHash; /** 最近一次配置密码轮换时间 */ @JsonFormat(pattern = "yyyy-MM-dd") @@ -249,13 +250,7 @@ public class UsdtConfigPlus implements Serializable .append("encryptionAlgorithm", getEncryptionAlgorithm()) .append("passwordKdf", getPasswordKdf()) .append("iterations", getIterations()) - .append("encryptedMnemonic", getEncryptedMnemonic()) - .append("mnemonicNonce", getMnemonicNonce()) - .append("encryptedDek", getEncryptedDek()) - .append("dekNonce", getDekNonce()) - .append("keySalt", getKeySalt()) - .append("passwordSalt", getPasswordSalt()) - .append("passwordHash", getPasswordHash()) + .append("walletEnvelope", "") .append("rotatedAt", getRotatedAt()) .append("trxNum", getTrxNum()) .append("tokenAddress", getTokenAddress()) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigCreateRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigCreateRequest.java new file mode 100644 index 0000000..4c8f989 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigCreateRequest.java @@ -0,0 +1,36 @@ +package com.ruoyi.system.domain.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import java.math.BigDecimal; + +/** + * 全局钱包配置首次创建请求。 + * + * 配置密码仅用于本次请求中派生密钥,不会保存到数据库,也不会写入接口响应。 + */ +public class UsdtConfigCreateRequest { + private BigDecimal payUsdtNum; + private BigDecimal receiveUsdtNum; + private Integer tronNetType; + private BigDecimal trxNum; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String configurationPassword; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String confirmPassword; + + public BigDecimal getPayUsdtNum() { return payUsdtNum; } + public void setPayUsdtNum(BigDecimal payUsdtNum) { this.payUsdtNum = payUsdtNum; } + public BigDecimal getReceiveUsdtNum() { return receiveUsdtNum; } + public void setReceiveUsdtNum(BigDecimal receiveUsdtNum) { this.receiveUsdtNum = receiveUsdtNum; } + public Integer getTronNetType() { return tronNetType; } + public void setTronNetType(Integer tronNetType) { this.tronNetType = tronNetType; } + public BigDecimal getTrxNum() { return trxNum; } + public void setTrxNum(BigDecimal trxNum) { this.trxNum = trxNum; } + public String getConfigurationPassword() { return configurationPassword; } + public void setConfigurationPassword(String configurationPassword) { this.configurationPassword = configurationPassword; } + public String getConfirmPassword() { return confirmPassword; } + public void setConfirmPassword(String confirmPassword) { this.confirmPassword = confirmPassword; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigRotateRequest.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigRotateRequest.java new file mode 100644 index 0000000..1a8d48c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/UsdtConfigRotateRequest.java @@ -0,0 +1,22 @@ +package com.ruoyi.system.domain.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** 配置密码轮换请求。 */ +public class UsdtConfigRotateRequest { + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String oldPassword; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String newPassword; + + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String confirmPassword; + + public String getOldPassword() { return oldPassword; } + public void setOldPassword(String oldPassword) { this.oldPassword = oldPassword; } + public String getNewPassword() { return newPassword; } + public void setNewPassword(String newPassword) { this.newPassword = newPassword; } + public String getConfirmPassword() { return confirmPassword; } + public void setConfirmPassword(String confirmPassword) { this.confirmPassword = confirmPassword; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigCreateResult.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigCreateResult.java new file mode 100644 index 0000000..e56ae6f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigCreateResult.java @@ -0,0 +1,24 @@ +package com.ruoyi.system.domain.vo; + +/** + * 全局钱包配置首次创建结果。 + * mnemonic 只在首次创建成功时返回一次,调用方必须立即离线备份。 + */ +public class UsdtConfigCreateResult { + private final Long id; + private final Long version; + private final String tokenAddress; + private final String mnemonic; + + public UsdtConfigCreateResult(Long id, Long version, String tokenAddress, String mnemonic) { + this.id = id; + this.version = version; + this.tokenAddress = tokenAddress; + this.mnemonic = mnemonic; + } + + public Long getId() { return id; } + public Long getVersion() { return version; } + public String getTokenAddress() { return tokenAddress; } + public String getMnemonic() { return mnemonic; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigRotateResult.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigRotateResult.java new file mode 100644 index 0000000..37a9a78 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/UsdtConfigRotateResult.java @@ -0,0 +1,18 @@ +package com.ruoyi.system.domain.vo; + +/** 配置密码轮换结果,不包含密码及任何钱包密钥材料。 */ +public class UsdtConfigRotateResult { + private final Long id; + private final Long version; + private final String tokenAddress; + + public UsdtConfigRotateResult(Long id, Long version, String tokenAddress) { + this.id = id; + this.version = version; + this.tokenAddress = tokenAddress; + } + + public Long getId() { return id; } + public Long getVersion() { return version; } + public String getTokenAddress() { return tokenAddress; } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtConfigMapper.java index 75fcf2f..1afaabb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtConfigMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtConfigMapper.java @@ -15,6 +15,11 @@ import com.ruoyi.system.domain.UsdtConfigPlus; */ public interface UsdtConfigMapper extends BaseMapper { + /** 锁定全局配置记录;空表时在 MySQL InnoDB 下同时锁定首记录间隙。 */ + UsdtConfig selectFirstForUpdate(); + + /** 使用旧版本作为条件原子更新加密信封,防止并发轮换互相覆盖。 */ + int rotateEnvelope(@Param("config") UsdtConfig config, @Param("oldVersion") Long oldVersion); /** * 查询全局配置 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtConfigService.java index 5788334..59b914e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtConfigService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/IUsdtConfigService.java @@ -6,6 +6,10 @@ import com.ruoyi.system.domain.UsdtConfigPlus; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.system.domain.dto.UsdtConfigCreateRequest; +import com.ruoyi.system.domain.dto.UsdtConfigRotateRequest; +import com.ruoyi.system.domain.vo.UsdtConfigCreateResult; +import com.ruoyi.system.domain.vo.UsdtConfigRotateResult; /** * 全局配置Service接口 * @@ -15,6 +19,12 @@ import com.ruoyi.common.select.SelectItem; public interface IUsdtConfigService extends IService { + /** 首次创建全局钱包配置并返回仅出现一次的助记词。 */ + UsdtConfigCreateResult createInitialConfig(UsdtConfigCreateRequest request); + + /** 轮换配置密码,不改变助记词、派生地址及历史订单映射。 */ + UsdtConfigRotateResult rotateConfigurationPassword(Long id, UsdtConfigRotateRequest request); + /** * 查询全局配置 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtConfigServiceImpl.java index 20f9aad..80593f9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtConfigServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtConfigServiceImpl.java @@ -18,6 +18,16 @@ import com.ruoyi.system.service.IUsdtConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import com.ruoyi.common.select.SelectItem; +import com.ruoyi.common.exception.CustomException; +import com.ruoyi.system.demo.WalletEnvelopeEncryptionDemo; +import com.ruoyi.system.domain.dto.UsdtConfigCreateRequest; +import com.ruoyi.system.domain.dto.UsdtConfigRotateRequest; +import com.ruoyi.system.domain.vo.UsdtConfigCreateResult; +import com.ruoyi.system.domain.vo.UsdtConfigRotateResult; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.Date; /** * 全局配置Service业务层处理 * @@ -32,6 +42,145 @@ public class UsdtConfigServiceImpl extends ServiceImpl getByIds(List ids, SFunction... columns) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() diff --git a/ruoyi-system/src/main/resources/mapper/system/UsdtConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UsdtConfigMapper.xml index 62fb4b7..dd38be8 100644 --- a/ruoyi-system/src/main/resources/mapper/system/UsdtConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/UsdtConfigMapper.xml @@ -56,6 +56,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + + + + + update usdt_config + set version = #{config.version}, + encryption_algorithm = #{config.encryptionAlgorithm}, + password_kdf = #{config.passwordKdf}, + iterations = #{config.iterations}, + encrypted_dek = #{config.encryptedDek}, + dek_nonce = #{config.dekNonce}, + key_salt = #{config.keySalt}, + password_salt = #{config.passwordSalt}, + password_hash = #{config.passwordHash}, + rotated_at = #{config.rotatedAt} + where id = #{config.id} + and version = #{oldVersion} + insert into usdt_config @@ -133,4 +154,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} - \ No newline at end of file +