diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java
index 04263a32e..75187e045 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/ClassUtils.java
@@ -39,7 +39,7 @@ import java.lang.reflect.Method;
  */
 @UtilityClass
 public class ClassUtils extends org.springframework.util.ClassUtils {
-	private static final ParameterNameDiscoverer PARAMETERNAMEDISCOVERER = new DefaultParameterNameDiscoverer();
+	private final ParameterNameDiscoverer PARAMETERNAMEDISCOVERER = new DefaultParameterNameDiscoverer();
 
 	/**
 	 * 获取方法参数信息
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java
index cf7cdf3c3..0679f76ef 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/TenantContextHolder.java
@@ -18,15 +18,17 @@
 package com.pig4cloud.pigx.common.core.util;
 
 import com.alibaba.ttl.TransmittableThreadLocal;
+import lombok.experimental.UtilityClass;
 
 /**
  * @author lengleng
  * @date 2018/10/4
  * 租户工具类
  */
+@UtilityClass
 public class TenantContextHolder {
 
-	private static final ThreadLocal<Integer> THREAD_LOCAL_TENANT = new TransmittableThreadLocal<>();
+	private final ThreadLocal<Integer> THREAD_LOCAL_TENANT = new TransmittableThreadLocal<>();
 
 
 	/**
@@ -34,7 +36,7 @@ public class TenantContextHolder {
 	 *
 	 * @param tenantId
 	 */
-	public static void setTenantId(Integer tenantId) {
+	public void setTenantId(Integer tenantId) {
 		THREAD_LOCAL_TENANT.set(tenantId);
 	}
 
@@ -43,11 +45,11 @@ public class TenantContextHolder {
 	 *
 	 * @return
 	 */
-	public static Integer getTenantId() {
+	public Integer getTenantId() {
 		return THREAD_LOCAL_TENANT.get();
 	}
 
-	public static void clear() {
+	public void clear() {
 		THREAD_LOCAL_TENANT.remove();
 	}
 }
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java
index c1425866a..ee7cbdcdc 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/WebUtils.java
@@ -50,8 +50,8 @@ import java.io.PrintWriter;
 @Slf4j
 @UtilityClass
 public class WebUtils extends org.springframework.web.util.WebUtils {
-	private static final String BASIC_ = "Basic ";
-	public static final String UNKNOWN = "unknown";
+	private  final String BASIC_ = "Basic ";
+	private  final String UNKNOWN = "unknown";
 
 	/**
 	 * 判断是否ajax请求
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java
index d15b0d105..755183d75 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java
@@ -34,7 +34,7 @@ import java.io.IOException;
 @Slf4j
 @UtilityClass
 public class AuthUtils {
-	private static final String BASIC_ = "Basic ";
+	private final String BASIC_ = "Basic ";
 
 	/**
 	 * 从header 请求中的clientId/clientsecect