From 73009913b60c490ae8918f5b213eaa2e7e0db570 Mon Sep 17 00:00:00 2001
From: zhangzhuo <zhangzhuo@jyd.com.cn>
Date: Thu, 28 Jan 2021 10:21:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A1=88=E4=BE=8B=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/basic-example/basic-example-main/pom.xml    |  2 ++
 .../integration-mybatis-main/pom.xml                |  2 +-
 .../integration-mybatisplus-main/pom.xml            |  2 ++
 .../com/mybatisplus/plugin/rest/AppController.java  | 13 -------------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/example/basic-example/basic-example-main/pom.xml b/example/basic-example/basic-example-main/pom.xml
index e82ea1e..32c29e3 100644
--- a/example/basic-example/basic-example-main/pom.xml
+++ b/example/basic-example/basic-example-main/pom.xml
@@ -81,6 +81,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
+                        <!-- 高版本Spring-boot 2.1.1.RELEASE 需要新增id -->
+                        <id>repackage</id>
                         <goals>
                             <goal>repackage</goal>
                         </goals>
diff --git a/example/integration-mybatis/integration-mybatis-main/pom.xml b/example/integration-mybatis/integration-mybatis-main/pom.xml
index 673a53a..7b174d6 100644
--- a/example/integration-mybatis/integration-mybatis-main/pom.xml
+++ b/example/integration-mybatis/integration-mybatis-main/pom.xml
@@ -120,7 +120,7 @@
                             <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <classifier>exec</classifier>
+                            <attach>false</attach>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/example/integration-mybatisplus/integration-mybatisplus-main/pom.xml b/example/integration-mybatisplus/integration-mybatisplus-main/pom.xml
index fce0dc9..d6343a5 100644
--- a/example/integration-mybatisplus/integration-mybatisplus-main/pom.xml
+++ b/example/integration-mybatisplus/integration-mybatisplus-main/pom.xml
@@ -120,6 +120,8 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
+                        <!-- 高版本Spring-boot 2.1.1.RELEASE 需要新增id -->
+                        <id>repackage</id>
                         <goals>
                             <goal>repackage</goal>
                         </goals>
diff --git a/example/integration-mybatisplus/plugins/integration-mybatisplus-plugin/src/main/java/com/mybatisplus/plugin/rest/AppController.java b/example/integration-mybatisplus/plugins/integration-mybatisplus-plugin/src/main/java/com/mybatisplus/plugin/rest/AppController.java
index 89da14b..91d3759 100644
--- a/example/integration-mybatisplus/plugins/integration-mybatisplus-plugin/src/main/java/com/mybatisplus/plugin/rest/AppController.java
+++ b/example/integration-mybatisplus/plugins/integration-mybatisplus-plugin/src/main/java/com/mybatisplus/plugin/rest/AppController.java
@@ -1,11 +1,7 @@
 package com.mybatisplus.plugin.rest;
 
-import com.mybatisplus.plugin.A;
-import com.mybatisplus.plugin.MybatisPlusPlugin;
 import com.mybatisplus.plugin.entity.App;
-import com.mybatisplus.plugin.entity.PluginData;
 import com.mybatisplus.plugin.mapper.AppMapper;
-import com.mybatisplus.plugin.service.PluginDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -26,9 +22,6 @@ public class AppController {
     @Autowired
     private AppMapper appMapper;
 
-    @Autowired
-    private A a;
-
 
     @GetMapping
     public List<App> getAll(){
@@ -36,12 +29,6 @@ public class AppController {
     }
 
 
-
-    @GetMapping("a")
-    public String getA(){
-        return a.getName();
-    }
-
     @GetMapping("{version}")
     public List<App> getAll(@PathVariable("version") Integer version){
         return appMapper.getAppVersion(version);
-- 
Gitee