Resolve QueryParser exception.

Format comments.
2022-01-04 10:36:49 +08:00 · 2022-01-04 09:59:25 +08:00 · 2022-01-04 09:56:41 +08:00 · 2022-01-04 09:51:21 +08:00 · 2022-01-04 09:48:28 +08:00 · 2022-01-04 09:44:12 +08:00
33 changed files with 17106 additions and 1716 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@ -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.
--- a/.travis.yml
+++ b/.travis.yml
@ -1,3 +1,4 @@
 language: java
+
 jdk:
-  - oraclejdk8
+  - openjdk8
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -0,0 +1 @@
+
--- a/README-CLOUD.md
+++ b/README-CLOUD.md
@ -25,7 +25,7 @@
    ```

 4. 配置Solr的`managed-schema`，添加`ik分词器`，示例如下；
-   ```console
+   ```xml
   <!-- ik分词器 -->
   <fieldType name="text_ik" class="solr.TextField">
     <analyzer type="index">
--- a/README.md
+++ b/README.md
@ -1,19 +1,21 @@
-# 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)

-[![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/stargazers)
+[![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；
-#### 扩展IK原有词库：
+**适配最新版本solr 7&8；**
+
+**扩展IK原有词库：**
+
 | 分词工具 | 词库中词的数量 | 最后更新时间 |
 | :------: | :------: | :------: |
 | ik | 27.5万 | 2012年 |
@ -21,23 +23,27 @@ ik-analyzer for solr7.x
 | word | 64.2万 | 2014年 |
 | jieba | 58.4万 | 2012年 |
 | jcesg | 16.6万 | 2018年 |
-| sougou词库 | 115.2万 | 2018年 |
-#### 将以上词库进行整理后约188.5万条词汇；
-#### 添加动态加载词典表功能，在不需要重启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)
+| sougou词库 | 115.2万 | 2020年 |
+
+**将以上词库进行整理后约187.1万条词汇；**
+
+**添加动态加载词典表功能，在不需要重启solr服务的情况下加载新增的词典。**
+
+> <small>关闭默认主词典请在`IKAnalyzer.cfg.xml`配置文件中设置`use_main_dict`为`false`。</small>
+> * 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.7.1-519dd9.svg)](https://search.maven.org/remotecontent?filepath=com/github/magese/ik-analyzer/7.7.1/ik-analyzer-7.7.1.jar)
+* jar包下载地址：[![GitHub version](https://img.shields.io/badge/version-8.5.0-519dd9.svg)](https://search.maven.org/remotecontent?filepath=com/github/magese/ik-analyzer/8.5.0/ik-analyzer-8.5.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
+    ```xml
    <!-- Maven仓库地址 -->
    <dependency>
        <groupId>com.github.magese</groupId>
        <artifactId>ik-analyzer</artifactId>
-        <version>7.7.1</version>
+        <version>8.5.0</version>
    </dependency>
    ```

@ -57,7 +63,7 @@ ik-analyzer for solr7.x
    ```

 3. 配置Solr的`managed-schema`，添加`ik分词器`，示例如下；
-    ```console
+    ```xml
    <!-- ik分词器 -->
    <fieldType name="text_ik" class="solr.TextField">
      <analyzer type="index">
@ -75,8 +81,16 @@ ik-analyzer for solr7.x

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

-5. `ik.conf`文件说明：
-    ```console
+5. `IKAnalyzer.cfg.xml`配置文件说明：
+
+    | 名称 | 类型 | 描述 | 默认 |
+    | ------ | ------ | ------ | ------ |
+    | use_main_dict | boolean | 是否使用默认主词典 | true |
+    | ext_dict | String | 扩展词典文件名称，多个用分号隔开 | ext.dic; |
+    | ext_stopwords | String | 停用词典文件名称，多个用分号隔开 | stopword.dic; |
+
+6. `ik.conf`文件说明：
+    ```properties
    files=dynamicdic.txt
    lastupdate=0
    ```
@ -84,33 +98,48 @@ 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-03-01:` 升级lucene版本为`7.7.1`
- `2019-02-15:` 升级lucene版本为`7.7.0`
- `2018-12-26:` 
+- **2021-12-23:** 升级lucene版本为`8.5.0`
+- **2021-03-22:** 升级lucene版本为`8.4.0`
+- **2020-12-30:**
+    - 升级lucene版本为`8.3.1`
+    - 更新词库
+- **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`进行管理
    - 动态词典增加注释功能，以`#`开头的行将视为注释
- `2018-12-04:` 整理更新词库列表`magese.dic`
- `2018-10-10:` 升级lucene版本为`7.5.0`
- `2018-09-03:` 优化注释与输出信息，取消部分中文输出避免不同字符集乱码，现会打印被调用inform方法的hashcode
- `2018-08-23: `
+- **2018-12-04:** 整理更新词库列表`magese.dic`
+- **2018-10-10:** 升级lucene版本为`7.5.0`
+- **2018-09-03:** 优化注释与输出信息，取消部分中文输出避免不同字符集乱码，现会打印被调用inform方法的hashcode
+- **2018-08-23:**
    - 完善了动态更新词库代码注释；
    - 将ik.conf配置文件中的lastUpdate属性改为long类型，现已支持时间戳形式
- `2018-08-13:` 更新maven仓库地址
- `2018-08-01:` 移除默认的扩展词与停用词
- `2018-07-23:` 升级lucene版本为`7.4.0`
+- **2018-08-13:** 更新maven仓库地址
+- **2018-08-01:** 移除默认的扩展词与停用词
+- **2018-07-23:** 升级lucene版本为`7.4.0`


 ## 感谢 Thanks

-[![IDEA](./img/jetbrains.svg)](https://www.jetbrains.com/?from=ik-analyzer-solr7)
+[![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)

--- a/pom.xml
+++ b/pom.xml
@ -4,29 +4,22 @@

    <groupId>com.github.magese</groupId>
    <artifactId>ik-analyzer</artifactId>
-    <version>7.7.1</version>
+    <version>8.5.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.7.1</description>
+    <description>IK-Analyzer for solr 7-8</description>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <lucene.version>7.7.1</lucene.version>
+        <lucene.version>8.5.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>
    </properties>

    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
        <dependency>
            <groupId>org.apache.lucene</groupId>
            <artifactId>lucene-core</artifactId>
@ -55,9 +48,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>
@ -152,4 +145,3 @@
        </profile>
    </profiles>
 </project>
-  
--- a/src/main/java/org/wltea/analyzer/cfg/Configuration.java
+++ b/src/main/java/org/wltea/analyzer/cfg/Configuration.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.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);

    /**
     * 获取主词典路径
@ -63,7 +76,7 @@ public interface Configuration {
     *
     * @return String 量词词典路径
     */
-    String getQuantifierDicionary();
+    String getQuantifierDictionary();

    /**
     * 获取扩展字典配置路径
--- a/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java
+++ b/src/main/java/org/wltea/analyzer/cfg/DefaultConfig.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.cfg;
@ -41,24 +41,28 @@ public class DefaultConfig implements Configuration {
    /*
     * 分词器默认字典路径
     */
-    private static final String PATH_DIC_MAIN = "dict/magese.dic";
+    private static final String PATH_DIC_MAIN = "dict/main_dic_2020.dic";
    private static final String PATH_DIC_QUANTIFIER = "dict/quantifier.dic";

    /*
     * 分词器配置文件路径
     */
    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方式分词
-     */
+    private final Properties props;
+
+    // 是否使用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;
+    }
+
    /**
     * 获取主词典路径
     *
@ -118,7 +145,7 @@ public class DefaultConfig implements Configuration {
     *
     * @return String 量词词典路径
     */
