更新

src/main/java/com/keymobile/rest/controller/ExcelController.java

@@ -3,6 +3,7 @@ package com.keymobile.rest.controller;
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
 import com.keymobile.rest.controller.constant.TaskConstant;
+import com.keymobile.rest.model.User;
 import com.keymobile.rest.model.Activity;
 import com.keymobile.rest.model.DataInfo;
 import com.keymobile.rest.model.Process;
@@ -33,7 +34,7 @@ public class ExcelController {
     private ActivityService activityService;
 
     @Autowired
-    private FeignAuthService authService;
+    private SessionService sessionService;
     @Autowired
     private TaskService taskService;
     @Autowired
@@ -54,8 +55,8 @@ public class ExcelController {
         Template template = templateService.findById(excelId);
         CommonValidator.notNull(template, "模板不存在");
 
-        Map user = authService.getUserById(3L);
-        taskService.claim(taskId, user.get("name").toString());
+        User user = sessionService.getLoginUser();
+        taskService.claim(taskId, user.getName());
 
         String processInstanceId = task.getProcessInstanceId();
         Process process = processService.findByProcessId(processInstanceId);
@@ -64,7 +65,7 @@ public class ExcelController {
         dataInfo.setCreateAt(DateUtil.getTimestamp());
         dataInfo.setTemplate(template);
         dataInfo.setTaskId(taskId);
-        dataInfo.setUserId(Long.parseLong(user.get("id").toString()));
+        dataInfo.setUserId(user.getId());
         dataInfo.setProcess(process);
         dataInfo.setData(dataStr);
         dataInfoService.save(dataInfo);

src/main/java/com/keymobile/rest/controller/TaskController.java

@@ -6,7 +6,7 @@ import com.keymobile.rest.common.utils.BeanUti;
 import com.keymobile.rest.common.utils.DateUtil;
 import com.keymobile.rest.common.validator.CommonValidator;
 import com.keymobile.rest.controller.constant.TaskConstant;
-import com.keymobile.rest.dto.User;
+import com.keymobile.rest.model.User;
 import com.keymobile.rest.model.*;
 import com.keymobile.rest.model.Process;
 import com.keymobile.rest.service.*;
@@ -49,8 +49,6 @@ public class TaskController {
     @Autowired
     private TemplateService templateService;
     @Autowired
-    private FeignAuthService feignAuthService;
-    @Autowired
     private ProcessService processService;
     @Autowired
     private UserTemplateMapperService userTemplateMapperService;

src/main/java/com/keymobile/rest/dto/User.java → src/main/java/com/keymobile/rest/model/User.java

-package com.keymobile.rest.dto;
+package com.keymobile.rest.model;
 
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/keymobile/rest/service/SessionService.java

 package com.keymobile.rest.service;
 
-import com.keymobile.rest.dto.User;
+import com.keymobile.rest.model.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
-import javax.xml.ws.soap.Addressing;
 import java.util.Map;