Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
E
enterprise-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
enterprise-platform
Commits
0361b046
Commit
0361b046
authored
Dec 18, 2024
by
廖旭伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改测试bug
parent
8c40dcb5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/FeedbackApiController.java
.../mortals/xhx/busiz/applets/web/FeedbackApiController.java
+1
-1
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/NewsApiController.java
.../com/mortals/xhx/busiz/applets/web/NewsApiController.java
+1
-1
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/ProductApiController.java
...m/mortals/xhx/busiz/applets/web/ProductApiController.java
+1
-1
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java
...com/mortals/xhx/busiz/applets/web/StaffApiController.java
+4
-3
No files found.
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/FeedbackApiController.java
View file @
0361b046
...
@@ -64,7 +64,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq>{
...
@@ -64,7 +64,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq>{
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
PageInfo
pageInfo
=
buildPageInfo
(
feedbackReq
);
PageInfo
pageInfo
=
buildPageInfo
(
feedbackReq
);
...
...
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/NewsApiController.java
View file @
0361b046
...
@@ -101,7 +101,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
...
@@ -101,7 +101,7 @@ public class NewsApiController extends AbstractBaseController<NewsReq> {
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
PageInfo
pageInfo
=
buildPageInfo
(
newsReq
);
PageInfo
pageInfo
=
buildPageInfo
(
newsReq
);
...
...
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/ProductApiController.java
View file @
0361b046
...
@@ -75,7 +75,7 @@ public class ProductApiController extends AbstractBaseController<ProductReq>{
...
@@ -75,7 +75,7 @@ public class ProductApiController extends AbstractBaseController<ProductReq>{
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Map
<
String
,
Object
>
model
=
new
HashMap
<>();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
PageInfo
pageInfo
=
buildPageInfo
(
productReq
);
PageInfo
pageInfo
=
buildPageInfo
(
productReq
);
...
...
enterprise-manager/src/main/java/com/mortals/xhx/busiz/applets/web/StaffApiController.java
View file @
0361b046
...
@@ -67,7 +67,8 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
...
@@ -67,7 +67,8 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
Rest
<
Object
>
rest
=
Rest
.
ok
();
Rest
<
Object
>
rest
=
Rest
.
ok
();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
//throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
...
@@ -100,7 +101,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
...
@@ -100,7 +101,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
Rest
<
Object
>
rest
=
Rest
.
ok
();
Rest
<
Object
>
rest
=
Rest
.
ok
();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
...
@@ -133,7 +134,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
...
@@ -133,7 +134,7 @@ public class StaffApiController extends AbstractBaseController<StaffReq>{
Rest
<
Object
>
rest
=
Rest
.
ok
();
Rest
<
Object
>
rest
=
Rest
.
ok
();
Context
context
=
this
.
getContext
();
Context
context
=
this
.
getContext
();
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
if
(
ObjectUtils
.
isEmpty
(
context
)
||
ObjectUtils
.
isEmpty
(
context
.
getUser
()))
{
throw
new
AppException
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
return
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
);
}
}
try
{
try
{
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
if
(!
ObjectUtils
.
isEmpty
(
staffReq
.
getId
())){
...
...
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