fix:log输出增加了userID

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

@@ -3,13 +3,10 @@ package cn.seecoder.common.util;
 import Utils.LogBuilder;
 import client.LogTrackingClient;
 import com.nju.edu.logTracking.enums.SeecSystem;
-import cn.seecoder.web.service.user.UserService;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class LogTrackingUtil {
-    @Autowired
-    public UserService userService;
 
     private static final Logger logger = LoggerUtil.getLogger(LogTrackingUtil.class);
 
@@ -19,7 +16,7 @@ public class LogTrackingUtil {
                 .target(SeecSystem.SMART)
                 .source(SeecSystem.DEVCLOUD)
                 .operationType(opType.getNum())
-                .data(data.concat(" uid:").concat(userService.loginUser().getId()))
+                .data(data)
                 .message(opType.getName())
                 .build();
         LogTrackingClient

web/src/main/java/cn/seecoder/web/core/pipeline/template/PipelineTemplateTable.java

@@ -1,6 +1,7 @@
 package cn.seecoder.web.core.pipeline.template;
 
 import cn.seecoder.web.core.pipeline.PipelineException;
+import cn.seecoder.web.service.user.UserService;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.core.io.ClassPathResource;
@@ -21,7 +22,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
  */
 public class PipelineTemplateTable {
 
-
+    private UserService userService;
     private static final HashSet<String> templateNames;
 
     //模板名

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

@@ -154,9 +154,9 @@ public class BugListServiceImpl implements BugListService {
         try{
             BugListPO bugPo = bugListMapper.selectById(po.getId());
             JSONObject object = new JSONObject();
+            object.put("user_id",bugPo.getProcessorId());
             object.put("bug_id",bugPo.getId());
             object.put("project_id",bugPo.getProjectId());
-            object.put("user_id",bugPo.getProcessorId());
             object.put("priority",bugPo.getPriority());
             object.put("title",bugPo.getTitle());
             object.put("description",bugPo.getDescription());
@@ -187,9 +187,9 @@ public class BugListServiceImpl implements BugListService {
         try{
             BugListPO bugPo = bugListMapper.selectById(po.getId());
             JSONObject object = new JSONObject();
+            object.put("user_id",bugPo.getProcessorId());
             object.put("bug_id",bugPo.getId());
             object.put("project_id",bugPo.getProjectId());
-            object.put("user_id",bugPo.getProcessorId());
             object.put("priority",bugPo.getPriority());
             object.put("title",bugPo.getTitle());
             object.put("description",bugPo.getDescription());

web/src/main/java/cn/seecoder/web/service/impl/commit/CommitLinkServiceImpl.java

@@ -62,8 +62,8 @@ public class CommitLinkServiceImpl implements CommitLinkService {
             //ANA 日志需要打出用户的commit信息
             JSONObject object = new JSONObject();
             try{
-                object.put("commit_id",commit.getId());
                 object.put("user_id",userMapper.selectIdByEmail(commit.getAuthor().getEmail()));
+                object.put("commit_id",commit.getId());
                 object.put("project_id",projectId);
                 object.put("commit_time",commit.getTimestamp());
                 object.put("message",commit.getMessage());
@@ -119,8 +119,8 @@ public class CommitLinkServiceImpl implements CommitLinkService {
         //ANA 日志需要打出用户commit的信息
         try{
             JSONObject object = new JSONObject();
-            object.put("commit_id",po.getId());
             object.put("user_id",userMapper.selectIdByUserName(po.getGitlabUsername()));
+            object.put("commit_id",po.getId());
             object.put("project_id",po.getProjectId());
             object.put("commit_name",po.getGitlabUsername());
             object.put("commit_time",po.getTimestamp());

web/src/main/java/cn/seecoder/web/service/impl/pipeline/DeploymentServiceImpl.java

@@ -179,10 +179,10 @@ public class DeploymentServiceImpl implements DeploymentService {
         PipelineRecordPO pipelineRecordPO = pipelineRecordMapper.selectPipelinesLatestRecord(pipelineIds);
         try {
             JSONObject object = new JSONObject();
+            object.put("user_id", userId);
             object.put("project_id", projectId);
             object.put("record_id", pipelineRecordPO.getId());
             object.put("pipeline_id", pipelineId);
-            object.put("user_id", userId);
             object.put("type", record.getResult());
             object.put("result", record.getResult());
             object.put("success", record.getResult().equals(PipelineRecordPO.DEPLOY_SUCCESS));

web/src/main/java/cn/seecoder/web/service/impl/pipeline/PipelineServiceImpl.java

@@ -17,6 +17,7 @@ import cn.seecoder.web.model.po.user.UserPO;
 import cn.seecoder.web.model.vo.pipeline.*;
 import cn.seecoder.web.service.pipeline.DeploymentService;
 import cn.seecoder.web.service.pipeline.PipelineService;
+import cn.seecoder.web.service.user.UserService;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +36,8 @@ import java.util.stream.Collectors;
 @Service
 public class PipelineServiceImpl implements PipelineService {
 
+    private final UserService userService;
+
     private final PipelineRecordMapper pipelineRecordMapper;
 
     private final PipelineMapper pipelineMapper;
@@ -48,7 +51,8 @@ public class PipelineServiceImpl implements PipelineService {
 
 
     @Autowired
-    public PipelineServiceImpl(PipelineRecordMapper pipelineRecordMapper, PipelineMapper pipelineMapper, UserMapper userMapper, DeploymentService deploymentService) {
+    public PipelineServiceImpl(UserService userService, PipelineRecordMapper pipelineRecordMapper, PipelineMapper pipelineMapper, UserMapper userMapper, DeploymentService deploymentService) {
+        this.userService = userService;
         this.pipelineRecordMapper = pipelineRecordMapper;
         this.pipelineMapper = pipelineMapper;
         this.userMapper = userMapper;
@@ -129,6 +133,7 @@ public class PipelineServiceImpl implements PipelineService {
         PipelinePO pipelinePO = pipelineMapper.selectByNameAndProjectId(pipelineCreateVO.getName(),pipelineCreateVO.getProjectId());
         try{
             JSONObject object = new JSONObject();
+            object.put("user_id",userService.getLoginUser().getId());
             object.put("pipeline_id",pipelinePO.getId());
             object.put("project_id",pipelinePO.getProjectId());
             object.put("project_name",pipelinePO.getName());
@@ -156,6 +161,7 @@ public class PipelineServiceImpl implements PipelineService {
         DeploymentPO deploymentPO = deploymentMapper.selectByPipelineId(pipelineId);
         try{
             JSONObject object = new JSONObject();
+            object.put("user_id",userService.getLoginUser().getId());
             object.put("pipeline_id",pipelineId);
             object.put("project_id",projectId);
             object.put("delete_deploy_id",deploymentPO.getId());

web/src/main/java/cn/seecoder/web/service/impl/project/ProjectServiceImpl.java

@@ -34,6 +34,8 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectServiceImpl implements ProjectService {
 
+    private final UserService userService;
+
     private final ProjectMapper projectMapper;
 
     private final ProjectRelatedMapper projectRelatedMapper;
@@ -47,7 +49,8 @@ public class ProjectServiceImpl implements ProjectService {
     private final static Logger log = LoggerFactory.getLogger(ProjectServiceImpl.class);
 
     @Autowired
-    public ProjectServiceImpl(ProjectMapper projectMapper, ProjectRelatedMapper projectRelatedMapper, UserMapper userMapper, SeecoderGitlabApi seecoderGitlabApi, ApplicationProperties properties) {
+    public ProjectServiceImpl(UserService userService, ProjectMapper projectMapper, ProjectRelatedMapper projectRelatedMapper, UserMapper userMapper, SeecoderGitlabApi seecoderGitlabApi, ApplicationProperties properties) {
+        this.userService = userService;
         this.projectMapper = projectMapper;
         this.projectRelatedMapper = projectRelatedMapper;
         this.userMapper = userMapper;
@@ -110,6 +113,7 @@ public class ProjectServiceImpl implements ProjectService {
         //ANA 日志需要打出创建项目的基础信息
         try{
             JSONObject object = new JSONObject();
+            object.put("user_id",userService.getLoginUser().getId());
             object.put("project_id",po.getId());
             object.put("project_name",po.getName());
             object.put("description",po.getDescription());
@@ -136,6 +140,7 @@ public class ProjectServiceImpl implements ProjectService {
         //ANA 日志需要打出加入的成员信息
         try{
             JSONObject object = new JSONObject();
+
             object.put("project_id",projectId);
             object.put("user_id",userId);
 
@@ -204,6 +209,7 @@ public class ProjectServiceImpl implements ProjectService {
         //ANA 日志需要打出关联项目的id
         try{
             JSONObject object = new JSONObject();
+            object.put("user_id",userService.getLoginUser().getId());
             object.put("projectA_id",projectId);
             object.put("projectB_id",result[0].intValue());