From 7d51a4f5ba7b3338e8dec2e4bf8b3ae3f4ec0dab Mon Sep 17 00:00:00 2001 From: zhouhao Date: Thu, 19 Apr 2018 15:26:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/dictionary/api/DictionaryWrapper.java | 15 +++++++++++++++ .../pom.xml | 2 +- .../simple/BoostDictDefineRepository.java | 0 .../simple/DefaultDictionaryHelper.java | 0 .../simple/DefaultDictionaryWrapper.java | 0 .../simple/DictionaryWrapperObject.java | 0 .../simple/SimpleDictionaryItemService.java | 0 .../dictionary/simple/SimpleDictionaryParser.java | 0 .../simple/SimpleDictionaryParserService.java | 0 .../simple/SimpleDictionaryService.java | 0 .../builder/SimpleDictionaryParserBuilder.java | 0 .../web/dictionary/simple/dao/DictionaryDao.java | 0 .../dictionary/simple/dao/DictionaryItemDao.java | 0 .../simple/dao/DictionaryParserDao.java | 0 .../simple/parser/DictParserFormat.java | 0 .../simple/parser/DictParserFormatter.java | 0 .../dictionary/simple/parser/FormatterResult.java | 0 .../simple/parser/ScriptSingleDictParser.java | 0 .../simple/parser/SimpleDictParserFormatter.java | 0 .../simple/parser/SimpleSingleDictParser.java | 0 .../mappers/dictionary/DictionaryItemMapper.xml | 0 .../mappers/dictionary/DictionaryMapper.xml | 0 .../mappers/dictionary/DictionaryParserMapper.xml | 0 .../simple/DefaultDictionaryWrapperTest.java | 0 .../web/dictionary/simple/EmptyDictBean.java | 0 .../web/dictionary/simple/TestBean.java | 0 .../web/dictionary/simple/TestDict.java | 0 .../hsweb-system-dictionary-starter/pom.xml | 2 +- .../web/dictionary/starter/DictionaryTests.java | 1 + hsweb-system/hsweb-system-dictionary/pom.xml | 2 +- 30 files changed, 19 insertions(+), 3 deletions(-) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/pom.xml (95%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryHelper.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapper.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/DictionaryWrapperObject.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParser.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParserService.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryService.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/builder/SimpleDictionaryParserBuilder.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryDao.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryItemDao.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryParserDao.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormat.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormatter.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/FormatterResult.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/ScriptSingleDictParser.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleSingleDictParser.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/test/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapperTest.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/test/java/org/hswebframework/web/dictionary/simple/EmptyDictBean.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/test/java/org/hswebframework/web/dictionary/simple/TestBean.java (100%) rename hsweb-system/hsweb-system-dictionary/{hsweb-system-dictionary-simple => hsweb-system-dictionary-local}/src/test/java/org/hswebframework/web/dictionary/simple/TestDict.java (100%) diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/DictionaryWrapper.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/DictionaryWrapper.java index 019e2bd80..5e6b856fb 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/DictionaryWrapper.java +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-api/src/main/java/org/hswebframework/web/dictionary/api/DictionaryWrapper.java @@ -7,7 +7,22 @@ package org.hswebframework.web.dictionary.api; * @since 3.0 */ public interface DictionaryWrapper { + /** + * 向一个实体类里填充数据字典 + * + * @param id 实体类的id + * @param bean 实体类 + * @param 实体类型 + * @return 填充后的实体类 + */ T wrap(Object id, T bean); + /** + * 把实体类中的 + * @param id + * @param bean + * @param + * @return + */ T persistent(Object id, T bean); } diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml similarity index 95% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/pom.xml rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml index dfec1f204..bbf1282c6 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - hsweb-system-dictionary-simple + hsweb-system-dictionary-local diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/BoostDictDefineRepository.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryHelper.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryHelper.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryHelper.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryHelper.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapper.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapper.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapper.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapper.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DictionaryWrapperObject.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DictionaryWrapperObject.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/DictionaryWrapperObject.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/DictionaryWrapperObject.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryItemService.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParser.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParser.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParser.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParser.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParserService.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParserService.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParserService.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryParserService.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryService.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryService.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryService.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/SimpleDictionaryService.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/builder/SimpleDictionaryParserBuilder.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/builder/SimpleDictionaryParserBuilder.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/builder/SimpleDictionaryParserBuilder.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/builder/SimpleDictionaryParserBuilder.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryDao.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryDao.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryDao.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryDao.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryItemDao.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryItemDao.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryItemDao.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryItemDao.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryParserDao.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryParserDao.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryParserDao.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/dao/DictionaryParserDao.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormat.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormat.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormat.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormat.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormatter.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormatter.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormatter.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/DictParserFormatter.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/FormatterResult.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/FormatterResult.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/FormatterResult.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/FormatterResult.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/ScriptSingleDictParser.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/ScriptSingleDictParser.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/ScriptSingleDictParser.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/ScriptSingleDictParser.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleDictParserFormatter.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleSingleDictParser.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleSingleDictParser.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleSingleDictParser.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/java/org/hswebframework/web/dictionary/simple/parser/SimpleSingleDictParser.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryItemMapper.xml diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryMapper.xml diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/main/resources/org/hswebframework/web/dao/mybatis/mappers/dictionary/DictionaryParserMapper.xml diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapperTest.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapperTest.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapperTest.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/DefaultDictionaryWrapperTest.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/EmptyDictBean.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/EmptyDictBean.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/EmptyDictBean.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/EmptyDictBean.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/TestBean.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/TestBean.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/TestBean.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/TestBean.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/TestDict.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/TestDict.java similarity index 100% rename from hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-simple/src/test/java/org/hswebframework/web/dictionary/simple/TestDict.java rename to hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-local/src/test/java/org/hswebframework/web/dictionary/simple/TestDict.java diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml index f38b817ae..d4e521cb3 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/pom.xml @@ -41,7 +41,7 @@ org.hswebframework.web - hsweb-system-dictionary-simple + hsweb-system-dictionary-local ${project.version} diff --git a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/test/java/org/hswebframework/web/dictionary/starter/DictionaryTests.java b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/test/java/org/hswebframework/web/dictionary/starter/DictionaryTests.java index 58746c9b5..4275b6b8d 100644 --- a/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/test/java/org/hswebframework/web/dictionary/starter/DictionaryTests.java +++ b/hsweb-system/hsweb-system-dictionary/hsweb-system-dictionary-starter/src/test/java/org/hswebframework/web/dictionary/starter/DictionaryTests.java @@ -30,6 +30,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; +import java.math.BigDecimal; import java.util.List; /** diff --git a/hsweb-system/hsweb-system-dictionary/pom.xml b/hsweb-system/hsweb-system-dictionary/pom.xml index 58fc4ae5b..752763b69 100644 --- a/hsweb-system/hsweb-system-dictionary/pom.xml +++ b/hsweb-system/hsweb-system-dictionary/pom.xml @@ -31,7 +31,7 @@ hsweb-system-dictionary-starter hsweb-system-dictionary-api - hsweb-system-dictionary-simple + hsweb-system-dictionary-local hsweb-system-dictionary-web