adjust package and rename some classes

log/history/logback-info-2019-04-30.log

@@ -31,7 +31,7 @@
 2019-04-30 09:33:12.087 logback [main] INFO  e.m.diagnosis.config.DiagnosisConfig - file d:\diagnosis\upload\otherother,mkdir true,create false
 2019-04-30 09:33:12.088 logback [main] INFO  e.m.diagnosis.config.DiagnosisConfig - file d:\diagnosis\upload\imageimage,mkdir true,create false
 2019-04-30 09:33:12.089 logback [main] INFO  e.m.diagnosis.config.DiagnosisConfig - file d:\diagnosis\upload\excelexcel,mkdir true,create false
-2019-04-30 09:33:13.178 logback [main] INFO  edu.math.diagnosis.util.ExcelUtils - docpath: /E:/workspace/IdeaProject/yaoxiang/target/classes/doc/ 
+2019-04-30 09:33:13.178 logback [main] INFO  edu.math.diagnosis.word.ExcelUtils - docpath: /E:/workspace/IdeaProject/yaoxiang/target/classes/doc/
 2019-04-30 09:33:14.566 logback [main] INFO  o.s.b.a.e.web.EndpointLinksResolver - Exposing 17 endpoint(s) beneath base path '/actuator'
 2019-04-30 09:33:14.901 logback [main] INFO  io.lettuce.core.EpollProvider - Starting without optional epoll library
 2019-04-30 09:33:14.901 logback [main] INFO  io.lettuce.core.KqueueProvider - Starting without optional kqueue library

log/logback-info-%d{yyyy-MM-dd}.log

@@ -49,7 +49,7 @@ Error starting ApplicationContext. To display the conditions report re-run your
 2019-08-29 20:29:29.948 logback [main] INFO  o.s.o.j.LocalContainerEntityManagerFactoryBean - Initialized JPA EntityManagerFactory for persistence unit 'default'
 2019-08-29 20:29:30.748 logback [main] INFO  e.math.diagnosis.util.FormulaService - loading OMML2MML.XSL
 2019-08-29 20:29:31.159 logback [main] INFO  e.math.diagnosis.util.FormulaService - load OMML2MML.XSL finish
-2019-08-29 20:29:31.240 logback [main] INFO  edu.math.diagnosis.util.ExcelUtils - docpath: /E:/workspace/IdeaProject/yaoxiang/target/classes/doc/ 
+2019-08-29 20:29:31.240 logback [main] INFO  edu.math.diagnosis.word.ExcelUtils - docpath: /E:/workspace/IdeaProject/yaoxiang/target/classes/doc/
 2019-08-29 20:29:32.199 logback [main] INFO  o.s.b.a.e.web.EndpointLinksResolver - Exposing 17 endpoint(s) beneath base path '/actuator'
 2019-08-29 20:29:32.450 logback [main] INFO  io.lettuce.core.EpollProvider - Starting without optional epoll library
 2019-08-29 20:29:32.451 logback [main] INFO  io.lettuce.core.KqueueProvider - Starting without optional kqueue library
@@ -142,7 +142,7 @@ Error starting ApplicationContext. To display the conditions report re-run your
 2019-08-31 13:53:55.839 logback [main] INFO  o.s.o.j.LocalContainerEntityManagerFactoryBean - Initialized JPA EntityManagerFactory for persistence unit 'default'
 2019-08-31 13:53:56.577 logback [main] INFO  e.math.diagnosis.util.FormulaService - loading OMML2MML.XSL
 2019-08-31 13:53:56.961 logback [main] INFO  e.math.diagnosis.util.FormulaService - load OMML2MML.XSL finish
-2019-08-31 13:53:57.054 logback [main] INFO  edu.math.diagnosis.util.ExcelUtils - docpath: /Users/feick/IdeaProjects/diagnosis/target/classes/doc/ 
+2019-08-31 13:53:57.054 logback [main] INFO  edu.math.diagnosis.word.ExcelUtils - docpath: /Users/feick/IdeaProjects/diagnosis/target/classes/doc/
 2019-08-31 13:53:58.218 logback [main] INFO  o.s.b.a.e.web.EndpointLinksResolver - Exposing 17 endpoint(s) beneath base path '/actuator'
 2019-08-31 13:53:58.533 logback [main] INFO  io.lettuce.core.EpollProvider - Starting without optional epoll library
 2019-08-31 13:53:58.535 logback [main] INFO  io.lettuce.core.KqueueProvider - Starting without optional kqueue library
