Merge branch 'master' of http://gogs.seec.seecoder.cn/WengPuHong/seecoder-devcloud

web/src/main/java/cn/seecoder/web/dao/user/UserMapper.java

@@ -40,4 +40,7 @@ public interface UserMapper {
 
     @Select("select id from user where email = #{email}")
     Integer selectIdByEmail(String email);
+
+    @Select("select id from user where username = #{username}")
+    Integer selectIdByUserName(String username);
 }

web/src/main/java/cn/seecoder/web/service/impl/APITest/APITestServiceImpl.java

@@ -1,8 +1,11 @@
 package cn.seecoder.web.service.impl.APITest;
 
+import cn.seecoder.common.util.LogTrackingUtil;
+import cn.seecoder.common.util.OpType;
 import cn.seecoder.web.dao.APITest.APITestMapper;
 import cn.seecoder.web.dao.pipeline.PipelineMapper;
 import cn.seecoder.web.dao.pipeline.PipelineRecordMapper;
+import cn.seecoder.web.dao.user.UserMapper;
 import cn.seecoder.web.model.po.APITest.APITestInfo;
 import cn.seecoder.web.model.po.APITest.APITestResult;
 import cn.seecoder.web.model.po.APITest.TestInfo;
@@ -43,6 +46,9 @@ public class APITestServiceImpl implements APITestService {
 
     private final PipelineRecordMapper pipelineRecordMapper;
 
+    @Autowired
+    private UserMapper userMapper;
+
     @Autowired
     public APITestServiceImpl(APITestMapper apiTestMapper, PipelineMapper pipelineMapper, PipelineRecordMapper pipelineRecordMapper) {
         this.apiTestMapper = apiTestMapper;
@@ -64,7 +70,6 @@ public class APITestServiceImpl implements APITestService {
              .qps(apiTestBodyVO.getQps())
              .build();
         apiTestMapper.insert(testInfo);
-        //ANA 日志需要打出创建的测试信息
     }
 
     @Override
@@ -100,6 +105,7 @@ public class APITestServiceImpl implements APITestService {
             handleRequest(url, params, qps, testId, "POST", projectId);
         }
         //ANA 日志需要打出测试信息和执行结果，具体信息在handleRequest方法内
+
     }
 
     @Override
@@ -270,6 +276,21 @@ public class APITestServiceImpl implements APITestService {
                 .pipelineRecordId(latestRecord==null? -1:latestRecord.getId())
                 .build();
         apiTestMapper.execute(testResult);
+
+        //ANA
+        TestInfo testInfo = apiTestMapper.selectByTestId(testId);
+        try{
+            JSONObject object = new JSONObject();
+            object.put("apiTest",testId);
+            object.put("project_id",projectId);
+            object.put("user_id",userMapper.selectIdByUserName(testInfo.getUsername()));
+            object.put("success",success[0]);
+            object.put("failure",failure[0]);
+
+            String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
+            LogTrackingUtil.log(data, OpType.INTERFACE_TEST);
+
+        }catch{}
     }
 
     // 处理GET请求