From c28ea950c0742bbed5f33657137b8163783e103a Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 15 Apr 2019 13:56:10 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20swagger=E6=89=AB=E6=8F=8Foauth2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/config/BladeResourceServerConfiguration.java           | 2 +-
 blade-auth/src/main/resources/application.yml                   | 2 ++
 .../java/org/springblade/flowable/engine/mapper/FlowMapper.xml  | 2 +-
 pom.xml                                                         | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 blade-auth/src/main/resources/application.yml

diff --git a/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java b/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java
index da2d9dc8..f9d6c14b 100644
--- a/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java
+++ b/blade-auth/src/main/java/org/springblade/auth/config/BladeResourceServerConfiguration.java
@@ -47,7 +47,7 @@ public class BladeResourceServerConfiguration extends ResourceServerConfigurerAd
 			.successHandler(appLoginInSuccessHandler)
 			.and()
 			.authorizeRequests()
-			.antMatchers("/actuator/**", "/token/**", "/mobile/**").permitAll()
+			.antMatchers("/actuator/**", "/token/**", "/mobile/**", "/v2/api-docs", "/v2/api-docs-ext").permitAll()
 			.anyRequest().authenticated().and()
 			.csrf().disable();
 	}
diff --git a/blade-auth/src/main/resources/application.yml b/blade-auth/src/main/resources/application.yml
new file mode 100644
index 00000000..50780b25
--- /dev/null
+++ b/blade-auth/src/main/resources/application.yml
@@ -0,0 +1,2 @@
+swagger:
+  base-package: org.springblade,org.springframework.security.oauth2.provider.endpoint
diff --git a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml
index fb332e62..3f57b5b2 100644
--- a/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml
+++ b/blade-service/blade-flow/src/main/java/org/springblade/flowable/engine/mapper/FlowMapper.xml
@@ -47,7 +47,7 @@
     <select id="findByParentModelId" parameterType="string" resultMap="flowModelResultMap">
         select model.* from ACT_DE_MODEL_RELATION modelrelation
                                 inner join ACT_DE_MODEL model on modelrelation.model_id = model.id
-        where modelrelation.parent_model_id = #{parentModelId, jdbcType=VARCHAR}
+        where modelrelation.parent_model_id = #{_parameter}
     </select>
 
 </mapper>
diff --git a/pom.xml b/pom.xml
index c4e4cf15..a2b54665 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         <java.version>1.8</java.version>
         <swagger.version>2.9.2</swagger.version>
         <swagger.models.version>1.5.21</swagger.models.version>
-        <swagger.bootstrapui.version>1.9.1</swagger.bootstrapui.version>
+        <swagger.bootstrapui.version>1.9.2</swagger.bootstrapui.version>
         <mybatis.plus.version>3.1.0</mybatis.plus.version>
         <curator.framework.version>4.0.1</curator.framework.version>
         <protostuff.version>1.6.0</protostuff.version>