Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java

@@ -717,7 +717,7 @@ public class AppController extends BaseController
     @GetMapping("/version/info")
     public AjaxResult queryVersionInformation(){
         String localPath = RuoYiConfig.getAppInfoPath();
-        String file = FileUtils.readJsonFile(localPath + "appVersion.json");
+        String file = FileUtils.readJsonFile(localPath +"/" + "appVersion.json");
         return AjaxResult.success(JSONObject.parseObject(file));
     }
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

@@ -347,7 +347,7 @@ public class FileUtils
      * @return {@code String}
      */
     public static String readJsonFile(String Filename) {
-        String jsonStr = "";
+        String jsonStr;
         try {
             File jsonFile = new File(Filename);
             FileReader fileReader = new FileReader(jsonFile);
@@ -362,8 +362,7 @@ public class FileUtils
             jsonStr = sb.toString();
             return jsonStr;
         } catch (IOException e) {
-            e.printStackTrace();
+            throw new ServiceException(e.getMessage());
-            return null;
         }
     }
 }