From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
index 4f0855e..e7597e6 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
@@ -3,7 +3,6 @@
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.matrix.component.redis.RedisClient;
-import com.matrix.component.redis.RedisUserLoginUtils;
 import com.matrix.core.constance.MatrixConstance;
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.tools.LogUtil;
@@ -11,8 +10,6 @@
 import com.matrix.core.tools.StringUtils;
 import com.matrix.system.common.bean.SysUsers;
 import com.matrix.system.common.dao.SysUsersDao;
-import com.matrix.system.hive.bean.SysVipInfo;
-import com.matrix.system.hive.dao.SysVipInfoDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -33,7 +30,7 @@
     private RedisClient redisClient;
 
     @Value("${login_private_key}")
-    private static String privateKey;
+    private  String privateKey;
 
     @Value("${evn}")
     private String evn;
@@ -46,13 +43,13 @@
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-       if ("dev".equals(evn)) {
-            SysUsers sysUsers = sysUsersDao.selectById(1012L);
+    if ("dev".equals(evn)) {
+            SysUsers sysUsers = sysUsersDao.selectById(1022L);
             request.getSession().setAttribute(MatrixConstance.LOGIN_KEY, sysUsers);
             return true;
         }
 
-        String token = resolveToken(request);
+        String token = resolveToken(request,privateKey);
         AjaxResult ajaxResult = new AjaxResult();
         ajaxResult.setStatus(AjaxResult.STATUS_LOGIN_INVALID);
 
@@ -95,7 +92,7 @@
      * @param request
      * @return
      */
-    public static String resolveToken(HttpServletRequest request) {
+    public static String resolveToken(HttpServletRequest request,String privateKey) {
         String headToken = request.getHeader(TOKEN_HEADER);
         String sb = request.getRequestURI();
 

--
Gitblit v1.9.1