Browse Source

web和webflux冲突

yufeng0528 4 years ago
parent
commit
ce69c3a42c
3 changed files with 28 additions and 12 deletions
  1. 0 6
      pom.xml
  2. 5 6
      spring5-auth/spring5-auth-client/pom.xml
  3. 23 0
      spring5-gateway/pom.xml

+ 0 - 6
pom.xml

@@ -87,12 +87,6 @@
87 87
             <artifactId>spring-cloud-alibaba-nacos-discovery</artifactId>
88 88
         </dependency>
89 89
         
90
-        <!-- Spring Boot Web 依赖 -->
91
-        <dependency>
92
-            <groupId>org.springframework.boot</groupId>
93
-            <artifactId>spring-boot-starter-web</artifactId>
94
-        </dependency>
95
-       
96 90
        <!--热加载-->
97 91
 <!--         <dependency> -->
98 92
 <!--             <groupId>org.springframework.boot</groupId> -->

+ 5 - 6
spring5-auth/spring5-auth-client/pom.xml

@@ -21,12 +21,11 @@
21 21
 <!--             <artifactId>spring-boot-starter-data-redis-reactive</artifactId> -->
22 22
 <!--         </dependency> -->
23 23
         
24
-	    <!-- shrio -->
25
-<!--         <dependency> -->
26
-<!--             <groupId>org.apache.shiro</groupId> -->
27
-<!--             <artifactId>shiro-spring-boot-web-starter</artifactId> -->
28
-<!--             <version>1.4.0</version> -->
29
-<!--         </dependency> -->
24
+        <!-- Spring Boot Web 依赖 -->
25
+        <dependency>
26
+            <groupId>org.springframework.boot</groupId>
27
+            <artifactId>spring-boot-starter-web</artifactId>
28
+        </dependency>
30 29
         
31 30
         <!-- jwt -->
32 31
         <dependency>

+ 23 - 0
spring5-gateway/pom.xml

@@ -123,6 +123,29 @@
123 123
                     </resources>
124 124
                 </configuration>
125 125
             </plugin>
126
+            
127
+            <!-- 打包时跳过单元测试 -->
128
+            <plugin>
129
+                <groupId>org.apache.maven.plugins</groupId>
130
+                <artifactId>maven-surefire-plugin</artifactId>
131
+                <configuration>
132
+                    <skipTests>true</skipTests>
133
+                </configuration>
134
+            </plugin>
135
+            
136
+            <plugin>
137
+                <groupId>org.springframework.boot</groupId>
138
+                <artifactId>spring-boot-maven-plugin</artifactId>
139
+                <version>2.1.4.RELEASE</version>
140
+                <executions>
141
+                    <execution>
142
+                        <goals>
143
+                            <goal>build-info</goal>
144
+                            <goal>repackage</goal>
145
+                        </goals>
146
+                    </execution>
147
+                </executions>
148
+            </plugin>
126 149
         </plugins>
127 150
     </build>
128 151
 </project>