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

jerryjzhang · jerryjzhang · commit 06b25025c3b3 · 2025-02-14T00:27:19.000+08:00
diff --git a/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java b/auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java
@@ -12,4 +12,7 @@ public class UserReq {
 
     @NotBlank(message = "password can not be null")
     private String password;
+
+    @NotBlank(message = "password can not be null")
+    private String newPassword;
 }
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java
@@ -127,7 +127,7 @@ public void resetPassword(String userName, String password, String newPassword)
                 .orElseThrow(() -> new RuntimeException("User does not exist, please register"));
 
         try {
-            validateOldPassword(userDO, password);
+            //validateOldPassword(userDO, password);
             updatePassword(userDO, newPassword, userRepository);
         } catch (PasswordEncryptionException e) {
             throw new RuntimeException("Password encryption error, please try again", e);
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java
@@ -1,7 +1,13 @@
 package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("s2_user")
 public class UserDO {
-    /** */
+
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /** */
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/mapper/UserDOMapper.java
@@ -1,18 +1,16 @@
 package com.tencent.supersonic.auth.authentication.persistence.mapper;
 
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO;
 import com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
 @Mapper
-public interface UserDOMapper {
+public interface UserDOMapper extends BaseMapper<UserDO> {
 
-    /** @mbg.generated */
-    int insert(UserDO record);
-
-    /** @mbg.generated */
     List<UserDO> selectByExample(UserDOExample example);
 
     void updateByPrimaryKey(UserDO userDO);
diff --git a/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java b/auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/rest/UserController.java
@@ -72,6 +72,13 @@ public String login(@RequestBody UserReq userCmd, HttpServletRequest request) {
         return userService.login(userCmd, request);
     }
 
+    @PostMapping("/resetPassword")
+    public void resetPassword(@RequestBody UserReq userCmd, HttpServletRequest request,
+                                HttpServletResponse response) {
+        User user = userService.getCurrentUser(request, response);
+        userService.resetPassword(user.getName(), userCmd.getPassword(), userCmd.getNewPassword());
+    }
+
     @PostMapping("/generateToken")
     public UserToken generateToken(@RequestBody UserTokenReq userTokenReq,
             HttpServletRequest request, HttpServletResponse response) {
diff --git a/auth/authentication/src/main/resources/mapper/UserDOMapper.xml b/auth/authentication/src/main/resources/mapper/UserDOMapper.xml
@@ -59,14 +59,6 @@
       limit #{limitStart} , #{limitEnd}
     </if>
   </select>
-  <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    insert into s2_user (id, name, password, salt,
-      display_name, email, is_admin
-      )
-    values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR},
-      #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{isAdmin,jdbcType=INTEGER}
-      )
-  </insert>
   <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user
     <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git 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 @@
 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 @@ private static ArrayList<String> getCandidateValues() {
     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 @@ private static List<Parameter.Dependency> getPathDependency() {
     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 @@ private static List<Parameter.Dependency> getDimensionDependency() {
     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 @@ private static List<Parameter.Dependency> getPortDependency() {
     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 @@ private static List<Parameter.Dependency> getUserDependency() {
     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"));
diff --git 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 static String replaceAliasWithBackticks(String sql) {
         }
         // 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();
diff --git 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 @@ private static List<Parameter.Dependency> getApiKeyDependency() {
 
     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() {
diff --git 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 OpenAiChatModel(String baseUrl, String apiKey, String organizationId, Str
 
         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;
diff --git 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.Configuration;
 
 import static dev.langchain4j.opensearch.spring.Properties.PREFIX;
+
 @Configuration
 @EnableConfigurationProperties(dev.langchain4j.opensearch.spring.Properties.class)
 public class OpenSearchAutoConfig {
diff --git 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.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 @@ private static EmbeddingStoreProperties createPropertiesFromConfig(
 
     @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();
     }
 }
diff --git 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();
diff --git 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 @@ void testReplaceAliasWithBackticks() {
                 + "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);
 
     }
diff --git a/launchers/standalone/src/main/resources/db/data-h2.sql b/launchers/standalone/src/main/resources/db/data-h2.sql
@@ -1,10 +1,10 @@
 -- sample user
 ---The default value for the password is 123456
-MERGE INTO s2_user (id, `name`, password, salt, display_name, email, is_admin) values (1, 'admin','c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT','jGl25bVBBBW96Qi9Te4V3w==','admin','admin@xx.com', 1);
-MERGE INTO s2_user (id, `name`, password, salt,  display_name, email) values (2, 'jack','c3VwZXJzb25pY0BiaWNvbWxGalmwa0h/trkh/3CWOYMDiku0Op1VmOfESIKmN0HG','MWERWefm/3hD6kYndF6JIg==','jack','jack@xx.com');
-MERGE INTO s2_user (id, `name`, password, salt,  display_name, email) values (3, 'tom','c3VwZXJzb25pY0BiaWNvbVWv0CZ6HzeX8GRUpw0C8NSaQ+0hE/dAcmzRpCFwAqxK','4WCPdcXXgT89QDHLML+3hg==','tom','tom@xx.com');
-MERGE INTO s2_user (id, `name`, password, salt,  display_name, email) values (4, 'lucy','c3VwZXJzb25pY0BiaWNvbc7Ychfu99lPL7rLmCkf/vgF4RASa4Z++Mxo1qlDCpci','3Jnpqob6uDoGLP9eCAg5Fw==','lucy','lucy@xx.com');
-MERGE INTO s2_user (id, `name`, password, salt,  display_name, email) values (5, 'alice','c3VwZXJzb25pY0BiaWNvbe9Z4F2/DVIfAJoN1HwUTuH1KgVuiusvfh7KkWYQSNHk','K9gGyX8OAK8aH8Myj6djqQ==','alice','alice@xx.com');
+INSERT INTO s2_user (`name`, password, salt, display_name, email, is_admin) values ('admin','c3VwZXJzb25pY0BiaWNvbdktJJYWw6A3rEmBUPzbn/6DNeYnD+y3mAwDKEMS3KVT','jGl25bVBBBW96Qi9Te4V3w==','admin','admin@xx.com', 1);
+INSERT INTO s2_user (`name`, password, salt,  display_name, email) values ('jack','c3VwZXJzb25pY0BiaWNvbWxGalmwa0h/trkh/3CWOYMDiku0Op1VmOfESIKmN0HG','MWERWefm/3hD6kYndF6JIg==','jack','jack@xx.com');
+INSERT INTO s2_user (`name`, password, salt,  display_name, email) values ('tom','c3VwZXJzb25pY0BiaWNvbVWv0CZ6HzeX8GRUpw0C8NSaQ+0hE/dAcmzRpCFwAqxK','4WCPdcXXgT89QDHLML+3hg==','tom','tom@xx.com');
+INSERT INTO s2_user (`name`, password, salt,  display_name, email) values ('lucy','c3VwZXJzb25pY0BiaWNvbc7Ychfu99lPL7rLmCkf/vgF4RASa4Z++Mxo1qlDCpci','3Jnpqob6uDoGLP9eCAg5Fw==','lucy','lucy@xx.com');
+INSERT INTO s2_user (`name`, password, salt,  display_name, email) values ('alice','c3VwZXJzb25pY0BiaWNvbe9Z4F2/DVIfAJoN1HwUTuH1KgVuiusvfh7KkWYQSNHk','K9gGyX8OAK8aH8Myj6djqQ==','alice','alice@xx.com');
 
 MERGE INTO s2_available_date_info(`id`,`item_id` ,`type`    ,`date_format` ,`start_date`  ,`end_date` ,`unavailable_date` ,`created_at`  ,`created_by`  ,`updated_at`  ,`updated_by` )
 values (1 , 1, 'dimension', 'yyyy-MM-dd', DATEADD('DAY', -28, CURRENT_DATE()), DATEADD('DAY', -1, CURRENT_DATE()), '[]', '2023-06-01', 'admin', '2023-06-01', 'admin');
diff --git a/launchers/standalone/src/main/resources/db/data-mysql.sql b/launchers/standalone/src/main/resources/db/data-mysql.sql
diff --git a/launchers/standalone/src/main/resources/db/data-postgres.sql b/launchers/standalone/src/main/resources/db/data-postgres.sql

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,7 @@ public class UserReq {`
`12`	`12`
`13`	`13`	`@NotBlank(message = "password can not be null")`
`14`	`14`	`private String password;`
	`15`	`+`
	`16`	`+ @NotBlank(message = "password can not be null")`
	`17`	`+ private String newPassword;`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -518,14 +518,15 @@ public static String replaceAliasWithBackticks(String sql) {`
`518`	`518`	`}`
`519`	`519`	`// Alias columns`
`520`	`520`	`for (SelectItem<?> selectItem : plainSelect.getSelectItems()) {`
`521`		`- if (selectItem.getExpression() instanceof Column){`
	`521`	`+ if (selectItem.getExpression() instanceof Column) {`
`522`	`522`	`replaceColumn((Column) selectItem.getExpression(), aliasReplacedMap, true);`
`523`	`523`	`}`
`524`	`524`	`}`
`525`	`525`	`// Having`
`526`	`526`	`Expression having = plainSelect.getHaving();`
`527`	`527`	`if (Objects.nonNull(having)) {`
`528`		`- ExpressionReplaceVisitor expressionReplaceVisitor = new ExpressionReplaceVisitor(aliasReplacedMap);`
	`528`	`+ ExpressionReplaceVisitor expressionReplaceVisitor =`
	`529`	`+ new ExpressionReplaceVisitor(aliasReplacedMap);`
`529`	`530`	`having.accept(expressionReplaceVisitor);`
`530`	`531`	`}`
`531`	`532`	`return selectStatement.toString();`