代码优化

framework-base/src/main/java/com/chelvc/framework/base/context/SessionContextHolder.java

@@ -606,7 +606,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 身份标识
      */
     protected Long getId(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_ID), null), Long::parseLong);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_ID), Long::parseLong);
     }
 
     /**
@@ -616,7 +616,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 会话类型
      */
     protected Session.Type getType(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_TYPE), null), Session.Type::valueOf);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_TYPE), Session.Type::valueOf);
     }
 
     /**
@@ -626,7 +626,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 主机地址
      */
     protected String getHost(HttpServletRequest request) {
-        return StringUtils.ifEmpty(HttpUtils.getRequestAddress(request), null);
+        return StringUtils.ifEmpty(HttpUtils.getRequestAddress(request), (String) null);
     }
 
     /**
@@ -636,7 +636,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 租户标识
      */
     protected Integer getTenant(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_TENANT), null), Integer::parseInt);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_TENANT), Integer::parseInt);
     }
 
     /**
@@ -646,7 +646,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 设备标识
      */
     protected String getDevice(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_DEVICE), null), String::trim);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_DEVICE), (String) null);
     }
 
     /**
@@ -656,7 +656,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 渠道来源
      */
     protected String getChannel(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_CHANNEL), null), String::trim);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_CHANNEL), (String) null);
     }
 
     /**
@@ -666,7 +666,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 版本号
      */
     protected String getVersion(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_VERSION), null), String::trim);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_VERSION), (String) null);
     }
 
     /**
@@ -676,7 +676,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 平台标识
      */
     protected Platform getPlatform(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_PLATFORM), null), Platform::valueOf);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_PLATFORM), Platform::valueOf);
     }
 
     /**
@@ -686,7 +686,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 终端标识
      */
     protected Terminal getTerminal(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_TERMINAL), null), Terminal::valueOf);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_TERMINAL), Terminal::valueOf);
     }
 
     /**
@@ -696,7 +696,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 签名信息
      */
     protected String getSignature(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_SIGNATURE), null), String::trim);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_SIGNATURE), (String) null);
     }
 
     /**
@@ -706,7 +706,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return true/false
      */
     protected Boolean getInitial(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_INITIAL), null), Boolean::parseBoolean);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_INITIAL), Boolean::parseBoolean);
     }
 
     /**
@@ -716,7 +716,7 @@ public class SessionContextHolder implements ServletRequestListener {
      * @return 客户端序号
      */
     protected Integer getSequence(HttpServletRequest request) {
-        return ObjectUtils.ifNull(StringUtils.ifEmpty(request.getHeader(HEADER_SEQUENCE), null), Integer::parseInt);
+        return StringUtils.ifEmpty(request.getHeader(HEADER_SEQUENCE), Integer::parseInt);
     }
 
     @Override

framework-database/src/main/java/com/chelvc/framework/database/interceptor/UniqueValidateInterceptor.java

@@ -18,6 +18,7 @@ import com.beust.jcommander.internal.Maps;
 import com.chelvc.framework.base.util.AESUtils;
 import com.chelvc.framework.base.util.ErrorUtils;
 import com.chelvc.framework.base.util.ObjectUtils;
+import com.chelvc.framework.base.util.StringUtils;
 import com.chelvc.framework.database.annotation.Unique;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.database.entity.Entity;
@@ -36,7 +37,6 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 /**
  * 数据唯一约束验证拦截器

framework-email/src/main/java/com/chelvc/framework/email/DefaultEmailHandler.java

@@ -12,13 +12,13 @@ import javax.mail.internet.MimeBodyPart;
 import javax.mail.internet.MimeMessage;
 
 import com.chelvc.framework.base.util.EmailUtils;
+import com.chelvc.framework.base.util.StringUtils;
 import com.chelvc.framework.email.config.EmailProperties;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 /**
  * 邮件操作接口默认实现

framework-nacos/src/main/java/com/chelvc/framework/nacos/config/MultiserverNacosConfigurer.java

@@ -4,13 +4,13 @@ import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
 import com.alibaba.cloud.nacos.registry.NacosRegistration;
 import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
 import com.chelvc.framework.base.context.ApplicationContextHolder;
+import com.chelvc.framework.base.util.StringUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.Resource;
-import org.springframework.util.StringUtils;
 
 /**
  * 多服务Nacos配置

framework-nacos/src/main/java/com/chelvc/framework/nacos/config/NacosConfigConfigurer.java

@@ -8,9 +8,9 @@ import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.api.config.ConfigService;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource;
+import com.chelvc.framework.base.util.StringUtils;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
 
 /**
  * Nacos配置中心配置

framework-security/src/main/java/com/chelvc/framework/security/context/PasswordContextHolder.java

@@ -2,12 +2,12 @@ package com.chelvc.framework.security.context;
 
 import java.util.Objects;
 
+import com.chelvc.framework.base.util.StringUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Woody

framework-security/src/main/java/com/chelvc/framework/security/interceptor/SignatureValidateInterceptor.java

@@ -8,6 +8,7 @@ import javax.annotation.PostConstruct;
 
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.util.ObjectUtils;
+import com.chelvc.framework.base.util.StringUtils;
 import com.chelvc.framework.security.annotation.Sign;
 import com.chelvc.framework.security.annotation.Signable;
 import com.chelvc.framework.security.signature.Signer;
@@ -23,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 
 /**
  * 方法签名验证拦截器

framework-security/src/main/java/com/chelvc/framework/security/token/RedisTokenActiveValidator.java

@@ -5,6 +5,7 @@ import java.util.Objects;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.model.Session;
 import com.chelvc.framework.base.model.Terminal;
+import com.chelvc.framework.base.util.StringUtils;
 import com.chelvc.framework.security.config.WebSecurityConfigurer;
 import com.chelvc.framework.security.util.TokenUtils;
 import lombok.NonNull;
@@ -16,7 +17,6 @@ import org.springframework.security.oauth2.core.OAuth2Error;
 import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult;
 import org.springframework.security.oauth2.jwt.Jwt;
 import org.springframework.security.oauth2.server.resource.BearerTokenError;
-import org.springframework.util.StringUtils;
 
 /**
  * 基于Redis的令牌有效性验证实现