Merge branch 'dev' into 'master'

将https改为http

See merge request !448

quality-review/src/main/java/com/ruoyi/service/impl/MatrixServiceImpl.java

@@ -56,7 +56,7 @@ public class MatrixServiceImpl implements MatrixService {
     public MatrixResponse getMatrixForUrl() throws IOException {
 
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.77:8090/DescribeScenarioTestTypeList","");
+        String result= HttpUtil.post("http://10.12.48.77:8090/DescribeScenarioTestTypeList","");
         JSONObject jsonObject = JSONObject.parseObject(result);
 
         // 获取测试场景列表
@@ -121,7 +121,7 @@ public class MatrixServiceImpl implements MatrixService {
     @Override
     public MatrixResponse getMatrixForUrlPad() throws IOException {
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.77:8090/DescribeScenarioTestTypeList","");
+        String result= HttpUtil.post("http://10.12.48.77:8090/DescribeScenarioTestTypeList","");
         JSONObject jsonObject = JSONObject.parseObject(result);
 
         // 获取测试场景列表

quality-review/src/main/java/com/ruoyi/service/impl/PdfTemplateManagementServiceImpl.java

@@ -353,7 +353,7 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
             for (String[] attachments : convertedList) {
                 // 遍历数组中的每个元素
                 for (String attachmentId : attachments) {
-                    HttpResponse response = HttpUtil.createPost("https://10.12.48.77:8090/api/project/download/" + attachmentId)
+                    HttpResponse response = HttpUtil.createPost("http://10.12.48.77:8090/api/project/download/" + attachmentId)
                             .execute();
 
                     if (response.isOk()) {
@@ -624,7 +624,16 @@ public class PdfTemplateManagementServiceImpl implements PdfTemplateManagementSe
                         Paragraph context = new Paragraph();
                         ElementList elementList = null;
                         try {
-                            elementList = parseToElementList(record.getTestDetails(), null);
+                            /*
+                            * 判断一下testDetails是否为null
+                            * */
+
+                            String testDetails = "<p>暂无<p>";
+                            if (record.getTestDetails() == null){
+                                elementList = parseToElementList(testDetails,null);
+                            }else {
+                                elementList = parseToElementList(record.getTestDetails(), null);
+                            }
                         } catch (IOException e) {
                             throw new RuntimeException(e);
                         }

quality-review/src/main/java/com/ruoyi/service/impl/StrategyModelTestTaskNew.java

@@ -165,7 +165,7 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
             map.put("verbose", "DETAILED");
 
             //以post形式请求接口
-            String result= HttpUtil.post("https://10.12.48.77:8090/DescribeProjectComplianceResult", JSONObject.toJSONString(map));
+            String result= HttpUtil.post("http://10.12.48.77:8090/DescribeProjectComplianceResult", JSONObject.toJSONString(map));
 
             JSONObject jsonObject = JSONObject.parseObject(result);
             /*//添加一个找不到的逻辑
@@ -190,7 +190,7 @@ public class StrategyModelTestTaskNew implements StrategyModelTestTask, Initiali
             response.setModelTestTaskViewResponseList(list);
 
             // 用例
-            String resultUseCase= HttpUtil.post("https://10.12.48.77:8090/DescribeProjectTestResult", JSONObject.toJSONString(map));
+            String resultUseCase= HttpUtil.post("http://10.12.48.77:8090/DescribeProjectTestResult", JSONObject.toJSONString(map));
 
             JSONObject jsonObjectUseCase = JSONObject.parseObject(resultUseCase);
 

quality-review/src/main/java/com/ruoyi/service/impl/StrategyModelTestTaskPending.java

@@ -47,7 +47,7 @@ public class StrategyModelTestTaskPending implements StrategyModelTestTask, Init
     @Autowired
     private ISysUserService sysUserService;
 
-    private static String url = "https://10.12.48.77:8090/DescribeProjectTestResult";
+    private static String url = "http://10.12.48.77:8090/DescribeProjectTestResult";
 
     @Override
     public ModelTestResponse doView(ModelTestTask modelTestTask) {

quality-review/src/main/java/com/ruoyi/service/impl/TaskServiceImpl.java

@@ -979,11 +979,11 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
 
             if (modelTestTask.getTestSchemeId() != null) {
                 // 用例维度
-                String url = "https://10.12.48.77:8090/DescribeProjectTestResult";
+                String url = "http://10.12.48.77:8090/DescribeProjectTestResult";
                 Statistics(response,task,url,"useCase");
 
                 // 合规维度
-                String urlCompliance = "https://10.12.48.77:8090/DescribeProjectComplianceResult";
+                String urlCompliance = "http://10.12.48.77:8090/DescribeProjectComplianceResult";
                 Statistics(response,task,urlCompliance,"compliance");
             }
         } else {
@@ -1184,7 +1184,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task>implements Tas
                     map.put("verbose", "BASIC");
 
                     //以post形式请求接口
-                    String result= HttpUtil.post("https://10.12.48.77:8090/DescribeProjectTestResult", JSONObject.toJSONString(map));
+                    String result= HttpUtil.post("http://10.12.48.77:8090/DescribeProjectTestResult", JSONObject.toJSONString(map));
 
                     JSONObject jsonObject = JSONObject.parseObject(result);
 

quality-review/src/main/java/com/ruoyi/service/impl/TestRecordsServiceImpl.java

@@ -42,7 +42,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
         map.put("verbose", "ALL");
 
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.78:8096/DescribeProjectTestResult",JSONObject.toJSONString(map));
+        String result= HttpUtil.post("http://10.12.48.78:8090/DescribeProjectTestResult",JSONObject.toJSONString(map));
 
         JSONObject jsonObject = JSONObject.parseObject(result);
 
@@ -162,7 +162,7 @@ public class TestRecordsServiceImpl extends ServiceImpl<TestRecordsMapper, TestR
         map.put("verbose", "ALL");
 
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.77:8090/DescribeProjectTestResult",JSONObject.toJSONString(map));
+        String result= HttpUtil.post("http://10.12.48.77:8090/DescribeProjectTestResult",JSONObject.toJSONString(map));
 
         JSONObject jsonObject = JSONObject.parseObject(result);
 

quality-review/src/main/java/com/ruoyi/service/impl/TestScenarioServiceImpl.java

@@ -25,7 +25,7 @@ public class TestScenarioServiceImpl extends ServiceImpl<TestScenarioMapper, Tes
     @Autowired
     private TestUseCaseService testUseCaseService;
 
-    private static String url = "https://10.12.48.77:8090/DescribeScenarioTestTypeList";
+    private static String url = "http://10.12.48.77:8090/DescribeScenarioTestTypeList";
 
     @Override
     public List<TestScenario> selectTestScenarioList(TestScenarioRequest testScenarioRequest){

quality-review/src/main/java/com/ruoyi/service/impl/TestTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class TestTypeServiceImpl extends ServiceImpl<TestTypeMapper, TestType> i
     @Override
     public List<String> getTestTypeList() {
         //以post形式请求接口
-        String result= HttpUtil.post("https://10.12.48.77:8090/DescribeScenarioTestTypeList","");
+        String result= HttpUtil.post("http://10.12.48.77:8090/DescribeScenarioTestTypeList","");
         JSONObject jsonObject = JSONObject.parseObject(result);
 
         return jsonObject.getList("test_type_list", TypeVO.class)

quality-review/src/main/java/com/ruoyi/service/impl/TestUseCaseServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 @Transactional
 public class TestUseCaseServiceImpl extends ServiceImpl<TestUseCaseMapper, TestUseCase> implements TestUseCaseService{
 
-    private String describeCaseList = "https://10.12.48.77:8090/DescribeCaseList";
+    private String describeCaseList = "http://10.12.48.77:8090/DescribeCaseList";
 
     @Autowired
     private TestUseCaseMapper testUseCaseMapper;