Răsfoiți Sursa

新增我的任务查询

hubin 1 an în urmă
părinte
comite
00c3c5e667

+ 13 - 6
aizuda-service-parent/src/main/java/com/aizuda/service/web/UserSession.java

@@ -10,7 +10,6 @@ import com.aizuda.service.spring.SpringHelper;
 import com.baomidou.kisso.SSOHelper;
 import com.baomidou.kisso.security.token.SSOToken;
 import jakarta.servlet.http.HttpServletRequest;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,11 +25,19 @@ import java.util.Objects;
  */
 @Getter
 @Setter
-@Builder
 public class UserSession {
-    private Long id;
+    private String userId;
     private String username;
 
+    public UserSession(String id, String issuer) {
+        this.userId = id;
+        this.username = issuer;
+    }
+
+    public Long getId() {
+        return Long.valueOf(this.userId);
+    }
+
     public static UserSession getLoginInfo() {
         return getLoginInfo(false);
     }
@@ -41,11 +48,11 @@ public class UserSession {
 
     public static UserSession getLoginInfo(HttpServletRequest request, boolean allowNull) {
         SSOToken ssoToken = getSSOToken(request);
-        if (null == ssoToken && allowNull) {
+        if (allowNull && null == ssoToken) {
             return null;
         }
-        ApiAssert.fail("未登录");
-        return new UserSession(Long.valueOf(ssoToken.getId()), ssoToken.getIssuer());
+        ApiAssert.fail(null == ssoToken, "未登录");
+        return new UserSession(ssoToken.getId(), ssoToken.getIssuer());
     }
 
     /**