diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md index f989f24..bc9b39d 100644 --- a/CHANGE_LOG.md +++ b/CHANGE_LOG.md @@ -292,3 +292,9 @@ | 序号 | 变更类型 | 说明 | 时间 | 备注 | |:---|:-----|------------|:-------------------|:-------------------------------------------------| | 1 | A | 结果添加敏感词的类别 | 2024-4-11 15:02:25 | | + +# release_0.15.0 + +| 序号 | 变更类型 | 说明 | 时间 | 备注 | +|:---|:-----|---------------------|:-------------------|:-------------------------------------------------| +| 1 | F | 调整默认文件名称，避免和其他框架重合。 | 2024-4-23 21:02:25 | https://github.com/houbb/sensitive-word/issues/54 | diff --git a/README.md b/README.md index 6fa9eab..8fb871e 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,9 @@ [CHANGE_LOG.md](https://github.com/houbb/sensitive-word/blob/master/CHANGE_LOG.md) -V0.14.0: raw 添加敏感词类别。 +V0.15.0: + +- [x] 修复 [#54](https://github.com/houbb/sensitive-word/issues/54) ## 更多资料 @@ -84,7 +86,7 @@ V0.14.0: raw 添加敏感词类别。 com.github.houbb sensitive-word - 0.14.0 + 0.15.0 ``` diff --git a/pom.xml b/pom.xml index f30901a..652dcad 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.houbb sensitive-word - 0.14.0 + 0.15.0 diff --git a/release.bat b/release.bat index 0b7323f..642d2ed 100644 --- a/release.bat +++ b/release.bat @@ -10,9 +10,9 @@ ECHO "============================= RELEASE START..." :: 版本号信息(需要手动指定) :::: 旧版本名称 -SET version=0.14.0 +SET version=0.15.0 :::: 新版本名称 -SET newVersion=0.15.0 +SET newVersion=0.16.0 :::: 组织名称 SET groupName=com.github.houbb :::: 项目名称 diff --git a/src/main/java/com/github/houbb/sensitive/word/support/deny/WordDenySystem.java b/src/main/java/com/github/houbb/sensitive/word/support/deny/WordDenySystem.java index 8c91837..81e6286 100644 --- a/src/main/java/com/github/houbb/sensitive/word/support/deny/WordDenySystem.java +++ b/src/main/java/com/github/houbb/sensitive/word/support/deny/WordDenySystem.java @@ -25,8 +25,8 @@ public class WordDenySystem implements IWordDeny { @Override public List deny() { - List results = StreamUtil.readAllLines("/dict.txt"); - results.addAll(StreamUtil.readAllLines("/dict_en.txt")); + List results = StreamUtil.readAllLines("/sensitive_word_dict.txt"); + results.addAll(StreamUtil.readAllLines("/sensitive_word_dict_en.txt")); results.addAll(StreamUtil.readAllLines("/sensitive_word_deny.txt")); return results; } diff --git a/src/main/resources/dict.txt b/src/main/resources/sensitive_word_dict.txt similarity index 100% rename from src/main/resources/dict.txt rename to src/main/resources/sensitive_word_dict.txt diff --git a/src/main/resources/dict_en.txt b/src/main/resources/sensitive_word_dict_en.txt similarity index 100% rename from src/main/resources/dict_en.txt rename to src/main/resources/sensitive_word_dict_en.txt diff --git a/src/test/java/ai/com/github/houbb/sensitive/word/utils/package-info.java b/src/test/java/ai/com/github/houbb/sensitive/word/utils/package-info.java new file mode 100644 index 0000000..f27d3ec --- /dev/null +++ b/src/test/java/ai/com/github/houbb/sensitive/word/utils/package-info.java @@ -0,0 +1 @@ +package ai.com.github.houbb.sensitive.word.utils; \ No newline at end of file diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DataInitTest.java b/src/test/java/com/github/houbb/sensitive/word/data/DataInitTest.java index 8563d12..e1e0ab0 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DataInitTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DataInitTest.java @@ -34,11 +34,11 @@ public class DataInitTest { @Test @Ignore public void trimTest() { - final String source = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String source = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List lines = FileUtil.readAllLines(source); List trimLines = CollectionUtil.distinct(CollectionUtil.trimCollection(lines)); - final String target = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String target = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; } /** @@ -75,7 +75,7 @@ public class DataInitTest { @Test @Ignore public void dictAllInOneTest() { - final List allLines = distinctLines("dict.txt"); + final List allLines = distinctLines("sensitive_word_dict.txt"); allLines.addAll(distinctLines("不正当竞争.txt")); allLines.addAll(distinctLines("人名.txt")); @@ -97,7 +97,7 @@ public class DataInitTest { Collections.sort(disctinct); - final String target = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String target = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; FileUtil.write(target, disctinct); } @@ -105,7 +105,7 @@ public class DataInitTest { @Test @Ignore public void oneWordTest() { - final String source = "D:\\_github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String source = "D:\\_github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List lines = FileUtil.readAllLines(source); for(int i = 0; i < lines.size(); i++) { diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DataUtil.java b/src/test/java/com/github/houbb/sensitive/word/data/DataUtil.java index 207ef05..4f6a66c 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DataUtil.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DataUtil.java @@ -38,7 +38,7 @@ public class DataUtil { @Test @Ignore public void singleCharTest() { - final String path = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String path = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List stringList = FileUtil.readAllLines(path); for(String s : stringList) { diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DictNumTest.java b/src/test/java/com/github/houbb/sensitive/word/data/DictNumTest.java index 07e56e8..7b23512 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DictNumTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DictNumTest.java @@ -26,8 +26,8 @@ public class DictNumTest { @Test @Ignore public void formatTest() { - final String sourceFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\dict.txt"; - final String targetFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String sourceFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; + final String targetFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List words = FileUtil.readAllLines(sourceFile); // List formats = CollectionUtil.toList(words, new IHandler() { diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveSingleTest.java b/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveSingleTest.java index 4d4d597..768bb3a 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveSingleTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveSingleTest.java @@ -27,7 +27,7 @@ public class DictRemoveSingleTest { @Ignore public void removeSingleWord() { final String sourceFile = "D:\\code\\github\\sensitive-word\\src\\test\\resources\\dict_20231117.txt"; - final String targetFile = "D:\\code\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String targetFile = "D:\\code\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List words = FileUtil.readAllLines(sourceFile); diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveTwoEnglishTest.java b/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveTwoEnglishTest.java index a3bd712..f476b5e 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveTwoEnglishTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DictRemoveTwoEnglishTest.java @@ -17,7 +17,7 @@ import java.util.List; public class DictRemoveTwoEnglishTest { public static void main(String[] args) { - final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; final String targetFile = "D:\\github\\sensitive-word\\src\\test\\resources\\dict_v20240407.txt"; List words = FileUtil.readAllLines(sourceFile); diff --git a/src/test/java/com/github/houbb/sensitive/word/data/DictSlimTest.java b/src/test/java/com/github/houbb/sensitive/word/data/DictSlimTest.java index 7507aa1..535f121 100644 --- a/src/test/java/com/github/houbb/sensitive/word/data/DictSlimTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/data/DictSlimTest.java @@ -33,8 +33,8 @@ public class DictSlimTest { @Test @Ignore public void formatTest() { - final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; - final String targetFile = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; + final String targetFile = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List words = FileUtil.readAllLines(sourceFile); @@ -67,8 +67,8 @@ public class DictSlimTest { @Test @Ignore public void removeTest() { - final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; - final String targetFile = "D:\\github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String sourceFile = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; + final String targetFile = "D:\\github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List words = FileUtil.readAllLines(sourceFile); @@ -92,8 +92,8 @@ public class DictSlimTest { */ @Test public void removeNumberMappingTest() { - final String sourceFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\dict.txt"; - final String targetFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\dict.txt"; + final String sourceFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; + final String targetFile = "D:\\_github\\sensitive-word\\src\\main\\resources\\sensitive_word_dict.txt"; List words = FileUtil.readAllLines(sourceFile); List formats = CollectionUtil.toList(words, new IHandler() { diff --git a/src/test/java/com/github/houbb/sensitive/word/memory/DataMemoryTest.java b/src/test/java/com/github/houbb/sensitive/word/memory/DataMemoryTest.java index 6e30cae..af1321d 100644 --- a/src/test/java/com/github/houbb/sensitive/word/memory/DataMemoryTest.java +++ b/src/test/java/com/github/houbb/sensitive/word/memory/DataMemoryTest.java @@ -22,7 +22,7 @@ public class DataMemoryTest { */ @Test public void hashMapTest() { - List allLines = StreamUtil.readAllLines("/dict.txt"); + List allLines = StreamUtil.readAllLines("/sensitive_word_dict.txt"); IWordData wordData = WordDatas.defaults(); wordData.initWordData(allLines); @@ -36,7 +36,7 @@ public class DataMemoryTest { //33.4 MB @Test public void treeTest() { - List allLines = StreamUtil.readAllLines("/dict.txt"); + List allLines = StreamUtil.readAllLines("/sensitive_word_dict.txt"); IWordData wordData = WordDatas.tree(); wordData.initWordData(allLines);