[fix][auth]Fix user registration and resetPassword issue.

2025-12-11 12:07:42 +00:00 · 2025-02-13 23:37:18 +08:00
parent 89e07509de
commit 6cc145935d
16 changed files with 81 additions and 77 deletions
--- a/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java
+++ b/common/src/main/java/com/tencent/supersonic/common/config/EmbeddingStoreParameterConfig.java
@@ -17,9 +17,10 @@ import java.util.List;
 public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static final String MODULE_NAME = "向量数据库配置";

-    public static final Parameter EMBEDDING_STORE_PROVIDER = new Parameter(
-            "s2.embedding.store.provider", EmbeddingStoreType.IN_MEMORY.name(), "向量库类型",
-            "目前支持四种类型：IN_MEMORY、MILVUS、CHROMA、PGVECTOR、OPENSEARCH", "list", MODULE_NAME, getCandidateValues());
+    public static final Parameter EMBEDDING_STORE_PROVIDER =
+            new Parameter("s2.embedding.store.provider", EmbeddingStoreType.IN_MEMORY.name(),
+                    "向量库类型", "目前支持四种类型：IN_MEMORY、MILVUS、CHROMA、PGVECTOR、OPENSEARCH", "list",
+                    MODULE_NAME, getCandidateValues());

    public static final Parameter EMBEDDING_STORE_BASE_URL =
            new Parameter("s2.embedding.store.base.url", "", "BaseUrl", "", "string", MODULE_NAME,
@@ -93,8 +94,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static List<Parameter.Dependency> getBaseUrlDependency() {
        return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
                Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
-                        EmbeddingStoreType.CHROMA.name(),
-                        EmbeddingStoreType.PGVECTOR.name(),
+                        EmbeddingStoreType.CHROMA.name(), EmbeddingStoreType.PGVECTOR.name(),
                        EmbeddingStoreType.OPENSEARCH.name()),
                ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "http://localhost:19530",
                        EmbeddingStoreType.CHROMA.name(), "http://localhost:8000",
@@ -117,8 +117,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static List<Parameter.Dependency> getDimensionDependency() {
        return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
                Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
-                        EmbeddingStoreType.PGVECTOR.name(),
-                        EmbeddingStoreType.OPENSEARCH.name()),
+                        EmbeddingStoreType.PGVECTOR.name(), EmbeddingStoreType.OPENSEARCH.name()),
                ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "384",
                        EmbeddingStoreType.PGVECTOR.name(), "512",
                        EmbeddingStoreType.OPENSEARCH.name(), "512"));
@@ -127,8 +126,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static List<Parameter.Dependency> getDatabaseNameDependency() {
        return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
                Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
-                        EmbeddingStoreType.PGVECTOR.name(),
-                        EmbeddingStoreType.OPENSEARCH.name()),
+                        EmbeddingStoreType.PGVECTOR.name(), EmbeddingStoreType.OPENSEARCH.name()),
                ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "",
                        EmbeddingStoreType.PGVECTOR.name(), "postgres",
                        EmbeddingStoreType.OPENSEARCH.name(), "ai_sql"));
@@ -143,8 +141,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static List<Parameter.Dependency> getUserDependency() {
        return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
                Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
-                        EmbeddingStoreType.PGVECTOR.name(),
-                        EmbeddingStoreType.OPENSEARCH.name()),
+                        EmbeddingStoreType.PGVECTOR.name(), EmbeddingStoreType.OPENSEARCH.name()),
                ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "milvus",
                        EmbeddingStoreType.PGVECTOR.name(), "postgres",
                        EmbeddingStoreType.OPENSEARCH.name(), "opensearch"));
