Merge branch 'release/0.0.1'

conf/jieba/user.dict → conf/user.dict

@@ -3,3 +3,4 @@
 显瘦 3
 又拍云 3
 iphone 3
+鲜芋仙 3

pom.xml

@@ -1,10 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
 	<groupId>com.huaban</groupId>
 	<artifactId>jieba-analysis</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>结巴分词工具(jieba for java)</name>
@@ -18,11 +22,24 @@
 		</license>
 	</licenses>
 
+	<scm>
+		<connection>scm:git:git@github.com:huaban/jieba-analysis.git</connection>
+		<developerConnection>scm:git:git@github.com:huaban/jieba-analysis.git</developerConnection>
+		<url>git@github.com:huaban/jieba-analysis.git</url>
+	</scm>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
+	<developers>
+		<developer>
+			<id>libin</id>
+			<name>libin</name>
+			<email>piaolingxue305@gmail.com</email>
+		</developer>
+	</developers>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
@@ -45,4 +62,5 @@
 			</plugin>
 		</plugins>
 	</build>
+
 </project>

src/main/java/com/huaban/analysis/jieba/WordDictionary.java

@@ -16,8 +16,7 @@
 public class WordDictionary {
     private static WordDictionary singleInstance;
     private static final String MAIN_DICT = "/dict.txt";
-    private static String SOUGOU_DICT = "jieba/sougou.dict";
-    private static String USER_DICT = "jieba/user.dict";
+    private static String USER_DICT_SUFFIX = ".dict";
 
     public final TrieNode trie = new TrieNode();
     public final Map<String, Double> freqs = new HashMap<String, Double>();
@@ -42,10 +41,11 @@ public synchronized static WordDictionary getInstance() {
      */
     public synchronized void init(File configFile) {
         if (!isLoaded) {
-            File sougouDict = new File(configFile, SOUGOU_DICT);
-            File userDict = new File(configFile, USER_DICT);
-            singleInstance.loadUserDict(sougouDict);
-            singleInstance.loadUserDict(userDict);
+            for (File userDict : configFile.listFiles()) {
+                if (userDict.getPath().endsWith(USER_DICT_SUFFIX)) {
+                    singleInstance.loadUserDict(userDict);
+                }
+            }
             isLoaded = true;
         }
     }