Merge branch 'master' of https://gitee.com/linlinjava/litemall

litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/config/ShiroConfig.java

@@ -34,6 +34,12 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/admin/auth/index", "anon");
         filterChainDefinitionMap.put("/admin/auth/403", "anon");
         filterChainDefinitionMap.put("/admin/index/index", "anon");
+        filterChainDefinitionMap.put("/swagger-ui.html", "anon");
+        filterChainDefinitionMap.put("/swagger-resources", "anon");
+        filterChainDefinitionMap.put("/swagger-resources/configuration/security", "anon");
+        filterChainDefinitionMap.put("/swagger-resources/configuration/ui", "anon");
+        filterChainDefinitionMap.put("/v2/api-docs", "anon");
+        filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
 
         filterChainDefinitionMap.put("/admin/**", "authc");
         shiroFilterFactoryBean.setLoginUrl("/admin/auth/401");

litemall-wx-api/pom.xml

@@ -50,12 +50,23 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+		     <groupId>io.springfox</groupId>
+			 <artifactId>springfox-swagger2</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger-ui</artifactId>
+		</dependency>
+		
+		<!--引入ui包-->
+		<dependency>
+	 		 <groupId>com.github.xiaoymin</groupId>
+	 		 <artifactId>swagger-bootstrap-ui</artifactId>
+		</dependency>
+		<dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>

pom.xml

@@ -142,16 +142,31 @@
                 <artifactId>spring-boot-starter-mail</artifactId>
                 <version>2.1.5.RELEASE</version>
             </dependency>
+
             <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>2.2.2</version>
-            </dependency>
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>2.2.2</version>
-            </dependency>
+		       <groupId>io.springfox</groupId>
+			   <artifactId>springfox-swagger2</artifactId>
+			   <version>2.9.2</version>
+		   </dependency>
+		
+		<dependency>
+			  <groupId>io.springfox</groupId>
+			  <artifactId>springfox-swagger-ui</artifactId>
+			  <version>2.9.2</version>
+		</dependency>
+		
+		<!--引入ui包-->
+		<dependency>
+	 		 <groupId>com.github.xiaoymin</groupId>
+	 		 <artifactId>swagger-bootstrap-ui</artifactId>
+	 		<version>1.9.3</version>
+		</dependency>
+		<dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>25.1-jre</version>
+        </dependency>
+            
             <dependency>
                 <groupId>com.auth0</groupId>
                 <artifactId>java-jwt</artifactId>