diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java index c2f7b757..f0b4d1e5 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java @@ -4,16 +4,29 @@ import java.io.Serializable; import java.util.Set; import com.bonus.sgzb.system.api.domain.SysUser; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Negative; /** * 用户信息 * * @author ruoyi */ +@Data +@AllArgsConstructor +@NoArgsConstructor public class LoginUser implements Serializable { private static final long serialVersionUID = 1L; + /** + * 唯一标识 + */ + private Integer code; + /** * 用户唯一标识 */ diff --git a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java index 080b0269..f1a61e67 100644 --- a/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java +++ b/sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java @@ -60,6 +60,9 @@ public class TokenController { String decryptedData = RsaUtil.decryptByPrivateKey(form.getPassword(), Constants.privateKey); // 用户登录 LoginUser userInfo = sysLoginService.login(form.getUsername(), decryptedData); + if (decryptedData.equals(Constants.USER_PASSWORD)) { + userInfo.setCode(1); + } String uuid = form.getUuid(); String captcha = redisService.getCacheObject(CacheConstants.CAPTCHA_CODE_KEY + uuid).toString(); if (StringUtils.isBlank(captcha)) {