Update README.md

Update lucene version to 8.3.0
增加是否加载主词典useMainDict属性。
2019-11-12 11:46:03 +08:00 · 2019-11-12 11:30:57 +08:00 · 2019-11-12 11:29:56 +08:00 · 2019-11-12 11:27:22 +08:00 · 2019-09-27 14:31:16 +08:00 · 2019-09-27 14:29:12 +08:00
33 changed files with 15913 additions and 316 deletions
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
@@ -1,3 +1,4 @@
 language: java
+
 jdk:
-  - oraclejdk8
+  - openjdk8
@@ -0,0 +1 @@
+
@@ -1,5 +1,5 @@

-##Solr-Cloud说明
+## Solr-Cloud说明

 ##### 因为`Solr-Cloud`中的配置文件是交由`zookeeper`进行管理的， 所以为了方便更新动态词典， 所以也要将动态词典文件上传至`zookeeper`中，目录与`solr`的配置文件目录一致。

@@ -1,19 +1,19 @@
-# ik-analyzer-solr7
-ik-analyzer for solr7.x
+# ik-analyzer-solr
+ik-analyzer for solr 7.x-8.x

 <!-- Badges section here. -->
 [![GitHub version](https://img.shields.io/maven-central/v/com.github.magese/ik-analyzer.svg?style=flat-square)](https://search.maven.org/search?q=g:com.github.magese%20AND%20a:ik-analyzer&core=gav)
-[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/magese/ik-analyzer-solr7/releases)
-
+[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/magese/ik-analyzer-solr/releases)
 [![Crates.io](https://img.shields.io/crates/l/rustc-serialize.svg)](./LICENSE)
-[![Build Status](https://travis-ci.org/magese/ik-analyzer-solr7.svg?branch=master)](https://travis-ci.org/magese/ik-analyzer-solr7)
+[![Build Status](https://travis-ci.org/magese/ik-analyzer-solr.svg?branch=master)](https://travis-ci.org/magese/ik-analyzer-solr)
+[![HitCount](http://hits.dwyl.io/magese/ik-analyzer-solr.svg)](http://hits.dwyl.io/magese/ik-analyzer-solr)

-[![GitHub forks](https://img.shields.io/github/forks/magese/ik-analyzer-solr7.svg?style=social&label=Fork)](https://github.com/magese/ik-analyzer-solr7/fork)
-[![GitHub stars](https://img.shields.io/github/stars/magese/ik-analyzer-solr7.svg?style=social&label=Star)](https://github.com/magese/ik-analyzer-solr7/star)
+[![GitHub forks](https://img.shields.io/github/forks/magese/ik-analyzer-solr.svg?style=social&label=Fork)](https://github.com/magese/ik-analyzer-solr/network/members)
+[![GitHub stars](https://img.shields.io/github/stars/magese/ik-analyzer-solr.svg?style=social&label=Star)](https://github.com/magese/ik-analyzer-solr/stargazers)
 <!-- /Badges section end. -->

 ## 简介
-#### 适配最新版本solr7；
+#### 适配最新版本solr 7&8；
 #### 扩展IK原有词库：
 | 分词工具 | 词库中词的数量 | 最后更新时间 |
 | :------: | :------: | :------: |
@@ -22,15 +22,15 @@ ik-analyzer for solr7.x
 | word | 64.2万 | 2014年 |
 | jieba | 58.4万 | 2012年 |
 | jcesg | 16.6万 | 2018年 |
-| sougou词库 | 115.2万 | 2018年 |
-#### 将以上词库进行整理后约188.5万条词汇；
+| sougou词库 | 115.2万 | 2019年 |
+#### 将以上词库进行整理后约187.1万条词汇；
 #### 添加动态加载词典表功能，在不需要重启solr服务的情况下加载新增的词典。
 * IKAnalyzer的原作者为林良益<linliangyi2007@gmail.com>，项目网站为<http://code.google.com/p/ik-analyzer>
 * 该项目动态加载功能根据博主[@星火燎原智勇](http://www.cnblogs.com/liang1101/articles/6395016.html)的博客进行修改，其GITHUB地址为[@liang68](https://github.com/liang68)


 ## 使用说明
-* jar包下载地址：[![GitHub version](https://img.shields.io/badge/version-7.6.0-519dd9.svg)](https://search.maven.org/remotecontent?filepath=com/github/magese/ik-analyzer/7.6.0/ik-analyzer-7.6.0.jar)
+* jar包下载地址：[![GitHub version](https://img.shields.io/badge/version-8.3.0-519dd9.svg)](https://search.maven.org/remotecontent?filepath=com/github/magese/ik-analyzer/8.3.0/ik-analyzer-8.3.0.jar)
 * 历史版本：[![GitHub version](https://img.shields.io/maven-central/v/com.github.magese/ik-analyzer.svg?style=flat-square)](https://search.maven.org/search?q=g:com.github.magese%20AND%20a:ik-analyzer&core=gav)

    ```console
@@ -38,7 +38,7 @@ ik-analyzer for solr7.x
    <dependency>
        <groupId>com.github.magese</groupId>
        <artifactId>ik-analyzer</artifactId>
-        <version>7.6.0</version>
+        <version>8.3.0</version>
    </dependency>
    ```

@@ -76,7 +76,15 @@ ik-analyzer for solr7.x

    ![analyzer](./img/analyzer.png)

-5. `ik.conf`文件说明：
+5. `IKAnalyzer.cfg.xml`配置文件说明：
+
+    | 名称 | 类型 | 描述 | 默认 |
+    | :------: | :------: | :------: | :------: |
+    | use_main_dict | boolean | 是否使用默认主词典 | true |
+    | ext_dict | String | 扩展词典文件名称，多个用分号隔开 | ext.dic; |
+    | ext_stopwords | String | 停用词典文件名称，多个用分号隔开 | stopword.dic; |
+
+6. `ik.conf`文件说明：
    ```console
    files=dynamicdic.txt
    lastupdate=0
@@ -85,13 +93,25 @@ ik-analyzer for solr7.x
    1. `files`为动态词典列表，可以设置多个词典表，用逗号进行分隔，默认动态词典表为`dynamicdic.txt`；
    2. `lastupdate`默认值为`0`，每次对动态词典表修改后请+1，不然不会将词典表中新的词语添加到内存中。<s>`lastupdate`采用的是`int`类型，不支持时间戳，如果使用时间戳的朋友可以把源码中的`int`改成`long`即可；</s> `2018-08-23` 已将源码中`lastUpdate`改为`long`类型，现可以用时间戳了。

-6. `dynamicdic.txt` 为动态词典
+7. `dynamicdic.txt` 为动态词典

    在此文件配置的词语不需重启服务即可加载进内存中。
    以`#`开头的词语视为注释，将不会加载到内存中。


 ## 更新说明
+- `2019-11-12:` 
+    - 升级lucene版本为`8.3.0`
+    - `IKAnalyzer.cfg.xml`增加配置项`use_main_dict`，用于配置是否启用默认主词典
+- `2019-09-27:` 升级lucene版本为`8.2.0`
+- `2019-07-11:` 升级lucene版本为`8.1.1`
+- `2019-05-27:` 
+    - 升级lucene版本为`8.1.0`
+    - 优化原词典部分重复词语
+    - 更新搜狗2019最新流行词汇词典，约20k词汇量
+- `2019-05-15:` 升级lucene版本为`8.0.0`，并支持Solr8使用
+- `2019-03-01:` 升级lucene版本为`7.7.1`
+- `2019-02-15:` 升级lucene版本为`7.7.0`
 - `2018-12-26:` 
    - 升级lucene版本为`7.6.0`
    - 兼容solr-cloud，动态词典配置文件及动态词典可交由`zookeeper`进行管理
@@ -107,9 +127,14 @@ ik-analyzer for solr7.x
 - `2018-07-23:` 升级lucene版本为`7.4.0`


+## 感谢 Thanks
+
+[![IDEA](./img/jetbrains.svg)](https://www.jetbrains.com/?from=ik-analyzer-solr)
+
+[![forthebadge](https://forthebadge.com/images/badges/made-with-java.svg)](https://www.java.com)
+
+
 ## BUG & 疑问 & 其它
 如果您在使用过程中遇到了BUG，或者有不清楚的地方，请挂ISSUE或者联系作者：<magese@live.cn>

 如果您觉得该项目对您有帮助，请别忘记给这个项目一个`star`
-
-[![forthebadge](https://forthebadge.com/images/badges/made-with-java.svg)](https://www.java.com)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="120.1px" height="130.2px" viewBox="0 0 120.1 130.2" style="enable-background:new 0 0 120.1 130.2;" xml:space="preserve"
+	>
+<g>
+	<linearGradient id="XMLID_2_" gradientUnits="userSpaceOnUse" x1="31.8412" y1="120.5578" x2="110.2402" y2="73.24">
+		<stop  offset="0" style="stop-color:#FCEE39"/>
+		<stop  offset="1" style="stop-color:#F37B3D"/>
+	</linearGradient>
+	<path id="XMLID_3041_" style="fill:url(#XMLID_2_);" d="M118.6,71.8c0.9-0.8,1.4-1.9,1.5-3.2c0.1-2.6-1.8-4.7-4.4-4.9
+		c-1.2-0.1-2.4,0.4-3.3,1.1l0,0l-83.8,45.9c-1.9,0.8-3.6,2.2-4.7,4.1c-2.9,4.8-1.3,11,3.6,13.9c3.4,2,7.5,1.8,10.7-0.2l0,0l0,0
+		c0.2-0.2,0.5-0.3,0.7-0.5l78-54.8C117.3,72.9,118.4,72.1,118.6,71.8L118.6,71.8L118.6,71.8z"/>
+	<linearGradient id="XMLID_3_" gradientUnits="userSpaceOnUse" x1="48.3607" y1="6.9083" x2="119.9179" y2="69.5546">
+		<stop  offset="0" style="stop-color:#EF5A6B"/>
+		<stop  offset="0.57" style="stop-color:#F26F4E"/>
+		<stop  offset="1" style="stop-color:#F37B3D"/>
+	</linearGradient>
+	<path id="XMLID_3049_" style="fill:url(#XMLID_3_);" d="M118.8,65.1L118.8,65.1L55,2.5C53.6,1,51.6,0,49.3,0
+		c-4.3,0-7.7,3.5-7.7,7.7v0c0,2.1,0.8,3.9,2.1,5.3l0,0l0,0c0.4,0.4,0.8,0.7,1.2,1l67.4,57.7l0,0c0.8,0.7,1.8,1.2,3,1.3
+		c2.6,0.1,4.7-1.8,4.9-4.4C120.2,67.3,119.7,66,118.8,65.1z"/>
+	<linearGradient id="XMLID_4_" gradientUnits="userSpaceOnUse" x1="52.9467" y1="63.6407" x2="10.5379" y2="37.1562">
+		<stop  offset="0" style="stop-color:#7C59A4"/>
+		<stop  offset="0.3852" style="stop-color:#AF4C92"/>
+		<stop  offset="0.7654" style="stop-color:#DC4183"/>
+		<stop  offset="0.957" style="stop-color:#ED3D7D"/>
+	</linearGradient>
+	<path id="XMLID_3042_" style="fill:url(#XMLID_4_);" d="M57.1,59.5C57,59.5,17.7,28.5,16.9,28l0,0l0,0c-0.6-0.3-1.2-0.6-1.8-0.9
+		c-5.8-2.2-12.2,0.8-14.4,6.6c-1.9,5.1,0.2,10.7,4.6,13.4l0,0l0,0C6,47.5,6.6,47.8,7.3,48c0.4,0.2,45.4,18.8,45.4,18.8l0,0
+		c1.8,0.8,3.9,0.3,5.1-1.2C59.3,63.7,59,61,57.1,59.5z"/>
+	<linearGradient id="XMLID_5_" gradientUnits="userSpaceOnUse" x1="52.1736" y1="3.7019" x2="10.7706" y2="37.8971">
+		<stop  offset="0" style="stop-color:#EF5A6B"/>
+		<stop  offset="0.364" style="stop-color:#EE4E72"/>
+		<stop  offset="1" style="stop-color:#ED3D7D"/>
+	</linearGradient>
+	<path id="XMLID_3057_" style="fill:url(#XMLID_5_);" d="M49.3,0c-1.7,0-3.3,0.6-4.6,1.5L4.9,28.3c-0.1,0.1-0.2,0.1-0.2,0.2l-0.1,0
+		l0,0c-1.7,1.2-3.1,3-3.9,5.1C-1.5,39.4,1.5,45.9,7.3,48c3.6,1.4,7.5,0.7,10.4-1.4l0,0l0,0c0.7-0.5,1.3-1,1.8-1.6l34.6-31.2l0,0
+		c1.8-1.4,3-3.6,3-6.1v0C57.1,3.5,53.6,0,49.3,0z"/>
+	<g id="XMLID_3008_">
+		<rect id="XMLID_3033_" x="34.6" y="37.4" style="fill:#000000;" width="51" height="51"/>
+		<rect id="XMLID_3032_" x="39" y="78.8" style="fill:#FFFFFF;" width="19.1" height="3.2"/>
+		<g id="XMLID_3009_">
+			<path id="XMLID_3030_" style="fill:#FFFFFF;" d="M38.8,50.8l1.5-1.4c0.4,0.5,0.8,0.8,1.3,0.8c0.6,0,0.9-0.4,0.9-1.2l0-5.3l2.3,0
+				l0,5.3c0,1-0.3,1.8-0.8,2.3c-0.5,0.5-1.3,0.8-2.3,0.8C40.2,52.2,39.4,51.6,38.8,50.8z"/>
+			<path id="XMLID_3028_" style="fill:#FFFFFF;" d="M45.3,43.8l6.7,0v1.9l-4.4,0V47l4,0l0,1.8l-4,0l0,1.3l4.5,0l0,2l-6.7,0
+				L45.3,43.8z"/>
+			<path id="XMLID_3026_" style="fill:#FFFFFF;" d="M55,45.8l-2.5,0l0-2l7.3,0l0,2l-2.5,0l0,6.3l-2.3,0L55,45.8z"/>
+			<path id="XMLID_3022_" style="fill:#FFFFFF;" d="M39,54l4.3,0c1,0,1.8,0.3,2.3,0.7c0.3,0.3,0.5,0.8,0.5,1.4v0
+				c0,1-0.5,1.5-1.3,1.9c1,0.3,1.6,0.9,1.6,2v0c0,1.4-1.2,2.3-3.1,2.3l-4.3,0L39,54z M43.8,56.6c0-0.5-0.4-0.7-1-0.7l-1.5,0l0,1.5
+				l1.4,0C43.4,57.3,43.8,57.1,43.8,56.6L43.8,56.6z M43,59l-1.8,0l0,1.5H43c0.7,0,1.1-0.3,1.1-0.8v0C44.1,59.2,43.7,59,43,59z"/>
+			<path id="XMLID_3019_" style="fill:#FFFFFF;" d="M46.8,54l3.9,0c1.3,0,2.1,0.3,2.7,0.9c0.5,0.5,0.7,1.1,0.7,1.9v0
+				c0,1.3-0.7,2.1-1.7,2.6l2,2.9l-2.6,0l-1.7-2.5h-1l0,2.5l-2.3,0L46.8,54z M50.6,58c0.8,0,1.2-0.4,1.2-1v0c0-0.7-0.5-1-1.2-1
+				l-1.5,0v2H50.6z"/>
+			<path id="XMLID_3016_" style="fill:#FFFFFF;" d="M56.8,54l2.2,0l3.5,8.4l-2.5,0l-0.6-1.5l-3.2,0l-0.6,1.5l-2.4,0L56.8,54z
+				 M58.8,59l-0.9-2.3L57,59L58.8,59z"/>
+			<path id="XMLID_3014_" style="fill:#FFFFFF;" d="M62.8,54l2.3,0l0,8.3l-2.3,0L62.8,54z"/>
+			<path id="XMLID_3012_" style="fill:#FFFFFF;" d="M65.7,54l2.1,0l3.4,4.4l0-4.4l2.3,0l0,8.3l-2,0L68,57.8l0,4.6l-2.3,0L65.7,54z"
+				/>
+			<path id="XMLID_3010_" style="fill:#FFFFFF;" d="M73.7,61.1l1.3-1.5c0.8,0.7,1.7,1,2.7,1c0.6,0,1-0.2,1-0.6v0
+				c0-0.4-0.3-0.5-1.4-0.8c-1.8-0.4-3.1-0.9-3.1-2.6v0c0-1.5,1.2-2.7,3.2-2.7c1.4,0,2.5,0.4,3.4,1.1l-1.2,1.6
+				c-0.8-0.5-1.6-0.8-2.3-0.8c-0.6,0-0.8,0.2-0.8,0.5v0c0,0.4,0.3,0.5,1.4,0.8c1.9,0.4,3.1,1,3.1,2.6v0c0,1.7-1.3,2.7-3.4,2.7
+				C76.1,62.5,74.7,62,73.7,61.1z"/>
+		</g>
+	</g>
+</g>
+</svg>
@@ -4,16 +4,16 @@

    <groupId>com.github.magese</groupId>
    <artifactId>ik-analyzer</artifactId>
-    <version>7.6.0</version>
+    <version>8.3.0</version>
    <packaging>jar</packaging>

-    <name>ik-analyzer-solr7</name>
+    <name>ik-analyzer-solr</name>
    <url>http://code.google.com/p/ik-analyzer/</url>
-    <description>IK-Analyzer for solr7.6</description>
+    <description>IK-Analyzer for solr 7-8</description>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucene.version>7.6.0</lucene.version>
+        <lucene.version>8.3.0</lucene.version>
        <javac.src.version>1.8</javac.src.version>
        <javac.target.version>1.8</javac.target.version>
        <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
@@ -55,9 +55,9 @@
    </licenses>
    <scm>
        <tag>master</tag>
-        <url>https://github.com/magese/ik-analyzer-solr7</url>
-        <connection>scm:git:git@github.com:magese/ik-analyzer-solr7.git</connection>
-        <developerConnection>scm:git:git@github.com:magese/ik-analyzer-solr7.git</developerConnection>
+        <url>https://github.com/magese/ik-analyzer-solr</url>
+        <connection>scm:git:git@github.com:magese/ik-analyzer-solr.git</connection>
+        <developerConnection>scm:git:git@github.com:magese/ik-analyzer-solr.git</developerConnection>
    </scm>
    <developers>
        <developer>
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.cfg;
@@ -50,6 +50,19 @@ public interface Configuration {
     */
    void setUseSmart(boolean useSmart);

+    /**
+     * 获取是否使用主词典
+     *
+     * @return = true 默认加载主词典， = false 不加载主词典
+     */
+    boolean useMainDict();
+
+    /**
+     * 设置是否使用主词典
+     *
+     * @param useMainDic = true 默认加载主词典， = false 不加载主词典
+     */
+    void setUseMainDict(boolean useMainDic);

    /**
     * 获取主词典路径
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.cfg;
@@ -48,17 +48,21 @@ public class DefaultConfig implements Configuration {
     * 分词器配置文件路径
     */
    private static final String FILE_NAME = "IKAnalyzer.cfg.xml";
+    // 配置属性——是否使用主词典
+    private static final String USE_MAIN = "use_main_dict";
    // 配置属性——扩展字典
    private static final String EXT_DICT = "ext_dict";
    // 配置属性——扩展停止词典
    private static final String EXT_STOP = "ext_stopwords";

    private Properties props;
-    /*
-     * 是否使用smart方式分词
-     */
+
+    // 是否使用smart方式分词
    private boolean useSmart;

+    // 是否加载主词典
+    private boolean useMainDict = true;
+
    /**
     * 返回单例
     *
@@ -100,10 +104,33 @@ public class DefaultConfig implements Configuration {
     *
     * @param useSmart =true ，分词器使用智能切分策略， =false则使用细粒度切分
     */
+    @Override
    public void setUseSmart(boolean useSmart) {
        this.useSmart = useSmart;
    }

+    /**
+     * 获取是否使用主词典
+     *
+     * @return = true 默认加载主词典， = false 不加载主词典
+     */
+    public boolean useMainDict() {
+        String useMainDictCfg = props.getProperty(USE_MAIN);
+        if (useMainDictCfg != null && useMainDictCfg.trim().length() > 0)
+            setUseMainDict(Boolean.parseBoolean(useMainDictCfg));
+        return useMainDict;
+    }
+
+    /**
+     * 设置是否使用主词典
+     *
+     * @param useMainDict = true 默认加载主词典， = false 不加载主词典
+     */
+    @Override
+    public void setUseMainDict(boolean useMainDict) {
+        this.useMainDict = useMainDict;
+    }
+
    /**
     * 获取主词典路径
     *
@@ -142,7 +169,6 @@ public class DefaultConfig implements Configuration {
        return extDictFiles;
    }

-
    /**
     * 获取扩展停止词典配置路径
     *
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,21 +21,21 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;

+import org.wltea.analyzer.cfg.Configuration;
+import org.wltea.analyzer.cfg.DefaultConfig;
+import org.wltea.analyzer.dic.Dictionary;
+
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;

-import org.wltea.analyzer.cfg.Configuration;
-import org.wltea.analyzer.cfg.DefaultConfig;
-import org.wltea.analyzer.dic.Dictionary;
-
 /**
 * IK分词器主类
 */
@@ -58,7 +58,6 @@ public final class IKSegmenter {
     *
     * @param input    读取流
     * @param useSmart 为true，使用智能分词策略
-     *                 <p>
     *                 非智能分词：细粒度输出所有可能的切分结果
     *                 智能分词： 合并数词和量词，对分词结果进行歧义判断
     */
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.2.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.2.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.2.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;
@@ -226,31 +226,25 @@ public class Dictionary {
    private void loadMainDict() {
        // 建立一个主词典实例
        _MainDict = new DictSegment((char) 0);
-        // 读取主词典文件
-        InputStream is = this.getClass().getClassLoader().getResourceAsStream(cfg.getMainDictionary());
-        if (is == null) {
-            throw new RuntimeException("Main Dictionary not found!!!");
-        }
-
-        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8), 512);
-            String theWord;
-            do {
-                theWord = br.readLine();
-                if (theWord != null && !"".equals(theWord.trim())) {
-                    _MainDict.fillSegment(theWord.trim().toLowerCase().toCharArray());
-                }
-            } while (theWord != null);
-
-        } catch (IOException ioe) {
-            System.err.println("Main Dictionary loading exception.");
-            ioe.printStackTrace();
-
-        } finally {
+        // 获取是否加载主词典
+        if (cfg.useMainDict()) {
+            // 读取主词典文件
+            InputStream is = this.getClass().getClassLoader().getResourceAsStream(cfg.getMainDictionary());
+            if (is == null) {
+                throw new RuntimeException("Main Dictionary not found!!!");
+            }
            try {
-                is.close();
-            } catch (IOException e) {
-                e.printStackTrace();
+                readDict(is, _MainDict);
+            } catch (IOException ioe) {
+                System.err.println("Main Dictionary loading exception.");
+                ioe.printStackTrace();
+
+            } finally {
+                try {
+                    is.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
            }
        }
        // 加载扩展词典
@@ -274,17 +268,7 @@ public class Dictionary {
                    continue;
                }
                try {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8), 512);
-                    String theWord;
-                    do {
-                        theWord = br.readLine();
-                        if (theWord != null && !"".equals(theWord.trim())) {
-                            // 加载扩展词典数据到主内存词典中
-                            // System.out.println(theWord);
-                            _MainDict.fillSegment(theWord.trim().toLowerCase().toCharArray());
-                        }
-                    } while (theWord != null);
-
+                    readDict(is, _MainDict);
                } catch (IOException ioe) {
                    System.err.println("Extension Dictionary loading exception.");
                    ioe.printStackTrace();
@@ -319,17 +303,7 @@ public class Dictionary {
                    continue;
                }
                try {
-                    BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8), 512);
-                    String theWord;
-                    do {
-                        theWord = br.readLine();
-                        if (theWord != null && !"".equals(theWord.trim())) {
-                            // System.out.println(theWord);
-                            // 加载扩展停止词典数据到内存中
-                            _StopWordDict.fillSegment(theWord.trim().toLowerCase().toCharArray());
-                        }
-                    } while (theWord != null);
-
+                    readDict(is, _StopWordDict);
                } catch (IOException ioe) {
                    System.err.println("Extension Stop word Dictionary loading exception.");
                    ioe.printStackTrace();
@@ -357,15 +331,7 @@ public class Dictionary {
            throw new RuntimeException("Quantifier Dictionary not found!!!");
        }
        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8), 512);
-            String theWord;
-            do {
-                theWord = br.readLine();
-                if (theWord != null && !"".equals(theWord.trim())) {
-                    _QuantifierDict.fillSegment(theWord.trim().toLowerCase().toCharArray());
-                }
-            } while (theWord != null);
-
+            readDict(is, _QuantifierDict);
        } catch (IOException ioe) {
            System.err.println("Quantifier Dictionary loading exception.");
            ioe.printStackTrace();
@@ -379,4 +345,21 @@ public class Dictionary {
        }
    }

+    /**
+     * 读取词典文件到词典树中
+     *
+     * @param is          文件输入流
+     * @param dictSegment 词典树分段
+     * @throws IOException 读取异常
+     */
+    private void readDict(InputStream is, DictSegment dictSegment) throws IOException {
+        BufferedReader br = new BufferedReader(new InputStreamReader(is, StandardCharsets.UTF_8), 512);
+        String theWord;
+        do {
+            theWord = br.readLine();
+            if (theWord != null && !"".equals(theWord.trim())) {
+                dictSegment.fillSegment(theWord.trim().toLowerCase().toCharArray());
+            }
+        } while (theWord != null);
+    }
 }
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@@ -34,44 +34,40 @@ import org.apache.lucene.analysis.Tokenizer;
 * IK分词器，Lucene Analyzer接口实现
 */
@SuppressWarnings("unused")
-public final class IKAnalyzer extends Analyzer{
-	
-	private boolean useSmart;
-	
-	private boolean useSmart() {
-		return useSmart;
-	}
+public final class IKAnalyzer extends Analyzer {

-	public void setUseSmart(boolean useSmart) {
-		this.useSmart = useSmart;
-	}
+    private boolean useSmart;

-	/**
-	 * IK分词器Lucene  Analyzer接口实现类
-	 * 
-	 * 默认细粒度切分算法
-	 */
-	public IKAnalyzer(){
-		this(false);
-	}
-	
-	/**
-	 * IK分词器Lucene Analyzer接口实现类
-	 * 
-	 * @param useSmart 当为true时，分词器进行智能切分
-	 */
-	public IKAnalyzer(boolean useSmart){
-		super();
-		this.useSmart = useSmart;
-	}
+    private boolean useSmart() {
+        return useSmart;
+    }

-	/**
-	 * 重载Analyzer接口，构造分词组件
-	 */
-	@Override
-	protected TokenStreamComponents createComponents(String fieldName) {
-		Tokenizer _IKTokenizer = new IKTokenizer(this.useSmart());
-		return new TokenStreamComponents(_IKTokenizer);
-	}
+
+    /**
+     * IK分词器Lucene  Analyzer接口实现类
+     * 默认细粒度切分算法
+     */
+    public IKAnalyzer() {
+        this(false);
+    }
+
+    /**
+     * IK分词器Lucene Analyzer接口实现类
+     *
+     * @param useSmart 当为true时，分词器进行智能切分
+     */
+    public IKAnalyzer(boolean useSmart) {
+        super();
+        this.useSmart = useSmart;
+    }
+
+    /**
+     * 重载Analyzer接口，构造分词组件
+     */
+    @Override
+    protected TokenStreamComponents createComponents(String fieldName) {
+        Tokenizer _IKTokenizer = new IKTokenizer(this.useSmart());
+        return new TokenStreamComponents(_IKTokenizer);
+    }

 }
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@@ -43,88 +43,88 @@ import java.io.IOException;
 */
@SuppressWarnings("unused")
 public final class IKTokenizer extends Tokenizer {
-	
-	//IK分词器实现
-	private IKSegmenter _IKImplement;
-	
-	//词元文本属性
-	private CharTermAttribute termAtt;
-	//词元位移属性
-	private OffsetAttribute offsetAtt;
-	//词元分类属性（该属性分类参考org.wltea.analyzer.core.Lexeme中的分类常量）
-	private TypeAttribute typeAtt;
-	//记录最后一个词元的结束位置
-	private int endPosition;
-	
-	/**
-	 * Lucene 7.6 Tokenizer适配器类构造函数
-	 */
-	public IKTokenizer() {
-	    this(false);
-	}

-	IKTokenizer(boolean useSmart) {
-		super();
-		init(useSmart);
-	}
+    //IK分词器实现
+    private IKSegmenter _IKImplement;

-	public IKTokenizer(AttributeFactory factory) {
-		this(factory, false);
-	}
+    //词元文本属性
+    private CharTermAttribute termAtt;
+    //词元位移属性
+    private OffsetAttribute offsetAtt;
+    //词元分类属性（该属性分类参考org.wltea.analyzer.core.Lexeme中的分类常量）
+    private TypeAttribute typeAtt;
+    //记录最后一个词元的结束位置
+    private int endPosition;

-	IKTokenizer(AttributeFactory factory, boolean useSmart) {
-		super(factory);
-		init(useSmart);
-	}
+    /**
+     * Lucene 7.6 Tokenizer适配器类构造函数
+     */
+    public IKTokenizer() {
+        this(false);
+    }

-	private void init(boolean useSmart) {
-		offsetAtt = addAttribute(OffsetAttribute.class);
-		termAtt = addAttribute(CharTermAttribute.class);
-		typeAtt = addAttribute(TypeAttribute.class);
-		_IKImplement = new IKSegmenter(input , useSmart);
-	}
+    IKTokenizer(boolean useSmart) {
+        super();
+        init(useSmart);
+    }

-	/* (non-Javadoc)
-	 * @see org.apache.lucene.analysis.TokenStream#incrementToken()
-	 */
-	@Override
-	public boolean incrementToken() throws IOException {
-		//清除所有的词元属性
-		clearAttributes();
-		Lexeme nextLexeme = _IKImplement.next();
-		if(nextLexeme != null){
-			//将Lexeme转成Attributes
-			//设置词元文本
-			termAtt.append(nextLexeme.getLexemeText());
-			//设置词元长度
-			termAtt.setLength(nextLexeme.getLength());
-			//设置词元位移
-			offsetAtt.setOffset(nextLexeme.getBeginPosition(), nextLexeme.getEndPosition());
-			//记录分词的最后位置
-			endPosition = nextLexeme.getEndPosition();
-			//记录词元分类
-			typeAtt.setType(nextLexeme.getLexemeTypeString());			
-			//返会true告知还有下个词元
-			return true;
-		}
-		//返会false告知词元输出完毕
-		return false;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * @see org.apache.lucene.analysis.Tokenizer#reset(java.io.Reader)
-	 */
-	@Override
-	public void reset() throws IOException {
-		super.reset();
-		_IKImplement.reset(input);
-	}	
-	
-	@Override
-	public final void end() {
-	    // set final offset
-		int finalOffset = correctOffset(this.endPosition);
-		offsetAtt.setOffset(finalOffset, finalOffset);
-	}
+    public IKTokenizer(AttributeFactory factory) {
+        this(factory, false);
+    }
+
+    IKTokenizer(AttributeFactory factory, boolean useSmart) {
+        super(factory);
+        init(useSmart);
+    }
+
+    private void init(boolean useSmart) {
+        offsetAtt = addAttribute(OffsetAttribute.class);
+        termAtt = addAttribute(CharTermAttribute.class);
+        typeAtt = addAttribute(TypeAttribute.class);
+        _IKImplement = new IKSegmenter(input, useSmart);
+    }
+
+    /* (non-Javadoc)
+     * @see org.apache.lucene.analysis.TokenStream#incrementToken()
+     */
+    @Override
+    public boolean incrementToken() throws IOException {
+        //清除所有的词元属性
+        clearAttributes();
+        Lexeme nextLexeme = _IKImplement.next();
+        if (nextLexeme != null) {
+            //将Lexeme转成Attributes
+            //设置词元文本
+            termAtt.append(nextLexeme.getLexemeText());
+            //设置词元长度
+            termAtt.setLength(nextLexeme.getLength());
+            //设置词元位移
+            offsetAtt.setOffset(nextLexeme.getBeginPosition(), nextLexeme.getEndPosition());
+            //记录分词的最后位置
+            endPosition = nextLexeme.getEndPosition();
+            //记录词元分类
+            typeAtt.setType(nextLexeme.getLexemeTypeString());
+            //返会true告知还有下个词元
+            return true;
+        }
+        //返会false告知词元输出完毕
+        return false;
+    }
+
+    /*
+     * (non-Javadoc)
+     * @see org.apache.lucene.analysis.Tokenizer#reset(java.io.Reader)
+     */
+    @Override
+    public void reset() throws IOException {
+        super.reset();
+        _IKImplement.reset(input);
+    }
+
+    @Override
+    public final void end() {
+        // set final offset
+        int finalOffset = correctOffset(this.endPosition);
+        offsetAtt.setOffset(finalOffset, finalOffset);
+    }
 }
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.query;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.query;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.sample;
@@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.5
- * IK Analyzer release 7.5
+ * IK 中文分词  版本 8.3.0
+ * IK Analyzer release 8.3.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@@ -21,8 +21,8 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.6版本 由 Magese (magese@live.cn) 更新
- * release 7.6 update by Magese(magese@live.cn)
+ * 8.3.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.sample;
@@ -39,10 +39,7 @@ import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.index.IndexWriterConfig.OpenMode;
 import org.apache.lucene.queryparser.classic.ParseException;
 import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ScoreDoc;
-import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.*;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
 import org.wltea.analyzer.lucene.IKAnalyzer;
@@ -107,10 +104,11 @@ public class LuceneIndexAndSearchDemo {

            //搜索相似度最高的5条记录
            TopDocs topDocs = isearcher.search(query, 5);
-            System.out.println("命中：" + topDocs.totalHits);
+            long totalHits = topDocs.totalHits.value;
+            System.out.println("命中：" + totalHits);
            //输出结果
            ScoreDoc[] scoreDocs = topDocs.scoreDocs;
-            for (int i = 0; i < topDocs.totalHits; i++) {
+            for (int i = 0; i < totalHits; i++) {
                Document targetDoc = isearcher.doc(scoreDocs[i].doc);
                System.out.println("内容：" + targetDoc.toString());
            }
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">  
-<properties>  
-	<comment>IK Analyzer 扩展配置</comment>
-	<!--用户可以在这里配置自己的扩展字典 -->
-	<entry key="ext_dict">ext.dic;</entry> 
-	
-	<!--用户可以在这里配置自己的扩展停止词字典-->
-	<entry key="ext_stopwords">stopword.dic;</entry> 
-	
+<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
+<properties>
+    <comment>IK Analyzer 扩展配置</comment>
+	<!-- 配置是否加载默认词典 -->
+	<entry key="use_main_dict">true</entry>
+    <!-- 配置自己的扩展字典，多个用分号分隔 -->
+    <entry key="ext_dict">ext.dic;</entry>
+    <!-- 配置自己的扩展停止词字典，多个用分号分隔 -->
+    <entry key="ext_stopwords">stopword.dic;</entry>
 </properties>
Author	SHA1	Message	Date
magese	95ba364090	Update README.md	2019-11-12 11:46:03 +08:00
magese	0c8992fd80	Update lucene version to 8.3.0	2019-11-12 11:30:57 +08:00
magese	356d9d9ae9	增加是否加载主词典useMainDict属性。	2019-11-12 11:29:56 +08:00
magese	cd43d4b9ee	增加use_main_dict配置选项，可配置是否加载主词典。	2019-11-12 11:27:22 +08:00
magese	5068a58e0f	Update jdk version	2019-09-27 14:31:16 +08:00
magese	107b4ced30	Update travis properties	2019-09-27 14:29:12 +08:00
magese	e6817ecba5	Extract method from duplicate code	2019-09-27 09:54:15 +08:00
magese	0916f3f8bd	Update lucene to 8.2.0	2019-09-27 09:52:45 +08:00
magese	a3705f5753	Merge remote-tracking branch 'origin/master'	2019-07-11 15:08:40 +08:00
magese	cc9f0d7bea	Update lucene to 8.1.1	2019-07-11 13:51:05 +08:00
Magese	7a2515a134	Update README.md Add HitCount	2019-05-29 08:58:17 +08:00
magese	2ebf31fed5	Update README.md	2019-05-27 13:23:53 +08:00
magese	fd35153cce	Update lucene to 8.1.0	2019-05-27 10:23:32 +08:00
magese	48a0234bb6	更新搜狗2019流行词汇；	2019-05-27 10:21:00 +08:00
magese	a00336d239	Update README.md	2019-05-15 13:28:47 +08:00
magese	32d874b1ba	Merge remote-tracking branch 'origin/master'	2019-05-15 10:38:25 +08:00
magese	7b0d009d32	support solr 8.0.0	2019-05-15 10:37:29 +08:00
Magese	e3695f9192	Create CONTRIBUTING.md	2019-03-01 15:02:32 +08:00
Magese	33ac83d619	Update issue templates	2019-03-01 15:01:25 +08:00
magese	fa1451042b	Update README.md	2019-03-01 09:08:22 +08:00
magese	c2e408473a	Update Lucene version to 7.7.1	2019-02-28 09:46:10 +08:00
magese	712da9e7fc	UPDATE README.md	2019-02-15 17:22:17 +08:00
magese	76a4499777	UPDATE README.md	2019-02-15 17:20:53 +08:00
magese	e6023b1317	Update lucene version to 7.7.0	2019-02-15 14:53:02 +08:00
magese	2b2f551f0e	UPDATE LUCENE VERSION TO 7.7.0	2019-02-15 14:39:30 +08:00
Magese	39a4fe434f	Update README.md	2019-02-13 11:19:42 +08:00
magese	c73e99133a	ADD THANKS TO IDEA	2019-01-18 09:42:08 +08:00
Magese	1dc338cbba	Update README.md	2019-01-10 16:54:31 +08:00
Magese	76c5092fd9	Update README-CLOUD.md	2018-12-26 17:35:34 +08:00