Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-webapp-plug
Overview
Overview
Details
Activity
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
base_platform_enterprise
gic-webapp-plug
Commits
4bceae29
Commit
4bceae29
authored
Jul 31, 2019
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加注释
parent
f76e213f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
StoreGroupController.java
...ava/com/gic/plug/web/controller/StoreGroupController.java
+1
-1
GlobalExceptionHandler.java
...va/com/gic/plug/web/exception/GlobalExceptionHandler.java
+2
-2
No files found.
src/main/java/com/gic/plug/web/controller/StoreGroupController.java
View file @
4bceae29
...
...
@@ -29,7 +29,7 @@ public class StoreGroupController {
public
RestResponse
listStoreGroup
()
{
StoreGroupDTO
dto
=
new
StoreGroupDTO
();
dto
.
setEnterpriseId
(
StoreGroupConstant
.
TEST_ENTERPRISE_ID
);
List
<
StoreGroupDTO
>
list
=
storeGroupApiService
.
listStoreGroup
(
dto
);
List
<
StoreGroupDTO
>
list
=
storeGroupApiService
.
listStoreGroup
(
dto
)
.
getResult
()
;
return
RestResponse
.
success
(
ChangeListToTree
.
changeListToTreeNotIncludeAllStore
(
StoreGroupConstant
.
ALL_STORE_LEVEL
,
list
));
}
}
src/main/java/com/gic/plug/web/exception/GlobalExceptionHandler.java
View file @
4bceae29
...
...
@@ -29,7 +29,7 @@ public class GlobalExceptionHandler {
@ExceptionHandler
(
Exception
.
class
)
public
RestResponse
controllerException
(
HttpServletResponse
response
,
Exception
ex
)
{
logger
.
error
(
"err"
,
ex
);
RestResponse
failureResponse
=
getRestResponse
(
StoreGroupErrorEnum
.
E
rror
.
getCode
(),
StoreGroupErrorEnum
.
Error
.
getMessage
());
RestResponse
failureResponse
=
getRestResponse
(
StoreGroupErrorEnum
.
E
RROR
.
getCode
(),
StoreGroupErrorEnum
.
ERROR
.
getMessage
());
StringBuilder
sb
=
new
StringBuilder
();
ByteArrayOutputStream
baos
=
new
ByteArrayOutputStream
();
try
(
PrintWriter
printWriter
=
new
PrintWriter
(
baos
))
{
...
...
@@ -63,7 +63,7 @@ public class GlobalExceptionHandler {
.
append
(
fieldError
.
getDefaultMessage
())
.
append
(
","
);
});
return
getRestResponse
(
StoreGroupErrorEnum
.
E
rror
.
getCode
(),
errorMessage
.
toString
());
return
getRestResponse
(
StoreGroupErrorEnum
.
E
RROR
.
getCode
(),
errorMessage
.
toString
());
}
/**
...
...
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