优化登录实体类

flow-common/flow-common-core/src/main/java/com/flow/common/core/util/SecurityContextUtil.java

@@ -22,17 +22,30 @@ public class SecurityContextUtil {
     public static String getUserId() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (Objects.nonNull(authentication)) {
-            OauthUserDetails userDetails = (OauthUserDetails) authentication.getPrincipal();
-            return userDetails.getUsername();
+            return authentication.getName();
+        }
+        return null;
+    }
+
+    /**
+     * 获得当前登录用户昵称
+     *
+     * @return
+     */
+    public static String getNickName() {
+        OauthUserDetails userDetails = getUserInfo();
+        if (Objects.nonNull(userDetails)) {
+            return userDetails.getNickName();
         }
         return null;
     }
 
     /**
      * 登录用户信息
+     *
      * @return
      */
-    public static OauthUserDetails getUserInfo(){
+    public static OauthUserDetails getUserInfo() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null) {
             return (OauthUserDetails) authentication.getPrincipal();
@@ -42,9 +55,10 @@ public class SecurityContextUtil {
 
     /**
      * 获得当前登录用户Token
+     *
      * @return
      */
-    public static String getAccessToken(){
+    public static String getAccessToken() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null) {
             OAuth2AuthenticationDetails details = (OAuth2AuthenticationDetails) authentication.getDetails();
@@ -56,9 +70,10 @@ public class SecurityContextUtil {
 
     /**
      * 获取当前登录用户的权限
+     *
      * @return
      */
-    public static List<String> getCurrentAuthorities(){
+    public static List<String> getCurrentAuthorities() {
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         if (authentication != null) {
             Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowInstanceServiceImpl.java

@@ -6,13 +6,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.flow.common.core.exception.BaseException;
 import com.flow.common.core.model.PageResult;
+import com.flow.common.core.util.SecurityContextUtil;
 import com.flow.common.core.util.StrUtil;
 import com.flow.common.mybatis.service.impl.BaseServiceImpl;
 import com.flow.dao.FlowInstanceDao;
 import com.flow.entity.FlowDefine;
 import com.flow.entity.FlowInstance;
 import com.flow.entity.Notify;
-import com.flow.entity.User;
 import com.flow.entity.settings.PrintConfig;
 import com.flow.entity.settings.Settings;
 import com.flow.enums.NotifyEnum;
@@ -52,8 +52,6 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
     @Autowired
     private NotifyService notifyService;
     @Autowired
-    private UserService userService;
-    @Autowired
     private HistoryService historyService;
     @Autowired
     private ObjectMapper objectMapper;
@@ -209,8 +207,7 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
             // return null;
         }
         Map<String, Object> variables = this.getVariables(instanceId);
-        User user = userService.getByUsername(instance.getStartUserId());
-        variables.put("_initiator_", user.getName());
+        variables.put("_initiator_", SecurityContextUtil.getNickName());
         variables.put("_code_", instance.getId());
         variables.put("_title_", instance.getName());
         String _startTime_ = Objects.nonNull(instance.getStartTime()) ?