diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java index 7f67fa189..7b037e824 100644 --- a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java +++ b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java @@ -1,5 +1,23 @@ package com.tencent.supersonic.auth.authentication.utils; +import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig; +import com.tencent.supersonic.auth.api.authentication.pojo.User; +import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword; +import com.tencent.supersonic.common.pojo.exception.AccessException; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.springframework.stereotype.Component; + +import javax.servlet.http.HttpServletRequest; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_ALGORITHM; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN; @@ -10,22 +28,6 @@ import static com.tencent.supersonic.auth.api.authentication.constant.UserConsta import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_NAME; import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_PASSWORD; -import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig; -import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.auth.api.authentication.pojo.UserWithPassword; -import com.tencent.supersonic.common.pojo.exception.AccessException; -import io.jsonwebtoken.Claims; -import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; -import java.nio.charset.StandardCharsets; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - @Slf4j @Component public class UserTokenUtils { @@ -118,15 +120,19 @@ public class UserTokenUtils { String tokenSecret = getTokenSecret(appKey); claims = Jwts.parser() .setSigningKey(tokenSecret.getBytes(StandardCharsets.UTF_8)) - .parseClaimsJws(token.startsWith(TOKEN_PREFIX) - ? token.substring(token.indexOf(TOKEN_PREFIX) + TOKEN_PREFIX.length()).trim() : - token.trim()).getBody(); + .build().parseClaimsJws(getTokenString(token)).getBody(); } catch (Exception e) { throw new AccessException("parse user info from token failed :" + token); } return claims; } + @NotNull + private static String getTokenString(String token) { + return token.startsWith(TOKEN_PREFIX) ? token.substring(token.indexOf(TOKEN_PREFIX) + + TOKEN_PREFIX.length()).trim() : token.trim(); + } + private String generate(Map claims, String appKey) { return toTokenString(claims, appKey); } diff --git a/common/pom.xml b/common/pom.xml index 3f5ff78e6..e3cdf84db 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -253,6 +253,16 @@ + + dev.langchain4j + langchain4j-chatglm + + + org.slf4j + slf4j-simple + + + com.hankcs diff --git a/common/src/main/java/dev/langchain4j/milvus/spring/EmbeddingStoreProperties.java b/common/src/main/java/dev/langchain4j/milvus/spring/EmbeddingStoreProperties.java index c65739e62..a9a595df9 100644 --- a/common/src/main/java/dev/langchain4j/milvus/spring/EmbeddingStoreProperties.java +++ b/common/src/main/java/dev/langchain4j/milvus/spring/EmbeddingStoreProperties.java @@ -10,13 +10,13 @@ import lombok.Setter; @Setter class EmbeddingStoreProperties { + private String uri; private String host; private Integer port; private String collectionName; private Integer dimension; private IndexType indexType; private MetricType metricType; - private String uri; private String token; private String username; private String password; diff --git a/common/src/main/java/dev/langchain4j/milvus/spring/MilvusAutoConfig.java b/common/src/main/java/dev/langchain4j/milvus/spring/MilvusAutoConfig.java index 7f48fb1b2..194c0d328 100644 --- a/common/src/main/java/dev/langchain4j/milvus/spring/MilvusAutoConfig.java +++ b/common/src/main/java/dev/langchain4j/milvus/spring/MilvusAutoConfig.java @@ -1,19 +1,19 @@ package dev.langchain4j.milvus.spring; -import static dev.langchain4j.milvus.spring.Properties.PREFIX; - import dev.langchain4j.store.embedding.EmbeddingStoreFactory; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import static dev.langchain4j.milvus.spring.Properties.PREFIX; + @Configuration @EnableConfigurationProperties(Properties.class) public class MilvusAutoConfig { @Bean - @ConditionalOnProperty(PREFIX + ".embedding-store.base-url") + @ConditionalOnProperty(PREFIX + ".embedding-store.url") EmbeddingStoreFactory milvusChatModel(Properties properties) { return new MilvusEmbeddingStoreFactory(properties); } diff --git a/pom.xml b/pom.xml index 9334705b7..5c0ad69c5 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ 2.1.0 3.5.3 1.18.20 - 20.0 + 32.0.0-jre portable-1.8.3 2.7.2 2.11.2 @@ -47,7 +47,7 @@ 6.13.1 2.14.1 2.12.1 - 0.9.1 + 0.12.3 1.2.3 5.1.46 3.1.2 @@ -225,6 +225,17 @@ + + dev.langchain4j + langchain4j-chatglm + ${langchain4j.version} + + + org.slf4j + slf4j-simple + + + org.springframework.boot