From 464b99a09bf2a47837c71c53fb70e833730b8ef1 Mon Sep 17 00:00:00 2001 From: yhl452493373 Date: Wed, 16 Feb 2022 17:36:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BA=E8=A1=A8?= =?UTF-8?q?=E6=97=B6key=E3=80=81type=E3=80=81seq=E7=9A=84=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E5=88=86=E5=88=AB=E4=B8=BA64=EF=BC=8C64?= =?UTF-8?q?=EF=BC=8C20=EF=BC=8C=E9=81=BF=E5=85=8D=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E2=80=9CSpecified=20key=20was=20too=20long;=20max=20key=20leng?= =?UTF-8?q?th=20is=20767=20bytes=E2=80=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- .../com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java | 6 +++--- .../yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java | 6 +++--- .../yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java | 6 +++--- src/main/java/com/yanghuanglin/seq/po/Sequences.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 4fda1fb..5cf34b9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.yanghuanglin seq - 1.5.1 + 1.5.2 seq seq diff --git a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java index 25a1890..5e54f60 100644 --- a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java @@ -57,9 +57,9 @@ public class SequencesDaoImpl implements SequencesDao { @Override public void createTable() { String sql = "CREATE TABLE IF NOT EXISTS `%s` ( " + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," + - " `%s` BIGINT ( 2 ) NOT NULL COMMENT '已使用到的序号'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," + + " `%s` BIGINT ( 20 ) NOT NULL COMMENT '已使用到的序号'," + " PRIMARY KEY ( `%s`, `%s` ) " + " ) COMMENT '当前序号表'"; sql = String.format(sql, tableConfig.getTable(), diff --git a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java index ec50a3a..c5445bf 100644 --- a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java @@ -72,9 +72,9 @@ public class SequencesUnlockDaoImpl implements SequencesUnlockDao { @Override public void createTable() { String sql = "CREATE TABLE IF NOT EXISTS `%s_unlock` ( " + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," + - " `%s` BIGINT ( 2 ) NOT NULL COMMENT '尚未锁定的序号'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," + + " `%s` BIGINT ( 20 ) NOT NULL COMMENT '尚未锁定的序号'," + " `%s` DATETIME NOT NULL COMMENT '使用时间'," + " PRIMARY KEY ( `%s`, `%s` ,`%s` ) " + " ) COMMENT '未锁定序号表'"; diff --git a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java index 4244612..67d5184 100644 --- a/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java @@ -91,9 +91,9 @@ public class SequencesUnusedDaoImpl implements SequencesUnusedDao { @Override public void createTable() { String sql = "CREATE TABLE IF NOT EXISTS `%s_unused` ( " + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号英文名称'," + - " `%s` VARCHAR ( 255 ) NOT NULL COMMENT '序号类型'," + - " `%s` BIGINT ( 2 ) NOT NULL COMMENT '闲置的的序号'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号英文名称'," + + " `%s` VARCHAR ( 64 ) NOT NULL COMMENT '序号类型'," + + " `%s` BIGINT ( 20 ) NOT NULL COMMENT '闲置的的序号'," + " `%s` DATETIME NOT NULL COMMENT '设为闲置序号的时间'," + " PRIMARY KEY ( `%s`, `%s`, `%s` ) " + " ) COMMENT '闲置序号表'"; diff --git a/src/main/java/com/yanghuanglin/seq/po/Sequences.java b/src/main/java/com/yanghuanglin/seq/po/Sequences.java index 58d1bdb..74c4466 100644 --- a/src/main/java/com/yanghuanglin/seq/po/Sequences.java +++ b/src/main/java/com/yanghuanglin/seq/po/Sequences.java @@ -129,9 +129,9 @@ public class Sequences { * @return 补零后的序号，若未单独设置序号的长度，则最小长度为{@link BaseConfig#getMinLength()}长度；否则为修改后的长度，不足部分补零 */ public String format() { - BaseConfig baseConfig = BaseConfig.getInstance(); - if (baseConfig.getMinLength() != null) - return String.format("%0" + baseConfig.getMinLength() + "d", this.seq); + Integer minLength = BaseConfig.getInstance().getMinLength(); + if (minLength != null) + return String.format("%0" + minLength + "d", this.seq); return String.valueOf(this.seq); }