@@ -209,7 +209,7 @@ Error starting ApplicationContext. To display the conditions report re-run your
 2019-08-31 15:25:34.766 logback [main] INFO  o.s.o.j.LocalContainerEntityManagerFactoryBean - Initialized JPA EntityManagerFactory for persistence unit 'default'
 2019-08-31 15:25:35.592 logback [main] INFO  e.math.diagnosis.util.FormulaService - loading OMML2MML.XSL
 2019-08-31 15:25:35.956 logback [main] INFO  e.math.diagnosis.util.FormulaService - load OMML2MML.XSL finish
-2019-08-31 15:25:36.048 logback [main] INFO  edu.math.diagnosis.util.ExcelUtils - docpath: /Users/feick/OneDrive%20-%20m.scnu.edu.cn/Workspace/IdeaProjects/diagnosis/target/classes/doc/ 
+2019-08-31 15:25:36.048 logback [main] INFO  edu.math.diagnosis.word.ExcelUtils - docpath: /Users/feick/OneDrive%20-%20m.scnu.edu.cn/Workspace/IdeaProjects/diagnosis/target/classes/doc/
 2019-08-31 15:25:36.521 logback [main] INFO  o.s.b.a.e.web.EndpointLinksResolver - Exposing 17 endpoint(s) beneath base path '/actuator'
 2019-08-31 15:25:36.834 logback [main] INFO  io.lettuce.core.EpollProvider - Starting without optional epoll library
 2019-08-31 15:25:36.835 logback [main] INFO  io.lettuce.core.KqueueProvider - Starting without optional kqueue library
@@ -276,7 +276,7 @@ Error starting ApplicationContext. To display the conditions report re-run your
 2019-08-31 15:34:42.119 logback [main] INFO  o.s.o.j.LocalContainerEntityManagerFactoryBean - Initialized JPA EntityManagerFactory for persistence unit 'default'
 2019-08-31 15:34:42.847 logback [main] INFO  e.math.diagnosis.util.FormulaService - loading OMML2MML.XSL
 2019-08-31 15:34:43.149 logback [main] INFO  e.math.diagnosis.util.FormulaService - load OMML2MML.XSL finish
-2019-08-31 15:34:43.245 logback [main] INFO  edu.math.diagnosis.util.ExcelUtils - docpath: /Users/feick/OneDrive%20-%20m.scnu.edu.cn/Workspace/IdeaProjects/diagnosis/target/classes/doc/ 
+2019-08-31 15:34:43.245 logback [main] INFO  edu.math.diagnosis.word.ExcelUtils - docpath: /Users/feick/OneDrive%20-%20m.scnu.edu.cn/Workspace/IdeaProjects/diagnosis/target/classes/doc/
 2019-08-31 15:34:43.664 logback [main] INFO  o.s.b.a.e.web.EndpointLinksResolver - Exposing 17 endpoint(s) beneath base path '/actuator'
 2019-08-31 15:34:43.925 logback [main] INFO  io.lettuce.core.EpollProvider - Starting without optional epoll library
 2019-08-31 15:34:43.926 logback [main] INFO  io.lettuce.core.KqueueProvider - Starting without optional kqueue library

src/main/java/edu/math/diagnosis/cache/DbCacheFactory.java

@@ -1,7 +1,7 @@
 package edu.math.diagnosis.cache;
 
 
