Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
head_group
xyqb-user2
Commits
bffa035a
Commit
bffa035a
authored
Jun 25, 2018
by
技术部-任文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
规范代码顺序
parent
d491a5c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
7 deletions
+6
-7
pom.xml
pom.xml
+5
-6
PlatformAPIController.java
...b/controller/internal/platform/PlatformAPIController.java
+1
-1
No files found.
pom.xml
View file @
bffa035a
...
@@ -2,6 +2,11 @@
...
@@ -2,6 +2,11 @@
<project
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xmlns=
"http://maven.apache.org/POM/4.0.0"
<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"
>
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>
<modelVersion>
4.0.0
</modelVersion>
<parent>
<groupId>
cn.quantgroup
</groupId>
<artifactId>
commons-parent
</artifactId>
<version>
0.2.4
</version>
</parent>
<artifactId>
xyqb-user2
</artifactId>
<artifactId>
xyqb-user2
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<version>
0.0.1-SNAPSHOT
</version>
...
@@ -10,12 +15,6 @@
...
@@ -10,12 +15,6 @@
<name>
xyqb-user2
</name>
<name>
xyqb-user2
</name>
<description>
xyqb web application
</description>
<description>
xyqb web application
</description>
<parent>
<groupId>
cn.quantgroup
</groupId>
<artifactId>
commons-parent
</artifactId>
<version>
0.2.4
</version>
</parent>
<properties>
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<java.version>
1.8
</java.version>
<java.version>
1.8
</java.version>
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java
View file @
bffa035a
...
@@ -67,7 +67,7 @@ public class PlatformAPIController implements IBaseController {
...
@@ -67,7 +67,7 @@ public class PlatformAPIController implements IBaseController {
}
}
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
}
}
if
(
StringUtils
.
is
Empty
(
nextPage
))
{
if
(
StringUtils
.
is
Blank
(
nextPage
))
{
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
return
JsonResult
.
buildErrorStateResult
(
""
,
null
);
}
}
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"user"
,
"transition"
,
nextPage
));
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"user"
,
"transition"
,
nextPage
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment