diff --git a/src/main/java/org/redkale/schedule/Scheduled.java b/src/main/java/org/redkale/schedule/Scheduled.java index a524460f4..8d4264644 100644 --- a/src/main/java/org/redkale/schedule/Scheduled.java +++ b/src/main/java/org/redkale/schedule/Scheduled.java @@ -32,8 +32,9 @@ public @interface Scheduled { /** * cron表达式, 特殊值:
- * yearly、annually、monthly、weekly、daily、midnight、hourly、minutely - * 1m、2m、3m、5m、10m、15m、30m、1h、2h、3h、6h + * @yearly、@annually、@monthly、@weekly、@daily、@midnight、@hourly、@minutely + * @1m、@2m、@3m、@5m、@10m、@15m、@30m、 + * @1h、@2h、@3h、@6h * ${env.scheduling.cron}: 读取系统配置项 * * @return cron表达式 diff --git a/src/main/java/org/redkale/schedule/spi/CronExpression.java b/src/main/java/org/redkale/schedule/spi/CronExpression.java index baa0607b7..e7bfaa125 100644 --- a/src/main/java/org/redkale/schedule/spi/CronExpression.java +++ b/src/main/java/org/redkale/schedule/spi/CronExpression.java @@ -32,9 +32,33 @@ public class CronExpression { "@yearly", "0 0 0 1 1 *", "@annually", "0 0 0 1 1 *", "@monthly", "0 0 0 1 * *", + "@monthly10s", "10 0 0 1 * *", + "@monthly30s", "30 0 0 1 * *", + "@monthly1m", "0 1 0 1 * *", + "@monthly5m", "0 5 0 1 * *", + "@monthly15m", "0 15 0 1 * *", + "@monthly30m", "0 30 0 1 * *", + "@monthly1h", "0 0 1 1 * *", + "@monthly2h", "0 0 2 1 * *", "@weekly", "0 0 0 * * 0", "@daily", "0 0 0 * * *", + "@daily10s", "10 0 0 * * *", + "@daily30s", "30 0 0 * * *", + "@daily1m", "0 1 0 * * *", + "@daily5m", "0 5 0 * * *", + "@daily15m", "0 15 0 * * *", + "@daily30m", "0 30 0 * * *", + "@daily1h", "0 0 1 * * *", + "@daily2h", "0 0 2 * * *", "@midnight", "0 0 0 * * *", + "@midnight10s", "10 0 0 * * *", + "@midnight30s", "30 0 0 * * *", + "@midnight1m", "0 1 0 * * *", + "@midnight5m", "0 5 0 * * *", + "@midnight15m", "0 15 0 * * *", + "@midnight30m", "0 30 0 * * *", + "@midnight1h", "0 0 1 * * *", + "@midnight2h", "0 0 2 * * *", "@hourly", "0 0 * * * *", "@minutely", "0 0/1 * * * *", "@1m", "0 0/1 * * * *", diff --git a/src/main/java/org/redkale/source/DataJdbcSource.java b/src/main/java/org/redkale/source/DataJdbcSource.java index 6028dec5e..2b078586e 100644 --- a/src/main/java/org/redkale/source/DataJdbcSource.java +++ b/src/main/java/org/redkale/source/DataJdbcSource.java @@ -415,6 +415,7 @@ public class DataJdbcSource extends AbstractDataSqlSource { } } catch (SQLException se) { conn.rollback(prestmt, prestmts); + stmtsRef.clear(); if (!isTableNotExist(info, se.getSQLState())) { throw se; } @@ -3033,14 +3034,13 @@ public class DataJdbcSource extends AbstractDataSqlSource { return conn; } else { offerConnection(conn); - conn = null; } return newConnection(this.queue); } //用于事务的连接 public JdbcConnection pollTransConnection() { - return pollTransConnection(); + return pollConnection(); } private JdbcConnection newConnection(ArrayBlockingQueue queue) {