Merge branch 'master' into 20180625-acolyte-buddhistscriptures

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/config/swagger/SwaggerConfig.java

pom.xml

@@ -2,6 +2,11 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.quantgroup</groupId>
+        <artifactId>commons-parent</artifactId>
+        <version>0.2.4</version>
+    </parent>
 
     <artifactId>xyqb-user2</artifactId>
     <version>0.0.1-SNAPSHOT</version>
@@ -10,12 +15,6 @@
     <name>xyqb-user2</name>
     <description>xyqb web application</description>
 
-    <parent>
-        <groupId>cn.quantgroup</groupId>
-        <artifactId>commons-parent</artifactId>
-        <version>0.2.4</version>
-    </parent>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>1.8</java.version>

src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java

@@ -67,7 +67,7 @@ public class PlatformAPIController implements IBaseController {
             }
             return JsonResult.buildSuccessResult("", ImmutableMap.of("type", "external", "transition", merchantConfig.getConfigValue()));
         }
-        if (StringUtils.isEmpty(nextPage)) {
+        if (StringUtils.isBlank(nextPage)) {
             return JsonResult.buildErrorStateResult("", null);
         }
         return JsonResult.buildSuccessResult("", ImmutableMap.of("type", "user", "transition", nextPage));