Merge remote-tracking branch 'origin/master'

common/src/main/java/cn/seecoder/common/util/OpType.java

@@ -13,7 +13,9 @@ public enum OpType {
     ADD_MEMBER(108,"将成员加入项目中"),
     RELATE_PROJECT(109,"将项目A与项目B关联"),
     CREATE_PROJECT(110,"创建项目并存储信息"),
-    CREATE_USER(111,"用户注册并存储信息");
+    CREATE_USER(111,"用户注册并存储信息"),
+    //试一下新日志
+    CREATE_TEST(1000,"用户创建新的接口测试");
 
 
 

web/src/main/java/cn/seecoder/web/dao/InterfaceTest/InterfaceTestMapper.java

@@ -15,7 +15,8 @@ import java.util.List;
 public interface InterfaceTestMapper {
     @InsertProvider(type = GeneralInsertUpdateSqlProvider.class, method = "insert")
     @Options(useGeneratedKeys = true, keyProperty = "param1.id")
-    boolean insert(InterfaceTestInfo interfaceTestInfo, String... ignoredCols);
+//    boolean insert(InterfaceTestInfo interfaceTestInfo, String... ignoredCols);
+    int insert(InterfaceTestInfo interfaceTestInfo, String... ignoredCols);
 
     @Select("select * from interface_test_info where project_id = #{id}")
     List<InterfaceTestInfo> selectByProjectId(Integer id);

web/src/main/java/cn/seecoder/web/service/impl/InterfaceTest/InterfaceTestServiceImpl.java

@@ -61,7 +61,19 @@ public class InterfaceTestServiceImpl implements InterfaceTestService {
                 .method(interfaceTestInfoVO.getMethod())
                 .params(JSONObject.fromObject(interfaceTestInfoVO.getParams()).toString())
                 .build();
-        interfaceTestMapper.insert(info);
+        int infoId = interfaceTestMapper.insert(info);
+        //ANA 日志需要打出测试信息和执行结果，具体信息在handleRequest方法内
+        try{
+            JSONObject object = new JSONObject();
+            object.put("test_name",interfaceTestInfoVO.getName());
+            object.put("project_id",interfaceTestInfoVO.getProjectId());
+            object.put("username",interfaceTestInfoVO.getUsername());
+
+            String data = com.alibaba.fastjson.JSONObject.toJSONString(object);
+            LogTrackingUtil.log(data,OpType.CREATE_TEST);
+        }catch (Exception e){
+
+        }
     }
 
     @Override
@@ -85,6 +97,7 @@ public class InterfaceTestServiceImpl implements InterfaceTestService {
         Integer projectId = info.getProjectId();
         handleRequest(url, params, id, method, username, type, projectId);
         //ANA 日志需要打出测试信息和执行结果，具体信息在handleRequest方法内
+
     }
 
     @Override
@@ -150,7 +163,7 @@ public class InterfaceTestServiceImpl implements InterfaceTestService {
                 .build();
         interfaceTestMapper.insertResult(result);
 
-        //ANA
+        //ANA 日志需要打出测试信息和执行结果
         try{
             JSONObject object = new JSONObject();
             object.put("apiTest_id",id);

web/src/main/java/cn/seecoder/web/service/impl/bug_list/BugListServiceImpl.java

@@ -88,7 +88,7 @@ public class BugListServiceImpl implements BugListService {
         try{
             BugListPO bugPo = bugListMapper.selectById(bugId);
             JSONObject object = new JSONObject();
-            object.put("bug_id",bugPo.getId());
+            object.put("bug_id",123);
             object.put("project_id",po.getProjectId());
             object.put("user_id",po.getProcessorId());
             object.put("priority",po.getPriority());