-    public String getQuantifierDicionary() {
+    public String getQuantifierDictionary() {
        return PATH_DIC_QUANTIFIER;
    }

@ -142,7 +169,6 @@ public class DefaultConfig implements Configuration {
        return extDictFiles;
    }

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

-import java.io.IOException;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Map;
-import java.util.Set;
-
 import org.wltea.analyzer.cfg.Configuration;
 import org.wltea.analyzer.dic.Dictionary;

+import java.io.IOException;
+import java.io.Reader;
+import java.util.*;
+
 /**
 * 分词器上下文状态
 */
 class AnalyzeContext {

-    //默认缓冲区大小
+    // 默认缓冲区大小
    private static final int BUFF_SIZE = 4096;
-    //缓冲区耗尽的临界值
+    // 缓冲区耗尽的临界值
    private static final int BUFF_EXHAUST_CRITICAL = 100;


-    //字符窜读取缓冲
+    // 字符窜读取缓冲
    private char[] segmentBuff;
-    //字符类型数组
+    // 字符类型数组
    private int[] charTypes;


-    //记录Reader内已分析的字串总长度
-    //在分多段分析词元时，该变量累计当前的segmentBuff相对于reader起始位置的位移
+    // 记录Reader内已分析的字串总长度
+    // 在分多段分析词元时，该变量累计当前的segmentBuff相对于reader起始位置的位移
    private int buffOffset;
-    //当前缓冲区位置指针
+    // 当前缓冲区位置指针
    private int cursor;
-    //最近一次读入的,可处理的字串长度
+    // 最近一次读入的,可处理的字串长度
    private int available;


-    //子分词器锁
-    //该集合非空，说明有子分词器在占用segmentBuff
-    private Set<String> buffLocker;
+    // 子分词器锁
+    // 该集合非空，说明有子分词器在占用segmentBuff
+    private final Set<String> buffLocker;

-    //原始分词结果集合，未经歧义处理
+    // 原始分词结果集合，未经歧义处理
    private QuickSortSet orgLexemes;
-    //LexemePath位置索引表
-    private Map<Integer, LexemePath> pathMap;
-    //最终分词结果集
-    private LinkedList<Lexeme> results;
+    // LexemePath位置索引表
+    private final Map<Integer, LexemePath> pathMap;
+    // 最终分词结果集
+    private final LinkedList<Lexeme> results;

-    //分词器配置项
-    private Configuration cfg;
+    // 分词器配置项
+    private final Configuration cfg;

    AnalyzeContext(Configuration cfg) {
        this.cfg = cfg;
@ -117,21 +113,21 @@ class AnalyzeContext {
    int fillBuffer(Reader reader) throws IOException {
        int readCount = 0;
        if (this.buffOffset == 0) {
-            //首次读取reader
+            // 首次读取reader
            readCount = reader.read(segmentBuff);
        } else {
            int offset = this.available - this.cursor;
            if (offset > 0) {
-                //最近一次读取的>最近一次处理的，将未处理的字串拷贝到segmentBuff头部
+                // 最近一次读取的>最近一次处理的，将未处理的字串拷贝到segmentBuff头部
                System.arraycopy(this.segmentBuff, this.cursor, this.segmentBuff, 0, offset);
                readCount = offset;
            }
-            //继续读取reader ，以onceReadIn - onceAnalyzed为起始位置，继续填充segmentBuff剩余的部分
+            // 继续读取reader ，以onceReadIn - onceAnalyzed为起始位置，继续填充segmentBuff剩余的部分
            readCount += reader.read(this.segmentBuff, offset, BUFF_SIZE - offset);
        }
-        //记录最后一次从Reader中读入的可用字符长度
+        // 记录最后一次从Reader中读入的可用字符长度
        this.available = readCount;
-        //重置当前指针
+        // 重置当前指针
        this.cursor = 0;
        return readCount;
    }
@ -254,36 +250,36 @@ class AnalyzeContext {
     */
    void outputToResult() {
        int index = 0;
-        for (; index <= this.cursor; ) {
-            //跳过非CJK字符
+        while (index <= this.cursor) {
+            // 跳过非CJK字符
            if (CharacterUtil.CHAR_USELESS == this.charTypes[index]) {
                index++;
                continue;
            }
-            //从pathMap找出对应index位置的LexemePath
+            // 从pathMap找出对应index位置的LexemePath
            LexemePath path = this.pathMap.get(index);
            if (path != null) {
-                //输出LexemePath中的lexeme到results集合
+                // 输出LexemePath中的lexeme到results集合
                Lexeme l = path.pollFirst();
                while (l != null) {
                    this.results.add(l);
-                    //将index移至lexeme后
+                    // 将index移至lexeme后
                    index = l.getBegin() + l.getLength();
                    l = path.pollFirst();
                    if (l != null) {
-                        //输出path内部，词元间遗漏的单字
+                        // 输出path内部，词元间遗漏的单字
                        for (; index < l.getBegin(); index++) {
                            this.outputSingleCJK(index);
                        }
                    }
                }
-            } else {//pathMap中找不到index对应的LexemePath
-                //单字输出
+            } else {// pathMap中找不到index对应的LexemePath
+                // 单字输出
                this.outputSingleCJK(index);
                index++;
            }
        }
-        //清空当前的Map
+        // 清空当前的Map
        this.pathMap.clear();
    }

@ -308,16 +304,16 @@ class AnalyzeContext {
     * 同时处理合并
     */
    Lexeme getNextLexeme() {
-        //从结果集取出，并移除第一个Lexme
+        // 从结果集取出，并移除第一个Lexme
        Lexeme result = this.results.pollFirst();
        while (result != null) {
-            //数量词合并
+            // 数量词合并
            this.compound(result);
            if (Dictionary.getSingleton().isStopWord(this.segmentBuff, result.getBegin(), result.getLength())) {
-                //是停止词继续取列表的下一个
+                // 是停止词继续取列表的下一个
                result = this.results.pollFirst();
            } else {
-                //不是停止词, 生成lexeme的词元文本,输出
+                // 不是停止词, 生成lexeme的词元文本,输出
                result.setLexemeText(String.valueOf(segmentBuff, result.getBegin(), result.getLength()));
                break;
            }
@ -347,35 +343,37 @@ class AnalyzeContext {
        if (!this.cfg.useSmart()) {
            return;
        }
-        //数量词合并处理
+        // 数量词合并处理
        if (!this.results.isEmpty()) {

            if (Lexeme.TYPE_ARABIC == result.getLexemeType()) {
                Lexeme nextLexeme = this.results.peekFirst();
                boolean appendOk = false;
-                if (Lexeme.TYPE_CNUM == nextLexeme.getLexemeType()) {
-                    //合并英文数词+中文数词
-                    appendOk = result.append(nextLexeme, Lexeme.TYPE_CNUM);
-                } else if (Lexeme.TYPE_COUNT == nextLexeme.getLexemeType()) {
-                    //合并英文数词+中文量词
-                    appendOk = result.append(nextLexeme, Lexeme.TYPE_CQUAN);
+                if (nextLexeme != null) {
+                    if (Lexeme.TYPE_CNUM == nextLexeme.getLexemeType()) {
+                        // 合并英文数词+中文数词
+                        appendOk = result.append(nextLexeme, Lexeme.TYPE_CNUM);
+                    } else if (Lexeme.TYPE_COUNT == nextLexeme.getLexemeType()) {
+                        // 合并英文数词+中文量词
+                        appendOk = result.append(nextLexeme, Lexeme.TYPE_CQUAN);
+                    }
                }
                if (appendOk) {
-                    //弹出
+                    // 弹出
                    this.results.pollFirst();
                }
            }

-            //可能存在第二轮合并
+            // 可能存在第二轮合并
            if (Lexeme.TYPE_CNUM == result.getLexemeType() && !this.results.isEmpty()) {
                Lexeme nextLexeme = this.results.peekFirst();
                boolean appendOk = false;
                if (Lexeme.TYPE_COUNT == nextLexeme.getLexemeType()) {
-                    //合并中文数词+中文量词
+                    // 合并中文数词+中文量词
                    appendOk = result.append(nextLexeme, Lexeme.TYPE_CQUAN);
                }
                if (appendOk) {
-                    //弹出
+                    // 弹出
                    this.results.pollFirst();
                }
            }
--- a/src/main/java/org/wltea/analyzer/core/CJKSegmenter.java
+++ b/src/main/java/org/wltea/analyzer/core/CJKSegmenter.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,108 +21,107 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;

-import java.util.LinkedList;
-import java.util.List;
-
 import org.wltea.analyzer.dic.Dictionary;
 import org.wltea.analyzer.dic.Hit;

+import java.util.LinkedList;
+import java.util.List;
+

 /**
- *  中文-日韩文子分词器
+ * 中文-日韩文子分词器
 */
 class CJKSegmenter implements ISegmenter {
-	
-	//子分词器标签
-	private static final String SEGMENTER_NAME = "CJK_SEGMENTER";
-	//待处理的分词hit队列
-	private List<Hit> tmpHits;
-	
-	
-	CJKSegmenter(){
-		this.tmpHits = new LinkedList<>();
-	}

-	/* (non-Javadoc)
-	 * @see org.wltea.analyzer.core.ISegmenter#analyze(org.wltea.analyzer.core.AnalyzeContext)
-	 */
-	public void analyze(AnalyzeContext context) {
-		if(CharacterUtil.CHAR_USELESS != context.getCurrentCharType()){
-			
-			//优先处理tmpHits中的hit
-			if(!this.tmpHits.isEmpty()){
-				//处理词段队列
-				Hit[] tmpArray = this.tmpHits.toArray(new Hit[0]);
-				for(Hit hit : tmpArray){
-					hit = Dictionary.getSingleton().matchWithHit(context.getSegmentBuff(), context.getCursor() , hit);
-					if(hit.isMatch()){
-						//输出当前的词
-						Lexeme newLexeme = new Lexeme(context.getBufferOffset() , hit.getBegin() , context.getCursor() - hit.getBegin() + 1 , Lexeme.TYPE_CNWORD);
-						context.addLexeme(newLexeme);
-						
-						if(!hit.isPrefix()){//不是词前缀，hit不需要继续匹配，移除
-							this.tmpHits.remove(hit);
-						}
-						
-					}else if(hit.isUnmatch()){
-						//hit不是词，移除
-						this.tmpHits.remove(hit);
-					}					
-				}
-			}			
-			
-			//*********************************
-			//再对当前指针位置的字符进行单字匹配
-			Hit singleCharHit = Dictionary.getSingleton().matchInMainDict(context.getSegmentBuff(), context.getCursor(), 1);
-			if(singleCharHit.isMatch()){//首字成词
-				//输出当前的词
-				Lexeme newLexeme = new Lexeme(context.getBufferOffset() , context.getCursor() , 1 , Lexeme.TYPE_CNWORD);
-				context.addLexeme(newLexeme);
+    // 子分词器标签
+    private static final String SEGMENTER_NAME = "CJK_SEGMENTER";
+    // 待处理的分词hit队列
+    private final List<Hit> tmpHits;

-				//同时也是词前缀
-				if(singleCharHit.isPrefix()){
-					//前缀匹配则放入hit列表
-					this.tmpHits.add(singleCharHit);
-				}
-			}else if(singleCharHit.isPrefix()){//首字为词前缀
-				//前缀匹配则放入hit列表
-				this.tmpHits.add(singleCharHit);
-			}
-			

-		}else{
-			//遇到CHAR_USELESS字符
-			//清空队列
-			this.tmpHits.clear();
-		}
-		
-		//判断缓冲区是否已经读完
-		if(context.isBufferConsumed()){
-			//清空队列
-			this.tmpHits.clear();
-		}
-		
-		//判断是否锁定缓冲区
-		if(this.tmpHits.size() == 0){
-			context.unlockBuffer(SEGMENTER_NAME);
-			
-		}else{
-			context.lockBuffer(SEGMENTER_NAME);
-		}
-	}
+    CJKSegmenter() {
+        this.tmpHits = new LinkedList<>();
+    }

-	/* (non-Javadoc)
-	 * @see org.wltea.analyzer.core.ISegmenter#reset()
-	 */
-	public void reset() {
-		//清空队列
-		this.tmpHits.clear();
-	}
+    /* (non-Javadoc)
+     * @see org.wltea.analyzer.core.ISegmenter#analyze(org.wltea.analyzer.core.AnalyzeContext)
+     */
+    public void analyze(AnalyzeContext context) {
+        if (CharacterUtil.CHAR_USELESS != context.getCurrentCharType()) {
+
+            // 优先处理tmpHits中的hit
+            if (!this.tmpHits.isEmpty()) {
+                // 处理词段队列
+                Hit[] tmpArray = this.tmpHits.toArray(new Hit[0]);
+                for (Hit hit : tmpArray) {
+                    hit = Dictionary.getSingleton().matchWithHit(context.getSegmentBuff(), context.getCursor(), hit);
+                    if (hit.isMatch()) {
+                        // 输出当前的词
+                        Lexeme newLexeme = new Lexeme(context.getBufferOffset(), hit.getBegin(), context.getCursor() - hit.getBegin() + 1, Lexeme.TYPE_CNWORD);
+                        context.addLexeme(newLexeme);
+
+                        if (!hit.isPrefix()) {// 不是词前缀，hit不需要继续匹配，移除
+                            this.tmpHits.remove(hit);
+                        }
+
+                    } else if (hit.isUnmatch()) {
+                        // hit不是词，移除
+                        this.tmpHits.remove(hit);
+                    }
+                }
+            }
+
+            // *********************************
+            // 再对当前指针位置的字符进行单字匹配
+            Hit singleCharHit = Dictionary.getSingleton().matchInMainDict(context.getSegmentBuff(), context.getCursor(), 1);
+
+            // 首字为词前缀
+            if (singleCharHit.isMatch()) {
+                // 输出当前的词
+                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), context.getCursor(), 1, Lexeme.TYPE_CNWORD);
+                context.addLexeme(newLexeme);
+            }
+
+            // 前缀匹配则放入hit列表
+            if (singleCharHit.isPrefix()) {
+                // 前缀匹配则放入hit列表
+                this.tmpHits.add(singleCharHit);
+            }
+
+
+        } else {
+            // 遇到CHAR_USELESS字符
+            // 清空队列
+            this.tmpHits.clear();
+        }
+
+        // 判断缓冲区是否已经读完
+        if (context.isBufferConsumed()) {
+            // 清空队列
+            this.tmpHits.clear();
+        }
+
+        // 判断是否锁定缓冲区
+        if (this.tmpHits.size() == 0) {
+            context.unlockBuffer(SEGMENTER_NAME);
+
+        } else {
+            context.lockBuffer(SEGMENTER_NAME);
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.wltea.analyzer.core.ISegmenter#reset()
+     */
+    public void reset() {
+        // 清空队列
+        this.tmpHits.clear();
+    }

 }
--- a/src/main/java/org/wltea/analyzer/core/CN_QuantifierSegmenter.java
+++ b/src/main/java/org/wltea/analyzer/core/CN_QuantifierSegmenter.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@ -36,206 +36,205 @@ import java.util.List;
 import java.util.Set;

 /**
- * 
 * 中文数量词子分词器
 */
-class CN_QuantifierSegmenter implements ISegmenter{
-	
-	//子分词器标签
-	private static final String SEGMENTER_NAME = "QUAN_SEGMENTER";
+class CN_QuantifierSegmenter implements ISegmenter {

-	private static Set<Character> ChnNumberChars = new HashSet<>();
-	static{
-		//中文数词
-		//Cnum
-		String chn_Num = "一二两三四五六七八九十零壹贰叁肆伍陆柒捌玖拾百千万亿拾佰仟萬億兆卅廿";
-		char[] ca = chn_Num.toCharArray();
-		for(char nChar : ca){
-			ChnNumberChars.add(nChar);
-		}
-	}
-	
-	/*
-	 * 词元的开始位置，
-	 * 同时作为子分词器状态标识
-	 * 当start > -1 时，标识当前的分词器正在处理字符
-	 */
-	private int nStart;
-	/*
-	 * 记录词元结束位置
-	 * end记录的是在词元中最后一个出现的合理的数词结束
-	 */
-	private int nEnd;
+    // 子分词器标签
+    private static final String SEGMENTER_NAME = "QUAN_SEGMENTER";

-	//待处理的量词hit队列
-	private List<Hit> countHits;
-	
-	
-	CN_QuantifierSegmenter(){
-		nStart = -1;
-		nEnd = -1;
-		this.countHits  = new LinkedList<>();
-	}
-	
-	/**
-	 * 分词
-	 */
-	public void analyze(AnalyzeContext context) {
-		//处理中文数词
-		this.processCNumber(context);
-		//处理中文量词
-		this.processCount(context);
-		
-		//判断是否锁定缓冲区
-		if(this.nStart == -1 && this.nEnd == -1	&& countHits.isEmpty()){
-			//对缓冲区解锁
-			context.unlockBuffer(SEGMENTER_NAME);
-		}else{
-			context.lockBuffer(SEGMENTER_NAME);
-		}
-	}
-	
+    private static final Set<Character> CHN_NUMBER_CHARS = new HashSet<>();

-	/**
-	 * 重置子分词器状态
-	 */
-	public void reset() {
-		nStart = -1;
-		nEnd = -1;
-		countHits.clear();
-	}
-	
-	/**
-	 * 处理数词
-	 */
-	private void processCNumber(AnalyzeContext context){
-		if(nStart == -1 && nEnd == -1){//初始状态
-			if(CharacterUtil.CHAR_CHINESE == context.getCurrentCharType() 
-					&& ChnNumberChars.contains(context.getCurrentChar())){
-				//记录数词的起始、结束位置
-				nStart = context.getCursor();
-				nEnd = context.getCursor();
-			}
-		}else{//正在处理状态
-			if(CharacterUtil.CHAR_CHINESE == context.getCurrentCharType() 
-					&& ChnNumberChars.contains(context.getCurrentChar())){
-				//记录数词的结束位置
-				nEnd = context.getCursor();
-			}else{
-				//输出数词
-				this.outputNumLexeme(context);
-				//重置头尾指针
-				nStart = -1;
-				nEnd = -1;
-			}
-		}
-		
-		//缓冲区已经用完，还有尚未输出的数词
-		if(context.isBufferConsumed()){
-			if(nStart != -1 && nEnd != -1){
-				//输出数词
-				outputNumLexeme(context);
-				//重置头尾指针
-				nStart = -1;
-				nEnd = -1;
-			}
-		}	
-	}
-	
-	/**
-	 * 处理中文量词
-	 * @param context 需要处理的内容
-	 */
-	private void processCount(AnalyzeContext context){
-		// 判断是否需要启动量词扫描
-		if(!this.needCountScan(context)){
-			return;
-		}
-		
-		if(CharacterUtil.CHAR_CHINESE == context.getCurrentCharType()){
-			
-			//优先处理countHits中的hit
-			if(!this.countHits.isEmpty()){
-				//处理词段队列
-				Hit[] tmpArray = this.countHits.toArray(new Hit[0]);
-				for(Hit hit : tmpArray){
-					hit = Dictionary.getSingleton().matchWithHit(context.getSegmentBuff(), context.getCursor() , hit);
-					if(hit.isMatch()){
-						//输出当前的词
-						Lexeme newLexeme = new Lexeme(context.getBufferOffset() , hit.getBegin() , context.getCursor() - hit.getBegin() + 1 , Lexeme.TYPE_COUNT);
-						context.addLexeme(newLexeme);
-						
-						if(!hit.isPrefix()){//不是词前缀，hit不需要继续匹配，移除
-							this.countHits.remove(hit);
-						}
-						
-					}else if(hit.isUnmatch()){
-						//hit不是词，移除
-						this.countHits.remove(hit);
-					}					
-				}
-			}				
+    static {
+        // 中文数词
+        String chn_Num = "一二两三四五六七八九十零壹贰叁肆伍陆柒捌玖拾百千万亿拾佰仟萬億兆卅廿";
+        char[] ca = chn_Num.toCharArray();
+        for (char nChar : ca) {
+            CHN_NUMBER_CHARS.add(nChar);
+        }
+    }

-			//*********************************
-			//对当前指针位置的字符进行单字匹配
-			Hit singleCharHit = Dictionary.getSingleton().matchInQuantifierDict(context.getSegmentBuff(), context.getCursor(), 1);
-			if(singleCharHit.isMatch()){//首字成量词词
-				//输出当前的词
-				Lexeme newLexeme = new Lexeme(context.getBufferOffset() , context.getCursor() , 1 , Lexeme.TYPE_COUNT);
-				context.addLexeme(newLexeme);
+    /*
+     * 词元的开始位置，
+     * 同时作为子分词器状态标识
+     * 当start > -1 时，标识当前的分词器正在处理字符
+     */
+    private int nStart;
+    /*
+     * 记录词元结束位置
+     * end记录的是在词元中最后一个出现的合理的数词结束
+     */
+    private int nEnd;

-				//同时也是词前缀
-				if(singleCharHit.isPrefix()){
-					//前缀匹配则放入hit列表
-					this.countHits.add(singleCharHit);
-				}
-			}else if(singleCharHit.isPrefix()){//首字为量词前缀
-				//前缀匹配则放入hit列表
-				this.countHits.add(singleCharHit);
-			}
-			
-			
-		}else{
-			//输入的不是中文字符
-			//清空未成形的量词
-			this.countHits.clear();
-		}
-		
-		//缓冲区数据已经读完，还有尚未输出的量词
-		if(context.isBufferConsumed()){
-			//清空未成形的量词
-			this.countHits.clear();
-		}
-	}
-	
-	/**
-	 * 判断是否需要扫描量词
-	 */
-	private boolean needCountScan(AnalyzeContext context){
-		if((nStart != -1 && nEnd != -1 ) || !countHits.isEmpty()){
-			//正在处理中文数词,或者正在处理量词
-			return true;
-		}else{
-			//找到一个相邻的数词
-			if(!context.getOrgLexemes().isEmpty()){
-				Lexeme l = context.getOrgLexemes().peekLast();
-				if(Lexeme.TYPE_CNUM == l.getLexemeType() ||  Lexeme.TYPE_ARABIC == l.getLexemeType()){
-					return l.getBegin() + l.getLength() == context.getCursor();
-				}
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * 添加数词词元到结果集
-	 * @param context 需要添加的词元
-	 */
-	private void outputNumLexeme(AnalyzeContext context){
-		if(nStart > -1 && nEnd > -1){
-			//输出数词
-			Lexeme newLexeme = new Lexeme(context.getBufferOffset() , nStart , nEnd - nStart + 1 , Lexeme.TYPE_CNUM);
-			context.addLexeme(newLexeme);
-		}
-	}
+    // 待处理的量词hit队列
+    private final List<Hit> countHits;
+
+
+    CN_QuantifierSegmenter() {
+        nStart = -1;
+        nEnd = -1;
+        this.countHits = new LinkedList<>();
+    }
+
+    /**
+     * 分词
+     */
+    public void analyze(AnalyzeContext context) {
+        // 处理中文数词
+        this.processCNumber(context);
+        // 处理中文量词
+        this.processCount(context);
+
+        // 判断是否锁定缓冲区
+        if (this.nStart == -1 && this.nEnd == -1 && countHits.isEmpty()) {
+            // 对缓冲区解锁
+            context.unlockBuffer(SEGMENTER_NAME);
+        } else {
+            context.lockBuffer(SEGMENTER_NAME);
+        }
+    }
+
+
+    /**
+     * 重置子分词器状态
+     */
+    public void reset() {
+        nStart = -1;
+        nEnd = -1;
+        countHits.clear();
+    }
+
+    /**
+     * 处理数词
+     */
+    private void processCNumber(AnalyzeContext context) {
+        if (nStart == -1 && nEnd == -1) {// 初始状态
+            if (CharacterUtil.CHAR_CHINESE == context.getCurrentCharType()
+                    && CHN_NUMBER_CHARS.contains(context.getCurrentChar())) {
+                // 记录数词的起始、结束位置
+                nStart = context.getCursor();
+                nEnd = context.getCursor();
+            }
+        } else {// 正在处理状态
+            if (CharacterUtil.CHAR_CHINESE == context.getCurrentCharType()
+                    && CHN_NUMBER_CHARS.contains(context.getCurrentChar())) {
+                // 记录数词的结束位置
+                nEnd = context.getCursor();
+            } else {
+                // 输出数词
+                this.outputNumLexeme(context);
+                // 重置头尾指针
+                nStart = -1;
+                nEnd = -1;
+            }
+        }
+
+        // 缓冲区已经用完，还有尚未输出的数词
+        if (context.isBufferConsumed()) {
+            if (nStart != -1 && nEnd != -1) {
+                // 输出数词
+                outputNumLexeme(context);
+                // 重置头尾指针
+                nStart = -1;
+                nEnd = -1;
+            }
+        }
+    }
+
+    /**
+     * 处理中文量词
+     *
+     * @param context 需要处理的内容
+     */
+    private void processCount(AnalyzeContext context) {
+        // 判断是否需要启动量词扫描
+        if (!this.needCountScan(context)) {
+            return;
+        }
+
+        if (CharacterUtil.CHAR_CHINESE == context.getCurrentCharType()) {
+
+            // 优先处理countHits中的hit
+            if (!this.countHits.isEmpty()) {
+                // 处理词段队列
+                Hit[] tmpArray = this.countHits.toArray(new Hit[0]);
+                for (Hit hit : tmpArray) {
+                    hit = Dictionary.getSingleton().matchWithHit(context.getSegmentBuff(), context.getCursor(), hit);
+                    if (hit.isMatch()) {
+                        // 输出当前的词
+                        Lexeme newLexeme = new Lexeme(context.getBufferOffset(), hit.getBegin(), context.getCursor() - hit.getBegin() + 1, Lexeme.TYPE_COUNT);
+                        context.addLexeme(newLexeme);
+
+                        if (!hit.isPrefix()) {// 不是词前缀，hit不需要继续匹配，移除
+                            this.countHits.remove(hit);
+                        }
+
+                    } else if (hit.isUnmatch()) {
+                        // hit不是词，移除
+                        this.countHits.remove(hit);
+                    }
+                }
+            }
+
+            // *********************************
+            // 对当前指针位置的字符进行单字匹配
+            Hit singleCharHit = Dictionary.getSingleton().matchInQuantifierDict(context.getSegmentBuff(), context.getCursor(), 1);
+
+            // 首字为量词前缀
+            if (singleCharHit.isMatch()) {
+                // 输出当前的词
+                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), context.getCursor(), 1, Lexeme.TYPE_COUNT);
+                context.addLexeme(newLexeme);
+            }
+
+            // 前缀匹配则放入hit列表
+            if (singleCharHit.isPrefix()) {
+                // 前缀匹配则放入hit列表
+                this.countHits.add(singleCharHit);
+            }
+
+        } else {
+            // 输入的不是中文字符
+            // 清空未成形的量词
+            this.countHits.clear();
+        }
+
+        // 缓冲区数据已经读完，还有尚未输出的量词
+        if (context.isBufferConsumed()) {
+            // 清空未成形的量词
+            this.countHits.clear();
+        }
+    }
+
+    /**
+     * 判断是否需要扫描量词
+     */
+    private boolean needCountScan(AnalyzeContext context) {
+        if ((nStart != -1 && nEnd != -1) || !countHits.isEmpty()) {
+            // 正在处理中文数词,或者正在处理量词
+            return true;
+        } else {
+            // 找到一个相邻的数词
+            if (!context.getOrgLexemes().isEmpty()) {
+                Lexeme l = context.getOrgLexemes().peekLast();
+                if (Lexeme.TYPE_CNUM == l.getLexemeType() || Lexeme.TYPE_ARABIC == l.getLexemeType()) {
+                    return l.getBegin() + l.getLength() == context.getCursor();
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 添加数词词元到结果集
+     *
+     * @param context 需要添加的词元
+     */
+    private void outputNumLexeme(AnalyzeContext context) {
+        if (nStart > -1 && nEnd > -1) {
+            // 输出数词
+            Lexeme newLexeme = new Lexeme(context.getBufferOffset(), nStart, nEnd - nStart + 1, Lexeme.TYPE_CNUM);
+            context.addLexeme(newLexeme);
+        }
+    }
 }
--- a/src/main/java/org/wltea/analyzer/core/CharacterUtil.java
+++ b/src/main/java/org/wltea/analyzer/core/CharacterUtil.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,84 +21,85 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;

 /**
- *
 * 字符集识别工具类
 */
 class CharacterUtil {
-	
-	static final int CHAR_USELESS = 0;
-	
-	static final int CHAR_ARABIC = 0X00000001;
-	
-	static final int CHAR_ENGLISH = 0X00000002;
-	
-	static final int CHAR_CHINESE = 0X00000004;
-	
-	static final int CHAR_OTHER_CJK = 0X00000008;
-	
-	
-	/**
-	 * 识别字符类型
-	 * @param input 需要识别的字符
-	 * @return int CharacterUtil定义的字符类型常量
-	 */
-	static int identifyCharType(char input){
-		if(input >= '0' && input <= '9'){
-			return CHAR_ARABIC;
-			
-		}else if((input >= 'a' && input <= 'z')
-				|| (input >= 'A' && input <= 'Z')){
-			return CHAR_ENGLISH;
-			
-		}else {
-			Character.UnicodeBlock ub = Character.UnicodeBlock.of(input);
-			
-			if(ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS  
-					|| ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS  
-					|| ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A){
-				//目前已知的中文字符UTF-8集合
-				return CHAR_CHINESE;
-				
-			}else if(ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS //全角数字字符和日韩字符
-					//韩文字符集
-					|| ub == Character.UnicodeBlock.HANGUL_SYLLABLES 
-					|| ub == Character.UnicodeBlock.HANGUL_JAMO
-					|| ub == Character.UnicodeBlock.HANGUL_COMPATIBILITY_JAMO
-					//日文字符集
-					|| ub == Character.UnicodeBlock.HIRAGANA //平假名
-					|| ub == Character.UnicodeBlock.KATAKANA //片假名
-					|| ub == Character.UnicodeBlock.KATAKANA_PHONETIC_EXTENSIONS){
-				return CHAR_OTHER_CJK;
-				
-			}
-		}
-		//其他的不做处理的字符
-		return CHAR_USELESS;
-	}
-	
-	/**
-	 * 进行字符规格化（全角转半角，大写转小写处理）
-	 * @param input 需要转换的字符
-	 * @return char
-	 */
-	static char regularize(char input){
+
+    static final int CHAR_USELESS = 0;
+
+    static final int CHAR_ARABIC = 0X00000001;
+
+    static final int CHAR_ENGLISH = 0X00000002;
+
+    static final int CHAR_CHINESE = 0X00000004;
+
+    static final int CHAR_OTHER_CJK = 0X00000008;
+
+
+    /**
+     * 识别字符类型
+     *
+     * @param input 需要识别的字符
+     * @return int CharacterUtil定义的字符类型常量
+     */
+    static int identifyCharType(char input) {
+        if (input >= '0' && input <= '9') {
+            return CHAR_ARABIC;
+
+        } else if ((input >= 'a' && input <= 'z')
+                || (input >= 'A' && input <= 'Z')) {
+            return CHAR_ENGLISH;
+
+        } else {
+            Character.UnicodeBlock ub = Character.UnicodeBlock.of(input);
+
+            if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
+                    || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A) {
+                //目前已知的中文字符UTF-8集合
+                return CHAR_CHINESE;
+
+            } else if (ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS //全角数字字符和日韩字符
+                    //韩文字符集
+                    || ub == Character.UnicodeBlock.HANGUL_SYLLABLES
+                    || ub == Character.UnicodeBlock.HANGUL_JAMO
+                    || ub == Character.UnicodeBlock.HANGUL_COMPATIBILITY_JAMO
+                    //日文字符集
+                    || ub == Character.UnicodeBlock.HIRAGANA //平假名
+                    || ub == Character.UnicodeBlock.KATAKANA //片假名
+                    || ub == Character.UnicodeBlock.KATAKANA_PHONETIC_EXTENSIONS) {
+                return CHAR_OTHER_CJK;
+
+            }
+        }
+        //其他的不做处理的字符
+        return CHAR_USELESS;
+    }
+
+    /**
+     * 进行字符规格化（全角转半角，大写转小写处理）
+     *
+     * @param input 需要转换的字符
+     * @return char
+     */
+    static char regularize(char input) {
        if (input == 12288) {
            input = (char) 32;
-            
-        }else if (input > 65280 && input < 65375) {
+
+        } else if (input > 65280 && input < 65375) {
            input = (char) (input - 65248);
-            
-        }else if (input >= 'A' && input <= 'Z') {
-        	input += 32;
-		}
-        
+
+        } else if (input >= 'A' && input <= 'Z') {
+            input += 32;
+        }
+
        return input;
-	}
+    }
 }
--- a/src/main/java/org/wltea/analyzer/core/IKArbitrator.java
+++ b/src/main/java/org/wltea/analyzer/core/IKArbitrator.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@ -35,9 +35,7 @@ import java.util.TreeSet;
 */
 class IKArbitrator {

-    IKArbitrator() {
-
-    }
+    IKArbitrator() {}

    /**
     * 分词歧义处理
@ -52,20 +50,20 @@ class IKArbitrator {
        LexemePath crossPath = new LexemePath();
        while (orgLexeme != null) {
            if (!crossPath.addCrossLexeme(orgLexeme)) {
-                //找到与crossPath不相交的下一个crossPath
+                // 找到与crossPath不相交的下一个crossPath
                if (crossPath.size() == 1 || !useSmart) {
-                    //crossPath没有歧义 或者 不做歧义处理
-                    //直接输出当前crossPath
+                    // crossPath没有歧义 或者 不做歧义处理
+                    // 直接输出当前crossPath
                    context.addLexemePath(crossPath);
                } else {
-                    //对当前的crossPath进行歧义处理
+                    // 对当前的crossPath进行歧义处理
                    QuickSortSet.Cell headCell = crossPath.getHead();
                    LexemePath judgeResult = this.judge(headCell);
-                    //输出歧义处理结果judgeResult
+                    // 输出歧义处理结果judgeResult
                    context.addLexemePath(judgeResult);
                }

-                //把orgLexeme加入新的crossPath中
+                // 把orgLexeme加入新的crossPath中
                crossPath = new LexemePath();
                crossPath.addCrossLexeme(orgLexeme);
            }
@ -73,16 +71,16 @@ class IKArbitrator {
        }


-        //处理最后的path
+        // 处理最后的path
        if (crossPath.size() == 1 || !useSmart) {
-            //crossPath没有歧义 或者 不做歧义处理
-            //直接输出当前crossPath
+            // crossPath没有歧义 或者 不做歧义处理
+            // 直接输出当前crossPath
            context.addLexemePath(crossPath);
        } else {
-            //对当前的crossPath进行歧义处理
+            // 对当前的crossPath进行歧义处理
            QuickSortSet.Cell headCell = crossPath.getHead();
            LexemePath judgeResult = this.judge(headCell);
-            //输出歧义处理结果judgeResult
+            // 输出歧义处理结果judgeResult
            context.addLexemePath(judgeResult);
        }
    }
@ -93,29 +91,29 @@ class IKArbitrator {
     * @param lexemeCell 歧义路径链表头
     */
    private LexemePath judge(QuickSortSet.Cell lexemeCell) {
-        //候选路径集合
+        // 候选路径集合
        TreeSet<LexemePath> pathOptions = new TreeSet<>();
-        //候选结果路径
+        // 候选结果路径
        LexemePath option = new LexemePath();

-        //对crossPath进行一次遍历,同时返回本次遍历中有冲突的Lexeme栈
+        // 对crossPath进行一次遍历,同时返回本次遍历中有冲突的Lexeme栈
        Stack<QuickSortSet.Cell> lexemeStack = this.forwardPath(lexemeCell, option);

-        //当前词元链并非最理想的，加入候选路径集合
+        // 当前词元链并非最理想的，加入候选路径集合
        pathOptions.add(option.copy());

-        //存在歧义词，处理
+        // 存在歧义词，处理
        QuickSortSet.Cell c;
        while (!lexemeStack.isEmpty()) {
            c = lexemeStack.pop();
-            //回滚词元链
+            // 回滚词元链
            this.backPath(c.getLexeme(), option);
-            //从歧义词位置开始，递归，生成可选方案
+            // 从歧义词位置开始，递归，生成可选方案
            this.forwardPath(c, option);
            pathOptions.add(option.copy());
        }

-        //返回集合中的最优方案
+        // 返回集合中的最优方案
        return pathOptions.first();

    }
@ -124,13 +122,13 @@ class IKArbitrator {
     * 向前遍历，添加词元，构造一个无歧义词元组合
     */
    private Stack<QuickSortSet.Cell> forwardPath(QuickSortSet.Cell lexemeCell, LexemePath option) {
-        //发生冲突的Lexeme栈
+        // 发生冲突的Lexeme栈
        Stack<QuickSortSet.Cell> conflictStack = new Stack<>();
        QuickSortSet.Cell c = lexemeCell;
-        //迭代遍历Lexeme链表
+        // 迭代遍历Lexeme链表
        while (c != null && c.getLexeme() != null) {
            if (!option.addNotCrossLexeme(c.getLexeme())) {
-                //词元交叉，添加失败则加入lexemeStack栈
+                // 词元交叉，添加失败则加入lexemeStack栈
                conflictStack.push(c);
            }
            c = c.getNext();
--- a/src/main/java/org/wltea/analyzer/core/IKSegmenter.java
+++ b/src/main/java/org/wltea/analyzer/core/IKSegmenter.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,35 +21,45 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.3.1 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分词器主类
 */
 public final class IKSegmenter {

-    //字符窜reader
+    /**
+     * 字符窜reader
+     */
    private Reader input;
-    //分词器配置项
-    private Configuration cfg;
-    //分词器上下文
+    /**
+     * 分词器配置项
+     */
+    private final Configuration cfg;
+    /**
+     * 分词器上下文
+     */
    private AnalyzeContext context;
-    //分词处理器列表
+    /**
+     * 分词处理器列表
+     */
    private List<ISegmenter> segmenters;
-    //分词歧义裁决器
+    /**
+     * 分词歧义裁决器
+     */
    private IKArbitrator arbitrator;


@ -58,7 +68,6 @@ public final class IKSegmenter {
     *
     * @param input    读取流
     * @param useSmart 为true，使用智能分词策略
-     *                 <p>
     *                 非智能分词：细粒度输出所有可能的切分结果
     *                 智能分词： 合并数词和量词，对分词结果进行歧义判断
     */
@ -86,13 +95,13 @@ public final class IKSegmenter {
     * 初始化
     */
    private void init() {
-        //初始化词典单例
+        // 初始化词典单例
        Dictionary.initial(this.cfg);
-        //初始化分词上下文
+        // 初始化分词上下文
        this.context = new AnalyzeContext(this.cfg);
-        //加载子分词器
+        // 加载子分词器
        this.segmenters = this.loadSegmenters();
-        //加载歧义裁决器
+        // 加载歧义裁决器
        this.arbitrator = new IKArbitrator();
    }

@ -103,11 +112,11 @@ public final class IKSegmenter {
     */
    private List<ISegmenter> loadSegmenters() {
        List<ISegmenter> segmenters = new ArrayList<>(4);
-        //处理字母的子分词器
+        // 处理字母的子分词器
        segmenters.add(new LetterSegmenter());
-        //处理中文数量词的子分词器
+        // 处理中文数量词的子分词器
        segmenters.add(new CN_QuantifierSegmenter());
-        //处理中文词的子分词器
+        // 处理中文词的子分词器
        segmenters.add(new CJKSegmenter());
        return segmenters;
    }
@ -127,34 +136,34 @@ public final class IKSegmenter {
             */
            int available = context.fillBuffer(this.input);
            if (available <= 0) {
-                //reader已经读完
+                // reader已经读完
                context.reset();
                return null;

            } else {
-                //初始化指针
+                // 初始化指针
                context.initCursor();
                do {
-                    //遍历子分词器
+                    // 遍历子分词器
                    for (ISegmenter segmenter : segmenters) {
                        segmenter.analyze(context);
                    }
-                    //字符缓冲区接近读完，需要读入新的字符
+                    // 字符缓冲区接近读完，需要读入新的字符
                    if (context.needRefillBuffer()) {
                        break;
                    }
-                    //向前移动指针
+                    // 向前移动指针
                } while (context.moveCursor());
-                //重置子分词器，为下轮循环进行初始化
+                // 重置子分词器，为下轮循环进行初始化
                for (ISegmenter segmenter : segmenters) {
                    segmenter.reset();
                }
            }
-            //对分词进行歧义处理
+            // 对分词进行歧义处理
            this.arbitrator.process(context, this.cfg.useSmart());
-            //将分词结果输出到结果集，并处理未切分的单个CJK字符
+            // 将分词结果输出到结果集，并处理未切分的单个CJK字符
            context.outputToResult();
-            //记录本次分词的缓冲区位移
+            // 记录本次分词的缓冲区位移
            context.markBufferOffset();
        }
        return l;
--- a/src/main/java/org/wltea/analyzer/core/ISegmenter.java
+++ b/src/main/java/org/wltea/analyzer/core/ISegmenter.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,29 +21,29 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;


 /**
- * 
 * 子分词器接口
 */
 interface ISegmenter {
-	
-	/**
-	 * 从分析器读取下一个可能分解的词元对象
-	 * @param context 分词算法上下文
-	 */
-	void analyze(AnalyzeContext context);
-	
-	
-	/**
-	 * 重置子分析器状态
-	 */
-	void reset();
+
+    /**
+     * 从分析器读取下一个可能分解的词元对象
+     *
+     * @param context 分词算法上下文
+     */
+    void analyze(AnalyzeContext context);
+
+
+    /**
+     * 重置子分析器状态
+     */
+    void reset();

 }
--- a/src/main/java/org/wltea/analyzer/core/LetterSegmenter.java
+++ b/src/main/java/org/wltea/analyzer/core/LetterSegmenter.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@ -34,14 +34,18 @@ import java.util.Arrays;
 */
 class LetterSegmenter implements ISegmenter {

-    //子分词器标签
+    /**
+     * 子分词器标签
+     */
    private static final String SEGMENTER_NAME = "LETTER_SEGMENTER";
-    //链接符号
+    /**
+     * 链接符号
+     */
    private static final char[] Letter_Connector = new char[]{'#', '&', '+', '-', '.', '@', '_'};
-
-    //数字符号
+    /**
+     * 数字符号
+     */
    private static final char[] Num_Connector = new char[]{',', '.'};
-
    /*
     * 词元的开始位置，
     * 同时作为子分词器状态标识
@ -53,22 +57,18 @@ class LetterSegmenter implements ISegmenter {
     * end记录的是在词元中最后一个出现的Letter但非Sign_Connector的字符的位置
     */
    private int end;
-
    /*
     * 字母起始位置
     */
    private int englishStart;
-
    /*
     * 字母结束位置
     */
    private int englishEnd;
-
    /*
     * 阿拉伯数字起始位置
     */
    private int arabicStart;
-
    /*
     * 阿拉伯数字结束位置
     */
@ -91,18 +91,18 @@ class LetterSegmenter implements ISegmenter {
     */
    public void analyze(AnalyzeContext context) {
        boolean bufferLockFlag;
-        //处理英文字母
+        // 处理英文字母
        bufferLockFlag = this.processEnglishLetter(context);
-        //处理阿拉伯字母
+        // 处理阿拉伯字母
        bufferLockFlag = this.processArabicLetter(context) || bufferLockFlag;
-        //处理混合字母(这个要放最后处理，可以通过QuickSortSet排除重复)
+        // 处理混合字母(这个要放最后处理，可以通过QuickSortSet排除重复)
        bufferLockFlag = this.processMixLetter(context) || bufferLockFlag;

-        //判断是否锁定缓冲区
+        // 判断是否锁定缓冲区
        if (bufferLockFlag) {
            context.lockBuffer(SEGMENTER_NAME);
        } else {
-            //对缓冲区解锁
+            // 对缓冲区解锁
            context.unlockBuffer(SEGMENTER_NAME);
        }
    }
@ -128,26 +128,26 @@ class LetterSegmenter implements ISegmenter {
    private boolean processMixLetter(AnalyzeContext context) {
        boolean needLock;

-        if (this.start == -1) {//当前的分词器尚未开始处理字符
+        if (this.start == -1) {// 当前的分词器尚未开始处理字符
            if (CharacterUtil.CHAR_ARABIC == context.getCurrentCharType()
                    || CharacterUtil.CHAR_ENGLISH == context.getCurrentCharType()) {
-                //记录起始指针的位置,标明分词器进入处理状态
+                // 记录起始指针的位置,标明分词器进入处理状态
                this.start = context.getCursor();
                this.end = start;
            }

-        } else {//当前的分词器正在处理字符
+        } else {// 当前的分词器正在处理字符
            if (CharacterUtil.CHAR_ARABIC == context.getCurrentCharType()
                    || CharacterUtil.CHAR_ENGLISH == context.getCurrentCharType()) {
-                //记录下可能的结束位置
+                // 记录下可能的结束位置
                this.end = context.getCursor();

            } else if (CharacterUtil.CHAR_USELESS == context.getCurrentCharType()
                    && this.isLetterConnector(context.getCurrentChar())) {
-                //记录下可能的结束位置
+                // 记录下可能的结束位置
                this.end = context.getCursor();
            } else {
-                //遇到非Letter字符，输出词元
+                // 遇到非Letter字符，输出词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.start, this.end - this.start + 1, Lexeme.TYPE_LETTER);
                context.addLexeme(newLexeme);
                this.start = -1;
@ -155,10 +155,10 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断缓冲区是否已经读完
+        // 判断缓冲区是否已经读完
        if (context.isBufferConsumed()) {
            if (this.start != -1 && this.end != -1) {
-                //缓冲以读完，输出词元
+                // 缓冲以读完，输出词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.start, this.end - this.start + 1, Lexeme.TYPE_LETTER);
                context.addLexeme(newLexeme);
                this.start = -1;
@ -166,7 +166,7 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断是否锁定缓冲区
+        // 判断是否锁定缓冲区
        needLock = this.start != -1 || this.end != -1;
        return needLock;
    }
@ -179,18 +179,18 @@ class LetterSegmenter implements ISegmenter {
    private boolean processEnglishLetter(AnalyzeContext context) {
        boolean needLock;

-        if (this.englishStart == -1) {//当前的分词器尚未开始处理英文字符
+        if (this.englishStart == -1) {// 当前的分词器尚未开始处理英文字符
            if (CharacterUtil.CHAR_ENGLISH == context.getCurrentCharType()) {
-                //记录起始指针的位置,标明分词器进入处理状态
+                // 记录起始指针的位置,标明分词器进入处理状态
                this.englishStart = context.getCursor();
                this.englishEnd = this.englishStart;
            }
-        } else {//当前的分词器正在处理英文字符
+        } else {// 当前的分词器正在处理英文字符
            if (CharacterUtil.CHAR_ENGLISH == context.getCurrentCharType()) {
-                //记录当前指针位置为结束位置
+                // 记录当前指针位置为结束位置
                this.englishEnd = context.getCursor();
            } else {
-                //遇到非English字符,输出词元
+                // 遇到非English字符,输出词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.englishStart, this.englishEnd - this.englishStart + 1, Lexeme.TYPE_ENGLISH);
                context.addLexeme(newLexeme);
                this.englishStart = -1;
@ -198,10 +198,10 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断缓冲区是否已经读完
+        // 判断缓冲区是否已经读完
        if (context.isBufferConsumed()) {
            if (this.englishStart != -1 && this.englishEnd != -1) {
-                //缓冲以读完，输出词元
+                // 缓冲以读完，输出词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.englishStart, this.englishEnd - this.englishStart + 1, Lexeme.TYPE_ENGLISH);
                context.addLexeme(newLexeme);
                this.englishStart = -1;
@ -209,7 +209,7 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断是否锁定缓冲区
+        // 判断是否锁定缓冲区
        needLock = this.englishStart != -1 || this.englishEnd != -1;
        return needLock;
    }
@ -222,21 +222,21 @@ class LetterSegmenter implements ISegmenter {
    private boolean processArabicLetter(AnalyzeContext context) {
        boolean needLock;

-        if (this.arabicStart == -1) {//当前的分词器尚未开始处理数字字符
+        if (this.arabicStart == -1) {// 当前的分词器尚未开始处理数字字符
            if (CharacterUtil.CHAR_ARABIC == context.getCurrentCharType()) {
-                //记录起始指针的位置,标明分词器进入处理状态
+                // 记录起始指针的位置,标明分词器进入处理状态
                this.arabicStart = context.getCursor();
                this.arabicEnd = this.arabicStart;
            }
-        } else {//当前的分词器正在处理数字字符
+        } else {// 当前的分词器正在处理数字字符
            if (CharacterUtil.CHAR_ARABIC == context.getCurrentCharType()) {
-                //记录当前指针位置为结束位置
+                // 记录当前指针位置为结束位置
                this.arabicEnd = context.getCursor();
            }/* else if (CharacterUtil.CHAR_USELESS == context.getCurrentCharType()
                    && this.isNumConnector(context.getCurrentChar())) {
-                //不输出数字，但不标记结束
+                // 不输出数字，但不标记结束
            }*/ else {
-                ////遇到非Arabic字符,输出词元
+                // //遇到非Arabic字符,输出词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.arabicStart, this.arabicEnd - this.arabicStart + 1, Lexeme.TYPE_ARABIC);
                context.addLexeme(newLexeme);
                this.arabicStart = -1;
@ -244,10 +244,10 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断缓冲区是否已经读完
+        // 判断缓冲区是否已经读完
        if (context.isBufferConsumed()) {
            if (this.arabicStart != -1 && this.arabicEnd != -1) {
-                //生成已切分的词元
+                // 生成已切分的词元
                Lexeme newLexeme = new Lexeme(context.getBufferOffset(), this.arabicStart, this.arabicEnd - this.arabicStart + 1, Lexeme.TYPE_ARABIC);
                context.addLexeme(newLexeme);
                this.arabicStart = -1;
@ -255,7 +255,7 @@ class LetterSegmenter implements ISegmenter {
            }
        }

-        //判断是否锁定缓冲区
+        // 判断是否锁定缓冲区
        needLock = this.arabicStart != -1 || this.arabicEnd != -1;
        return needLock;
    }
--- a/src/main/java/org/wltea/analyzer/core/Lexeme.java
+++ b/src/main/java/org/wltea/analyzer/core/Lexeme.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,252 +21,288 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;

 /**
- * IK词元对象 
+ * IK词元对象
 */
@SuppressWarnings("unused")
-public class Lexeme implements Comparable<Lexeme>{
-	//英文
-	static final int TYPE_ENGLISH = 1;
-	//数字
-	static final int TYPE_ARABIC = 2;
-	//英文数字混合
-	static final int TYPE_LETTER = 3;
-	//中文词元
-	static final int TYPE_CNWORD = 4;
-	//中文单字
-	static final int TYPE_CNCHAR = 64;
-	//日韩文字
-	static final int TYPE_OTHER_CJK = 8;
-	//中文数词
-	static final int TYPE_CNUM = 16;
-	//中文量词
-	static final int TYPE_COUNT = 32;
-	//中文数量词
-	static final int TYPE_CQUAN = 48;
-	
-	//词元的起始位移
-	private int offset;
-    //词元的相对起始位置
+public class Lexeme implements Comparable<Lexeme> {
+    /**
+     * 英文
+     */
+    static final int TYPE_ENGLISH = 1;
+    /**
+     * 数字
+     */
+    static final int TYPE_ARABIC = 2;
+    /**
+     * 英文数字混合
+     */
+    static final int TYPE_LETTER = 3;
+    /**
+     * 中文词元
+     */
+    static final int TYPE_CNWORD = 4;
+    /**
+     * 中文单字
+     */
+    static final int TYPE_CNCHAR = 64;
+    /**
+     * 日韩文字
+     */
+    static final int TYPE_OTHER_CJK = 8;
+    /**
+     * 中文数词
+     */
+    static final int TYPE_CNUM = 16;
+    /**
+     * 中文量词
+     */
+    static final int TYPE_COUNT = 32;
+    /**
+     * 中文数量词
+     */
+    static final int TYPE_CQUAN = 48;
+    /**
+     * 词元的起始位移
+     */
+    private int offset;
+    /**
+     * 词元的相对起始位置
+     */
    private int begin;
-    //词元的长度
+    /**
+     * 词元的长度
+     */
    private int length;
-    //词元文本
+    /**
+     * 词元文本
+     */
    private String lexemeText;
-    //词元类型
+    /**
+     * 词元类型
+     */
    private int lexemeType;
-    
-    
-	public Lexeme(int offset , int begin , int length , int lexemeType){
-		this.offset = offset;
-		this.begin = begin;
-		if(length < 0){
-			throw new IllegalArgumentException("length < 0");
-		}
-		this.length = length;
-		this.lexemeType = lexemeType;
-	}
-	
+
+
+    public Lexeme(int offset, int begin, int length, int lexemeType) {
+        this.offset = offset;
+        this.begin = begin;
+        if (length < 0) {
+            throw new IllegalArgumentException("length < 0");
+        }
+        this.length = length;
+        this.lexemeType = lexemeType;
+    }
+
    /*
     * 判断词元相等算法
     * 起始位置偏移、起始位置、终止位置相同
     * @see java.lang.Object#equals(Object o)
     */
-	public boolean equals(Object o){
-		if(o == null){
-			return false;
-		}
-		
-		if(this == o){
-			return true;
-		}
-		
-		if(o instanceof Lexeme){
-			Lexeme other = (Lexeme)o;
-			return this.offset == other.getOffset()
-					&& this.begin == other.getBegin()
-					&& this.length == other.getLength();
-		}else{		
-			return false;
-		}
-	}
-	
+    public boolean equals(Object o) {
+        if (o == null) {
+            return false;
+        }
+
+        if (this == o) {
+            return true;
+        }
+
+        if (o instanceof Lexeme) {
+            Lexeme other = (Lexeme) o;
+            return this.offset == other.getOffset()
+                    && this.begin == other.getBegin()
+                    && this.length == other.getLength();
+        } else {
+            return false;
+        }
+    }
+
    /*
     * 词元哈希编码算法
     * @see java.lang.Object#hashCode()
     */
-    public int hashCode(){
-    	int absBegin = getBeginPosition();
-    	int absEnd = getEndPosition();
-    	return  (absBegin * 37) + (absEnd * 31) + ((absBegin * absEnd) % getLength()) * 11;
+    public int hashCode() {
+        int absBegin = getBeginPosition();
+        int absEnd = getEndPosition();
+        return (absBegin * 37) + (absEnd * 31) + ((absBegin * absEnd) % getLength()) * 11;
    }
-    
+
    /*
     * 词元在排序集合中的比较算法
     * @see java.lang.Comparable#compareTo(java.lang.Object)
     */
-	public int compareTo(Lexeme other) {
-		//起始位置优先
-        if(this.begin < other.getBegin()){
+    public int compareTo(Lexeme other) {
+        // 起始位置优先
+        if (this.begin < other.getBegin()) {
            return -1;
-        }else if(this.begin == other.getBegin()){
-        	//词元长度优先
-			//this.length < other.getLength()
-			return Integer.compare(other.getLength(), this.length);
-        	
-        }else{//this.begin > other.getBegin()
-        	return 1;
+        } else if (this.begin == other.getBegin()) {
+            // 词元长度优先
+            // this.length < other.getLength()
+            return Integer.compare(other.getLength(), this.length);
+
+        } else {
+            return 1;
        }
-	}
-	
-	private int getOffset() {
-		return offset;
-	}
+    }

-	public void setOffset(int offset) {
-		this.offset = offset;
-	}
+    private int getOffset() {
+        return offset;
+    }

-	int getBegin() {
-		return begin;
-	}
-	/**
-	 * 获取词元在文本中的起始位置
-	 * @return int
-	 */
-	public int getBeginPosition(){
-		return offset + begin;
-	}
+    public void setOffset(int offset) {
+        this.offset = offset;
+    }

-	public void setBegin(int begin) {
-		this.begin = begin;
-	}
+    int getBegin() {
+        return begin;
+    }

-	/**
-	 * 获取词元在文本中的结束位置
-	 * @return int
-	 */
-	public int getEndPosition(){
-		return offset + begin + length;
-	}
-	
-	/**
-	 * 获取词元的字符长度
-	 * @return int
-	 */
-	public int getLength(){
-		return this.length;
-	}	
-	
-	public void setLength(int length) {
-		if(this.length < 0){
-			throw new IllegalArgumentException("length < 0");
-		}
-		this.length = length;
-	}
-	
-	/**
-	 * 获取词元的文本内容
-	 * @return String
-	 */
-	public String getLexemeText() {
-		if(lexemeText == null){
-			return "";
-		}
-		return lexemeText;
-	}
+    /**
+     * 获取词元在文本中的起始位置
+     *
+     * @return int
+     */
+    public int getBeginPosition() {
+        return offset + begin;
+    }

-	void setLexemeText(String lexemeText) {
-		if(lexemeText == null){
-			this.lexemeText = "";
-			this.length = 0;
-		}else{
-			this.lexemeText = lexemeText;
-			this.length = lexemeText.length();
-		}
-	}
+    public void setBegin(int begin) {
+        this.begin = begin;
+    }

-	/**
-	 * 获取词元类型
-	 * @return int
-	 */
-	int getLexemeType() {
-		return lexemeType;
-	}
-	
-	/**
-	 * 获取词元类型标示字符串
-	 * @return String
-	 */
-	public String getLexemeTypeString(){
-		switch(lexemeType) {
+    /**
+     * 获取词元在文本中的结束位置
+     *
+     * @return int
+     */
+    public int getEndPosition() {
+        return offset + begin + length;
+    }

-		case TYPE_ENGLISH :
-			return "ENGLISH";
-			
-		case TYPE_ARABIC :
-			return "ARABIC";
-			
-		case TYPE_LETTER :
-			return "LETTER";
-			
-		case TYPE_CNWORD : 
-			return "CN_WORD";
-			
-		case TYPE_CNCHAR : 
-			return "CN_CHAR";
-			
-		case TYPE_OTHER_CJK :
-			return "OTHER_CJK";
-			
-		case TYPE_COUNT :
-			return "COUNT";
-			
-		case TYPE_CNUM :
-			return "TYPE_CNUM";
-			
-		case TYPE_CQUAN:	
-			return "TYPE_CQUAN";
-			
-		default :
-			return "UNKONW";
-		}
-	}
-		
+    /**
+     * 获取词元的字符长度
+     *
+     * @return int
+     */
+    public int getLength() {
+        return this.length;
+    }

-	public void setLexemeType(int lexemeType) {
-		this.lexemeType = lexemeType;
-	}
-	
-	/**
-	 * 合并两个相邻的词元
-	 * @return boolean 词元是否成功合并
-	 */
-	boolean append(Lexeme l, int lexemeType){
-		if(l != null && this.getEndPosition() == l.getBeginPosition()){
-			this.length += l.getLength();
-			this.lexemeType = lexemeType;
-			return true;
-		}else {
-			return false;
-		}
-	}
-	
+    public void setLength(int length) {
+        if (this.length < 0) {
+            throw new IllegalArgumentException("length < 0");
+        }
+        this.length = length;
+    }
+
+    /**
+     * 获取词元的文本内容
+     *
+     * @return String
+     */
+    public String getLexemeText() {
+        if (lexemeText == null) {
+            return "";
+        }
+        return lexemeText;
+    }
+
+    void setLexemeText(String lexemeText) {
+        if (lexemeText == null) {
+            this.lexemeText = "";
+            this.length = 0;
+        } else {
+            this.lexemeText = lexemeText;
+            this.length = lexemeText.length();
+        }
+    }
+
+    /**
+     * 获取词元类型
+     *
+     * @return int
+     */
+    int getLexemeType() {
+        return lexemeType;
+    }
+
+    /**
+     * 获取词元类型标示字符串
+     *
+     * @return String
+     */
+    public String getLexemeTypeString() {
+        switch (lexemeType) {
+
+            case TYPE_ENGLISH:
+                return "ENGLISH";
+
+            case TYPE_ARABIC:
+                return "ARABIC";
+
+            case TYPE_LETTER:
+                return "LETTER";
+
+            case TYPE_CNWORD:
+                return "CN_WORD";
+
+            case TYPE_CNCHAR:
+                return "CN_CHAR";
+
+            case TYPE_OTHER_CJK:
+                return "OTHER_CJK";
+
+            case TYPE_COUNT:
+                return "COUNT";
+
+            case TYPE_CNUM:
+                return "TYPE_CNUM";
+
+            case TYPE_CQUAN:
+                return "TYPE_CQUAN";
+
+            default:
+                return "UNKNOWN";
+        }
+    }
+
+
+    public void setLexemeType(int lexemeType) {
+        this.lexemeType = lexemeType;
+    }
+
+    /**
+     * 合并两个相邻的词元
+     *
+     * @return boolean 词元是否成功合并
+     */
+    boolean append(Lexeme l, int lexemeType) {
+        if (l != null && this.getEndPosition() == l.getBeginPosition()) {
+            this.length += l.getLength();
+            this.lexemeType = lexemeType;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * ToString 方法
+     *
+     * @return 字符串输出
+     */
+    public String toString() {
+        return this.getBeginPosition() + "-" + this.getEndPosition() +
+                " : " + this.lexemeText + " : \t" +
+                this.getLexemeTypeString();
+    }

-	/**
-	 * 
-	 */
-	public String toString(){
-		return this.getBeginPosition() + "-" + this.getEndPosition() +
-				" : " + this.lexemeText + " : \t" +
-				this.getLexemeTypeString();
-	}
-	

 }
--- a/src/main/java/org/wltea/analyzer/core/LexemePath.java
+++ b/src/main/java/org/wltea/analyzer/core/LexemePath.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.core;
@ -34,11 +34,17 @@ package org.wltea.analyzer.core;
@SuppressWarnings("unused")
 class LexemePath extends QuickSortSet implements Comparable<LexemePath> {

-    //起始位置
+    /**
+     * 起始位置
+     */
    private int pathBegin;
-    //结束
+    /**
+     * 结束
+     */
    private int pathEnd;
-    //词元链的有效字符长度
+    /**
+     * 词元链的有效字符长度
+     */
    private int payloadLength;

    LexemePath() {
@ -100,7 +106,6 @@ class LexemePath extends QuickSortSet implements Comparable<LexemePath> {

    /**
     * 移除尾部的Lexeme
-     *
     */
    void removeTail() {
        Lexeme tail = this.pollLast();
@ -117,7 +122,6 @@ class LexemePath extends QuickSortSet implements Comparable<LexemePath> {

    /**
     * 检测词元位置交叉（有歧义的切分）
-     *
     */
    boolean checkCross(Lexeme lexeme) {
        return (lexeme.getBegin() >= this.pathBegin && lexeme.getBegin() < this.pathEnd)
@ -141,7 +145,6 @@ class LexemePath extends QuickSortSet implements Comparable<LexemePath> {

    /**
     * 获取LexemePath的路径长度
-     *
     */
    private int getPathLength() {
        return this.pathEnd - this.pathBegin;
@ -150,7 +153,6 @@ class LexemePath extends QuickSortSet implements Comparable<LexemePath> {

    /**
     * X权重（词元长度积）
-     *
     */
    private int getXWeight() {
        int product = 1;
@ -191,48 +193,48 @@ class LexemePath extends QuickSortSet implements Comparable<LexemePath> {
    }

    public int compareTo(LexemePath o) {
-        //比较有效文本长度
+        // 比较有效文本长度
        if (this.payloadLength > o.payloadLength) {
            return -1;
        } else if (this.payloadLength < o.payloadLength) {
            return 1;
-        } else {
-            //比较词元个数，越少越好
-            if (this.size() < o.size()) {
-                return -1;
-            } else if (this.size() > o.size()) {
-                return 1;
-            } else {
-                //路径跨度越大越好
-                if (this.getPathLength() > o.getPathLength()) {
-                    return -1;
-                } else if (this.getPathLength() < o.getPathLength()) {
-                    return 1;
-                } else {
-                    //根据统计学结论，逆向切分概率高于正向切分，因此位置越靠后的优先
-                    if (this.pathEnd > o.pathEnd) {
-                        return -1;
-                    } else if (pathEnd < o.pathEnd) {
-                        return 1;
-                    } else {
-                        //词长越平均越好
-                        if (this.getXWeight() > o.getXWeight()) {
-                            return -1;
-                        } else if (this.getXWeight() < o.getXWeight()) {
-                            return 1;
-                        } else {
-                            //词元位置权重比较
-                            if (this.getPWeight() > o.getPWeight()) {
-                                return -1;
-                            } else if (this.getPWeight() < o.getPWeight()) {
-                                return 1;
-                            }
-
-                        }
-                    }
-                }
-            }
        }
+
+        // 比较词元个数，越少越好
+        if (this.size() < o.size()) {
+            return -1;
+        } else if (this.size() > o.size()) {
+            return 1;
+        }
+
+        // 路径跨度越大越好
+        if (this.getPathLength() > o.getPathLength()) {
+            return -1;
+        } else if (this.getPathLength() < o.getPathLength()) {
+            return 1;
+        }
+
+        // 根据统计学结论，逆向切分概率高于正向切分，因此位置越靠后的优先
+        if (this.pathEnd > o.pathEnd) {
+            return -1;
+        } else if (pathEnd < o.pathEnd) {
+            return 1;
+        }
+
+        // 词长越平均越好
+        if (this.getXWeight() > o.getXWeight()) {
+            return -1;
+        } else if (this.getXWeight() < o.getXWeight()) {
+            return 1;
+        }
+
+        // 词元位置权重比较
+        if (this.getPWeight() > o.getPWeight()) {
+            return -1;
+        } else if (this.getPWeight() < o.getPWeight()) {
+            return 1;
+        }
+
        return 0;
    }

--- a/src/main/java/org/wltea/analyzer/core/QuickSortSet.java
+++ b/src/main/java/org/wltea/analyzer/core/QuickSortSet.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,188 +21,196 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 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;

 /**
- * IK分词器专用的Lexem快速排序集合
+ * IK分词器专用的Lexeme快速排序集合
 */
 class QuickSortSet {
-	//链表头
-	private Cell head;
-	//链表尾
-	private Cell tail;
-	//链表的实际大小
-	private int size;
-	
-	QuickSortSet(){
-		this.size = 0;
-	}
-	
-	/**
-	 * 向链表集合添加词元
-	 */
-	void addLexeme(Lexeme lexeme){
-		Cell newCell = new Cell(lexeme); 
-		if(this.size == 0){
-			this.head = newCell;
-			this.tail = newCell;
-			this.size++;
+    /**
+     * 链表头
+     */
+    private Cell head;
+    /**
+     * 链表尾
+     */
+    private Cell tail;
+    /**
+     * 链表的实际大小
+     */
+    private int size;

-		}else{
-			/*if(this.tail.compareTo(newCell) == 0){//词元与尾部词元相同，不放入集合
+    QuickSortSet() {
+        this.size = 0;
+    }

-			}else */if(this.tail.compareTo(newCell) < 0){//词元接入链表尾部
-				this.tail.next = newCell;
-				newCell.prev = this.tail;
-				this.tail = newCell;
-				this.size++;
+    /**
+     * 向链表集合添加词元
+     */
+    void addLexeme(Lexeme lexeme) {
+        Cell newCell = new Cell(lexeme);
+        if (this.size == 0) {
+            this.head = newCell;
+            this.tail = newCell;
+            this.size++;

-			}else if(this.head.compareTo(newCell) > 0){//词元接入链表头部
-				this.head.prev = newCell;
-				newCell.next = this.head;
-				this.head = newCell;
-				this.size++;
+        } else {
+            if (this.tail.compareTo(newCell) < 0) {
+                // 词元接入链表尾部
+                this.tail.next = newCell;
+                newCell.prev = this.tail;
+                this.tail = newCell;
+                this.size++;

-			}else{					
-				//从尾部上逆
-				Cell index = this.tail;
-				while(index != null && index.compareTo(newCell) > 0){
-					index = index.prev;
-				}
-				/*if(index.compareTo(newCell) == 0){//词元与集合中的词元重复，不放入集合
+            } else if (this.head.compareTo(newCell) > 0) {
+                // 词元接入链表头部
+                this.head.prev = newCell;
+                newCell.next = this.head;
+                this.head = newCell;
+                this.size++;

-				}else */if((index != null ? index.compareTo(newCell) : 1) < 0){//词元插入链表中的某个位置
-					newCell.prev = index;
-					newCell.next = index.next;
-					index.next.prev = newCell;
-					index.next = newCell;
-					this.size++;
-				}
-			}
-		}
-	}
-	
-	/**
-	 * 返回链表头部元素
-	 */
-	Lexeme peekFirst(){
-		if(this.head != null){
-			return this.head.lexeme;
-		}
-		return null;
-	}
-	
-	/**
-	 * 取出链表集合的第一个元素
-	 * @return Lexeme
-	 */
-	Lexeme pollFirst(){
-		if(this.size == 1){
-			Lexeme first = this.head.lexeme;
-			this.head = null;
-			this.tail = null;
-			this.size--;
-			return first;
-		}else if(this.size > 1){
-			Lexeme first = this.head.lexeme;
-			this.head = this.head.next;
-			this.size --;
-			return first;
-		}else{
-			return null;
-		}
-	}
-	
-	/**
-	 * 返回链表尾部元素
-	 */
-	Lexeme peekLast(){
-		if(this.tail != null){
-			return this.tail.lexeme;
-		}
-		return null;
-	}
-	
-	/**
-	 * 取出链表集合的最后一个元素
-	 * @return Lexeme
-	 */
-	Lexeme pollLast(){
-		if(this.size == 1){
-			Lexeme last = this.head.lexeme;
-			this.head = null;
-			this.tail = null;
-			this.size--;
-			return last;
-			
-		}else if(this.size > 1){
-			Lexeme last = this.tail.lexeme;
-			this.tail = this.tail.prev;
-			this.size--;
-			return last;
-			
-		}else{
-			return null;
-		}
-	}
-	
-	/**
-	 * 返回集合大小
-	 */
-	int size(){
-		return this.size;
-	}
-	
-	/**
-	 * 判断集合是否为空
-	 */
-	boolean isEmpty(){
-		return this.size == 0;
-	}
-	
-	/**
-	 * 返回lexeme链的头部
-	 */
-	Cell getHead(){
-		return this.head;
-	}
+            } else {
+                // 从尾部上逆
+                Cell index = this.tail;
+                while (index != null && index.compareTo(newCell) > 0) {
+                    index = index.prev;
+                }

-	/*
-	 * IK 中文分词  版本 7.0
-	 * IK Analyzer release 7.0
-	 * update by Magese(magese@live.cn)
-	 */
-	@SuppressWarnings("unused")
-	class Cell implements Comparable<Cell>{
-		private Cell prev;
-		private Cell next;
-		private Lexeme lexeme;
-		
-		Cell(Lexeme lexeme){
-			if(lexeme == null){
-				throw new IllegalArgumentException("lexeme must not be null");
-			}
-			this.lexeme = lexeme;
-		}
+                // 词元插入链表中的某个位置
+                if ((index != null ? index.compareTo(newCell) : 1) < 0) {
+                    newCell.prev = index;
+                    newCell.next = index.next;
+                    index.next.prev = newCell;
+                    index.next = newCell;
+                    this.size++;
+                }
+            }
+        }
+    }

-		public int compareTo(Cell o) {
-			return this.lexeme.compareTo(o.lexeme);
-		}
+    /**
+     * 返回链表头部元素
+     */
+    Lexeme peekFirst() {
+        if (this.head != null) {
+            return this.head.lexeme;
+        }
+        return null;
+    }

-		public Cell getPrev(){
-			return this.prev;
-		}
-		
-		Cell getNext(){
-			return this.next;
-		}
-		
-		public Lexeme getLexeme(){
-			return this.lexeme;
-		}
-	}
+    /**
+     * 取出链表集合的第一个元素
+     *
+     * @return Lexeme
+     */
+    Lexeme pollFirst() {
+        if (this.size == 1) {
+            Lexeme first = this.head.lexeme;
+            this.head = null;
+            this.tail = null;
+            this.size--;
+            return first;
+        } else if (this.size > 1) {
+            Lexeme first = this.head.lexeme;
+            this.head = this.head.next;
+            this.size--;
+            return first;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 返回链表尾部元素
+     */
+    Lexeme peekLast() {
+        if (this.tail != null) {
+            return this.tail.lexeme;
+        }
+        return null;
+    }
+
+    /**
+     * 取出链表集合的最后一个元素
+     *
+     * @return Lexeme
+     */
+    Lexeme pollLast() {
+        if (this.size == 1) {
+            Lexeme last = this.head.lexeme;
+            this.head = null;
+            this.tail = null;
+            this.size--;
+            return last;
+
+        } else if (this.size > 1) {
+            Lexeme last = this.tail.lexeme;
+            this.tail = this.tail.prev;
+            this.size--;
+            return last;
+
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * 返回集合大小
+     */
+    int size() {
+        return this.size;
+    }
+
+    /**
+     * 判断集合是否为空
+     */
+    boolean isEmpty() {
+        return this.size == 0;
+    }
+
+    /**
+     * 返回lexeme链的头部
+     */
+    Cell getHead() {
+        return this.head;
+    }
+
+    /*
+     * IK 中文分词  版本 8.5.0
+     * IK Analyzer release 8.5.0
+     * update by Magese(magese@live.cn)
+     */
+    @SuppressWarnings("unused")
+    static class Cell implements Comparable<Cell> {
+        private Cell prev;
+        private Cell next;
+        private final Lexeme lexeme;
+
+        Cell(Lexeme lexeme) {
+            if (lexeme == null) {
+                throw new IllegalArgumentException("lexeme must not be null");
+            }
+            this.lexeme = lexeme;
+        }
+
+        public int compareTo(Cell o) {
+            return this.lexeme.compareTo(o.lexeme);
+        }
+
+        public Cell getPrev() {
+            return this.prev;
+        }
+
+        Cell getNext() {
+            return this.next;
+        }
+
+        public Lexeme getLexeme() {
+            return this.lexeme;
+        }
+    }
 }
--- a/src/main/java/org/wltea/analyzer/dic/DictSegment.java
+++ b/src/main/java/org/wltea/analyzer/dic/DictSegment.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;
@ -37,24 +37,38 @@ import java.util.Map;
@SuppressWarnings("unused")
 class DictSegment implements Comparable<DictSegment> {

-    //公用字典表，存储汉字
+    /**
+     * 公用字典表，存储汉字
+     */
    private static final Map<Character, Character> charMap = new HashMap<>(16, 0.95f);
-    //数组大小上限
+    /**
+     * 数组大小上限
+     */
    private static final int ARRAY_LENGTH_LIMIT = 3;


-    //Map存储结构
-    private Map<Character, DictSegment> childrenMap;
-    //数组方式存储结构
-    private DictSegment[] childrenArray;
+    /**
+     * Map存储结构
+     */
+    private volatile Map<Character, DictSegment> childrenMap;
+    /**
+     * 数组方式存储结构
+     */
+    private volatile DictSegment[] childrenArray;


-    //当前节点上存储的字符
-    private Character nodeChar;
-    //当前节点存储的Segment数目
-    //storeSize <=ARRAY_LENGTH_LIMIT ，使用数组存储， storeSize >ARRAY_LENGTH_LIMIT ,则使用Map存储
+    /**
+     * 当前节点上存储的字符
+     */
+    private final Character nodeChar;
+    /**
+     * 当前节点存储的Segment数目
+     * storeSize <=ARRAY_LENGTH_LIMIT ，使用数组存储， storeSize >ARRAY_LENGTH_LIMIT ,则使用Map存储
+     */
    private int storeSize = 0;
-    //当前DictSegment状态 ,默认 0 , 1表示从根节点到当前节点的路径表示一个词
+    /**
+     * 当前DictSegment状态 ,默认 0 , 1表示从根节点到当前节点的路径表示一个词
+     */
    private int nodeState = 0;


--- a/src/main/java/org/wltea/analyzer/dic/Dictionary.java
+++ b/src/main/java/org/wltea/analyzer/dic/Dictionary.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.0
 *
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
@ -21,20 +21,20 @@
 * 版权声明 2012，乌龙茶工作室
 * provided by Linliangyi and copyright 2012 by Oolong studio
 *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;

+import org.wltea.analyzer.cfg.Configuration;
+import org.wltea.analyzer.cfg.DefaultConfig;
+
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;

-import org.wltea.analyzer.cfg.Configuration;
-import org.wltea.analyzer.cfg.DefaultConfig;
-
 /**
 * 词典管理类，单例模式
 */
@ -44,7 +44,7 @@ public class Dictionary {
    /*
     * 词典单子实例
     */
-    private static Dictionary singleton;
+    private static volatile Dictionary singleton;

    /*
     * 主词典对象
@ -63,7 +63,7 @@ public class Dictionary {
    /**
     * 配置对象
     */
-    private Configuration cfg;
+    private final Configuration cfg;

    /**
     * 私有构造方法，阻止外部直接实例化本类
@ -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();
@ -352,20 +326,12 @@ public class Dictionary {
        // 建立一个量词典实例
        _QuantifierDict = new DictSegment((char) 0);
        // 读取量词词典文件
-        InputStream is = this.getClass().getClassLoader().getResourceAsStream(cfg.getQuantifierDicionary());
+        InputStream is = this.getClass().getClassLoader().getResourceAsStream(cfg.getQuantifierDictionary());
        if (is == null) {
            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);
+    }
 }
--- a/src/main/java/org/wltea/analyzer/dic/Hit.java
+++ b/src/main/java/org/wltea/analyzer/dic/Hit.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.dic;
@ -32,29 +32,38 @@ package org.wltea.analyzer.dic;
 */
@SuppressWarnings("unused")
 public class Hit {
-	//Hit不匹配
+	/**
+	 * Hit不匹配
+	 */
 	private static final int UNMATCH = 0x00000000;
-	//Hit完全匹配
+	/**
+	 * Hit完全匹配
+	 */
 	private static final int MATCH = 0x00000001;
-	//Hit前缀匹配
+	/**
+	 * Hit前缀匹配
+	 */
 	private static final int PREFIX = 0x00000010;
-	
-	
-	//该HIT当前状态，默认未匹配
+
+
+	/**
+	 * 该HIT当前状态，默认未匹配
+	 */
 	private int hitState = UNMATCH;
-	
-	//记录词典匹配过程中，当前匹配到的词典分支节点
-	private DictSegment matchedDictSegment; 
-	/*
+	/**
+	 * 记录词典匹配过程中，当前匹配到的词典分支节点
+	 */
+	private DictSegment matchedDictSegment;
+	/**
 	 * 词段开始位置
 	 */
 	private int begin;
-	/*
+	/**
 	 * 词段的结束位置
 	 */
 	private int end;
-	
-	
+
+
 	/**
 	 * 判断是否完全匹配
 	 */
@ -62,7 +71,7 @@ public class Hit {
 		return (this.hitState & MATCH) > 0;
 	}
 	/**
-	 * 
+	 *
 	 */
 	void setMatch() {
 		this.hitState = this.hitState | MATCH;
@ -75,7 +84,7 @@ public class Hit {
 		return (this.hitState & PREFIX) > 0;
 	}
 	/**
-	 * 
+	 *
 	 */
 	void setPrefix() {
 		this.hitState = this.hitState | PREFIX;
@ -86,35 +95,33 @@ public class Hit {
 	public boolean isUnmatch() {
 		return this.hitState == UNMATCH ;
 	}
-	/**
-	 * 
-	 */
+
 	void setUnmatch() {
 		this.hitState = UNMATCH;
 	}
-	
+
 	DictSegment getMatchedDictSegment() {
 		return matchedDictSegment;
 	}
-	
+
 	void setMatchedDictSegment(DictSegment matchedDictSegment) {
 		this.matchedDictSegment = matchedDictSegment;
 	}
-	
+
 	public int getBegin() {
 		return begin;
 	}
-	
+
 	void setBegin(int begin) {
 		this.begin = begin;
 	}
-	
+
 	public int getEnd() {
 		return end;
 	}
-	
+
 	void setEnd(int end) {
 		this.end = end;
-	}	
-	
+	}
+
 }
--- a/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java
+++ b/src/main/java/org/wltea/analyzer/lucene/IKAnalyzer.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.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 final 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);
+    }

 }
--- a/src/main/java/org/wltea/analyzer/lucene/IKTokenizer.java
+++ b/src/main/java/org/wltea/analyzer/lucene/IKTokenizer.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@ -39,92 +39,102 @@ import java.io.IOException;

 /**
 * IK分词器 Lucene Tokenizer适配器类
- * 兼容Lucene 4.0版本
 */
-@SuppressWarnings("unused")
+@SuppressWarnings({"unused", "FinalMethodInFinalClass"})
 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);
+    }
 }
--- a/src/main/java/org/wltea/analyzer/lucene/IKTokenizerFactory.java
+++ b/src/main/java/org/wltea/analyzer/lucene/IKTokenizerFactory.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@ -44,6 +44,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.*;

 /**
+ * 分词器工厂类
+ *
 * @author <a href="magese@live.cn">Magese</a>
 */
 public class IKTokenizerFactory extends TokenizerFactory implements ResourceLoaderAware, UpdateThread.UpdateJob {
@ -74,7 +76,7 @@ public class IKTokenizerFactory extends TokenizerFactory implements ResourceLoad
     */
    @Override
    public void inform(ResourceLoader resourceLoader) throws IOException {
-        System.out.println(String.format("IKTokenizerFactory " + this.hashCode() + " inform conf: %s", getConf()));
+        System.out.printf("IKTokenizerFactory " + this.hashCode() + " inform conf: %s%n", getConf());
        this.loader = resourceLoader;
        update();
        if ((getConf() != null) && (!getConf().trim().isEmpty())) {
@ -174,4 +176,4 @@ public class IKTokenizerFactory extends TokenizerFactory implements ResourceLoad
    private void setConf(String conf) {
        this.conf = conf;
    }
-}
+}
--- a/src/main/java/org/wltea/analyzer/lucene/UpdateThread.java
+++ b/src/main/java/org/wltea/analyzer/lucene/UpdateThread.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.lucene;
@ -35,7 +35,7 @@ import java.util.Vector;
 */
 public class UpdateThread implements Runnable {
    private static final long INTERVAL = 30000L;                            // 循环等待时间
-    private Vector<UpdateJob> filterFactorys;                               // 更新任务集合
+    private final Vector<UpdateJob> filterFactorys;                         // 更新任务集合

    /**
     * 私有化构造器，阻止外部进行实例化
@ -51,7 +51,7 @@ public class UpdateThread implements Runnable {
     * 静态内部类，实现线程安全单例模式
     */
    private static class Builder {
-        private static UpdateThread singleton = new UpdateThread();
+        private static final UpdateThread singleton = new UpdateThread();
    }

    /**
@ -81,6 +81,7 @@ public class UpdateThread implements Runnable {
        //noinspection InfiniteLoopStatement
        while (true) {
            try {
+                //noinspection BusyWait
                Thread.sleep(INTERVAL);
            } catch (InterruptedException e) {
                e.printStackTrace();
--- a/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java
+++ b/src/main/java/org/wltea/analyzer/query/IKQueryExpressionParser.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.query;
@ -46,11 +46,11 @@ import java.util.Stack;
 public class IKQueryExpressionParser {


-    private List<Element> elements = new ArrayList<>();
+    private final List<Element> elements = new ArrayList<>();

-    private Stack<Query> querys = new Stack<>();
+    private final Stack<Query> querys = new Stack<>();

-    private Stack<Element> operates = new Stack<>();
+    private final Stack<Element> operates = new Stack<>();

    /**
     * 解析查询表达式，生成Lucene Query对象
@ -61,9 +61,9 @@ public class IKQueryExpressionParser {
        Query lucenceQuery = null;
        if (expression != null && !"".equals(expression.trim())) {
            try {
-                //文法解析
+                // 文法解析
                this.splitElements(expression);
-                //语法解析
+                // 语法解析
                this.parseSyntax();
                if (this.querys.size() == 1) {
                    lucenceQuery = this.querys.pop();
@ -87,263 +87,263 @@ public class IKQueryExpressionParser {
        if (expression == null) {
            return;
        }
-        Element curretElement = null;
+        Element currentElement = null;

        char[] expChars = expression.toCharArray();
        for (char expChar : expChars) {
            switch (expChar) {
                case '&':
-                    if (curretElement == null) {
-                        curretElement = new Element();
-                        curretElement.type = '&';
-                        curretElement.append(expChar);
-                    } else if (curretElement.type == '&') {
-                        curretElement.append(expChar);
-                        this.elements.add(curretElement);
-                        curretElement = null;
-                    } else if (curretElement.type == '\'') {
-                        curretElement.append(expChar);
+                    if (currentElement == null) {
+                        currentElement = new Element();
+                        currentElement.type = '&';
+                        currentElement.append(expChar);
+                    } else if (currentElement.type == '&') {
+                        currentElement.append(expChar);
+                        this.elements.add(currentElement);
+                        currentElement = null;
+                    } else if (currentElement.type == '\'') {
+                        currentElement.append(expChar);
                    } else {
-                        this.elements.add(curretElement);
-                        curretElement = new Element();
-                        curretElement.type = '&';
-                        curretElement.append(expChar);
+                        this.elements.add(currentElement);
+                        currentElement = new Element();
+                        currentElement.type = '&';
+                        currentElement.append(expChar);
                    }
                    break;

                case '|':
-                    if (curretElement == null) {
-                        curretElement = new Element();
-                        curretElement.type = '|';
-                        curretElement.append(expChar);
-                    } else if (curretElement.type == '|') {
-                        curretElement.append(expChar);
-                        this.elements.add(curretElement);
-                        curretElement = null;
-                    } else if (curretElement.type == '\'') {
-                        curretElement.append(expChar);
+                    if (currentElement == null) {
+                        currentElement = new Element();
+                        currentElement.type = '|';
+                        currentElement.append(expChar);
+                    } else if (currentElement.type == '|') {
+                        currentElement.append(expChar);
+                        this.elements.add(currentElement);
+                        currentElement = null;
+                    } else if (currentElement.type == '\'') {
+                        currentElement.append(expChar);
                    } else {
-                        this.elements.add(curretElement);
-                        curretElement = new Element();
-                        curretElement.type = '|';
-                        curretElement.append(expChar);
+                        this.elements.add(currentElement);
+                        currentElement = new Element();
+                        currentElement.type = '|';
+                        currentElement.append(expChar);
                    }
                    break;

                case '-':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '-';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '-';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case '(':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '(';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '(';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case ')':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = ')';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = ')';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case ':':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = ':';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = ':';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case '=':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '=';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '=';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case ' ':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                        } else {
-                            this.elements.add(curretElement);
-                            curretElement = null;
+                            this.elements.add(currentElement);
+                            currentElement = null;
                        }
                    }

                    break;

                case '\'':
-                    if (curretElement == null) {
-                        curretElement = new Element();
-                        curretElement.type = '\'';
+                    if (currentElement == null) {
+                        currentElement = new Element();
+                        currentElement.type = '\'';

-                    } else if (curretElement.type == '\'') {
-                        this.elements.add(curretElement);
-                        curretElement = null;
+                    } else if (currentElement.type == '\'') {
+                        this.elements.add(currentElement);
+                        currentElement = null;

                    } else {
-                        this.elements.add(curretElement);
-                        curretElement = new Element();
-                        curretElement.type = '\'';
+                        this.elements.add(currentElement);
+                        currentElement = new Element();
+                        currentElement.type = '\'';

                    }
                    break;

                case '[':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '[';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '[';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case ']':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = ']';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = ']';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;

                    break;

                case '{':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '{';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '{';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;
                    break;

                case '}':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = '}';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = '}';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;

                    break;
                case ',':
-                    if (curretElement != null) {
-                        if (curretElement.type == '\'') {
-                            curretElement.append(expChar);
+                    if (currentElement != null) {
+                        if (currentElement.type == '\'') {
+                            currentElement.append(expChar);
                            continue;
                        } else {
-                            this.elements.add(curretElement);
+                            this.elements.add(currentElement);
                        }
                    }
-                    curretElement = new Element();
-                    curretElement.type = ',';
-                    curretElement.append(expChar);
-                    this.elements.add(curretElement);
-                    curretElement = null;
+                    currentElement = new Element();
+                    currentElement.type = ',';
+                    currentElement.append(expChar);
+                    this.elements.add(currentElement);
+                    currentElement = null;

                    break;

                default:
-                    if (curretElement == null) {
-                        curretElement = new Element();
-                        curretElement.type = 'F';
-                        curretElement.append(expChar);
+                    if (currentElement == null) {
+                        currentElement = new Element();
+                        currentElement.type = 'F';
+                        currentElement.append(expChar);

-                    } else if (curretElement.type == 'F') {
-                        curretElement.append(expChar);
+                    } else if (currentElement.type == 'F') {
+                        currentElement.append(expChar);

-                    } else if (curretElement.type == '\'') {
-                        curretElement.append(expChar);
+                    } else if (currentElement.type == '\'') {
+                        currentElement.append(expChar);

                    } else {
-                        this.elements.add(curretElement);
-                        curretElement = new Element();
-                        curretElement.type = 'F';
-                        curretElement.append(expChar);
+                        this.elements.add(currentElement);
+                        currentElement = new Element();
+                        currentElement.type = 'F';
+                        currentElement.append(expChar);
                    }
            }
        }

-        if (curretElement != null) {
-            this.elements.add(curretElement);
+        if (currentElement != null) {
+            this.elements.add(currentElement);
        }
    }

@ -359,7 +359,7 @@ public class IKQueryExpressionParser {
                    throw new IllegalStateException("表达式异常： = 或 ： 号丢失");
                }
                Element e3 = this.elements.get(i + 2);
-                //处理 = 和 ： 运算
+                // 处理 = 和 ： 运算
                if ('\'' == e3.type) {
                    i += 2;
                    if ('=' == e2.type) {
@ -367,14 +367,14 @@ public class IKQueryExpressionParser {
                        this.querys.push(tQuery);
                    } else {
                        String keyword = e3.toString();
-                        //SWMCQuery Here
+                        // SWMCQuery Here
                        Query _SWMCQuery = SWMCQueryBuilder.create(e.toString(), keyword);
                        this.querys.push(_SWMCQuery);
                    }

                } else if ('[' == e3.type || '{' == e3.type) {
                    i += 2;
-                    //处理 [] 和 {}
+                    // 处理 [] 和 {}
                    LinkedList<Element> eQueue = new LinkedList<>();
                    eQueue.add(e3);
                    for (i++; i < this.elements.size(); i++) {
@ -384,7 +384,7 @@ public class IKQueryExpressionParser {
                            break;
                        }
                    }
-                    //翻译RangeQuery
+                    // 翻译RangeQuery
                    Query rangeQuery = this.toTermRangeQuery(e, eQueue);
                    this.querys.push(rangeQuery);
                } else {
@ -475,10 +475,10 @@ public class IKQueryExpressionParser {
                    }

                } else {
-                    //q1 instanceof TermQuery
-                    //q1 instanceof TermRangeQuery
-                    //q1 instanceof PhraseQuery
-                    //others
+                    // q1 instanceof TermQuery
+                    // q1 instanceof TermRangeQuery
+                    // q1 instanceof PhraseQuery
+                    // others
                    resultQuery.add(q1, Occur.MUST);
                }
            }
@ -496,10 +496,10 @@ public class IKQueryExpressionParser {
                    }

                } else {
-                    //q1 instanceof TermQuery
-                    //q1 instanceof TermRangeQuery
-                    //q1 instanceof PhraseQuery
-                    //others
+                    // q1 instanceof TermQuery
+                    // q1 instanceof TermRangeQuery
+                    // q1 instanceof PhraseQuery
+                    // others
                    resultQuery.add(q2, Occur.MUST);
                }
            }
@ -518,10 +518,10 @@ public class IKQueryExpressionParser {
                    }

                } else {
-                    //q1 instanceof TermQuery
-                    //q1 instanceof TermRangeQuery
-                    //q1 instanceof PhraseQuery
-                    //others
+                    // q1 instanceof TermQuery
+                    // q1 instanceof TermRangeQuery
+                    // q1 instanceof PhraseQuery
+                    // others
                    resultQuery.add(q1, Occur.SHOULD);
                }
            }
@ -538,10 +538,10 @@ public class IKQueryExpressionParser {
                        resultQuery.add(q2, Occur.SHOULD);
                    }
                } else {
-                    //q2 instanceof TermQuery
-                    //q2 instanceof TermRangeQuery
-                    //q2 instanceof PhraseQuery
-                    //others
+                    // q2 instanceof TermQuery
+                    // q2 instanceof TermRangeQuery
+                    // q2 instanceof PhraseQuery
+                    // others
                    resultQuery.add(q2, Occur.SHOULD);

                }
@ -563,10 +563,10 @@ public class IKQueryExpressionParser {
                }

            } else {
-                //q1 instanceof TermQuery
-                //q1 instanceof TermRangeQuery
-                //q1 instanceof PhraseQuery
-                //others
+                // q1 instanceof TermQuery
+                // q1 instanceof TermRangeQuery
+                // q1 instanceof PhraseQuery
+                // others
                resultQuery.add(q1, Occur.MUST);
            }

@ -584,7 +584,7 @@ public class IKQueryExpressionParser {
        boolean includeLast;
        String firstValue;
        String lastValue = null;
-        //检查第一个元素是否是[或者{
+        // 检查第一个元素是否是[或者{
        Element first = elements.getFirst();
        if ('[' == first.type) {
            includeFirst = true;
@ -593,7 +593,7 @@ public class IKQueryExpressionParser {
        } else {
            throw new IllegalStateException("表达式异常");
        }
-        //检查最后一个元素是否是]或者}
+        // 检查最后一个元素是否是]或者}
        Element last = elements.getLast();
        if (']' == last.type) {
            includeLast = true;
@ -605,7 +605,7 @@ public class IKQueryExpressionParser {
        if (elements.size() < 4 || elements.size() > 5) {
            throw new IllegalStateException("表达式异常, RangeQuery 错误");
        }
-        //读出中间部分
+        // 读出中间部分
        Element e2 = elements.get(1);
        if ('\'' == e2.type) {
            firstValue = e2.toString();
@ -673,7 +673,7 @@ public class IKQueryExpressionParser {
     * @author linliangyi
     * May 20, 2010
     */
-    private class Element {
+    private static class Element {
        char type = 0;
        StringBuffer eleTextBuff;

@ -692,11 +692,9 @@ public class IKQueryExpressionParser {

    public static void main(String[] args) {
        IKQueryExpressionParser parser = new IKQueryExpressionParser();
-        //String ikQueryExp = "newsTitle:'的两款《魔兽世界》插件Bigfoot和月光宝盒'";
        String ikQueryExp = "(id='ABcdRf' && date:{'20010101','20110101'} && keyword:'魔兽中国') || (content:'KSHT-KSH-A001-18'  || ulr='www.ik.com') - name:'林良益'";
        Query result = parser.parseExp(ikQueryExp);
        System.out.println(result);
-
    }

 }
--- a/src/main/java/org/wltea/analyzer/query/SWMCQueryBuilder.java
+++ b/src/main/java/org/wltea/analyzer/query/SWMCQueryBuilder.java
@ -1,6 +1,6 @@
 /*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
+ * IK 中文分词  版本 8.5.0
+ * IK Analyzer release 8.5.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.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
+ * 8.5.0版本 由 Magese (magese@live.cn) 更新
+ * release 8.5.0 update by Magese(magese@live.cn)
 *
 */
 package org.wltea.analyzer.query;
@ -45,6 +45,7 @@ import java.util.List;
 *
 * @author linliangyi
 */
+@SuppressWarnings("unused")
 class SWMCQueryBuilder {

    /**
@ -56,9 +57,9 @@ class SWMCQueryBuilder {
        if (fieldName == null || keywords == null) {
            throw new IllegalArgumentException("参数 fieldName 、 keywords 不能为null.");
        }
-        //1.对keywords进行分词处理
+        // 1.对keywords进行分词处理
        List<Lexeme> lexemes = doAnalyze(keywords);
-        //2.根据分词结果，生成SWMCQuery
+        // 2.根据分词结果，生成SWMCQuery
        return getSWMCQuery(fieldName, lexemes);
    }

@ -84,20 +85,20 @@ class SWMCQueryBuilder {
     * 根据分词结果生成SWMC搜索
     */
    private static Query getSWMCQuery(String fieldName, List<Lexeme> lexemes) {
-        //构造SWMC的查询表达式
+        // 构造SWMC的查询表达式
        StringBuilder keywordBuffer = new StringBuilder();
-        //精简的SWMC的查询表达式
+        // 精简的SWMC的查询表达式
        StringBuilder keywordBuffer_Short = new StringBuilder();
-        //记录最后词元长度
+        // 记录最后词元长度
        int lastLexemeLength = 0;
-        //记录最后词元结束位置
+        // 记录最后词元结束位置
        int lastLexemeEnd = -1;

        int shortCount = 0;
        int totalCount = 0;
        for (Lexeme l : lexemes) {
            totalCount += l.getLength();
-            //精简表达式
+            // 精简表达式
            if (l.getLength() > 1) {
                keywordBuffer_Short.append(' ').append(l.getLexemeText());
                shortCount += l.getLength();
@ -106,7 +107,7 @@ class SWMCQueryBuilder {
            if (lastLexemeLength == 0) {
                keywordBuffer.append(l.getLexemeText());
            } else if (lastLexemeLength == 1 && l.getLength() == 1
-                    && lastLexemeEnd == l.getBeginPosition()) {//单字位置相邻，长度为一，合并)
+                    && lastLexemeEnd == l.getBeginPosition()) {// 单字位置相邻，长度为一，合并)
                keywordBuffer.append(l.getLexemeText());
            } else {
                keywordBuffer.append(' ').append(l.getLexemeText());
@ -116,10 +117,10 @@ class SWMCQueryBuilder {
            lastLexemeEnd = l.getEndPosition();
        }

-        //借助lucene queryparser 生成SWMC Query
+        // 借助lucene queryparser 生成SWMC Query
        QueryParser qp = new QueryParser(fieldName, new StandardAnalyzer());
+        qp.setAutoGeneratePhraseQueries(false);
        qp.setDefaultOperator(QueryParser.AND_OPERATOR);
-        qp.setAutoGeneratePhraseQueries(true);

        if ((shortCount * 1.0f / totalCount) > 0.5f) {
            try {
--- a/src/main/java/org/wltea/analyzer/sample/IKAnalzyerDemo.java
+++ b/src/main/java/org/wltea/analyzer/sample/IKAnalzyerDemo.java
@ -1,86 +0,0 @@
-/*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * 源代码由林良益(linliangyi2005@gmail.com)提供
- * 版权声明 2012，乌龙茶工作室
- * provided by Linliangyi and copyright 2012 by Oolong studio
- *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
- *
- */
-package org.wltea.analyzer.sample;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
-import org.wltea.analyzer.lucene.IKAnalyzer;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-/**
- * 使用IKAnalyzer进行分词的演示
- * 2012-10-22
- */
-public class IKAnalzyerDemo {
-
-    public static void main(String[] args) {
-        //构建IK分词器，使用smart分词模式
-        Analyzer analyzer = new IKAnalyzer(true);
-
-        //获取Lucene的TokenStream对象
-        TokenStream ts = null;
-        try {
-            ts = analyzer.tokenStream("myfield", new StringReader("这是一个中文分词的例子，你可以直接运行它！IKAnalyer can analysis english text too"));
-            //获取词元位置属性
-            OffsetAttribute offset = ts.addAttribute(OffsetAttribute.class);
-            //获取词元文本属性
-            CharTermAttribute term = ts.addAttribute(CharTermAttribute.class);
-            //获取词元文本属性
-            TypeAttribute type = ts.addAttribute(TypeAttribute.class);
-
-
-            //重置TokenStream（重置StringReader）
-            ts.reset();
-            //迭代获取分词结果
-            while (ts.incrementToken()) {
-                System.out.println(offset.startOffset() + " - " + offset.endOffset() + " : " + term.toString() + " | " + type.type());
-            }
-            //关闭TokenStream（关闭StringReader）
-            ts.end();   // Perform end-of-stream operations, e.g. set the final offset.
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            //释放TokenStream的所有资源
-            if (ts != null) {
-                try {
-                    ts.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-    }
-
-}
--- a/src/main/java/org/wltea/analyzer/sample/LuceneIndexAndSearchDemo.java
+++ b/src/main/java/org/wltea/analyzer/sample/LuceneIndexAndSearchDemo.java
@ -1,137 +0,0 @@
-/*
- * IK 中文分词  版本 7.7.1
- * IK Analyzer release 7.7.1
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * 源代码由林良益(linliangyi2005@gmail.com)提供
- * 版权声明 2012，乌龙茶工作室
- * provided by Linliangyi and copyright 2012 by Oolong studio
- *
- * 7.7.1版本 由 Magese (magese@live.cn) 更新
- * release 7.7.1 update by Magese(magese@live.cn)
- *
- */
-package org.wltea.analyzer.sample;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-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.store.Directory;
-import org.apache.lucene.store.RAMDirectory;
-import org.wltea.analyzer.lucene.IKAnalyzer;
-
-import java.io.IOException;
-
-
-/**
- * 使用IKAnalyzer进行Lucene索引和查询的演示
- * 2012-3-2
- * <p>
- * 以下是结合Lucene4.0 API的写法
- */
-public class LuceneIndexAndSearchDemo {
-
-
-    /**
-     * 模拟：
-     * 创建一个单条记录的索引，并对其进行搜索
-     *
-     */
-    public static void main(String[] args) {
-        //Lucene Document的域名
-        String fieldName = "text";
-        //检索内容
-        String text = "IK Analyzer是一个结合词典分词和文法分词的中文分词开源工具包。它使用了全新的正向迭代最细粒度切分算法。";
-
-        //实例化IKAnalyzer分词器
-        Analyzer analyzer = new IKAnalyzer(true);
-
-        Directory directory = null;
-        IndexWriter iwriter;
-        IndexReader ireader = null;
-        IndexSearcher isearcher;
-        try {
-            //建立内存索引对象
-            directory = new RAMDirectory();
-
-            //配置IndexWriterConfig
-            IndexWriterConfig iwConfig = new IndexWriterConfig(analyzer);
-            iwConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);
-            iwriter = new IndexWriter(directory, iwConfig);
-            //写入索引
-            Document doc = new Document();
-            doc.add(new StringField("ID", "10000", Field.Store.YES));
-            doc.add(new TextField(fieldName, text, Field.Store.YES));
-            iwriter.addDocument(doc);
-            iwriter.close();
-
-
-            //搜索过程**********************************
-            //实例化搜索器
-            ireader = DirectoryReader.open(directory);
-            isearcher = new IndexSearcher(ireader);
-
-            String keyword = "中文分词工具包";
-            //使用QueryParser查询分析器构造Query对象
-            QueryParser qp = new QueryParser(fieldName, analyzer);
-            qp.setDefaultOperator(QueryParser.AND_OPERATOR);
-            Query query = qp.parse(keyword);
-            System.out.println("Query = " + query);
-
-            //搜索相似度最高的5条记录
-            TopDocs topDocs = isearcher.search(query, 5);
-            System.out.println("命中：" + topDocs.totalHits);
-            //输出结果
-            ScoreDoc[] scoreDocs = topDocs.scoreDocs;
-            for (int i = 0; i < topDocs.totalHits; i++) {
-                Document targetDoc = isearcher.doc(scoreDocs[i].doc);
-                System.out.println("内容：" + targetDoc.toString());
-            }
-
-        } catch (ParseException | IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (ireader != null) {
-                try {
-                    ireader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-            if (directory != null) {
-                try {
-                    directory.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-    }
-}
--- a/src/main/resources/IKAnalyzer.cfg.xml
+++ b/src/main/resources/IKAnalyzer.cfg.xml
@ -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>
--- a/src/main/resources/dict/main_dic_2020.dic
+++ b/src/main/resources/dict/main_dic_2020.dic
--- a/src/main/resources/ik.conf
+++ b/src/main/resources/ik.conf
@ -1,3 +1,3 @@
-Wed Aug 01 11:21:30 CST 2018
+Wed Aug 01 00:00:00 CST 2021
 files=dynamicdic.txt
 lastupdate=0
Author	SHA1	Message	Date
Magese	f0059e2c78	Resolve QueryParser exception.	2022-01-04 10:36:49 +08:00
Magese	fb4defedb7	Format comments.	2022-01-04 09:59:25 +08:00
Magese	9ed56a0f41	Format comments.	2022-01-04 09:56:41 +08:00
Magese	70d40bc3af	Using final.	2022-01-04 09:51:21 +08:00
Magese	ef2dbeb979	Format comments.	2022-01-04 09:48:28 +08:00
Magese	872aac8298	Using final and volatile.	2022-01-04 09:44:12 +08:00
Magese	052e8f476e	Package sorting.	2022-01-04 09:36:59 +08:00
Magese	6cc121e98d	Remove HitCount Badges.	2021-12-31 17:56:33 +08:00
Magese	32a9369680	注释格式化；	2021-12-31 17:51:35 +08:00
Magese	dd7822b6be	优化排序算法逻辑；	2021-12-31 17:48:21 +08:00
Magese	6ef4798752	代码及注释格式化；	2021-12-31 17:43:40 +08:00
Magese	56f23a9027	注释格式化；	2021-12-31 17:38:43 +08:00
Magese	5ab517079b	注释格式化；	2021-12-31 17:36:34 +08:00
Magese	020f83e665	构造初始化成员变量声明为 final；	2021-12-31 17:35:32 +08:00
Magese	ab50f161e6	注释格式化；	2021-12-31 17:33:07 +08:00
Magese	47439fa94b	注释格式化；	2021-12-31 17:31:28 +08:00
Magese	c938bf1f2b	成员变量申明为 final，逻辑判断优化；	2021-12-31 17:29:59 +08:00
Magese	92cb2a28d6	格式化代码、注释；	2021-12-31 17:27:42 +08:00
Magese	f173925dc0	优化词前置判断逻辑；	2021-12-31 17:17:47 +08:00
Magese	f9bc7a12fa	代码、注释格式化；	2021-12-31 17:14:07 +08:00
Magese	df29bdc4df	代码格式化；	2021-12-31 17:11:52 +08:00
Magese	3ec8076730	日志格式优化；	2021-12-31 17:10:19 +08:00
Magese	7149c54de7	单例对象使用 volatile 关键字；	2021-12-31 17:02:02 +08:00
Magese	fff131a45a	修复单词拼写错误；	2021-12-31 16:59:38 +08:00
Magese	0c6560fe61	升级lucene版本为 8.5.0	2021-12-23 17:09:21 +08:00
Magese	bf3df0e58c	移除demo，修改配置	2021-12-23 14:30:10 +08:00
老王	4180900415	Update README.md	2021-05-26 16:32:30 +08:00
gaozhicheng	eaf58c0f1d	Update README.md	2021-03-22 11:49:04 +08:00
gaozhicheng	aba7aeff19	Update README.md	2021-03-22 11:48:33 +08:00
gaozhicheng	a234d047cd	Update README.md	2021-03-22 11:46:41 +08:00
gaozhicheng	8d67193774	Update lucene to 8.4.0	2021-03-22 11:41:13 +08:00
gaozhicheng	9b731bb002	更新README.md；	2020-12-30 11:42:31 +08:00
gaozhicheng	8b04070253	更新Lucene版本为8.3.1；	2020-12-30 10:59:19 +08:00
gaozhicheng	4dd4a86b4d	更新默认主词典；	2020-12-30 10:28:45 +08:00
Magese	59b86a341f	Merge pull request #15 from magese/dependabot/maven/junit-junit-4.13.1 Bump junit from 4.11 to 4.13.1	2020-12-14 14:15:11 +08:00
dependabot[bot]	a45434162d	Bump junit from 4.11 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1) Signed-off-by: dependabot[bot] <support@github.com>	2020-10-13 07:05:33 +00:00
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