purchase

purchase-admin/src/main/java/com/ozs/web/filter/LogOutFilter.java

@@ -7,7 +7,6 @@ import com.ozs.common.utils.SecurityUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 
-import javax.annotation.PostConstruct;
 
 public class LogOutFilter extends Filter<ILoggingEvent> {
 

purchase-admin/src/main/java/com/ozs/web/filter/LogOutUtil.java

@@ -1,16 +1,42 @@
 package com.ozs.web.filter;
 
 import com.ozs.common.constant.Constants;
+import com.ozs.common.core.domain.entity.SysUser;
+import com.ozs.common.core.domain.model.LoginUser;
 import com.ozs.common.utils.SecurityUtils;
+import com.ozs.common.utils.ServletUtils;
+import com.ozs.common.utils.ip.AddressUtils;
+import com.ozs.common.utils.ip.IpUtils;
+import eu.bitwalker.useragentutils.UserAgent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
+import java.util.Set;
+
 
 @Slf4j
 public class LogOutUtil {
 
+    static {
+        LoginUser loginUser = new LoginUser();
+        SysUser user = new SysUser();
+        user.setUserId(-1L);
+        user.setUserName("purchase");
+        loginUser.setUser(user);
+        loginUser.setUserId(-1L);
+        loginUser.setToken(Constants.PRUCHASE_TOKEN);
+        UserAgent userAgent = UserAgent.parseUserAgentString(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = IpUtils.getIpAddr(ServletUtils.getRequest());
+        loginUser.setIpaddr(ip);
+        loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        loginUser.setBrowser(userAgent.getBrowser().getName());
+        loginUser.setOs(userAgent.getOperatingSystem().getName());
+        Constants.map.put(Constants.PRUCHASE_TOKEN, loginUser);
+    }
+
     public static boolean getFlay() {
-        if (!ObjectUtils.isEmpty(Constants.map.keySet())) {
+        Set<String> strings = Constants.map.keySet();
+        if (!ObjectUtils.isEmpty(strings)) {
             Long userId = SecurityUtils.getUserId();
             if (!ObjectUtils.isEmpty(userId)) {
                 if (userId.equals(Long.parseLong("-1"))) {

purchase-common/src/main/java/com/ozs/common/constant/Constants.java

@@ -1,6 +1,11 @@
 package com.ozs.common.constant;
 
+import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.model.LoginUser;
+import com.ozs.common.utils.ServletUtils;
+import com.ozs.common.utils.ip.AddressUtils;
+import com.ozs.common.utils.ip.IpUtils;
+import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 
 import java.util.HashMap;
@@ -167,5 +172,5 @@ public class Constants {
     public static final String PROJECT_WARN_STATUS = "project_warn_status";
     // 单位性质
     public static final String SYS_COMPANY_NATURE = "sys_company_nature";
-    public static ThreadLocal<String> localVar = new ThreadLocal<String>();
+
 }

purchase-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

@@ -75,7 +75,6 @@ public class SysLoginService {
             loginUser.setUserId(-1L);
             // 生成token
             String token = tokenService.createToken(loginUser);
-            Constants.map.clear();
             Constants.map.put(token, loginUser);
             return token;
         }else {

purchase-framework/src/main/java/com/ozs/framework/web/service/TokenService.java

@@ -114,8 +114,6 @@ public class TokenService {
         if (!loginUser.getUserId().equals(Long.parseLong("-1"))) {
             refreshToken(loginUser);
         }
-
-
         Map<String, Object> claims = new HashMap<>();
         claims.put(Constants.LOGIN_USER_KEY, token);
         return createToken(claims);