2/9 lrj

RMS/src/main/java/cn/cslg/report/common/config/WebMvcConfig.java

@@ -10,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
         @Override
         public void addResourceHandlers(ResourceHandlerRegistry registry) {
             // /images/**是静态映射， file:/root/images/是文件在服务器的路径
-            registry.addResourceHandler("/file/**")
+            registry.addResourceHandler("/**")
                     .addResourceLocations("file:D:/RMS/RMS/target/file/");
         }
     }

RMS/src/main/java/cn/cslg/report/service/OutInterfaceService.java

@@ -53,7 +53,11 @@ public class OutInterfaceService {
      * @description 接口来源:PCS
      */
     public String getVerifyCodeFromPCS() throws IOException {
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .pingInterval(400, TimeUnit.SECONDS) // 设置 PING 帧发送间隔
+                .connectTimeout(300, TimeUnit.SECONDS)//设置连接超时时间
+                .readTimeout(300, TimeUnit.SECONDS)//设置读取超时时间
+                .build();
         Request request = new Request.Builder()
                 .url(PCSUrl + "/permission/api/admin/verifyCode")
                 .get()
@@ -221,7 +225,11 @@ public class OutInterfaceService {
 
         String param = new Gson().toJson(ids);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient =new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
         Request request = new Request.Builder()
                 .url(PCSUrl + "/permission/api/system/getPersonnelByIds")
                 .post(requestBody)
@@ -286,7 +294,11 @@ public class OutInterfaceService {
     }
 
     public String getDeparts(List<Integer> ids) throws IOException {
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
         String param = new Gson().toJson(ids);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
         Request request = new Request.Builder()
@@ -320,7 +332,11 @@ public class OutInterfaceService {
         dicts.add(Constants.ENTERPRISE_APPLICATION_SCENARIO);
         String param = new Gson().toJson(dicts);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), param);
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/system/dict")
                 .post(requestBody)
@@ -365,7 +381,11 @@ public class OutInterfaceService {
         map.put("orderItem",patentVO.getOrderItem());
         JSONObject json = new JSONObject(map);
         RequestBody requestBody = RequestBody.create(JSON, String.valueOf(json));
-        OkHttpClient okHttpClient = new OkHttpClient();
+        OkHttpClient okHttpClient = new OkHttpClient.Builder()
+                .connectTimeout(60, TimeUnit.SECONDS)
+                .writeTimeout(60, TimeUnit.SECONDS)
+                .readTimeout(60, TimeUnit.SECONDS)
+                .build();
         Request request = new Request.Builder()
                 .url(PASUrl + "/api/v2/system/patentList")
                 .post(requestBody)

RMS/src/main/java/cn/cslg/report/service/business/CompareRecordsService.java

@@ -119,7 +119,6 @@ public class CompareRecordsService extends ServiceImpl<CompareRecordsMapper, Com
      * @return 对比文件 对应实体：compareFiles 对比记录 对应实体：compareRecord
      * @throws IOException
      */
-
     public String getCompareRecords(CompareRecords compareRecord) throws IOException {
         //根据报告id查询对比文件
         LambdaQueryWrapper<CompareRecords> wrapper = new LambdaQueryWrapper<>();

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -91,7 +91,6 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
                 //将文档上传并返回文件入库的Id
                 List<Integer> fileIds = reportFileService.uploadFiles(files);
                 assoReportFileService.addAsso(report.getId(), fileIds);
-
             }
             //如果报告生成成功，给报告添加默认自定义字段
             if (addFlag) {