fix flyway depends bean

backend/src/main/java/com/zl/mjga/config/ai/ChatModelConfig.java

@@ -1,23 +1,27 @@
 package com.zl.mjga.config.ai;
 
+import com.zl.mjga.service.LlmService;
 import dev.langchain4j.community.model.zhipu.ZhipuAiStreamingChatModel;
 import dev.langchain4j.memory.chat.MessageWindowChatMemory;
 import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import dev.langchain4j.service.AiServices;
 import lombok.RequiredArgsConstructor;
+import org.jooq.generated.mjga.enums.LlmCodeEnum;
+import org.jooq.generated.mjga.tables.pojos.AiLlmConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 
 @Configuration
 @RequiredArgsConstructor
 public class ChatModelConfig {
 
-  private final DeepSeekConfiguration deepSeekConfiguration;
-  private final ZhiPuConfiguration zhiPuConfiguration;
+  private final LlmService llmService;
   private final PromptConfiguration promptConfiguration;
 
   @Bean
-  public ZhipuAiStreamingChatModel zhipuChatModel() {
+  @DependsOn("flywayInitializer")
+  public ZhipuAiStreamingChatModel zhipuChatModel(ZhiPuConfiguration zhiPuConfiguration) {
     return ZhipuAiStreamingChatModel.builder()
         .model(zhiPuConfiguration.getModelName())
         .apiKey(zhiPuConfiguration.getApiKey())
@@ -27,7 +31,8 @@ public class ChatModelConfig {
   }
 
   @Bean
-  public OpenAiStreamingChatModel deepSeekChatModel() {
+  @DependsOn("flywayInitializer")
+  public OpenAiStreamingChatModel deepSeekChatModel(DeepSeekConfiguration deepSeekConfiguration) {
     return OpenAiStreamingChatModel.builder()
         .baseUrl(deepSeekConfiguration.getBaseUrl())
         .apiKey(deepSeekConfiguration.getApiKey())
@@ -36,6 +41,7 @@ public class ChatModelConfig {
   }
 
   @Bean
+  @DependsOn("flywayInitializer")
   public AiChatAssistant deepSeekChatAssistant(OpenAiStreamingChatModel deepSeekChatModel) {
     return AiServices.builder(AiChatAssistant.class)
         .streamingChatModel(deepSeekChatModel)
@@ -45,6 +51,7 @@ public class ChatModelConfig {
   }
 
   @Bean
+  @DependsOn("flywayInitializer")
   public AiChatAssistant zhiPuChatAssistant(ZhipuAiStreamingChatModel zhipuChatModel) {
     return AiServices.builder(AiChatAssistant.class)
         .streamingChatModel(zhipuChatModel)
@@ -52,4 +59,22 @@ public class ChatModelConfig {
         .chatMemoryProvider(memoryId -> MessageWindowChatMemory.withMaxMessages(10))
         .build();
   }
+
+  @Bean
+  @DependsOn("flywayInitializer")
+  public DeepSeekConfiguration deepSeekConfiguration() {
+    DeepSeekConfiguration deepSeekConfiguration = new DeepSeekConfiguration();
+    AiLlmConfig deepSeek = llmService.loadConfig(LlmCodeEnum.DEEP_SEEK);
+    deepSeekConfiguration.init(deepSeek);
+    return deepSeekConfiguration;
+  }
+
+  @Bean
+  @DependsOn("flywayInitializer")
+  public ZhiPuConfiguration zhiPuConfiguration() {
+    ZhiPuConfiguration zhiPuConfiguration = new ZhiPuConfiguration();
+    AiLlmConfig aiLlmConfig = llmService.loadConfig(LlmCodeEnum.ZHI_PU);
+    zhiPuConfiguration.init(aiLlmConfig);
+    return zhiPuConfiguration;
+  }
 }

backend/src/main/java/com/zl/mjga/config/ai/DeepSeekConfiguration.java

@@ -1,29 +1,18 @@
 package com.zl.mjga.config.ai;
 
-import com.zl.mjga.service.LlmService;
-import jakarta.annotation.PostConstruct;
 import lombok.Data;
-import lombok.RequiredArgsConstructor;
-import org.jooq.generated.default_schema.enums.LlmCodeEnum;
 import org.jooq.generated.mjga.tables.pojos.AiLlmConfig;
-import org.springframework.stereotype.Component;
 
 @Data
-@Component
-@RequiredArgsConstructor
 public class DeepSeekConfiguration {
 
   private String baseUrl;
   private String apiKey;
   private String modelName;
 
-  private final LlmService llmService;
-
-  @PostConstruct
-  public void init() {
-    AiLlmConfig aiLlmConfig = llmService.loadConfig(LlmCodeEnum.DEEP_SEEK);
-    baseUrl = aiLlmConfig.getUrl();
-    apiKey = aiLlmConfig.getApiKey();
-    modelName = aiLlmConfig.getModelName();
+  public void init(AiLlmConfig config) {
+    this.baseUrl = config.getUrl();
+    this.apiKey = config.getApiKey();
+    this.modelName = config.getModelName();
   }
 }

backend/src/main/java/com/zl/mjga/config/ai/ZhiPuConfiguration.java

@@ -1,9 +1,6 @@
 package com.zl.mjga.config.ai;
 
-import com.zl.mjga.service.LlmService;
-import jakarta.annotation.PostConstruct;
 import lombok.Data;
-import org.jooq.generated.default_schema.enums.LlmCodeEnum;
 import org.jooq.generated.mjga.tables.pojos.AiLlmConfig;
 import org.springframework.stereotype.Component;
 
@@ -15,13 +12,9 @@ public class ZhiPuConfiguration {
   private String apiKey;
   private String modelName;
 
-  private final LlmService llmService;
-
-  @PostConstruct
-  public void init() {
-    AiLlmConfig aiLlmConfig = llmService.loadConfig(LlmCodeEnum.ZHI_PU);
-    baseUrl = aiLlmConfig.getUrl();
-    apiKey = aiLlmConfig.getApiKey();
-    modelName = aiLlmConfig.getModelName();
+  public void init(AiLlmConfig config) {
+    this.baseUrl = config.getUrl();
+    this.apiKey = config.getApiKey();
+    this.modelName = config.getModelName();
   }
 }

backend/src/main/java/com/zl/mjga/service/AiChatService.java

@@ -4,7 +4,7 @@ import com.zl.mjga.config.ai.AiChatAssistant;
 import dev.langchain4j.service.TokenStream;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jooq.generated.default_schema.enums.LlmCodeEnum;
+import org.jooq.generated.mjga.enums.LlmCodeEnum;
 import org.jooq.generated.mjga.tables.pojos.AiLlmConfig;
 import org.springframework.stereotype.Service;
 

backend/src/main/java/com/zl/mjga/service/LlmService.java

@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jooq.Record;
 import org.jooq.Result;
-import org.jooq.generated.default_schema.enums.LlmCodeEnum;
+import org.jooq.generated.mjga.enums.LlmCodeEnum;
 import org.jooq.generated.mjga.tables.pojos.AiLlmConfig;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;