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
d3208344
Commit
d3208344
authored
Apr 12, 2017
by
wudi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
4d01d6f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
PlatformAPIController.java
...b/controller/internal/platform/PlatformAPIController.java
+6
-0
No files found.
src/main/java/cn/quantgroup/xyqb/controller/internal/platform/PlatformAPIController.java
View file @
d3208344
...
@@ -10,6 +10,8 @@ import cn.quantgroup.xyqb.service.merchant.IMerchantService;
...
@@ -10,6 +10,8 @@ import cn.quantgroup.xyqb.service.merchant.IMerchantService;
import
cn.quantgroup.xyqb.service.page.IPageService
;
import
cn.quantgroup.xyqb.service.page.IPageService
;
import
com.google.common.collect.ImmutableMap
;
import
com.google.common.collect.ImmutableMap
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RequestParam
;
...
@@ -22,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
...
@@ -22,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping
(
"/platform/api"
)
@RequestMapping
(
"/platform/api"
)
public
class
PlatformAPIController
implements
IBaseController
{
public
class
PlatformAPIController
implements
IBaseController
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
PlatformAPIController
.
class
);
@Autowired
@Autowired
private
IPageService
pageService
;
private
IPageService
pageService
;
@Autowired
@Autowired
...
@@ -58,6 +63,7 @@ public class PlatformAPIController implements IBaseController {
...
@@ -58,6 +63,7 @@ public class PlatformAPIController implements IBaseController {
if
(
merchantConfig
==
null
)
{
if
(
merchantConfig
==
null
)
{
return
JsonResult
.
buildSuccessResult
(
""
,
null
);
return
JsonResult
.
buildSuccessResult
(
""
,
null
);
}
}
LOGGER
.
info
(
"merchantConfig={}"
,
merchantConfig
);
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
return
JsonResult
.
buildSuccessResult
(
""
,
ImmutableMap
.
of
(
"type"
,
"external"
,
"transition"
,
merchantConfig
.
getConfigValue
()));
}
}
if
(
StringUtils
.
isEmpty
(
nextPage
))
{
if
(
StringUtils
.
isEmpty
(
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