Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
chnmuseum-party
Project
Project
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
liqin
chnmuseum-party
Commits
8c80d5be
Commit
8c80d5be
authored
Apr 13, 2021
by
liqin
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fixed
parent
eb8846ae
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
VideoContentCatController.java
...useum/party/web/controller/VideoContentCatController.java
+1
-0
BaseController.java
...y/chnmuseum/party/web/controller/base/BaseController.java
+4
-4
No files found.
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java
View file @
8c80d5be
...
...
@@ -171,6 +171,7 @@ public class VideoContentCatController extends BaseController {
//todo 删除中间关联表
return
getSuccessResult
();
}
...
...
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/base/BaseController.java
View file @
8c80d5be
...
...
@@ -117,7 +117,7 @@ public class BaseController implements Serializable {
*/
protected
Map
<
String
,
Object
>
getFailResult
()
{
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_CODE
.
getKey
(),
"400"
);
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_CODE
.
getKey
(),
RESPONSE_CODE_ENUM
.
SERVER_ERROR
.
getResultCode
()
);
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_MSG
.
getKey
(),
RESPONSE_CODE_ENUM
.
SERVER_ERROR
.
getMessage
());
return
map
;
}
...
...
@@ -143,7 +143,7 @@ public class BaseController implements Serializable {
*/
protected
Map
<
String
,
Object
>
getFailResult
(
String
msg
)
{
Map
<
String
,
Object
>
map
=
new
LinkedHashMap
<>();
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_CODE
.
getKey
(),
RESPONSE_CODE_ENUM
.
PARAM_NOT_VALID
.
getResultCode
());
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_CODE
.
getKey
(),
RESPONSE_CODE_ENUM
.
SERVER_ERROR
.
getResultCode
());
map
.
put
(
RESULT_INFO_ENUM
.
RESULT_MSG
.
getKey
(),
msg
);
return
map
;
}
...
...
@@ -204,7 +204,7 @@ public class BaseController implements Serializable {
if
(
authorization
.
startsWith
(
"Bearer "
))
{
authorization
=
authorization
.
substring
(
7
);
}
}
else
{
}
else
{
throw
new
AuthenticationException
(
"token失效,请重新登录"
);
}
return
JwtTokenUtil
.
getEmployeeId
(
authorization
);
...
...
@@ -221,7 +221,7 @@ public class BaseController implements Serializable {
if
(
authorization
.
startsWith
(
"Bearer "
))
{
authorization
=
authorization
.
substring
(
7
);
}
}
else
{
}
else
{
throw
new
AuthenticationException
(
"token失效,请重新登录"
);
}
return
JwtTokenUtil
.
getUsername
(
authorization
);
...
...
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