소스 검색

文件源修改为本地

xujiawei 4 년 전
부모
커밋
02ae1a1464
2개의 변경된 파일19개의 추가작업 그리고 8개의 파일을 삭제
  1. 8 0
      src/main/java/edu/nju/controller/DataController.java
  2. 11 8
      src/main/java/edu/nju/service/DataService.java

+ 8 - 0
src/main/java/edu/nju/controller/DataController.java

@@ -31,6 +31,14 @@ public class DataController {
     }
 
 
+    /**
+     * bug数据导入
+     * @param zipFilePath
+     * @param jsonFilePath
+     * @param originalCaseId 与慕测哪个case对应
+     * @param cpSerialNum 来自哪个cp
+     * @return
+     */
     @RequestMapping(value = "/inputFromOSS")
     @ResponseBody
     public List<BugDetail> saveBugDetailFromOss(String zipFilePath,String jsonFilePath,String originalCaseId,String cpSerialNum) {

+ 11 - 8
src/main/java/edu/nju/service/DataService.java

@@ -176,14 +176,17 @@ public class DataService {
 
     public List<BugDetail> saveBugDetailFromOss(String zipFilePath,String jsonFilePath, String originalCaseId, String cpSerialNum) {
         try {
-            //从oss下载json文件
-            URL url = new URL(jsonFilePath);
-            URLConnection urlConnection = url.openConnection();
-            HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
-            httpURLConnection.setConnectTimeout(1000 * 5);
-            httpURLConnection.setRequestProperty("Charset", "UTF-8");
-            httpURLConnection.connect();
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(httpURLConnection.getInputStream());
+//            //从oss下载json文件
+//            URL url = new URL(jsonFilePath);
+//            URLConnection urlConnection = url.openConnection();
+//            HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
+//            httpURLConnection.setConnectTimeout(1000 * 5);
+//            httpURLConnection.setRequestProperty("Charset", "UTF-8");
+//            httpURLConnection.connect();
+            //读取本地文件
+            File jsonFile=new File(jsonFilePath);
+//            BufferedInputStream bufferedInputStream = new BufferedInputStream(httpURLConnection.getInputStream());
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(jsonFile));
             ByteArrayOutputStream buf = new ByteArrayOutputStream();
             int result = bufferedInputStream.read();
             while (result != -1) {