From 962516d117343f07fa313bd87ae35675d88a377c Mon Sep 17 00:00:00 2001 From: liuchuang Date: Thu, 21 Nov 2019 14:54:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8E=B7=E5=8F=96token?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=B3=A8=E5=86=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/AuthServiceImpl.java | 12 +++++++----- .../common/token/dto/WorkUserAuthorizationDTO.java | 5 +++++ .../esua/epdc/service/impl/WorkUserServiceImpl.java | 5 ++++- .../dto/constant/GroupConstant.java | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java index 8032d27a2..88cde28c8 100644 --- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java +++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java @@ -14,6 +14,7 @@ import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; import com.elink.esua.epdc.common.token.util.CpUserDetailRedis; import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.ErrorCode; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.log.SysLogLogin; @@ -142,6 +143,9 @@ public class AuthServiceImpl implements AuthService { Result result = userFeignClient.getByUsername(username); UserDetail user = result.getData(); + //授权信息 + WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); + //登录日志 SysLogLogin log = new SysLogLogin(); log.setType(LogTypeEnum.LOGIN.value()); @@ -156,8 +160,8 @@ public class AuthServiceImpl implements AuthService { log.setStatus(LoginStatusEnum.FAIL.value()); log.setCreatorName(username); logProducer.saveLog(log); - - return new Result().error("账号不存在"); + authorization.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(authorization); } //密码错误 @@ -176,7 +180,6 @@ public class AuthServiceImpl implements AuthService { log.setCreator(user.getId()); log.setCreatorName(user.getUsername()); logProducer.saveLog(log); - return new Result().error("账号已停用"); } @@ -186,8 +189,6 @@ public class AuthServiceImpl implements AuthService { //登录成功，生成token String token = jwtUtils.generateToken(user.getId()); - //授权信息 - WorkUserAuthorizationDTO authorization = new WorkUserAuthorizationDTO(); authorization.setToken(token); authorization.setExpire(jwtProperties.getExpire()); @@ -203,6 +204,7 @@ public class AuthServiceImpl implements AuthService { authorization.setDeptName(user.getDeptName()); authorization.setUserTagKey(user.getTypeKey()); + authorization.setRegisterState(NumConstant.ONE_STR); return new Result().ok(authorization); } diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java index 17c83983a..afee518ad 100644 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java +++ b/esua-epdc/epdc-commons/epdc-common-clienttoken/src/main/java/com/elink/esua/epdc/common/token/dto/WorkUserAuthorizationDTO.java @@ -36,6 +36,11 @@ public class WorkUserAuthorizationDTO implements Serializable { */ private String userTagKey; + /** + * 注册状态 0-未注册，1-已注册 + */ + private String registerState; + /** * 用户所有角色权限信息 */ diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java index 435a0e02f..ecd615a05 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java @@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO; import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO; import com.elink.esua.epdc.common.token.dto.WorkUserTokenFormDTO; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -63,7 +64,9 @@ public class WorkUserServiceImpl implements WorkUserService { } SysUserDTO userDto = sysUserDtoResult.getData(); if (null == userDto) { - return new Result().error("用户不存在"); + WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO(); + resultDto.setRegisterState(NumConstant.ZERO_STR); + return new Result().ok(resultDto); } return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class)); diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java index 748399514..f5634a11c 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupConstant.java @@ -17,5 +17,5 @@ public interface GroupConstant { /** * 网格党员群默认头像 */ - String PARTY_GROUP_AVATAR = ""; + String PARTY_GROUP_AVATAR = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_party_group_avatar.png"; }