From e45e75c64465bdd2ce15d6da692b6d0511957a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=BB=84=E6=9E=97?= Date: Tue, 1 Feb 2022 15:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 36 +++++++++---------- pom.xml | 3 +- .../seq/config/GeneratorConfig.java | 2 +- .../seq/config/TableConfig.java | 2 +- .../seq/dao/SequencesDao.java | 4 +-- .../seq/dao/SequencesUnlockDao.java | 4 +-- .../seq/dao/SequencesUnusedDao.java | 4 +-- .../seq/dao/impl/SequencesDaoImpl.java | 8 ++--- .../seq/dao/impl/SequencesUnlockDaoImpl.java | 8 ++--- .../seq/dao/impl/SequencesUnusedDaoImpl.java | 8 ++--- .../seq/generator/Generator.java | 8 ++--- .../generator/impl/SequencesGenerator.java | 24 ++++++------- .../seq/po/Sequences.java | 2 +- .../seq/po/SequencesUnlock.java | 2 +- .../seq/po/SequencesUnused.java | 2 +- src/test/java/SeqTest.java | 10 +++--- 16 files changed, 63 insertions(+), 64 deletions(-) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/config/GeneratorConfig.java (98%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/config/TableConfig.java (97%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/SequencesDao.java (83%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/SequencesUnlockDao.java (90%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/SequencesUnusedDao.java (88%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/impl/SequencesDaoImpl.java (94%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/impl/SequencesUnlockDaoImpl.java (95%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/dao/impl/SequencesUnusedDaoImpl.java (96%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/generator/Generator.java (96%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/generator/impl/SequencesGenerator.java (92%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/po/Sequences.java (98%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/po/SequencesUnlock.java (95%) rename src/main/java/com/{cdhncy => yanghuanglin}/seq/po/SequencesUnused.java (91%) diff --git a/README.md b/README.md index a4c37da..f07d4ad 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ - com.cdhncy + com.yanghuanglincom.yanghuanglin seq 1.0.0 @@ -52,7 +52,7 @@ ${pom.basedir}/lib/seq-1.0.0-pom.xml ${project.basedir}/lib/seq-1.0.0-sources.jar default - com.cdhncy + com.yanghuanglincom.yanghuanglin seq 1.0.0 jar @@ -69,10 +69,10 @@ ```java package com.yang.springseq.config; -import com.cdhncy.seq.config.GeneratorConfig; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.generator.Generator; -import com.cdhncy.seq.generator.impl.SequencesGenerator; +import com.yanghuanglin.seq.config.GeneratorConfig; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.generator.Generator; +import com.yanghuanglin.seq.generator.impl.SequencesGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.core.JdbcTemplate; @@ -140,14 +140,12 @@ public class SeqGeneratorConfig { ```java package com.yang.springseq.config; -import com.cdhncy.seq.config.GeneratorConfig; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.generator.Generator; -import com.cdhncy.seq.generator.impl.SequencesGenerator; +import com.yanghuanglin.seq.config.GeneratorConfig; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.generator.Generator; +import com.yanghuanglin.seq.generator.impl.SequencesGenerator; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.transaction.support.TransactionTemplate; import javax.annotation.Resource; import javax.sql.DataSource; @@ -205,8 +203,8 @@ public class SeqGeneratorConfig { ```java package com.yang.springseq.config; -import com.cdhncy.seq.generator.Generator; -import com.cdhncy.seq.po.Sequences; +import com.yanghuanglin.seq.generator.Generator; +import com.yanghuanglin.seq.po.Sequences; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -277,7 +275,7 @@ GeneratorConfig配置项，通过set方法设置 | transactionManager | org.springframework.jdbc.datasource.DataSourceTransactionManager | null | 事务管理器 | | autoCreate | Boolean | true | 开启自动建表 | | step | Integer | 1 | 序号增加时的步长 | -| tableConfig | com.cdhncy.seq.config.TableConfig | TableConfig的默认配置 | 表配置 | +| tableConfig | com.yanghuanglin.seq.config.TableConfig | TableConfig的默认配置 | 表配置 | 以上配置中，jdbcTemplate和transactionTemplate优先级最高，如果jdbcTemplate、transactionTemplate、dataSource、transactionManager同时配置，则dataSource和transactionManager无效； 进行这几种组合：dataSource+autoCreate+step+tableConfig，jdbcTemplate+transactionTemplate+autoCreate+step+tableConfig，jdbcTemplate+transactionManager+autoCreate+step+tableConfig @@ -286,11 +284,11 @@ GeneratorConfig配置项，通过set方法设置 Generator方法如下： ```java -package com.cdhncy.seq.generator; +package com.yanghuanglin.seq.generator; -import com.cdhncy.seq.po.Sequences; -import com.cdhncy.seq.po.SequencesUnlock; -import com.cdhncy.seq.po.SequencesUnused; +import com.yanghuanglin.seq.po.Sequences; +import com.yanghuanglin.seq.po.SequencesUnlock; +import com.yanghuanglin.seq.po.SequencesUnused; import java.util.Date; diff --git a/pom.xml b/pom.xml index f18d702..9aeb6c8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.cdhncy + com.yanghuanglin seq 1.0.0 seq @@ -34,6 +34,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.1 8 8 diff --git a/src/main/java/com/cdhncy/seq/config/GeneratorConfig.java b/src/main/java/com/yanghuanglin/seq/config/GeneratorConfig.java similarity index 98% rename from src/main/java/com/cdhncy/seq/config/GeneratorConfig.java rename to src/main/java/com/yanghuanglin/seq/config/GeneratorConfig.java index 087ad37..d8224f1 100644 --- a/src/main/java/com/cdhncy/seq/config/GeneratorConfig.java +++ b/src/main/java/com/yanghuanglin/seq/config/GeneratorConfig.java @@ -1,4 +1,4 @@ -package com.cdhncy.seq.config; +package com.yanghuanglin.seq.config; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/src/main/java/com/cdhncy/seq/config/TableConfig.java b/src/main/java/com/yanghuanglin/seq/config/TableConfig.java similarity index 97% rename from src/main/java/com/cdhncy/seq/config/TableConfig.java rename to src/main/java/com/yanghuanglin/seq/config/TableConfig.java index cd84762..05a6e3a 100644 --- a/src/main/java/com/cdhncy/seq/config/TableConfig.java +++ b/src/main/java/com/yanghuanglin/seq/config/TableConfig.java @@ -1,4 +1,4 @@ -package com.cdhncy.seq.config; +package com.yanghuanglin.seq.config; /** * 生成器对应的数据库表和字段配置 diff --git a/src/main/java/com/cdhncy/seq/dao/SequencesDao.java b/src/main/java/com/yanghuanglin/seq/dao/SequencesDao.java similarity index 83% rename from src/main/java/com/cdhncy/seq/dao/SequencesDao.java rename to src/main/java/com/yanghuanglin/seq/dao/SequencesDao.java index 2a771a9..b841d97 100644 --- a/src/main/java/com/cdhncy/seq/dao/SequencesDao.java +++ b/src/main/java/com/yanghuanglin/seq/dao/SequencesDao.java @@ -1,6 +1,6 @@ -package com.cdhncy.seq.dao; +package com.yanghuanglin.seq.dao; -import com.cdhncy.seq.po.Sequences; +import com.yanghuanglin.seq.po.Sequences; /** * @author yanghuanglin diff --git a/src/main/java/com/cdhncy/seq/dao/SequencesUnlockDao.java b/src/main/java/com/yanghuanglin/seq/dao/SequencesUnlockDao.java similarity index 90% rename from src/main/java/com/cdhncy/seq/dao/SequencesUnlockDao.java rename to src/main/java/com/yanghuanglin/seq/dao/SequencesUnlockDao.java index 07bfa61..8b71ea7 100644 --- a/src/main/java/com/cdhncy/seq/dao/SequencesUnlockDao.java +++ b/src/main/java/com/yanghuanglin/seq/dao/SequencesUnlockDao.java @@ -1,6 +1,6 @@ -package com.cdhncy.seq.dao; +package com.yanghuanglin.seq.dao; -import com.cdhncy.seq.po.SequencesUnlock; +import com.yanghuanglin.seq.po.SequencesUnlock; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/cdhncy/seq/dao/SequencesUnusedDao.java b/src/main/java/com/yanghuanglin/seq/dao/SequencesUnusedDao.java similarity index 88% rename from src/main/java/com/cdhncy/seq/dao/SequencesUnusedDao.java rename to src/main/java/com/yanghuanglin/seq/dao/SequencesUnusedDao.java index 166abfe..915e89f 100644 --- a/src/main/java/com/cdhncy/seq/dao/SequencesUnusedDao.java +++ b/src/main/java/com/yanghuanglin/seq/dao/SequencesUnusedDao.java @@ -1,6 +1,6 @@ -package com.cdhncy.seq.dao; +package com.yanghuanglin.seq.dao; -import com.cdhncy.seq.po.SequencesUnused; +import com.yanghuanglin.seq.po.SequencesUnused; import java.util.List; diff --git a/src/main/java/com/cdhncy/seq/dao/impl/SequencesDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java similarity index 94% rename from src/main/java/com/cdhncy/seq/dao/impl/SequencesDaoImpl.java rename to src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java index ca2c237..5e8270b 100644 --- a/src/main/java/com/cdhncy/seq/dao/impl/SequencesDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesDaoImpl.java @@ -1,8 +1,8 @@ -package com.cdhncy.seq.dao.impl; +package com.yanghuanglin.seq.dao.impl; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.dao.SequencesDao; -import com.cdhncy.seq.po.Sequences; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.dao.SequencesDao; +import com.yanghuanglin.seq.po.Sequences; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/cdhncy/seq/dao/impl/SequencesUnlockDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java similarity index 95% rename from src/main/java/com/cdhncy/seq/dao/impl/SequencesUnlockDaoImpl.java rename to src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java index fa67e0c..2ce0035 100644 --- a/src/main/java/com/cdhncy/seq/dao/impl/SequencesUnlockDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnlockDaoImpl.java @@ -1,8 +1,8 @@ -package com.cdhncy.seq.dao.impl; +package com.yanghuanglin.seq.dao.impl; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.dao.SequencesUnlockDao; -import com.cdhncy.seq.po.SequencesUnlock; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.dao.SequencesUnlockDao; +import com.yanghuanglin.seq.po.SequencesUnlock; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/src/main/java/com/cdhncy/seq/dao/impl/SequencesUnusedDaoImpl.java b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java similarity index 96% rename from src/main/java/com/cdhncy/seq/dao/impl/SequencesUnusedDaoImpl.java rename to src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java index 0f220b6..235c268 100644 --- a/src/main/java/com/cdhncy/seq/dao/impl/SequencesUnusedDaoImpl.java +++ b/src/main/java/com/yanghuanglin/seq/dao/impl/SequencesUnusedDaoImpl.java @@ -1,8 +1,8 @@ -package com.cdhncy.seq.dao.impl; +package com.yanghuanglin.seq.dao.impl; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.dao.SequencesUnusedDao; -import com.cdhncy.seq.po.SequencesUnused; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.dao.SequencesUnusedDao; +import com.yanghuanglin.seq.po.SequencesUnused; import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.jdbc.core.BatchPreparedStatementSetter; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/src/main/java/com/cdhncy/seq/generator/Generator.java b/src/main/java/com/yanghuanglin/seq/generator/Generator.java similarity index 96% rename from src/main/java/com/cdhncy/seq/generator/Generator.java rename to src/main/java/com/yanghuanglin/seq/generator/Generator.java index 09eeb83..ea5823b 100644 --- a/src/main/java/com/cdhncy/seq/generator/Generator.java +++ b/src/main/java/com/yanghuanglin/seq/generator/Generator.java @@ -1,8 +1,8 @@ -package com.cdhncy.seq.generator; +package com.yanghuanglin.seq.generator; -import com.cdhncy.seq.po.Sequences; -import com.cdhncy.seq.po.SequencesUnlock; -import com.cdhncy.seq.po.SequencesUnused; +import com.yanghuanglin.seq.po.Sequences; +import com.yanghuanglin.seq.po.SequencesUnlock; +import com.yanghuanglin.seq.po.SequencesUnused; import java.util.Date; diff --git a/src/main/java/com/cdhncy/seq/generator/impl/SequencesGenerator.java b/src/main/java/com/yanghuanglin/seq/generator/impl/SequencesGenerator.java similarity index 92% rename from src/main/java/com/cdhncy/seq/generator/impl/SequencesGenerator.java rename to src/main/java/com/yanghuanglin/seq/generator/impl/SequencesGenerator.java index 9acdc9c..bfb969b 100644 --- a/src/main/java/com/cdhncy/seq/generator/impl/SequencesGenerator.java +++ b/src/main/java/com/yanghuanglin/seq/generator/impl/SequencesGenerator.java @@ -1,16 +1,16 @@ -package com.cdhncy.seq.generator.impl; +package com.yanghuanglin.seq.generator.impl; -import com.cdhncy.seq.config.GeneratorConfig; -import com.cdhncy.seq.dao.SequencesDao; -import com.cdhncy.seq.dao.SequencesUnusedDao; -import com.cdhncy.seq.dao.SequencesUnlockDao; -import com.cdhncy.seq.dao.impl.SequencesDaoImpl; -import com.cdhncy.seq.dao.impl.SequencesUnusedDaoImpl; -import com.cdhncy.seq.dao.impl.SequencesUnlockDaoImpl; -import com.cdhncy.seq.po.Sequences; -import com.cdhncy.seq.po.SequencesUnused; -import com.cdhncy.seq.po.SequencesUnlock; -import com.cdhncy.seq.generator.Generator; +import com.yanghuanglin.seq.config.GeneratorConfig; +import com.yanghuanglin.seq.dao.SequencesDao; +import com.yanghuanglin.seq.dao.SequencesUnusedDao; +import com.yanghuanglin.seq.dao.SequencesUnlockDao; +import com.yanghuanglin.seq.dao.impl.SequencesDaoImpl; +import com.yanghuanglin.seq.dao.impl.SequencesUnusedDaoImpl; +import com.yanghuanglin.seq.dao.impl.SequencesUnlockDaoImpl; +import com.yanghuanglin.seq.po.Sequences; +import com.yanghuanglin.seq.po.SequencesUnused; +import com.yanghuanglin.seq.po.SequencesUnlock; +import com.yanghuanglin.seq.generator.Generator; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.support.JdbcTransactionManager; diff --git a/src/main/java/com/cdhncy/seq/po/Sequences.java b/src/main/java/com/yanghuanglin/seq/po/Sequences.java similarity index 98% rename from src/main/java/com/cdhncy/seq/po/Sequences.java rename to src/main/java/com/yanghuanglin/seq/po/Sequences.java index 52ed7a2..0485301 100644 --- a/src/main/java/com/cdhncy/seq/po/Sequences.java +++ b/src/main/java/com/yanghuanglin/seq/po/Sequences.java @@ -1,4 +1,4 @@ -package com.cdhncy.seq.po; +package com.yanghuanglin.seq.po; /** diff --git a/src/main/java/com/cdhncy/seq/po/SequencesUnlock.java b/src/main/java/com/yanghuanglin/seq/po/SequencesUnlock.java similarity index 95% rename from src/main/java/com/cdhncy/seq/po/SequencesUnlock.java rename to src/main/java/com/yanghuanglin/seq/po/SequencesUnlock.java index 24dd381..e952ad5 100644 --- a/src/main/java/com/cdhncy/seq/po/SequencesUnlock.java +++ b/src/main/java/com/yanghuanglin/seq/po/SequencesUnlock.java @@ -1,4 +1,4 @@ -package com.cdhncy.seq.po; +package com.yanghuanglin.seq.po; import java.util.Date; diff --git a/src/main/java/com/cdhncy/seq/po/SequencesUnused.java b/src/main/java/com/yanghuanglin/seq/po/SequencesUnused.java similarity index 91% rename from src/main/java/com/cdhncy/seq/po/SequencesUnused.java rename to src/main/java/com/yanghuanglin/seq/po/SequencesUnused.java index a85182d..3cdc4bd 100644 --- a/src/main/java/com/cdhncy/seq/po/SequencesUnused.java +++ b/src/main/java/com/yanghuanglin/seq/po/SequencesUnused.java @@ -1,4 +1,4 @@ -package com.cdhncy.seq.po; +package com.yanghuanglin.seq.po; /** diff --git a/src/test/java/SeqTest.java b/src/test/java/SeqTest.java index 5b99676..d4ddeef 100644 --- a/src/test/java/SeqTest.java +++ b/src/test/java/SeqTest.java @@ -1,8 +1,8 @@ -import com.cdhncy.seq.config.GeneratorConfig; -import com.cdhncy.seq.config.TableConfig; -import com.cdhncy.seq.po.Sequences; -import com.cdhncy.seq.generator.Generator; -import com.cdhncy.seq.generator.impl.SequencesGenerator; +import com.yanghuanglin.seq.config.GeneratorConfig; +import com.yanghuanglin.seq.config.TableConfig; +import com.yanghuanglin.seq.po.Sequences; +import com.yanghuanglin.seq.generator.Generator; +import com.yanghuanglin.seq.generator.impl.SequencesGenerator; import com.mysql.cj.jdbc.MysqlDataSource; import org.junit.Test;