Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
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
08c1d120
Commit
08c1d120
authored
Jun 18, 2021
by
nie'hong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加-新增视频内容必须选择视频分类
parent
56a93cd7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
JwtTokenUtil.java
src/main/java/cn/chnmuseum/party/auth/util/JwtTokenUtil.java
+4
-2
RedisUtil.java
src/main/java/cn/chnmuseum/party/common/util/RedisUtil.java
+2
-2
VideoContentController.java
...hnmuseum/party/web/controller/VideoContentController.java
+3
-0
No files found.
src/main/java/cn/chnmuseum/party/auth/util/JwtTokenUtil.java
View file @
08c1d120
...
@@ -93,9 +93,11 @@ public class JwtTokenUtil {
...
@@ -93,9 +93,11 @@ public class JwtTokenUtil {
// 附带username信息
// 附带username信息
return
JWT
.
create
().
withIssuer
(
jwtTokenIssuer
)
return
JWT
.
create
().
withIssuer
(
jwtTokenIssuer
)
// 创建时间
// 创建时间
.
withIssuedAt
(
DateUtil80
.
getCurrDateTime
()).
withSubject
(
username
)
.
withIssuedAt
(
DateUtil80
.
getCurrDateTime
())
.
withSubject
(
username
)
.
withClaim
(
"user_id"
,
employeeId
)
.
withClaim
(
"user_id"
,
employeeId
)
.
withExpiresAt
(
DateUtil80
.
asDate
(
currentTime
.
plusMinutes
(
240
))).
sign
(
algorithm
);
.
withExpiresAt
(
DateUtil80
.
asDate
(
currentTime
.
plusMinutes
(
240
)))
.
sign
(
algorithm
);
}
}
/**
/**
...
...
src/main/java/cn/chnmuseum/party/common/util/RedisUtil.java
View file @
08c1d120
...
@@ -579,9 +579,9 @@ public class RedisUtil {
...
@@ -579,9 +579,9 @@ public class RedisUtil {
long
requestTime
=
System
.
currentTimeMillis
();
long
requestTime
=
System
.
currentTimeMillis
();
while
(
true
){
while
(
true
){
//等待锁时间
//等待锁时间
long
wa
ti
Time
=
System
.
currentTimeMillis
()
-
requestTime
;
long
wa
it
Time
=
System
.
currentTimeMillis
()
-
requestTime
;
//如果等待锁时间超过10s,加锁失败
//如果等待锁时间超过10s,加锁失败
if
(
wa
ti
Time
>
TIMEOUT
){
if
(
wa
it
Time
>
TIMEOUT
){
log
.
info
(
"等待锁超时 kye:{},value:{}"
,
key
,
value
);
log
.
info
(
"等待锁超时 kye:{},value:{}"
,
key
,
value
);
return
false
;
return
false
;
}
}
...
...
src/main/java/cn/chnmuseum/party/web/controller/VideoContentController.java
View file @
08c1d120
...
@@ -80,6 +80,9 @@ public class VideoContentController extends BaseController {
...
@@ -80,6 +80,9 @@ public class VideoContentController extends BaseController {
if
(!
languageList
.
contains
(
LanguageEnum
.
ZH
.
name
()))
{
if
(!
languageList
.
contains
(
LanguageEnum
.
ZH
.
name
()))
{
return
getFailResult
(
"视频文件必须包含汉语"
);
return
getFailResult
(
"视频文件必须包含汉语"
);
}
}
if
(
StringUtils
.
isBlank
(
videoContent
.
getVideoContentCatId
()))
{
return
getFailResult
(
"视频内容必须选择"
);
}
videoContent
.
setAuditStatus
(
AuditStatusEnum
.
TBC
.
name
());
videoContent
.
setAuditStatus
(
AuditStatusEnum
.
TBC
.
name
());
videoContent
.
setPublished
(
false
);
videoContent
.
setPublished
(
false
);
...
...
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