diff --git a/matrix-aop/src/main/java/com/nepxion/matrix/proxy/aop/AbstractAutoScanProxy.java b/matrix-aop/src/main/java/com/nepxion/matrix/proxy/aop/AbstractAutoScanProxy.java
index 1394f1c..29a6702 100644
--- a/matrix-aop/src/main/java/com/nepxion/matrix/proxy/aop/AbstractAutoScanProxy.java
+++ b/matrix-aop/src/main/java/com/nepxion/matrix/proxy/aop/AbstractAutoScanProxy.java
@@ -198,10 +198,8 @@ protected Object[] scanAndProxyForTarget(Class<?> targetClass, String beanName,
         if (StringUtils.isNotEmpty(targetClassName) && !targetClassName.startsWith("java.")) {
             // 避免对同一个接口或者类扫描多次
             Boolean proxied = proxyMap.get(targetClassName);
-            if (proxied != null) {
-                if (proxied) {
+            if (proxied != null && proxied) {
                     return interceptors;
-                }
             } else {
                 Object[] proxyInterceptors = null;
                 switch (proxyMode) {
@@ -353,13 +351,14 @@ protected boolean scanPackagesContained(Class<?> beanClass) {
             if (StringUtils.isNotEmpty(scanPackage)) {
                 // beanClassName有时候会为null...
                 String beanClassName = beanClass.getCanonicalName();
-                if (StringUtils.isNotEmpty(beanClassName)) {
-                    if (beanClassName.startsWith(scanPackage) || beanClassName.contains(ProxyConstant.JDK_PROXY_NAME_KEY) || beanClassName.contains(ProxyConstant.CGLIB_PROXY_NAME_KEY)) {
-                        return true;
-                    }
-                } else {
-                    return false;
+                boolean isBeanClassName = StringUtils.isNotEmpty(beanClassName) && beanClassName.startsWith(scanPackage)
+                        || beanClassName.contains(ProxyConstant.JDK_PROXY_NAME_KEY)
+                        || beanClassName.contains(ProxyConstant.CGLIB_PROXY_NAME_KEY);
+                if (isBeanClassName) {
+                    return true;
                 }
+                return false;
+
             }
         }
 
diff --git a/matrix-aop/src/main/java/com/nepxion/matrix/registrar/AbstractRegistrar.java b/matrix-aop/src/main/java/com/nepxion/matrix/registrar/AbstractRegistrar.java
index fb96f2f..62d8f6f 100644
--- a/matrix-aop/src/main/java/com/nepxion/matrix/registrar/AbstractRegistrar.java
+++ b/matrix-aop/src/main/java/com/nepxion/matrix/registrar/AbstractRegistrar.java
@@ -133,7 +133,10 @@ protected ClassPathScanningCandidateComponentProvider getScanner() {
             @Override
             protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
                 if (beanDefinition.getMetadata().isIndependent()) {
-                    if (beanDefinition.getMetadata().isInterface() && beanDefinition.getMetadata().getInterfaceNames().length == 1 && Annotation.class.getName().equals(beanDefinition.getMetadata().getInterfaceNames()[0])) {
+                    boolean isInterface = beanDefinition.getMetadata().isInterface() &&
+                            beanDefinition.getMetadata().getInterfaceNames().length == 1 &&
+                            Annotation.class.getName().equals(beanDefinition.getMetadata().getInterfaceNames()[0]);
+                    if (isInterface) {
                         try {
                             Class<?> target = ClassUtils.forName(beanDefinition.getMetadata().getClassName(), AbstractRegistrar.this.classLoader);