From 26cd94bcca94d5163b304ac016ea770cd9da5d6f Mon Sep 17 00:00:00 2001 From: ajaxfan <909938737@qq.com> Date: Mon, 17 May 2021 14:31:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cloud/security/starter/common/Constants.java | 2 +- .../base/service/impl/BaseCacheUserServiceImpl.java | 2 -- .../mall/ebtp/common/config/WebConfig.java | 10 +++++----- .../common/uniBss/service/UniBssServiceImpl.java | 10 +++------- .../chinaunicom/mall/ebtp/common/util/JsonUtils.java | 12 ++++++------ 5 files changed, 15 insertions(+), 21 deletions(-) diff --git a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/Constants.java b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/Constants.java index 46ea1f2..4f0cda5 100644 --- a/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/Constants.java +++ b/mall-ebtp-cloud-security-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/security/starter/common/Constants.java @@ -10,7 +10,7 @@ public interface Constants { public static final String CURRENT_ROLE_CODE = "currentRoleCode"; public static final String COOKIE_TOKEN_CODE = "mall3_token"; - public static final String TOKEN_EXPIRED = "90403"; + public static final String TOKEN_EXPIRED = "90401"; public static final String REMOTE_ACCESS_FAILURE = "90500"; } diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java index 77b294c..391ce39 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/base/service/impl/BaseCacheUserServiceImpl.java @@ -2,7 +2,6 @@ package com.chinaunicom.mall.ebtp.common.base.service.impl; import java.util.Collection; import java.util.Map; -import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.BeanUtils; @@ -11,7 +10,6 @@ import org.springframework.stereotype.Service; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; -import com.chinaunicom.mall.ebtp.common.exception.entity.AuthFailureException; import lombok.extern.slf4j.Slf4j; diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java index f54f7fd..cbe40c1 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/config/WebConfig.java @@ -1,10 +1,8 @@ package com.chinaunicom.mall.ebtp.common.config; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import java.util.List; + import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.ResourceHttpMessageConverter; @@ -13,7 +11,9 @@ import org.springframework.http.converter.json.MappingJackson2HttpMessageConvert import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; -import java.util.List; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; /** * @author dino diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/uniBss/service/UniBssServiceImpl.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/uniBss/service/UniBssServiceImpl.java index 6276936..5dd1acb 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/uniBss/service/UniBssServiceImpl.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/uniBss/service/UniBssServiceImpl.java @@ -1,12 +1,5 @@ package com.chinaunicom.mall.ebtp.common.uniBss.service; -import cn.hutool.core.exceptions.ExceptionUtil; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.chinaunicom.mall.ebtp.common.uniBss.entity.UniBss; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; @@ -17,6 +10,9 @@ import java.security.MessageDigest; import java.util.HashMap; import java.util.Map; +import cn.hutool.core.exceptions.ExceptionUtil; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class UniBssServiceImpl { /** diff --git a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/util/JsonUtils.java b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/util/JsonUtils.java index 8c734ab..a973cb0 100644 --- a/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/util/JsonUtils.java +++ b/uboot-common/src/main/java/com/chinaunicom/mall/ebtp/common/util/JsonUtils.java @@ -1,18 +1,18 @@ package com.chinaunicom.mall.ebtp.common.util; -import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.exceptions.ExceptionUtil; -import com.baomidou.mybatisplus.extension.api.R; +import java.util.ArrayList; +import java.util.List; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import lombok.extern.slf4j.Slf4j; -import java.util.ArrayList; -import java.util.List; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.exceptions.ExceptionUtil; +import lombok.extern.slf4j.Slf4j; /** * json util