From 83c0b70a2d8e67e371b40322f1a8529ca13e3827 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 11 二月 2022 17:30:38 +0800
Subject: [PATCH] fix 修复 验证码 强制校验问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java | 339 ++++++++++++++++++--------------------------------------
1 files changed, 111 insertions(+), 228 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
index a8b1126..9f7186c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
@@ -1,228 +1,111 @@
-package com.ruoyi.common.core.domain.model;
-
-import java.util.Collection;
-import java.util.Set;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.ruoyi.common.core.domain.entity.SysUser;
-
-/**
- * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
- *
- * @author ruoyi
- */
-public class LoginUser implements UserDetails
-{
- private static final long serialVersionUID = 1L;
-
- /**
- * 鐢ㄦ埛鍞竴鏍囪瘑
- */
- private String token;
-
- /**
- * 鐧婚檰鏃堕棿
- */
- private Long loginTime;
-
- /**
- * 杩囨湡鏃堕棿
- */
- private Long expireTime;
-
- /**
- * 鐧诲綍IP鍦板潃
- */
- private String ipaddr;
-
- /**
- * 鐧诲綍鍦扮偣
- */
- private String loginLocation;
-
- /**
- * 娴忚鍣ㄧ被鍨�
- */
- private String browser;
-
- /**
- * 鎿嶄綔绯荤粺
- */
- private String os;
-
- /**
- * 鏉冮檺鍒楄〃
- */
- private Set<String> permissions;
-
- /**
- * 鐢ㄦ埛淇℃伅
- */
- private SysUser user;
-
- public String getToken()
- {
- return token;
- }
-
- public void setToken(String token)
- {
- this.token = token;
- }
-
- public LoginUser()
- {
- }
-
- public LoginUser(SysUser user, Set<String> permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
-
- @JsonIgnore
- @Override
- public String getPassword()
- {
- return user.getPassword();
- }
-
- @Override
- public String getUsername()
- {
- return user.getUserName();
- }
-
- /**
- * 璐︽埛鏄惁鏈繃鏈�,杩囨湡鏃犳硶楠岃瘉
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonExpired()
- {
- return true;
- }
-
- /**
- * 鎸囧畾鐢ㄦ埛鏄惁瑙ｉ攣,閿佸畾鐨勭敤鎴锋棤娉曡繘琛岃韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isAccountNonLocked()
- {
- return true;
- }
-
- /**
- * 鎸囩ず鏄惁宸茶繃鏈熺殑鐢ㄦ埛鐨勫嚟鎹�(瀵嗙爜),杩囨湡鐨勫嚟鎹槻姝㈣璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isCredentialsNonExpired()
- {
- return true;
- }
-
- /**
- * 鏄惁鍙敤 ,绂佺敤鐨勭敤鎴蜂笉鑳借韩浠介獙璇�
- *
- * @return
- */
- @JsonIgnore
- @Override
- public boolean isEnabled()
- {
- return true;
- }
-
- public Long getLoginTime()
- {
- return loginTime;
- }
-
- public void setLoginTime(Long loginTime)
- {
- this.loginTime = loginTime;
- }
-
- public String getIpaddr()
- {
- return ipaddr;
- }
-
- public void setIpaddr(String ipaddr)
- {
- this.ipaddr = ipaddr;
- }
-
- public String getLoginLocation()
- {
- return loginLocation;
- }
-
- public void setLoginLocation(String loginLocation)
- {
- this.loginLocation = loginLocation;
- }
-
- public String getBrowser()
- {
- return browser;
- }
-
- public void setBrowser(String browser)
- {
- this.browser = browser;
- }
-
- public String getOs()
- {
- return os;
- }
-
- public void setOs(String os)
- {
- this.os = os;
- }
-
- public Long getExpireTime()
- {
- return expireTime;
- }
-
- public void setExpireTime(Long expireTime)
- {
- this.expireTime = expireTime;
- }
-
- public Set<String> getPermissions()
- {
- return permissions;
- }
-
- public void setPermissions(Set<String> permissions)
- {
- this.permissions = permissions;
- }
-
- public SysUser getUser()
- {
- return user;
- }
-
- public void setUser(SysUser user)
- {
- this.user = user;
- }
-
- @Override
- public Collection<? extends GrantedAuthority> getAuthorities()
- {
- return null;
- }
-}
+package com.ruoyi.common.core.domain.model;
+
+import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.ruoyi.common.helper.LoginHelper;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 鐧诲綍鐢ㄦ埛韬唤鏉冮檺
+ *
+ * @author Lion Li
+ */
+
+@Data
+@NoArgsConstructor
+public class LoginUser implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鐢ㄦ埛ID
+ */
+ private Long userId;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ private Long deptId;
+
+ /**
+ * 閮ㄩ棬鍚�
+ */
+ private String deptName;
+
+ /**
+ * 鐢ㄦ埛鍞竴鏍囪瘑
+ */
+ private String token;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷
+ */
+ private String userType;
+
+ /**
+ * 鐧诲綍鏃堕棿
+ */
+ private Long loginTime;
+
+ /**
+ * 杩囨湡鏃堕棿
+ */
+ private Long expireTime;
+
+ /**
+ * 鐧诲綍IP鍦板潃
+ */
+ private String ipaddr;
+
+ /**
+ * 鐧诲綍鍦扮偣
+ */
+ private String loginLocation;
+
+ /**
+ * 娴忚鍣ㄧ被鍨�
+ */
+ private String browser;
+
+ /**
+ * 鎿嶄綔绯荤粺
+ */
+ private String os;
+
+ /**
+ * 鑿滃崟鏉冮檺
+ */
+ private Set<String> menuPermission;
+
+ /**
+ * 瑙掕壊鏉冮檺
+ */
+ private Set<String> rolePermission;
+
+ /**
+ * 鐢ㄦ埛鍚�
+ */
+ private String username;
+
+ /**
+ * 瑙掕壊瀵硅薄
+ */
+ private List<RoleDTO> roles;
+
+ /**
+ * 鏁版嵁鏉冮檺 褰撳墠瑙掕壊ID
+ */
+ private Long roleId;
+
+ /**
+ * 鑾峰彇鐧诲綍id
+ */
+ public String getLoginId() {
+ return userType + LoginHelper.JOIN_CODE + userId;
+ }
+
+}
--
Gitblit v1.9.3