Browse Source

设置kisso版本3.9.3打通sse支持

hubin 9 months ago
parent
commit
736b30d23a

+ 2 - 2
build.gradle

@@ -8,7 +8,7 @@ ext {
         mavenLocal()
         maven {
             allowInsecureProtocol = true
-            url 'http://git.aizuda.com/api/packages/aizuda/maven'
+            url 'https://git.aizuda.com/api/packages/aizuda/maven'
             credentials(HttpHeaderCredentials) {
                 name = "Authorization"
                 value = "token 7d725429ef7ac5c9fa9a6779f70032d6e42d7f34"
@@ -89,7 +89,7 @@ dependencies {
     implementation("mysql:mysql-connector-java:8.0.33")
 
     // SSO 单点登录
-    implementation("com.baomidou:kisso:3.9.2")
+    implementation("com.baomidou:kisso:3.9.3")
 
     // 本地缓存
     implementation("com.github.ben-manes.caffeine:caffeine")

+ 2 - 2
pom.xml

@@ -27,7 +27,7 @@
 	<repositories>
 		<repository>
 			<id>gitea</id>
-			<url>http://git.aizuda.com/api/packages/aizuda/maven</url>
+			<url>https://git.aizuda.com/api/packages/aizuda/maven</url>
 			<!-- 私服软件下载 maven 配置 settings.xml 文件中:
 			<settings>
 			  <servers>
@@ -115,7 +115,7 @@
 		<dependency>
 			<groupId>com.baomidou</groupId>
 			<artifactId>kisso</artifactId>
-			<version>3.9.2</version>
+			<version>3.9.3</version>
 		</dependency>
 
 		<!-- 本地缓存 -->

+ 6 - 11
src/main/java/com/aizuda/boot/modules/auth/service/impl/AuthServiceImpl.java

@@ -48,19 +48,14 @@ public class AuthServiceImpl implements IAuthService {
         ApiAssert.fail(Objects.equals(0, user.getStatus()), "用户已禁用,请联系管理员");
         ApiAssert.fail(!MD5Salt.isValid(user.getUsername() + user.getSalt()
                 , user.getPassword(), loginParam.getPassword()), "登录密码错误");
-        // 设置登录 COOKIE
-        SSOToken st = new SSOToken();
-        st.setId(user.getId());
-        st.setIssuer(user.getUsername());
-        st.setUserAgent(request);
-        st.setOrigin(TokenOrigin.HTML5);
-        st.setData(new HashMap<>(){{
-            // 设置会话ID,用于区分客户端消息发送
-            put("sid", IdWorker.get32UUID());
-        }});
+
         // 登录信息
         Map<String, Object> loginInfo = new HashMap<>(4);
-        loginInfo.put("token", st.getToken());
+        loginInfo.put("token", new SSOToken().id(user.getId()).issuer(user.getUsername())
+                .userAgent(request).origin(TokenOrigin.HTML5).data(new HashMap<>() {{
+                    // 设置会话ID,用于区分客户端消息发送
+                    put("sid", IdWorker.get32UUID());
+                }}).getToken());
         loginInfo.put("userInfo", new HashMap<String, Object>(2) {{
             put("userId", user.getId());
             put("userName", user.getNickName());