-import edu.math.diagnosis.util.ReflectorUtils;
+import edu.math.diagnosis.util.ReflectorUtil;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
@@ -17,7 +17,7 @@ public enum DbCacheFactory {
     DbCacheFactory() {
         System.out.println(DbCacheFactory.class.getSimpleName() + " init!");
         String pack = "edu.math.diagnosis.cache.instance";
-        Set<Class<?>> set = ReflectorUtils.getClasses(pack);
+        Set<Class<?>> set = ReflectorUtil.getClasses(pack);
         for (Class<?> claes : set) {
             try {
                 if (claes.getName().contains("$")) {

src/main/java/edu/math/diagnosis/config/Md5PasswordEncoder.java

@@ -1,18 +1,18 @@
 package edu.math.diagnosis.config;
 
-import edu.math.diagnosis.util.MD5;
+import edu.math.diagnosis.util.MD5Util;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 public class Md5PasswordEncoder implements PasswordEncoder {
 
     @Override
     public String encode(CharSequence rawPassword) {
-        return MD5.INSTANCE.md5((String) rawPassword);
+        return MD5Util.INSTANCE.md5((String) rawPassword);
     }
 
     @Override
     public boolean matches(CharSequence rawPassword, String encodedPassword) {
-        return encodedPassword.equals(MD5.INSTANCE.md5((String) rawPassword));
+        return encodedPassword.equals(MD5Util.INSTANCE.md5((String) rawPassword));
     }
 
 }

src/main/java/edu/math/diagnosis/controller/CommitController.java

@@ -9,7 +9,7 @@ import edu.math.diagnosis.entity.*;
 import edu.math.diagnosis.model.AuthUser;
 import edu.math.diagnosis.model.ResponseMessage;
 import edu.math.diagnosis.util.NumberUtil;
-import edu.math.diagnosis.util.ObjectUtils;
+import edu.math.diagnosis.util.ObjectUtil;
 import edu.math.diagnosis.util.SecurityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
@@ -49,7 +49,7 @@ public class CommitController {
         }));
         paper.setCreatetime(null);
         paper.setUpdatetime(null);
-        String data = ObjectUtils.Object2Json(paper);
+        String data = ObjectUtil.object2Json(paper);
         commit.setData(data);
         long uid = authUser.getUser().getId();
         long pid = paper.getId();

src/main/java/edu/math/diagnosis/controller/OpenController.java

@@ -2,7 +2,7 @@ package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.entity.UserInfo;
 import edu.math.diagnosis.service.UserService;
-import edu.math.diagnosis.util.Constants;
+import edu.math.diagnosis.model.Constants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

src/main/java/edu/math/diagnosis/controller/TempController.java

@@ -2,7 +2,7 @@ package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.model.GeneralInfo;
 import edu.math.diagnosis.model.Report;
-import edu.math.diagnosis.util.ExcelUtils;
+import edu.math.diagnosis.word.ExcelUtils;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/edu/math/diagnosis/controller/TestController.java

@@ -7,7 +7,7 @@ import edu.math.diagnosis.entity.Commit;
 import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.Question;
 import edu.math.diagnosis.model.AuthUser;
-import edu.math.diagnosis.util.ObjectUtils;
+import edu.math.diagnosis.util.ObjectUtil;
 import edu.math.diagnosis.util.SecurityUtil;
 import io.swagger.annotations.Api;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -71,10 +71,10 @@ public class TestController {
         List<PaperReport> result = new ArrayList<>();
         List<Commit> commitList = commitRepo.findAll();
         for (Commit commit : commitList) {
-            Paper paper = ObjectUtils.Json2Object(commit.getData(), Paper.class);
+            Paper paper = ObjectUtil.Json2Object(commit.getData(), Paper.class);
             PaperReport paperReport = commitController.generateReport(paper, commit.getUid());
             result.add(paperReport);
-            //		System.out.println(ObjectUtils.Object2Json(paperReport));
+            //		System.out.println(ObjectUtil.object2Json(paperReport));
         }
         return result;
     }

src/main/java/edu/math/diagnosis/controller/UserManagerController.java

@@ -2,7 +2,7 @@ package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.entity.UserInfo;
 import edu.math.diagnosis.service.UserService;
-import edu.math.diagnosis.util.Constants;
+import edu.math.diagnosis.model.Constants;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.*;
 

src/main/java/edu/math/diagnosis/model/AuthUser.java

@@ -1,7 +1,6 @@
 package edu.math.diagnosis.model;
 
 import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.util.Constants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/edu/math/diagnosis/util/Constants.java → src/main/java/edu/math/diagnosis/model/Constants.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.util;
+package edu.math.diagnosis.model;
 
 
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

src/main/java/edu/math/diagnosis/service/CommitService.java

@@ -4,7 +4,7 @@ import edu.math.diagnosis.dao.*;
 import edu.math.diagnosis.entity.*;
 import edu.math.diagnosis.model.QuestionDetail;
 import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.util.ObjectUtils;
+import edu.math.diagnosis.util.ObjectUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -45,7 +45,7 @@ public class CommitService {
         commit.setGenerateReport(true);
 //        Map<Long, List<Long>> ans = commit.getAns();
         Map<Long, List<Long>> ans = new HashMap<>();
-        commit.setJsonAns(ObjectUtils.Object2Json(ans));
+        commit.setJsonAns(ObjectUtil.object2Json(ans));
         List<QuestionDetail> questionDetails = new ArrayList<>(20);
         for (Map.Entry<Long, List<Long>> entry : ans.entrySet()) {
             List<Long> choices = entry.getValue();

src/main/java/edu/math/diagnosis/service/PaperService.java

@@ -4,12 +4,13 @@ import edu.math.diagnosis.dao.OptionRepo;
 import edu.math.diagnosis.dao.PaperRepo;
 import edu.math.diagnosis.dao.QuestionRepo;
 import edu.math.diagnosis.entity.*;
+import edu.math.diagnosis.util.ObjectUtil;
+import edu.math.diagnosis.word.WordService;
 import edu.math.diagnosis.model.PaperVo;
 import edu.math.diagnosis.model.Result;
 import edu.math.diagnosis.util.CommonUtil;
-import edu.math.diagnosis.util.Constants;
-import edu.math.diagnosis.util.ObjectUtils;
-import edu.math.diagnosis.util.WordUtil;
+import edu.math.diagnosis.model.Constants;
+import edu.math.diagnosis.word.WordUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;
@@ -354,7 +355,7 @@ public class PaperService {
     }
 
     private Paper init(PaperVo paperVo, String url) {
-        Paper paper = ObjectUtils.convert(paperVo, Paper.class);
+        Paper paper = ObjectUtil.convert(paperVo, Paper.class);
         paper.setDocxUrl(url);
         return paper;
     }

src/main/java/edu/math/diagnosis/service/PaperTemplateService.java

@@ -3,7 +3,7 @@ package edu.math.diagnosis.service;
 import edu.math.diagnosis.dao.PaperTemplateRepo;
 import edu.math.diagnosis.entity.PaperTemplate;
 import edu.math.diagnosis.util.CommonUtil;
-import edu.math.diagnosis.util.Constants;
+import edu.math.diagnosis.model.Constants;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/edu/math/diagnosis/service/QuestionService.java

@@ -4,6 +4,7 @@ import edu.math.diagnosis.dao.QuestionRepo;
 import edu.math.diagnosis.entity.Paper;
 import edu.math.diagnosis.entity.Question;
 import edu.math.diagnosis.entity.QuestionOption;
+import edu.math.diagnosis.word.WordService;
 import edu.math.diagnosis.model.Result;
 import edu.math.diagnosis.util.CommonUtil;
 import org.springframework.stereotype.Service;

src/main/java/edu/math/diagnosis/service/UserService.java

@@ -4,7 +4,7 @@ package edu.math.diagnosis.service;
 import edu.math.diagnosis.config.Constants;
 import edu.math.diagnosis.dao.UserRepo;
 import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.util.MD5;
+import edu.math.diagnosis.util.MD5Util;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
@@ -38,7 +38,7 @@ public class UserService {
         user.setUpdatetime(new Date());
         String salt = "";
         user.setSalt(salt);
-        user.setPassword(MD5.INSTANCE.md5(user.getPassword() + salt));
+        user.setPassword(MD5Util.INSTANCE.md5(user.getPassword() + salt));
         user.setLevel(1);
         user.setId(null);
         userRepo.save(user);

src/main/java/edu/math/diagnosis/util/MD5.java → src/main/java/edu/math/diagnosis/util/MD5Util.java

@@ -9,7 +9,7 @@ import java.nio.charset.Charset;
  * @DATE: Create in 2018/8/24 19:01
  * @DESCRIPTION:
  */
-public enum MD5 {
+public enum MD5Util {
     INSTANCE;
 
     public String md5(String value) {

src/main/java/edu/math/diagnosis/util/NumberUtil.java

@@ -8,8 +8,8 @@ public class NumberUtil {
     /**
      * 保留两位小数
      *
-     * @param d
-     * @return
+     * @param d data
+     * @return format data
      */
     public static String formatDouble(double d) {
         return df.format(d);

src/main/java/edu/math/diagnosis/util/ObjectUtils.java → src/main/java/edu/math/diagnosis/util/ObjectUtil.java

@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.List;
 
@@ -13,15 +14,15 @@ import java.util.List;
  * @DATE: Create in 2018/7/7 11:58
  * @DESCRIPTION:
  */
-public class ObjectUtils {
+public class ObjectUtil {
     private static final Gson gson = new GsonBuilder().create();
 
-    public static String Object2Json(Object o) {
+    public static String object2Json(Object o) {
         return gson.toJson(o);
     }
 
-    public static Object Json2Object(String json) {
-        java.lang.reflect.Type type = new TypeToken<HashMap<Long, List<Long>>>() {
+    public static Object json2Object(String json) {
+        Type type = new TypeToken<HashMap<Long, List<Long>>>() {
         }.getType();
         return gson.fromJson(json, type);
     }

src/main/java/edu/math/diagnosis/util/ReflectorUtils.java → src/main/java/edu/math/diagnosis/util/ReflectorUtil.java

@@ -1,7 +1,6 @@
 package edu.math.diagnosis.util;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.URL;
@@ -12,12 +11,12 @@ import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-public class ReflectorUtils {
+public class ReflectorUtil {
 
     public static Set<Class<?>> getClasses(String pack) {
 
         // 第一个class类的集合
-        Set<Class<?>> classes = new LinkedHashSet<Class<?>>();
+        Set<Class<?>> classes = new LinkedHashSet<>();
         // 是否循环迭代
         boolean recursive = true;
         // 获取包的名字 并进行替换
@@ -110,10 +109,10 @@ public class ReflectorUtils {
     /**
      * 以文件的形式来获取包下的所有Class
      *
-     * @param packageName
-     * @param packagePath
-     * @param recursive
-     * @param classes
+     * @param packageName 包名
+     * @param packagePath 包路径
+     * @param recursive 是否递归
+     * @param classes 类名
      */
     public static void findAndAddClassesInPackageByFile(String packageName,
                                                         String packagePath, final boolean recursive, Set<Class<?>> classes) {
@@ -125,15 +124,11 @@ public class ReflectorUtils {
             return;
         }
         // 如果存在 就获取包下的所有文件 包括目录
-        File[] dirfiles = dir.listFiles(new FileFilter() {
-            // 自定义过滤规则 如果可以循环(包含子目录) 或则是以.class结尾的文件(编译好的java类文件)
-            public boolean accept(File file) {
-                return (recursive && file.isDirectory())
-                        || (file.getName().endsWith(".class"));
-            }
-        });
+        // 自定义过滤规则 如果可以循环(包含子目录) 或则是以.class结尾的文件(编译好的java类文件)
+        File[] dirFiles = dir.listFiles(file -> (recursive && file.isDirectory())
+                || (file.getName().endsWith(".class")));
         // 循环所有文件
-        for (File file : dirfiles) {
+        for (File file : dirFiles) {
             // 如果是目录 则继续扫描
             if (file.isDirectory()) {
                 findAndAddClassesInPackageByFile(packageName + "."

src/main/java/edu/math/diagnosis/util/ExcelTest.java → src/main/java/edu/math/diagnosis/word/ExcelTest.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.util;
+package edu.math.diagnosis.word;
 
 import org.apache.poi.ss.usermodel.FillPatternType;
 import org.apache.poi.ss.usermodel.FormulaEvaluator;

src/main/java/edu/math/diagnosis/util/ExcelUtils.java → src/main/java/edu/math/diagnosis/word/ExcelUtils.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.util;
+package edu.math.diagnosis.word;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;

src/main/java/edu/math/diagnosis/util/FormulaService.java → src/main/java/edu/math/diagnosis/word/FormulaService.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.util;
+package edu.math.diagnosis.word;
 
 import net.sourceforge.jeuclid.context.LayoutContextImpl;
 import net.sourceforge.jeuclid.context.Parameter;

src/main/java/edu/math/diagnosis/service/WordService.java → src/main/java/edu/math/diagnosis/word/WordService.java

@@ -1,12 +1,12 @@
-package edu.math.diagnosis.service;
+package edu.math.diagnosis.word;
 
 import edu.math.diagnosis.entity.PaperTemplate;
 import edu.math.diagnosis.entity.Question;
 import edu.math.diagnosis.entity.QuestionOption;
+import edu.math.diagnosis.service.FileService;
+import edu.math.diagnosis.service.LocalFileService;
 import edu.math.diagnosis.util.CommonUtil;
-import edu.math.diagnosis.util.Constants;
-import edu.math.diagnosis.util.FormulaService;
-import edu.math.diagnosis.util.WordUtil;
+import edu.math.diagnosis.model.Constants;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.XmlCursor;

src/main/java/edu/math/diagnosis/util/WordUtil.java → src/main/java/edu/math/diagnosis/word/WordUtil.java

@@ -1,7 +1,8 @@
-package edu.math.diagnosis.util;
+package edu.math.diagnosis.word;
 
 import com.deepoove.poi.XWPFTemplate;
 import com.deepoove.poi.template.ElementTemplate;
+import edu.math.diagnosis.util.CommonUtil;
 import fr.opensagres.poi.xwpf.converter.core.ImageManager;
 import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLConverter;
 import fr.opensagres.poi.xwpf.converter.xhtml.XHTMLOptions;

src/test/java/edu/math/diagnosis/service/WordServiceTest.java

@@ -1,7 +1,7 @@
 package edu.math.diagnosis.service;
 
 import edu.math.diagnosis.util.CommonUtil;
-import edu.math.diagnosis.util.WordUtil;
+import edu.math.diagnosis.word.WordUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.apache.poi.xwpf.usermodel.XWPFParagraph;