Explorar o código

返回码,402token过期,406账号其他地方登陆

sunhh %!s(int64=2) %!d(string=hai) anos
pai
achega
ba8d760324

+ 10 - 0
base-common/src/main/java/com/ozs/common/constant/HttpStatus.java

@@ -52,6 +52,16 @@ public class HttpStatus
      */
     public static final int UNAUTHORIZED = 401;
 
+    /**
+     * token过期
+     */
+    public static final int TOKENEXPIRE = 402;
+
+    /**
+     * 账号其他地方登陆
+     */
+    public static final int LOGINELSEWHWERE = 406;
+
     /**
      * 访问受限,授权过期
      */

+ 35 - 67
base-common/src/main/java/com/ozs/common/core/domain/model/LoginUser.java

@@ -2,6 +2,7 @@ package com.ozs.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.alibaba.fastjson2.annotation.JSONField;
@@ -12,8 +13,7 @@ import com.ozs.common.core.domain.entity.SysUser;
  *
  * @author hx
  */
-public class LoginUser implements UserDetails
-{
+public class LoginUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -76,13 +76,11 @@ public class LoginUser implements UserDetails
      */
     private SysUser user;
 
-    public Long getId()
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setId(Long id)
-    {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -94,40 +92,33 @@ public class LoginUser implements UserDetails
         this.userId = userId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptId(Long deptId)
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public String getToken()
-    {
+    public String getToken() {
         return token;
     }
 
-    public void setToken(String token)
-    {
+    public void setToken(String token) {
         this.token = token;
     }
 
-    public LoginUser()
-    {
+    public LoginUser() {
     }
 
-    public LoginUser(SysUser user, Set<String> permissions)
-    {
+    public LoginUser(SysUser user, Set<String> permissions) {
         this.user = user;
         this.permissions = permissions;
     }
 
-    public LoginUser(Long id,String userId, Long deptId, SysUser user, Set<String> permissions)
-    {
+    public LoginUser(Long id, String userId, Long deptId, SysUser user, Set<String> permissions) {
         this.id = id;
-        this.userId=userId;
+        this.userId = userId;
         this.deptId = deptId;
         this.user = user;
         this.permissions = permissions;
@@ -135,14 +126,12 @@ public class LoginUser implements UserDetails
 
     @JSONField(serialize = false)
     @Override
-    public String getPassword()
-    {
+    public String getPassword() {
         return user.getPassword();
     }
 
     @Override
-    public String getUsername()
-    {
+    public String getUsername() {
         return user.getUserName();
     }
 
@@ -151,8 +140,7 @@ public class LoginUser implements UserDetails
      */
     @JSONField(serialize = false)
     @Override
-    public boolean isAccountNonExpired()
-    {
+    public boolean isAccountNonExpired() {
         return true;
     }
 
@@ -163,8 +151,7 @@ public class LoginUser implements UserDetails
      */
     @JSONField(serialize = false)
     @Override
-    public boolean isAccountNonLocked()
-    {
+    public boolean isAccountNonLocked() {
         return true;
     }
 
@@ -175,8 +162,7 @@ public class LoginUser implements UserDetails
      */
     @JSONField(serialize = false)
     @Override
-    public boolean isCredentialsNonExpired()
-    {
+    public boolean isCredentialsNonExpired() {
         return true;
     }
 
@@ -187,94 +173,76 @@ public class LoginUser implements UserDetails
      */
     @JSONField(serialize = false)
     @Override
-    public boolean isEnabled()
-    {
+    public boolean isEnabled() {
         return true;
     }
 
-    public Long getLoginTime()
-    {
+    public Long getLoginTime() {
         return loginTime;
     }
 
-    public void setLoginTime(Long loginTime)
-    {
+    public void setLoginTime(Long loginTime) {
         this.loginTime = loginTime;
     }
 
-    public String getIpaddr()
-    {
+    public String getIpaddr() {
         return ipaddr;
     }
 
-    public void setIpaddr(String ipaddr)
-    {
+    public void setIpaddr(String ipaddr) {
         this.ipaddr = ipaddr;
     }
 
-    public String getLoginLocation()
-    {
+    public String getLoginLocation() {
         return loginLocation;
     }
 
-    public void setLoginLocation(String loginLocation)
-    {
+    public void setLoginLocation(String loginLocation) {
         this.loginLocation = loginLocation;
     }
 
-    public String getBrowser()
-    {
+    public String getBrowser() {
         return browser;
     }
 
-    public void setBrowser(String browser)
-    {
+    public void setBrowser(String browser) {
         this.browser = browser;
     }
 
-    public String getOs()
-    {
+    public String getOs() {
         return os;
     }
 
-    public void setOs(String os)
-    {
+    public void setOs(String os) {
         this.os = os;
     }
 
-    public Long getExpireTime()
-    {
+    public Long getExpireTime() {
         return expireTime;
     }
 
-    public void setExpireTime(Long expireTime)
-    {
+    public void setExpireTime(Long expireTime) {
         this.expireTime = expireTime;
     }
 
-    public Set<String> getPermissions()
-    {
+    public Set<String> getPermissions() {
         return permissions;
     }
 
-    public void setPermissions(Set<String> permissions)
-    {
+    public void setPermissions(Set<String> permissions) {
         this.permissions = permissions;
     }
 
-    public SysUser getUser()
-    {
+    public SysUser getUser() {
         return user;
     }
 
-    public void setUser(SysUser user)
-    {
+    public void setUser(SysUser user) {
         this.user = user;
     }
 
     @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
-    {
+    public Collection<? extends GrantedAuthority> getAuthorities() {
         return null;
     }
 }

+ 11 - 10
base-framework/src/main/java/com/ozs/framework/security/handle/AuthenticationEntryPointImpl.java

@@ -30,8 +30,7 @@ import com.ozs.common.utils.StringUtils;
  * @author hx
  */
 @Component
-public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable
-{
+public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable {
     private static final long serialVersionUID = -8970718410437077606L;
     @Autowired
     private TokenService tokenService;
@@ -42,13 +41,15 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
 
     @Override
     public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException e)
-            throws IOException
-    {
-        int code = HttpStatus.UNAUTHORIZED;
+            throws IOException {
+        // 账号其他地方登陆
+        int code406 = HttpStatus.LOGINELSEWHWERE;
+        // token过期
+        int code402 = HttpStatus.TOKENEXPIRE;
         String token = tokenService.getToken(request);
         if (StringUtils.isNotEmpty(token)) {
             try {
-                Claims claims =tokenService.parseToken(token);
+                Claims claims = tokenService.parseToken(token);
                 String app = "";
                 // 解析对应的权限以及用户信息
                 String uuid = (String) claims.get(Constants.LOGIN_USER_KEY);
@@ -61,11 +62,11 @@ public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, S
                 SysLoginInfo loginTime = iSysLoginInfoService.getLoginTime(user.getUsername());
                 SimpleDateFormat dateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 String format1 = dateFormat1.format(loginTime.getLoginTime());
-                String msg = StringUtils.format("请求访问:{},认证失败,无法访问系统资源"+format1, request.getRequestURI());
-                ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code, msg)));
-            }catch (Exception exception){
+                String msg = StringUtils.format("请求访问:{},认证失败,无法访问系统资源" + format1, request.getRequestURI());
+                ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code406, msg)));
+            } catch (Exception exception) {
                 String msg = StringUtils.format("token已过期", request.getRequestURI());
-                ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(402, msg)));
+                ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.error(code402, msg)));
             }
         }
     }