Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-12-14 6992aaf0587c09f7c511c1afd12e1519d91363d3

 screen-api/src/main/java/com/moral/api/utils/JsonUtil.java

@@ -1,9 +1,9 @@
package com.moral.api.utils;

import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;

import java.io.*;

public class JsonUtil {

@@ -31,5 +31,21 @@
        }
    }

    public static String testReadFile(String filePath) throws IOException {
//        ClassPathResource classPathResource = new ClassPathResource("resource.properties");
        String jsonStr = "";
        Resource resource = new ClassPathResource(filePath);
        InputStream is = resource.getInputStream();
        Reader reader = new InputStreamReader(resource.getInputStream(), "utf-8");
        int ch = 0;
        StringBuffer sb = new StringBuffer();
        while ((ch = reader.read()) != -1) {
            sb.append((char) ch);
        }
        reader.close();
        jsonStr = sb.toString();
        return jsonStr;
    }

}