Merge remote-tracking branch 'origin/master'

src/main/java/com/ichaoj/ams/script/zksync2/cross/ZkSyncCrossScript.java

@@ -43,8 +43,8 @@ import java.util.Map;
  */
 @Script(name = "zksync-cross",
         params = {
-                @ScriptParam(name = "minAmount", note = "跨链金额"),
-                @ScriptParam(name = "maxAmount", note = "最大金额"),
+                @ScriptParam(name = "minAmount", note = "最小跨链金额"),
+                @ScriptParam(name = "maxAmount", note = "最大跨链金额"),
                 @ScriptParam(name = "accuracy", note = "转账精度（精确到小数点后几位）", defaultValue = "5"),
                 @ScriptParam(name = "l2Gas", note = "转账value，要求覆盖L2的手续费"),
                 @ScriptParam(name = "l2GasLimit", note = "L2 gas limit", defaultValue = "901876"),

src/main/java/com/ichaoj/ams/service/impl/AmsExecuteRecordServiceImpl.java

@@ -209,14 +209,16 @@ public class AmsExecuteRecordServiceImpl extends SuperWhaleServiceImpl<AmsExecut
         log.info("Pending re-execution of wallet : {}", walletsStr);
         log.info("The execution parameters are as follows : {}", executeRecord.getAirdropParams());
         AmsAirdropTask task = taskService.getById(executeRecord.getTaskId());
-//        runTask(
-//                executeRecord.getIntervalMin(),
-//                executeRecord.getIntervalMax(),
-//                executeRecord.getExecuteId(),
-//                task.getTaskCode(),
-//                JSON.parseArray(executeRecord.getAirdropParams(), AirdropParam.class),
-//                wallets
-//        );
+        executeRecord.setExecuteStatus(0);
+        this.updateById(executeRecord);
+        runTask(
+                executeRecord.getIntervalMin(),
+                executeRecord.getIntervalMax(),
+                executeRecord.getExecuteId(),
+                task.getTaskCode(),
+                JSON.parseArray(executeRecord.getAirdropParams(), AirdropParam.class),
+                wallets
+        );
 
     }