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
4a00cc66
Commit
4a00cc66
authored
4 years ago
by
jiawei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 用户登录数据库没有过期时间时 出现的空指针异常
parent
4c2e0b9a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
LoginController.java
...va/cn/chnmuseum/party/web/controller/LoginController.java
+3
-3
No files found.
src/main/java/cn/chnmuseum/party/web/controller/LoginController.java
View file @
4a00cc66
package
cn
.
chnmuseum
.
party
.
web
.
controller
;
import
cn.hutool.extra.qrcode.QrCodeUtil
;
import
cn.hutool.extra.qrcode.QrConfig
;
import
cn.chnmuseum.party.auth.SHA256PasswordEncryptionService
;
import
cn.chnmuseum.party.auth.util.AESUtils
;
import
cn.chnmuseum.party.auth.util.JwtTokenUtil
;
...
...
@@ -14,6 +12,8 @@ import cn.chnmuseum.party.service.RoleService;
import
cn.chnmuseum.party.service.impl.MenuServiceImpl
;
import
cn.chnmuseum.party.service.impl.TUserServiceImpl
;
import
cn.chnmuseum.party.web.controller.base.BaseController
;
import
cn.hutool.extra.qrcode.QrCodeUtil
;
import
cn.hutool.extra.qrcode.QrConfig
;
import
com.alibaba.fastjson.JSONObject
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiImplicitParam
;
...
...
@@ -149,7 +149,7 @@ public class LoginController extends BaseController {
}
if
(
user
.
getPermanent
()
!=
null
&&
!
user
.
getPermanent
())
{
if
(
user
.
getEffectiveDate
()
.
isAfter
(
LocalDate
.
now
())
||
user
.
getExiredDate
().
isBefore
(
LocalDate
.
now
()))
{
if
(
user
.
getEffectiveDate
()
!=
null
&&
user
.
getEffectiveDate
().
isAfter
(
LocalDate
.
now
())
||
user
.
getExiredDate
()
!=
null
&&
user
.
getExiredDate
().
isBefore
(
LocalDate
.
now
()))
{
resultMap
.
put
(
"resultCode"
,
"4F00"
);
resultMap
.
put
(
"message"
,
"此帐号已失效,请联系管理员!"
);
return
resultMap
;
...
...
This diff is collapsed.
Click to expand it.
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