Merge branch 'master' into master

src/main/java/com/genersoft/iot/vmp/conf/CivilCodeFileConf.java

@@ -15,6 +15,7 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 
 /**
@@ -53,8 +54,8 @@ public class CivilCodeFileConf implements CommandLineRunner {
             }
             inputStream = Files.newInputStream(civilCodeFile.toPath());
         }
-      
-        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(inputStream,"UTF-8"));
+
+        BufferedReader inputStreamReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
         int index = -1;
         String line;
         while ((line = inputStreamReader.readLine()) != null) {