Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
youjj
cloud-platform
Commits
bd69f2af
Commit
bd69f2af
authored
Aug 09, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d7dcdea7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
AppHomeController.java
...in/java/com/xxfc/platform/app/rest/AppHomeController.java
+1
-1
VehicleFeign.java
...in/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
+1
-1
VehicleModelController.java
...om/xxfc/platform/vehicle/rest/VehicleModelController.java
+2
-3
No files found.
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java
View file @
bd69f2af
...
@@ -52,7 +52,7 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
...
@@ -52,7 +52,7 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
}
else
if
(
type
==
3
){
}
else
if
(
type
==
3
){
list
=
campsiteFeign
.
goodList
(
page
,
limit
);
list
=
campsiteFeign
.
goodList
(
page
,
limit
);
}
else
if
(
type
==
4
){
}
else
if
(
type
==
4
){
list
=
vehicleFeign
.
goodList
(
page
,
limit
);
return
vehicleFeign
.
goodList
(
page
,
limit
);
}
}
return
new
ObjectRestResponse
<>().
rel
(
true
).
data
(
list
);
return
new
ObjectRestResponse
<>().
rel
(
true
).
data
(
list
);
}
}
...
...
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
View file @
bd69f2af
...
@@ -86,7 +86,7 @@ public interface VehicleFeign {
...
@@ -86,7 +86,7 @@ public interface VehicleFeign {
* @return 返回
* @return 返回
*/
*/
@GetMapping
(
"/vehicleModel/goodList"
)
@GetMapping
(
"/vehicleModel/goodList"
)
List
<
GoodDataVO
>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
"limit"
)
Integer
limit
);
ObjectRestResponse
<
List
<
GoodDataVO
>
>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
"limit"
)
Integer
limit
);
/**
/**
* 根据一个id获取城市
* 根据一个id获取城市
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
View file @
bd69f2af
...
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
...
@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.UserFeign
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.feign.dto.UserDTO
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.auth.client.config.UserAuthConfig
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
import
com.github.wxiaoqi.security.common.exception.BaseException
;
...
@@ -297,8 +296,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
...
@@ -297,8 +296,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
@ApiOperation
(
"优质车型"
)
@ApiOperation
(
"优质车型"
)
@GetMapping
(
value
=
"/goodList"
)
@GetMapping
(
value
=
"/goodList"
)
@IgnoreUserToken
@IgnoreUserToken
public
List
<
GoodDataVO
>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
)
Integer
limit
)
{
public
ObjectRestResponse
<
List
<
GoodDataVO
>>
goodList
(
@RequestParam
(
value
=
"page"
)
Integer
page
,
@RequestParam
(
value
=
"limit"
)
Integer
limit
)
{
return
baseBiz
.
goodList
(
page
,
limit
);
return
ObjectRestResponse
.
succ
(
baseBiz
.
goodList
(
page
,
limit
)
);
}
}
@ApiOperation
(
"上下架"
)
@ApiOperation
(
"上下架"
)
@PutMapping
(
value
=
"/setStatus/{id}/{status}"
)
@PutMapping
(
value
=
"/setStatus/{id}/{status}"
)
...
...
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