From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java | 56 ++++++--------------------------------------------------
1 files changed, 6 insertions(+), 50 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
index acc760f..bf15054 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
@@ -1,10 +1,10 @@
package com.moral.api.pojo.vo.login;
import com.fasterxml.jackson.annotation.JsonInclude;
-import com.moral.api.pojo.dto.login.AccountInfoDTO;
+import com.moral.api.pojo.redisBean.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
-import org.springframework.util.ObjectUtils;
/**
* @ClassName LoginVo
@@ -17,50 +17,11 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class LoginVO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public static final String NOT_EXIST = "-1";
-
- /*
- * ������������������
- * */
- public static final String IS_DELETE = "-2";
-
- /*
- * ������������
- * */
- public static final String PASSWORD_ERROR = "-3";
-
- /*
- * ������������������
- * */
- public static final String ROLE_EMPTY = "-4";
-
- /*
- * ������������������
- * */
- public static final String MENU_EMPTY = "-5";
-
- /*
- * ���������
- * */
- private String code;
/*
*������token
* */
private String token;
-
- /*
- * ������������������
- * */
- private AccountInfoVO accountInfoVO;
/**
* @Description: DTO������VO
@@ -70,16 +31,11 @@
* @Date: 2021/3/13
*/
public static LoginVO convert(LoginDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
LoginVO vo = new LoginVO();
- String code = dto.getCode();
- String token = dto.getToken();
- AccountInfoDTO accountInfoDTO = dto.getAccountInfoDTO();
- if (!ObjectUtils.isEmpty(accountInfoDTO)) {
- AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
- vo.setAccountInfoVO(accountInfoVO);
- }
- vo.setToken(token);
- vo.setCode(code);
+ vo.setToken(dto.getToken());
return vo;
}
}
--
Gitblit v1.8.0