Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
civil-bigdata
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
civil
civil-bigdata
Commits
a8cdb3b0
Commit
a8cdb3b0
authored
Dec 16, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改-续期同时续期加密key
parent
80e3ad9e
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
api-server/src/main/java/com/zq/api/service/ApiService.java
+1
-1
sys-server/src/main/java/com/zq/system/config/CacheKeys.java
+10
-0
sys-server/src/main/java/com/zq/system/config/security/TokenProvider.java
+8
-1
sys-server/src/main/java/com/zq/system/modules/system/service/SsoService.java
+2
-1
No files found.
api-server/src/main/java/com/zq/api/service/ApiService.java
View file @
a8cdb3b0
...
...
@@ -97,7 +97,7 @@ public class ApiService {
}
// 认证签名
String
key
=
redisUtils
.
getStr
(
token
);
String
key
=
redisUtils
.
getStr
(
"civil.apiKey."
+
token
);
String
sign
=
ApiUtils
.
getSign
(
form
.
getSignStr
(
key
==
null
?
""
:
key
));
if
(!
sign
.
equals
(
form
.
getSign
()))
{
return
ApiUtils
.
getCheckSignValidError
(
form
);
...
...
sys-server/src/main/java/com/zq/system/config/CacheKeys.java
View file @
a8cdb3b0
...
...
@@ -20,5 +20,15 @@ public class CacheKeys extends BaseCacheKeys {
return
AUTH_CODE
+
phone
;
}
/**
* 构造加密key的缓存key
*
* @param token
* @return
*/
public
static
String
apiKey
(
String
token
)
{
return
PREFIX
+
"apiKey."
+
token
;
}
}
sys-server/src/main/java/com/zq/system/config/security/TokenProvider.java
View file @
a8cdb3b0
...
...
@@ -18,8 +18,10 @@ import cn.hutool.core.date.DateField;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.util.ObjectUtil
;
import
c
om.zq.common.config.security.SecurityProperties
;
import
c
n.hutool.core.util.StrUtil
;
import
com.zq.common.config.redis.RedisUtils
;
import
com.zq.common.config.security.SecurityProperties
;
import
com.zq.system.config.CacheKeys
;
import
io.jsonwebtoken.Claims
;
import
io.jsonwebtoken.Jwts
;
import
io.jsonwebtoken.SignatureAlgorithm
;
...
...
@@ -120,6 +122,11 @@ public class TokenProvider implements InitializingBean {
if
(
differ
<=
properties
.
getDetect
())
{
long
renew
=
time
+
properties
.
getRenew
();
redisUtils
.
expire
(
properties
.
getOnlineKey
()
+
token
,
renew
,
TimeUnit
.
MILLISECONDS
);
String
key
=
redisUtils
.
getStr
(
CacheKeys
.
apiKey
(
token
));
if
(
StrUtil
.
isNotBlank
(
key
))
{
redisUtils
.
expire
(
CacheKeys
.
apiKey
(
token
),
renew
,
TimeUnit
.
MILLISECONDS
);
}
}
}
...
...
sys-server/src/main/java/com/zq/system/modules/system/service/SsoService.java
View file @
a8cdb3b0
...
...
@@ -13,6 +13,7 @@ import com.zq.common.exception.BusinessException;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.vo.OnlineUserDto
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.system.config.CacheKeys
;
import
com.zq.system.config.RsaProperties
;
import
com.zq.system.config.security.TokenProvider
;
import
com.zq.system.modules.system.dao.BlindUserInfoDao
;
...
...
@@ -166,7 +167,7 @@ public class SsoService {
onlineUserService
.
save
(
jwtUserDto
,
token
,
request
);
String
key
=
IdUtil
.
simpleUUID
();
redisUtils
.
setStr
(
token
,
key
,
properties
.
getTokenValidityInSeconds
()
/
1000
,
TimeUnit
.
SECONDS
);
redisUtils
.
setStr
(
CacheKeys
.
apiKey
(
token
)
,
key
,
properties
.
getTokenValidityInSeconds
()
/
1000
,
TimeUnit
.
SECONDS
);
Map
<
String
,
Object
>
data
=
new
HashMap
<>();
data
.
put
(
"toUrl"
,
toUrl
+
"?"
+
properties
.
getHeader
()
+
"="
+
token
+
"&key="
+
key
);
...
...
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