修正定时任务获取操作人错误

Signed-off-by: TanYibin <5491541@qq.com>

修正定时任务获取操作人错误
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 51711336
Showing 2 changed files with 67 additions and 1 deletions
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
huaheng-wms-core/src/main/java/org/jeecg/utils/aspect/TaskBuildAudienceAspect.java
@@ -43,6 +43,9 @@ public class HuahengJwtUtil {
     /** 全仓CODE */
     public static final String ALL_WAREHOUSE_CODE = "ALL_WAREHOUSE";
+    
+    /** 定时任务操作人 */
+    public static final String TASK_AUDIENCE_NAME = "SYSTEM_TASK";
     public static final String SYSTEM_ACTIVATION_CODE_FILE_NAME = "ActivationCode.txt";
@@ -230,7 +233,12 @@ public class HuahengJwtUtil {
      * @return
      */
     public static String getCurrentOperator() {
-        LoginUser loginUser = SecurityUtils.getSubject().getPrincipal() != null ? (LoginUser)SecurityUtils.getSubject().getPrincipal() : null;
+        LoginUser loginUser = null;
+        try {
+            loginUser = SecurityUtils.getSubject().getPrincipal() != null ? (LoginUser)SecurityUtils.getSubject().getPrincipal() : null;
+        } catch (Exception e) {
+            loginUser = null;
+        }
         if (loginUser != null) {
             return loginUser.getRealname();
         }
@@ -253,3 +261,4 @@ public class HuahengJwtUtil {
         }
     }
 }
+
+package org.jeecg.utils.aspect;
+
+import java.lang.reflect.Method;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.utils.config.ApplicationConfig;
+import org.jeecg.utils.support.ApiAuthentication;
+import org.jeecg.utils.support.PassApiAuthentication;
+import org.jeecg.utils.support.RSA256Key;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import com.auth0.jwt.JWT;
+import com.auth0.jwt.JWTVerifier;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.auth0.jwt.exceptions.JWTVerificationException;
+import com.auth0.jwt.interfaces.DecodedJWT;
+
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 构建定时任务操作人拦截器
+ * @author     TanYibin
+ * @createDate 2023年4月4日
+ */
+@Slf4j
+@Aspect
+@Component
+@EnableAsync
+public class TaskBuildAudienceAspect {
+
+    @Pointcut("execution(* org.jeecg.modules.wms.monitor.job.*Task.execute(..))")
+    public void executeTask() {}
+
+    /**
+     * API Token 验证
+     * @author                           TanYibin
+     * @createDate                       2023年2月14日
+     * @param      joinPoint
+     * @throws     NoSuchMethodException
+     * @throws     Throwable
+     */
+    @Before("executeTask()")
+    public void doBefore(JoinPoint joinPoint) throws NoSuchMethodException, Throwable {
+        new ApiAuthentication.ApiAuthenticationBuild().audience(HuahengJwtUtil.TASK_AUDIENCE_NAME).bulid();
+    }
+}