telegram审核功能
This commit is contained in:
1 parent
2d88b77325
commit
5e63bb6add
10 files changed
+571
-2
No files matched your search
@@ -0,0 +1,3 @@
|
||||
package com.ruoyi.system.controller;
|
||||
import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.system.service.TelegramAuditService; import org.springframework.web.bind.annotation.*;
|
||||
@RestController @RequestMapping("/api/telegram") public class TelegramAuditController { private final TelegramAuditService service; public TelegramAuditController(TelegramAuditService s){service=s;} @PostMapping("/webhook") public AjaxResult webhook(@RequestHeader(value="X-Telegram-Bot-Api-Secret-Token",required=false)String secret,@RequestBody JSONObject update){if(!service.matchesSecret(secret))return AjaxResult.error("非法请求");service.handleUpdate(update);return AjaxResult.success();} }
|
||||
+10
-1
@@ -11,6 +11,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTask;
|
||||
import com.ruoyi.system.domain.UsdtAggregationTaskPlus;
|
||||
import com.ruoyi.system.service.IUsdtAggregationTaskService;
|
||||
import com.ruoyi.system.service.TelegramAuditService;
|
||||
import com.ruoyi.system.service.UsdtAggregationWorkflowService;
|
||||
import com.ruoyi.system.domain.vo.AggregationExecuteRequest;
|
||||
import com.ruoyi.system.domain.vo.AggregationTaskCreateRequest;
|
||||
@@ -33,6 +34,14 @@ public class UsdtAggregationTaskController extends BaseController {
|
||||
private IUsdtAggregationTaskService usdtAggregationTaskService;
|
||||
@Autowired
|
||||
private UsdtAggregationWorkflowService aggregationWorkflowService;
|
||||
@Autowired
|
||||
private TelegramAuditService telegramAuditService;
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:query')")
|
||||
@GetMapping("/{id}/telegram-audit")
|
||||
public AjaxResult telegramAudit(@PathVariable("id") Long id) {
|
||||
return AjaxResult.success(telegramAuditService.findAggregationAudit(id));
|
||||
}
|
||||
|
||||
/** 创建应用下全部子钱包的 USDT 归集任务。 */
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:add')")
|
||||
@@ -51,7 +60,7 @@ public class UsdtAggregationTaskController extends BaseController {
|
||||
@PreAuthorize("@ss.hasPermi('system:usdtTask:edit')")
|
||||
@PostMapping("/{id}/review")
|
||||
public AjaxResult review(@PathVariable("id") Long id, @RequestParam boolean approved) {
|
||||
aggregationWorkflowService.approve(id, approved);
|
||||
telegramAuditService.reviewFromBackoffice(id, approved);
|
||||
return AjaxResult.success(approved ? "审核通过" : "审核拒绝");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.ruoyi.system.domain;
|
||||
import java.util.Date;
|
||||
/** Telegram审核记录,不保存私钥和配置密码。 */
|
||||
public class TelegramAuditRecord {
|
||||
private Long id; private String auditNo,businessType,businessId,title,payload,auditStatus,telegramChatId,reviewerTelegramId,reviewerName,reviewComment; private Long telegramMessageId; private Date reviewedAt,createdAt,updatedAt;
|
||||
public Long getId(){return id;} public void setId(Long v){id=v;} public String getAuditNo(){return auditNo;} public void setAuditNo(String v){auditNo=v;} public String getBusinessType(){return businessType;} public void setBusinessType(String v){businessType=v;} public String getBusinessId(){return businessId;} public void setBusinessId(String v){businessId=v;} public String getTitle(){return title;} public void setTitle(String v){title=v;} public String getPayload(){return payload;} public void setPayload(String v){payload=v;} public String getAuditStatus(){return auditStatus;} public void setAuditStatus(String v){auditStatus=v;} public String getTelegramChatId(){return telegramChatId;} public void setTelegramChatId(String v){telegramChatId=v;} public Long getTelegramMessageId(){return telegramMessageId;} public void setTelegramMessageId(Long v){telegramMessageId=v;} public String getReviewerTelegramId(){return reviewerTelegramId;} public void setReviewerTelegramId(String v){reviewerTelegramId=v;} public String getReviewerName(){return reviewerName;} public void setReviewerName(String v){reviewerName=v;} public String getReviewComment(){return reviewComment;} public void setReviewComment(String v){reviewComment=v;} public Date getReviewedAt(){return reviewedAt;} public void setReviewedAt(Date v){reviewedAt=v;} public Date getCreatedAt(){return createdAt;} public void setCreatedAt(Date v){createdAt=v;} public Date getUpdatedAt(){return updatedAt;} public void setUpdatedAt(Date v){updatedAt=v;}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.ruoyi.system.mapper;
|
||||
|
||||
import com.ruoyi.system.domain.TelegramAuditRecord;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
public interface TelegramAuditMapper {
|
||||
int insertRecord(TelegramAuditRecord record);
|
||||
|
||||
TelegramAuditRecord selectByAuditNo(@Param("auditNo") String auditNo);
|
||||
|
||||
TelegramAuditRecord selectByBusiness(@Param("businessType") String businessType,
|
||||
@Param("businessId") String businessId);
|
||||
|
||||
int updateMessage(@Param("auditNo") String auditNo, @Param("chatId") String chatId,
|
||||
@Param("messageId") Long messageId, @Param("updatedAt") Date updatedAt);
|
||||
|
||||
int approve(@Param("auditNo") String auditNo, @Param("status") String status,
|
||||
@Param("reviewerId") String reviewerId, @Param("reviewerName") String reviewerName,
|
||||
@Param("reviewedAt") Date reviewedAt, @Param("updatedAt") Date updatedAt);
|
||||
|
||||
int insertLog(@Param("auditNo") String auditNo, @Param("updateId") Long updateId,
|
||||
@Param("callbackId") String callbackId, @Param("userId") String userId,
|
||||
@Param("username") String username, @Param("action") String action,
|
||||
@Param("oldStatus") String oldStatus, @Param("newStatus") String newStatus,
|
||||
@Param("createdAt") Date createdAt);
|
||||
|
||||
int updateLogOutcome(@Param("updateId") Long updateId, @Param("action") String action,
|
||||
@Param("oldStatus") String oldStatus, @Param("newStatus") String newStatus,
|
||||
@Param("comment") String comment);
|
||||
|
||||
int insertPushTask(@Param("auditNo") String auditNo, @Param("nextRetryAt") Date nextRetryAt,
|
||||
@Param("createdAt") Date createdAt);
|
||||
|
||||
List<String> selectDuePushAuditNos(@Param("limit") int limit);
|
||||
|
||||
int claimPushTask(@Param("auditNo") String auditNo, @Param("updatedAt") Date updatedAt);
|
||||
|
||||
int selectPushRetryCount(@Param("auditNo") String auditNo);
|
||||
|
||||
int completePushTask(@Param("auditNo") String auditNo, @Param("updatedAt") Date updatedAt);
|
||||
|
||||
int failPushTask(@Param("auditNo") String auditNo, @Param("status") String status,
|
||||
@Param("retryCount") int retryCount, @Param("nextRetryAt") Date nextRetryAt,
|
||||
@Param("lastError") String lastError, @Param("updatedAt") Date updatedAt);
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
package com.ruoyi.system.service;
|
||||
/** 归集任务创建后的Telegram审核事件。 */
|
||||
public class TelegramAggregationAuditEvent { private final Long taskId; private final String taskName,destination; private final int itemCount; private final String amount;
|
||||
public TelegramAggregationAuditEvent(Long id,String name,String dest,int count,String amount){taskId=id;taskName=name;destination=dest;itemCount=count;this.amount=amount;} public Long getTaskId(){return taskId;} public String getTaskName(){return taskName;} public String getDestination(){return destination;} public int getItemCount(){return itemCount;} public String getAmount(){return amount;} }
|
||||
@@ -0,0 +1,330 @@
|
||||
package com.ruoyi.system.service;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ruoyi.common.exception.CustomException;
|
||||
import com.ruoyi.common.utils.SecurityUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.ruoyi.system.domain.TelegramAuditRecord;
|
||||
import com.ruoyi.system.mapper.TelegramAuditMapper;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.scheduling.annotation.Scheduled;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.transaction.event.TransactionPhase;
|
||||
import org.springframework.transaction.event.TransactionalEventListener;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.support.TransactionSynchronizationAdapter;
|
||||
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
import org.springframework.web.client.RestTemplate;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
/** Telegram归集审核服务:只改变审核决定,不执行归集或接触钱包密钥。 */
|
||||
@Service
|
||||
public class TelegramAuditService {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(TelegramAuditService.class);
|
||||
private static final String BUSINESS_TYPE = "USDT_AGGREGATION";
|
||||
private static final int MAX_PUSH_RETRIES = 8;
|
||||
|
||||
private final TelegramAuditMapper mapper;
|
||||
private final UsdtAggregationWorkflowService workflow;
|
||||
private final RestTemplate restTemplate = new RestTemplate();
|
||||
private final TransactionTemplate transactionTemplate;
|
||||
|
||||
@Value("${telegram.enabled:false}") private boolean enabled;
|
||||
@Value("${telegram.bot-token:}") private String botToken;
|
||||
@Value("${telegram.audit-chat-id:}") private String auditChatId;
|
||||
@Value("${telegram.webhook-secret:}") private String webhookSecret;
|
||||
@Value("${telegram.allowed-user-ids:}") private String allowedUserIds;
|
||||
|
||||
public TelegramAuditService(TelegramAuditMapper mapper, UsdtAggregationWorkflowService workflow,
|
||||
PlatformTransactionManager transactionManager) {
|
||||
this.mapper = mapper;
|
||||
this.workflow = workflow;
|
||||
this.transactionTemplate = new TransactionTemplate(transactionManager);
|
||||
}
|
||||
|
||||
/** 创建归集审核记录及持久化推送任务。业务唯一键防止重复建单。 */
|
||||
@TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
|
||||
public void onCreated(TelegramAggregationAuditEvent event) {
|
||||
if (!enabled) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
transactionTemplate.execute(status -> {
|
||||
createAuditRecord(event);
|
||||
return null;
|
||||
});
|
||||
} catch (Exception exception) {
|
||||
// Telegram表未部署或数据库瞬时异常不能改变已经提交的归集任务结果。
|
||||
LOGGER.error("Telegram归集审核记录创建失败,taskId={}", event.getTaskId());
|
||||
}
|
||||
}
|
||||
|
||||
private void createAuditRecord(TelegramAggregationAuditEvent event) {
|
||||
if (mapper.selectByBusiness(BUSINESS_TYPE, String.valueOf(event.getTaskId())) != null) {
|
||||
return;
|
||||
}
|
||||
Date now = new Date();
|
||||
TelegramAuditRecord record = new TelegramAuditRecord();
|
||||
record.setAuditNo("TA-" + event.getTaskId() + "-" + UUID.randomUUID().toString().substring(0, 8));
|
||||
record.setBusinessType(BUSINESS_TYPE);
|
||||
record.setBusinessId(String.valueOf(event.getTaskId()));
|
||||
record.setTitle("USDT归集审核");
|
||||
record.setAuditStatus("PENDING");
|
||||
JSONObject payload = new JSONObject();
|
||||
payload.put("taskName", event.getTaskName());
|
||||
payload.put("destination", event.getDestination());
|
||||
payload.put("itemCount", event.getItemCount());
|
||||
payload.put("amount", event.getAmount());
|
||||
payload.put("resourceSummary", "请查看系统监控明细中的能量、带宽和TRX资源估算");
|
||||
record.setPayload(payload.toJSONString());
|
||||
record.setCreatedAt(now);
|
||||
record.setUpdatedAt(now);
|
||||
mapper.insertRecord(record);
|
||||
mapper.insertPushTask(record.getAuditNo(), now, now);
|
||||
}
|
||||
|
||||
/** update_id先占位防重;归集审核与Telegram最终状态在同一事务内提交。 */
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void handleUpdate(JSONObject update) {
|
||||
JSONObject callback = update == null ? null : update.getJSONObject("callback_query");
|
||||
if (callback == null) {
|
||||
return;
|
||||
}
|
||||
Long updateId = update.getLong("update_id");
|
||||
String callbackId = callback.getString("id");
|
||||
JSONObject from = callback.getJSONObject("from");
|
||||
String userId = from == null ? null : from.getString("id");
|
||||
String username = from == null ? null : from.getString("username");
|
||||
String[] parts = parseCallbackData(callback.getString("data"));
|
||||
String auditNo = parts[1];
|
||||
|
||||
if (mapper.insertLog(auditNo, updateId, callbackId, userId, username,
|
||||
"RECEIVED", null, null, new Date()) != 1) {
|
||||
afterCommit(callbackId, null, "该请求已处理");
|
||||
return;
|
||||
}
|
||||
if (!isAllowed(userId)) {
|
||||
mapper.updateLogOutcome(updateId, "UNAUTHORIZED", null, null, "Telegram用户无审核权限");
|
||||
afterCommit(callbackId, null, "无审核权限");
|
||||
return;
|
||||
}
|
||||
TelegramAuditRecord record = mapper.selectByAuditNo(auditNo);
|
||||
if (record == null) {
|
||||
mapper.updateLogOutcome(updateId, "NOT_FOUND", null, null, "审核记录不存在");
|
||||
afterCommit(callbackId, null, "审核记录不存在");
|
||||
return;
|
||||
}
|
||||
if (!"PENDING".equals(record.getAuditStatus())) {
|
||||
mapper.updateLogOutcome(updateId, "DUPLICATE", record.getAuditStatus(),
|
||||
record.getAuditStatus(), "审核记录已处理");
|
||||
afterCommit(callbackId, record, "该审核单已处理");
|
||||
return;
|
||||
}
|
||||
|
||||
boolean approved = "A".equals(parts[2]);
|
||||
String newStatus = approved ? "APPROVED" : "REJECTED";
|
||||
workflow.approve(Long.valueOf(record.getBusinessId()), approved);
|
||||
Date now = new Date();
|
||||
if (mapper.approve(auditNo, newStatus, userId, username, now, now) != 1) {
|
||||
throw new CustomException("审核状态已被其他操作修改,请刷新后重试");
|
||||
}
|
||||
mapper.updateLogOutcome(updateId, newStatus, "PENDING", newStatus, null);
|
||||
record.setAuditStatus(newStatus);
|
||||
record.setReviewerTelegramId(userId);
|
||||
record.setReviewerName(username);
|
||||
record.setReviewedAt(now);
|
||||
afterCommit(callbackId, record, approved ? "审核通过" : "审核拒绝");
|
||||
}
|
||||
|
||||
/** 后台审核与Telegram审核共用最终状态,防止两个入口给出相反决定。 */
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public void reviewFromBackoffice(Long taskId, boolean approved) {
|
||||
workflow.approve(taskId, approved);
|
||||
TelegramAuditRecord record = mapper.selectByBusiness(BUSINESS_TYPE, String.valueOf(taskId));
|
||||
if (record == null || !"PENDING".equals(record.getAuditStatus())) {
|
||||
return;
|
||||
}
|
||||
String status = approved ? "APPROVED" : "REJECTED";
|
||||
Date now = new Date();
|
||||
String reviewerName = SecurityUtils.getUsername();
|
||||
if (mapper.approve(record.getAuditNo(), status, "SYSTEM", reviewerName, now, now) != 1) {
|
||||
throw new CustomException("Telegram审核状态已被其他操作修改,请刷新后重试");
|
||||
}
|
||||
record.setAuditStatus(status);
|
||||
record.setReviewerTelegramId("SYSTEM");
|
||||
record.setReviewerName(reviewerName);
|
||||
record.setReviewedAt(now);
|
||||
afterCommit(null, record, approved ? "审核通过" : "审核拒绝");
|
||||
}
|
||||
|
||||
private String[] parseCallbackData(String data) {
|
||||
String[] parts = StringUtils.isBlank(data) ? new String[0] : data.split(":");
|
||||
if (parts.length != 3 || !"ta".equals(parts[0])
|
||||
|| !("A".equals(parts[2]) || "R".equals(parts[2]))) {
|
||||
throw new CustomException("无效的Telegram审核指令");
|
||||
}
|
||||
return parts;
|
||||
}
|
||||
|
||||
private void afterCommit(final String callbackId, final TelegramAuditRecord record,
|
||||
final String answerText) {
|
||||
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
|
||||
@Override
|
||||
public void afterCommit() {
|
||||
answerCallback(callbackId, answerText);
|
||||
if (record != null && !"PENDING".equals(record.getAuditStatus())) {
|
||||
editCompletedMessage(record);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** 按条件更新领取到期任务,支持多实例并发和PROCESSING租约恢复。 */
|
||||
@Scheduled(fixedDelayString = "${telegram.push-scan-interval-ms:10000}")
|
||||
public void retryPushTasks() {
|
||||
if (!enabled || StringUtils.isBlank(botToken) || StringUtils.isBlank(auditChatId)) {
|
||||
return;
|
||||
}
|
||||
List<String> auditNos = mapper.selectDuePushAuditNos(20);
|
||||
for (String auditNo : auditNos) {
|
||||
Date now = new Date();
|
||||
if (mapper.claimPushTask(auditNo, now) != 1) {
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
TelegramAuditRecord record = mapper.selectByAuditNo(auditNo);
|
||||
if (record == null || !"PENDING".equals(record.getAuditStatus())) {
|
||||
mapper.completePushTask(auditNo, now);
|
||||
continue;
|
||||
}
|
||||
Long messageId = sendAuditMessage(record);
|
||||
mapper.updateMessage(auditNo, auditChatId, messageId, now);
|
||||
mapper.completePushTask(auditNo, now);
|
||||
} catch (Exception exception) {
|
||||
int retryCount = mapper.selectPushRetryCount(auditNo) + 1;
|
||||
String status = retryCount >= MAX_PUSH_RETRIES ? "FAILED" : "RETRYING";
|
||||
mapper.failPushTask(auditNo, status, retryCount, nextRetryAt(retryCount),
|
||||
safeMessage(exception), new Date());
|
||||
LOGGER.warn("Telegram审核消息推送失败,auditNo={}, retryCount={}", auditNo, retryCount);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private Long sendAuditMessage(TelegramAuditRecord record) {
|
||||
JSONObject payload = JSONObject.parseObject(record.getPayload());
|
||||
String text = "归集审核\n审核单:" + record.getAuditNo()
|
||||
+ "\n任务:" + payload.getString("taskName")
|
||||
+ "\n子账号:" + payload.getIntValue("itemCount")
|
||||
+ "\n金额:" + payload.getString("amount") + " USDT"
|
||||
+ "\n目标:" + payload.getString("destination");
|
||||
Map<String, Object> body = new HashMap<>();
|
||||
body.put("chat_id", auditChatId);
|
||||
body.put("text", text);
|
||||
Map<String, Object> keyboard = new HashMap<>();
|
||||
keyboard.put("inline_keyboard", Collections.singletonList(Arrays.asList(
|
||||
button("审核通过", "ta:" + record.getAuditNo() + ":A"),
|
||||
button("审核拒绝", "ta:" + record.getAuditNo() + ":R"))));
|
||||
body.put("reply_markup", keyboard);
|
||||
JSONObject response = restTemplate.postForObject(botApi("sendMessage"), body, JSONObject.class);
|
||||
if (response == null || !response.getBooleanValue("ok")) {
|
||||
throw new CustomException("Telegram sendMessage返回失败");
|
||||
}
|
||||
return response.getJSONObject("result").getLong("message_id");
|
||||
}
|
||||
|
||||
/** 审核完成后更新原消息并移除按钮;失败不回滚业务审核。 */
|
||||
private void editCompletedMessage(TelegramAuditRecord record) {
|
||||
if (record.getTelegramMessageId() == null || StringUtils.isBlank(record.getTelegramChatId())) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
JSONObject payload = JSONObject.parseObject(record.getPayload());
|
||||
String result = "APPROVED".equals(record.getAuditStatus()) ? "审核通过" : "审核拒绝";
|
||||
String reviewer = StringUtils.isBlank(record.getReviewerName())
|
||||
? record.getReviewerTelegramId() : "@" + record.getReviewerName();
|
||||
Map<String, Object> body = new HashMap<>();
|
||||
body.put("chat_id", record.getTelegramChatId());
|
||||
body.put("message_id", record.getTelegramMessageId());
|
||||
body.put("text", "归集审核 - " + result + "\n审核单:" + record.getAuditNo()
|
||||
+ "\n任务:" + payload.getString("taskName")
|
||||
+ "\n目标:" + payload.getString("destination") + "\n审核人:" + reviewer);
|
||||
restTemplate.postForObject(botApi("editMessageText"), body, JSONObject.class);
|
||||
} catch (Exception exception) {
|
||||
LOGGER.warn("Telegram审核结果消息更新失败,auditNo={}", record.getAuditNo());
|
||||
}
|
||||
}
|
||||
|
||||
private void answerCallback(String callbackId, String text) {
|
||||
if (StringUtils.isBlank(botToken) || StringUtils.isBlank(callbackId)) {
|
||||
return;
|
||||
}
|
||||
try {
|
||||
Map<String, Object> body = new HashMap<>();
|
||||
body.put("callback_query_id", callbackId);
|
||||
body.put("text", text);
|
||||
restTemplate.postForObject(botApi("answerCallbackQuery"), body, Object.class);
|
||||
} catch (Exception exception) {
|
||||
LOGGER.warn("Telegram callback应答失败");
|
||||
}
|
||||
}
|
||||
|
||||
private Map<String, Object> button(String text, String callbackData) {
|
||||
Map<String, Object> button = new HashMap<>();
|
||||
button.put("text", text);
|
||||
button.put("callback_data", callbackData);
|
||||
return button;
|
||||
}
|
||||
|
||||
private boolean isAllowed(String userId) {
|
||||
if (StringUtils.isBlank(userId) || StringUtils.isBlank(allowedUserIds)) {
|
||||
return false;
|
||||
}
|
||||
Set<String> allowed = new HashSet<>();
|
||||
for (String value : allowedUserIds.split(",")) {
|
||||
if (StringUtils.isNotBlank(value)) {
|
||||
allowed.add(value.trim());
|
||||
}
|
||||
}
|
||||
return allowed.contains(userId.trim());
|
||||
}
|
||||
|
||||
private Date nextRetryAt(int retryCount) {
|
||||
long[] delays = {5L, 30L, 120L, 600L, 1800L, 3600L, 7200L, 14400L};
|
||||
long seconds = delays[Math.min(Math.max(retryCount - 1, 0), delays.length - 1)];
|
||||
return new Date(System.currentTimeMillis() + seconds * 1000L);
|
||||
}
|
||||
|
||||
private String safeMessage(Exception exception) {
|
||||
String message = exception == null ? null : exception.getMessage();
|
||||
if (StringUtils.isBlank(message)) {
|
||||
return "未知错误";
|
||||
}
|
||||
message = message.replace('\n', ' ').replace('\r', ' ');
|
||||
return message.length() > 900 ? message.substring(0, 900) : message;
|
||||
}
|
||||
|
||||
private String botApi(String method) {
|
||||
return "https://api.telegram.org/bot" + botToken + "/" + method;
|
||||
}
|
||||
|
||||
public boolean matchesSecret(String value) {
|
||||
return enabled && StringUtils.isNotBlank(webhookSecret) && webhookSecret.equals(value);
|
||||
}
|
||||
|
||||
public TelegramAuditRecord findAggregationAudit(Long taskId) {
|
||||
return mapper.selectByBusiness(BUSINESS_TYPE, String.valueOf(taskId));
|
||||
}
|
||||
}
|
||||
+6
-1
@@ -17,6 +17,7 @@ import com.ruoyi.system.domain.vo.WalletResourceEstimateVo;
|
||||
import com.ruoyi.system.mapper.UsdtAggregationTaskItemMapper;
|
||||
import com.ruoyi.system.mapper.UsdtAggregationTaskMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.context.ApplicationEventPublisher;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
@@ -38,6 +39,7 @@ public class UsdtAggregationWorkflowService {
|
||||
private final WalletOperationEstimateService estimateService;
|
||||
private final WalletSigningService walletSigningService;
|
||||
private final WalletLedgerPostingService ledgerPostingService;
|
||||
private final ApplicationEventPublisher eventPublisher;
|
||||
|
||||
public UsdtAggregationWorkflowService(IAppsService appsService,
|
||||
IWalletAddressService walletService,
|
||||
@@ -47,7 +49,7 @@ public class UsdtAggregationWorkflowService {
|
||||
UsdtAggregationTaskItemMapper itemMapper,
|
||||
WalletOperationEstimateService estimateService,
|
||||
WalletSigningService walletSigningService,
|
||||
WalletLedgerPostingService ledgerPostingService) {
|
||||
WalletLedgerPostingService ledgerPostingService, ApplicationEventPublisher eventPublisher) {
|
||||
this.appsService = appsService;
|
||||
this.walletService = walletService;
|
||||
this.taskService = taskService;
|
||||
@@ -57,6 +59,7 @@ public class UsdtAggregationWorkflowService {
|
||||
this.estimateService = estimateService;
|
||||
this.walletSigningService = walletSigningService;
|
||||
this.ledgerPostingService = ledgerPostingService;
|
||||
this.eventPublisher = eventPublisher;
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@@ -98,6 +101,8 @@ public class UsdtAggregationWorkflowService {
|
||||
UsdtAggregationTaskItem item = buildItem(task, wallet, now);
|
||||
itemMapper.insertUsdtAggregationTaskItem(item);
|
||||
}
|
||||
eventPublisher.publishEvent(new TelegramAggregationAuditEvent(task.getId(), task.getTaskName(),
|
||||
task.getDistTokenAddress(), eligible, "归集明细金额请以系统监控明细为准"));
|
||||
return task.getId();
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.system.mapper.TelegramAuditMapper">
|
||||
<resultMap id="TelegramAuditResult" type="com.ruoyi.system.domain.TelegramAuditRecord">
|
||||
<result property="id" column="id"/>
|
||||
<result property="auditNo" column="audit_no"/>
|
||||
<result property="businessType" column="business_type"/>
|
||||
<result property="businessId" column="business_id"/>
|
||||
<result property="title" column="title"/>
|
||||
<result property="payload" column="payload"/>
|
||||
<result property="auditStatus" column="audit_status"/>
|
||||
<result property="telegramChatId" column="telegram_chat_id"/>
|
||||
<result property="telegramMessageId" column="telegram_message_id"/>
|
||||
<result property="reviewerTelegramId" column="reviewer_telegram_id"/>
|
||||
<result property="reviewerName" column="reviewer_name"/>
|
||||
<result property="reviewComment" column="review_comment"/>
|
||||
<result property="reviewedAt" column="reviewed_at"/>
|
||||
<result property="createdAt" column="created_at"/>
|
||||
<result property="updatedAt" column="updated_at"/>
|
||||
</resultMap>
|
||||
<insert id="insertRecord" parameterType="com.ruoyi.system.domain.TelegramAuditRecord" useGeneratedKeys="true"
|
||||
keyProperty="id">
|
||||
INSERT INTO telegram_audit_record (audit_no, business_type, business_id, title, payload, audit_status,
|
||||
created_at, updated_at)
|
||||
VALUES (#{auditNo}, #{businessType}, #{businessId}, #{title}, #{payload}, #{auditStatus}, #{createdAt},
|
||||
#{updatedAt})
|
||||
</insert>
|
||||
<select id="selectByAuditNo" resultMap="TelegramAuditResult">SELECT *
|
||||
FROM telegram_audit_record
|
||||
WHERE audit_no = #{auditNo}</select>
|
||||
<select id="selectByBusiness" resultMap="TelegramAuditResult">SELECT *
|
||||
FROM telegram_audit_record
|
||||
WHERE business_type = #{businessType}
|
||||
AND business_id = #{businessId}</select>
|
||||
<update id="updateMessage">UPDATE telegram_audit_record
|
||||
SET telegram_chat_id=#{chatId},
|
||||
telegram_message_id=#{messageId},
|
||||
updated_at=#{updatedAt}
|
||||
WHERE audit_no = #{auditNo}</update>
|
||||
<update id="approve">UPDATE telegram_audit_record
|
||||
SET audit_status=#{status},
|
||||
reviewer_telegram_id=#{reviewerId},
|
||||
reviewer_name=#{reviewerName},
|
||||
reviewed_at=#{reviewedAt},
|
||||
updated_at=#{updatedAt}
|
||||
WHERE audit_no = #{auditNo}
|
||||
AND audit_status = 'PENDING'</update>
|
||||
<insert id="insertLog">INSERT
|
||||
IGNORE INTO telegram_audit_log (audit_no,telegram_update_id,telegram_callback_query_id,telegram_user_id,telegram_username,action,old_status,new_status,created_at) VALUES (
|
||||
#{auditNo},
|
||||
#{updateId},
|
||||
#{callbackId},
|
||||
#{userId},
|
||||
#{username},
|
||||
#{action},
|
||||
#{oldStatus},
|
||||
#{newStatus},
|
||||
#{createdAt}
|
||||
)</insert>
|
||||
<update id="updateLogOutcome">UPDATE telegram_audit_log
|
||||
SET action=#{action},
|
||||
old_status=#{oldStatus},
|
||||
new_status=#{newStatus},
|
||||
comment=#{comment}
|
||||
WHERE telegram_update_id = #{updateId}</update>
|
||||
<insert id="insertPushTask">INSERT INTO telegram_audit_push_task (audit_no, task_status, retry_count, next_retry_at,
|
||||
created_at, updated_at)
|
||||
VALUES (#{auditNo}, 'PENDING', 0, #{nextRetryAt}, #{createdAt}, #{createdAt})</insert>
|
||||
<select id="selectDuePushAuditNos" resultType="java.lang.String">
|
||||
SELECT audit_no
|
||||
FROM telegram_audit_push_task
|
||||
WHERE (task_status IN ('PENDING', 'RETRYING') AND next_retry_at <= NOW())
|
||||
OR (task_status = 'PROCESSING' AND updated_at < DATE_SUB(NOW(), INTERVAL 5 MINUTE))
|
||||
ORDER BY next_retry_at, id LIMIT #{limit}
|
||||
</select>
|
||||
<update id="claimPushTask">
|
||||
UPDATE telegram_audit_push_task
|
||||
SET task_status='PROCESSING',
|
||||
updated_at=#{updatedAt}
|
||||
WHERE audit_no = #{auditNo}
|
||||
AND ((task_status IN ('PENDING', 'RETRYING') AND next_retry_at <= NOW())
|
||||
OR (task_status = 'PROCESSING' AND updated_at < DATE_SUB(NOW(), INTERVAL 5 MINUTE)))
|
||||
</update>
|
||||
<select id="selectPushRetryCount" resultType="int">SELECT retry_count
|
||||
FROM telegram_audit_push_task
|
||||
WHERE audit_no = #{auditNo}</select>
|
||||
<update id="completePushTask">UPDATE telegram_audit_push_task
|
||||
SET task_status='SUCCESS',
|
||||
last_error=NULL,
|
||||
updated_at=#{updatedAt}
|
||||
WHERE audit_no = #{auditNo}
|
||||
AND task_status = 'PROCESSING'</update>
|
||||
<update id="failPushTask">UPDATE telegram_audit_push_task
|
||||
SET task_status=#{status},
|
||||
retry_count=#{retryCount},
|
||||
next_retry_at=#{nextRetryAt},
|
||||
last_error=#{lastError},
|
||||
updated_at=#{updatedAt}
|
||||
WHERE audit_no = #{auditNo}
|
||||
AND task_status = 'PROCESSING'</update>
|
||||
</mapper>
|
||||
Reference in new issue
Block a user