@@ -153,8 +150,7 @@ public class EmbeddingStoreParameterConfig extends ParameterConfig {
    private static List<Parameter.Dependency> getPasswordDependency() {
        return getDependency(EMBEDDING_STORE_PROVIDER.getName(),
                Lists.newArrayList(EmbeddingStoreType.MILVUS.name(),
-                        EmbeddingStoreType.PGVECTOR.name(),
-                        EmbeddingStoreType.OPENSEARCH.name()),
+                        EmbeddingStoreType.PGVECTOR.name(), EmbeddingStoreType.OPENSEARCH.name()),
                ImmutableMap.of(EmbeddingStoreType.MILVUS.name(), "milvus",
                        EmbeddingStoreType.PGVECTOR.name(), "postgres",
                        EmbeddingStoreType.OPENSEARCH.name(), "opensearch"));
--- a/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java
+++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java
@@ -518,14 +518,15 @@ public class SqlReplaceHelper {
        }
        // Alias columns
        for (SelectItem<?> selectItem : plainSelect.getSelectItems()) {
-            if (selectItem.getExpression() instanceof Column){
+            if (selectItem.getExpression() instanceof Column) {
                replaceColumn((Column) selectItem.getExpression(), aliasReplacedMap, true);
            }
        }
        // Having
        Expression having = plainSelect.getHaving();
        if (Objects.nonNull(having)) {
-            ExpressionReplaceVisitor expressionReplaceVisitor = new ExpressionReplaceVisitor(aliasReplacedMap);
+            ExpressionReplaceVisitor expressionReplaceVisitor =
+                    new ExpressionReplaceVisitor(aliasReplacedMap);
            having.accept(expressionReplaceVisitor);
        }
        return selectStatement.toString();
--- a/common/src/main/java/com/tencent/supersonic/common/pojo/ChatModelParameters.java
+++ b/common/src/main/java/com/tencent/supersonic/common/pojo/ChatModelParameters.java
@@ -34,8 +34,8 @@ public class ChatModelParameters {
    public static final Parameter CHAT_MODEL_API_KEY = new Parameter("apiKey", "", "ApiKey", "",
            "password", MODULE_NAME, null, getApiKeyDependency());

-    public static final Parameter CHAT_MODEL_API_VERSION = new Parameter("apiVersion", "2024-02-01", "ApiVersion", "",
-            "string", MODULE_NAME, null, getApiVersionDependency());
+    public static final Parameter CHAT_MODEL_API_VERSION = new Parameter("apiVersion", "2024-02-01",
+            "ApiVersion", "", "string", MODULE_NAME, null, getApiVersionDependency());

    public static final Parameter CHAT_MODEL_ENDPOINT = new Parameter("endpoint", "llama_2_70b",
            "Endpoint", "", "string", MODULE_NAME, null, getEndpointDependency());
@@ -95,8 +95,8 @@ public class ChatModelParameters {

    private static List<Parameter.Dependency> getApiVersionDependency() {
        return getDependency(CHAT_MODEL_PROVIDER.getName(),
-                Lists.newArrayList(OpenAiModelFactory.PROVIDER),
-                ImmutableMap.of(OpenAiModelFactory.PROVIDER, OpenAiModelFactory.DEFAULT_API_VERSION));
+                Lists.newArrayList(OpenAiModelFactory.PROVIDER), ImmutableMap
+                        .of(OpenAiModelFactory.PROVIDER, OpenAiModelFactory.DEFAULT_API_VERSION));
    }

    private static List<Parameter.Dependency> getModelNameDependency() {
--- a/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModel.java
+++ b/common/src/main/java/dev/langchain4j/model/openai/OpenAiChatModel.java
@@ -89,13 +89,14 @@ public class OpenAiChatModel implements ChatLanguageModel, TokenCountEstimator {
    private final List<ChatModelListener> listeners;

    @Builder
-    public OpenAiChatModel(String baseUrl, String apiKey, String organizationId, String modelName, String apiVersion,
-            Double temperature, Double topP, List<String> stop, Integer maxTokens,
-            Double presencePenalty, Double frequencyPenalty, Map<String, Integer> logitBias,
-            String responseFormat, Boolean strictJsonSchema, Integer seed, String user,
-            Boolean strictTools, Boolean parallelToolCalls, Duration timeout, Integer maxRetries,
-            Proxy proxy, Boolean logRequests, Boolean logResponses, Tokenizer tokenizer,
-            Map<String, String> customHeaders, List<ChatModelListener> listeners) {
+    public OpenAiChatModel(String baseUrl, String apiKey, String organizationId, String modelName,
+            String apiVersion, Double temperature, Double topP, List<String> stop,
+            Integer maxTokens, Double presencePenalty, Double frequencyPenalty,
+            Map<String, Integer> logitBias, String responseFormat, Boolean strictJsonSchema,
+            Integer seed, String user, Boolean strictTools, Boolean parallelToolCalls,
+            Duration timeout, Integer maxRetries, Proxy proxy, Boolean logRequests,
+            Boolean logResponses, Tokenizer tokenizer, Map<String, String> customHeaders,
+            List<ChatModelListener> listeners) {

        baseUrl = getOrDefault(baseUrl, OPENAI_URL);
        if (OPENAI_DEMO_API_KEY.equals(apiKey)) {
@@ -105,10 +106,10 @@ public class OpenAiChatModel implements ChatLanguageModel, TokenCountEstimator {

        timeout = getOrDefault(timeout, ofSeconds(60));

-        this.client = OpenAiClient.builder().openAiApiKey(apiKey).baseUrl(baseUrl).apiVersion(apiVersion)
-                .organizationId(organizationId).callTimeout(timeout).connectTimeout(timeout)
-                .readTimeout(timeout).writeTimeout(timeout).proxy(proxy).logRequests(logRequests)
-                .logResponses(logResponses).userAgent(DEFAULT_USER_AGENT)
+        this.client = OpenAiClient.builder().openAiApiKey(apiKey).baseUrl(baseUrl)
+                .apiVersion(apiVersion).organizationId(organizationId).callTimeout(timeout)
+                .connectTimeout(timeout).readTimeout(timeout).writeTimeout(timeout).proxy(proxy)
+                .logRequests(logRequests).logResponses(logResponses).userAgent(DEFAULT_USER_AGENT)
                .customHeaders(customHeaders).build();
        this.modelName = getOrDefault(modelName, GPT_3_5_TURBO);
        this.apiVersion = apiVersion;
--- a/common/src/main/java/dev/langchain4j/opensearch/spring/OpenSearchAutoConfig.java
+++ b/common/src/main/java/dev/langchain4j/opensearch/spring/OpenSearchAutoConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

 import static dev.langchain4j.opensearch.spring.Properties.PREFIX;
+
@Configuration
@EnableConfigurationProperties(dev.langchain4j.opensearch.spring.Properties.class)
 public class OpenSearchAutoConfig {
--- a/common/src/main/java/dev/langchain4j/opensearch/spring/OpenSearchEmbeddingStoreFactory.java
+++ b/common/src/main/java/dev/langchain4j/opensearch/spring/OpenSearchEmbeddingStoreFactory.java
@@ -11,11 +11,12 @@ import org.apache.hc.client5.http.impl.auth.BasicCredentialsProvider;
 import org.apache.hc.core5.http.HttpHost;
 import org.opensearch.client.transport.aws.AwsSdk2TransportOptions;
 import org.springframework.beans.BeanUtils;
-import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
-import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;

 import java.net.URI;

+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+
 /**
 * @author zyc
 */
@@ -42,18 +43,16 @@ public class OpenSearchEmbeddingStoreFactory extends BaseEmbeddingStoreFactory {

    @Override
    public EmbeddingStore<TextSegment> createEmbeddingStore(String collectionName) {
-        final AwsSdk2TransportOptions options = AwsSdk2TransportOptions.builder()
-                .setCredentials(StaticCredentialsProvider.create(AwsBasicCredentials.create(storeProperties.getUser(), storeProperties.getPassword())))
-                .build();
+        final AwsSdk2TransportOptions options =
+                AwsSdk2TransportOptions.builder()
+                        .setCredentials(StaticCredentialsProvider.create(AwsBasicCredentials
+                                .create(storeProperties.getUser(), storeProperties.getPassword())))
+                        .build();
        final String indexName = storeProperties.getDatabaseName() + "_" + collectionName;
        return OpenSearchEmbeddingStore.builder().serviceName(storeProperties.getServiceName())
-                .serverUrl(storeProperties.getUri())
-                .region(storeProperties.getRegion())
-                .indexName(indexName)
-                .userName(storeProperties.getUser())
-                .password(storeProperties.getPassword())
-                .apiKey(storeProperties.getToken())
-                .options(options)
-                .build();
+                .serverUrl(storeProperties.getUri()).region(storeProperties.getRegion())
+                .indexName(indexName).userName(storeProperties.getUser())
+                .password(storeProperties.getPassword()).apiKey(storeProperties.getToken())
+                .options(options).build();
    }
 }
--- a/common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java
+++ b/common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java
@@ -24,9 +24,8 @@ public class OpenAiModelFactory implements ModelFactory, InitializingBean {
    public ChatLanguageModel createChatModel(ChatModelConfig modelConfig) {
        return OpenAiChatModel.builder().baseUrl(modelConfig.getBaseUrl())
                .modelName(modelConfig.getModelName()).apiKey(modelConfig.keyDecrypt())
-                .apiVersion(modelConfig.getApiVersion())
-                .temperature(modelConfig.getTemperature()).topP(modelConfig.getTopP())
-                .maxRetries(modelConfig.getMaxRetries())
+                .apiVersion(modelConfig.getApiVersion()).temperature(modelConfig.getTemperature())
+                .topP(modelConfig.getTopP()).maxRetries(modelConfig.getMaxRetries())
                .timeout(Duration.ofSeconds(modelConfig.getTimeOut()))
                .logRequests(modelConfig.getLogRequests())
                .logResponses(modelConfig.getLogResponses()).build();
--- a/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java
+++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java
@@ -326,8 +326,9 @@ class SqlReplaceHelperTest {
                + "group by 部门, 部门数, 部门数2 having 访问次数 > 1 AND 部门数2 > 2 AND 部门数 > 1 AND 访问次数 > 1 order by 访问次数 desc  limit 10";
        replaceSql = SqlReplaceHelper.replaceAliasWithBackticks(sql);
        System.out.println(replaceSql);
-        Assert.assertEquals("SELECT 部门, sum(访问次数) AS `访问次数`, count(部门) AS `部门数`, count(部门) AS `部门数2`, `访问次数` FROM 超音数 WHERE (datediff('day', 数据日期, "
-                + "'2023-09-05') <= 3) AND 数据日期 = '2023-10-10' GROUP BY 部门, `部门数`, `部门数2` HAVING `访问次数` > 1 AND `部门数2` > 2 AND `部门数` > 1 AND `访问次数` > 1 ORDER BY `访问次数` DESC LIMIT 10",
+        Assert.assertEquals(
+                "SELECT 部门, sum(访问次数) AS `访问次数`, count(部门) AS `部门数`, count(部门) AS `部门数2`, `访问次数` FROM 超音数 WHERE (datediff('day', 数据日期, "
+                        + "'2023-09-05') <= 3) AND 数据日期 = '2023-10-10' GROUP BY 部门, `部门数`, `部门数2` HAVING `访问次数` > 1 AND `部门数2` > 2 AND `部门数` > 1 AND `访问次数` > 1 ORDER BY `访问次数` DESC LIMIT 10",
                replaceSql);

    }