From e691a061b5c41aa648e349bfdfcffde421bf8981 Mon Sep 17 00:00:00 2001
From: sousoiki <caoshx@outlook.com>
Date: Sat, 5 Dec 2020 00:45:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EPluginPreProcessorExtend?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BD=9C=E4=B8=BA=E5=89=8D=E7=BD=AE=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extension/mybatis/PluginMybatisMapperProcessor.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/springboot-plugin-framework-extension/springboot-plugin-framework-extension-mybatis/src/main/java/com/gitee/starblues/extension/mybatis/PluginMybatisMapperProcessor.java b/springboot-plugin-framework-extension/springboot-plugin-framework-extension-mybatis/src/main/java/com/gitee/starblues/extension/mybatis/PluginMybatisMapperProcessor.java
index 11e1e7c..bc9c8a8 100644
--- a/springboot-plugin-framework-extension/springboot-plugin-framework-extension-mybatis/src/main/java/com/gitee/starblues/extension/mybatis/PluginMybatisMapperProcessor.java
+++ b/springboot-plugin-framework-extension/springboot-plugin-framework-extension-mybatis/src/main/java/com/gitee/starblues/extension/mybatis/PluginMybatisMapperProcessor.java
@@ -1,11 +1,10 @@
 package com.gitee.starblues.extension.mybatis;
 
 import com.gitee.starblues.extension.mybatis.utils.MybatisInjectWrapper;
-import com.gitee.starblues.realize.BasePlugin;
 import com.gitee.starblues.factory.PluginInfoContainer;
 import com.gitee.starblues.factory.PluginRegistryInfo;
 import com.gitee.starblues.factory.SpringBeanRegister;
-import com.gitee.starblues.factory.process.pipe.PluginPipeProcessorExtend;
+import com.gitee.starblues.factory.process.pipe.PluginPreProcessorExtend;
 import com.gitee.starblues.factory.process.pipe.bean.name.PluginAnnotationBeanNameGenerator;
 import com.gitee.starblues.utils.OrderPriority;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -32,7 +31,7 @@ import java.util.Set;
  * @author zhangzhuo
  * @version 1.0
  */
-public class PluginMybatisMapperProcessor implements PluginPipeProcessorExtend {
+public class PluginMybatisMapperProcessor implements PluginPreProcessorExtend {
 
     private final static Logger LOG = LoggerFactory.getLogger(PluginMybatisMapperProcessor.class);
 
@@ -78,14 +77,13 @@ public class PluginMybatisMapperProcessor implements PluginPipeProcessorExtend {
         if(groupClasses == null || groupClasses.isEmpty()){
             return;
         }
-        BasePlugin basePlugin = pluginRegistryInfo.getBasePlugin();
         String pluginId = pluginRegistryInfo.getPluginWrapper().getPluginId();
         Set<String> beanNames = new HashSet<>();
         for (Class<?> groupClass : groupClasses) {
             if (groupClass == null) {
                 continue;
             }
-            BeanNameGenerator beanNameGenerator = new PluginAnnotationBeanNameGenerator(pluginId, basePlugin.getWrapper().getPluginId());
+            BeanNameGenerator beanNameGenerator = new PluginAnnotationBeanNameGenerator(pluginId);
             AnnotatedGenericBeanDefinition abd = new AnnotatedGenericBeanDefinition(groupClass);
             ScopeMetadata scopeMetadata = this.scopeMetadataResolver.resolveScopeMetadata(abd);
             abd.setScope(scopeMetadata.getScopeName());
@@ -122,4 +120,5 @@ public class PluginMybatisMapperProcessor implements PluginPipeProcessorExtend {
     public OrderPriority order() {
         return OrderPriority.getHighPriority();
     }
+
 }
-- 
Gitee