用户获取token接口添加注册状态字段

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<UserDetail> 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);
-
+            authorization.setRegisterState(NumConstant.ZERO_STR);
-            return new Result<WorkUserAuthorizationDTO>().error("账号不存在");
+            return new Result<WorkUserAuthorizationDTO>().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<WorkUserAuthorizationDTO>().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<WorkUserAuthorizationDTO>().ok(authorization);
     }

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;
+
     /**
      * 用户所有角色权限信息
      */

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<WorkUserAuthorizationDTO>().error("用户不存在");
+            WorkUserAuthorizationDTO resultDto = new WorkUserAuthorizationDTO();
+            resultDto.setRegisterState(NumConstant.ZERO_STR);
+            return new Result<WorkUserAuthorizationDTO>().ok(resultDto);
         }
 
         return resourceFeignClient.getToken(ConvertUtils.sourceToTarget(userDto, WorkUserTokenFormDTO.class));

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";
 }