Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/language/util/LanguageMsgService.java

@@ -13,8 +13,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ResourceUtils;
 
 import java.io.*;
+import java.net.URLDecoder;
 import java.util.*;
 
 @Slf4j
@@ -71,25 +73,32 @@ public class LanguageMsgService {
     }
 
     public void autoImportJsonFile() {
-        String classesPath = this.getClass().getResource("/").getPath();
-        File classDir = new File(classesPath); //需要获取的文件的路径
-        if (classDir.exists() && classDir.isDirectory()) {
-            for (File file : classDir.listFiles()) {
-                //只读取后缀名为json的
-                if (file.isFile()) {
-                    String fileName = file.getName();
-                    if (fileName.endsWith(".json")) {
-                        try {
-                            String jsonStr = FileUtil.readUtf8String(file);
-                            List<LanguageMsg> languageMsgs = JsonUtil.toList(jsonStr, LanguageMsg.class);
-                            msgListUpload(file.getName(),languageMsgs,false);
-                        } catch (Exception ex) {
-                            log.info("autoImportCsvFile 读取文件" + fileName + "错误：" + ex.toString());
+        try {
+            String classesPath = this.getClass().getResource("/").getFile();
+            classesPath = URLDecoder.decode(classesPath,"utf-8");
+            File classDir = ResourceUtils.getFile(classesPath);
+            log.info("开始导入["+classesPath+"]下的Json资源文件:" + classDir.exists() +" =" + classDir.isDirectory());
+            if (classDir.exists() && classDir.isDirectory()) {
+                for (File file : classDir.listFiles()) {
+                    //只读取后缀名为json的
+                    if (file.isFile()) {
+                        String fileName = file.getName();
+                        if (fileName.endsWith(".json")) {
+                            try {
+                                String jsonStr = FileUtil.readUtf8String(file);
+                                List<LanguageMsg> languageMsgs = JsonUtil.toList(jsonStr, LanguageMsg.class);
+                                msgListUpload(file.getName(),languageMsgs,false);
+                            } catch (Exception ex) {
+                                log.info("autoImportCsvFile 读取文件" + fileName + "错误：" + ex.toString());
+                            }
                         }
                     }
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+
     }
 
     public void autoImportCsvFile() {