Merge branch 'main' into main

ruoyi-admin/src/main/java/org/ruoyi/RuoYiAIApplication.java

@@ -11,7 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  *
  * @author Lion Li
  */
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"org.ruoyi", "org.ruoyi.aihuman"})
 @EnableScheduling
 @EnableAsync
 public class RuoYiAIApplication {
@@ -22,4 +22,4 @@ public class RuoYiAIApplication {
         application.run(args);
         System.out.println("(♥◠‿◠)ﾉﾞ  RuoYiAI启动成功   ლ(´ڡ`ლ)ﾞ");
     }
-}
+}

ruoyi-admin/src/main/resources/application-dev.yml

@@ -37,6 +37,8 @@ spring:
         connectionTestQuery: SELECT 1
         # 多久检查一次连接的活性
         keepaliveTime: 30000
+  mail:
+    username: xx
 
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring.data:
@@ -102,7 +104,15 @@ pdf:
 #百炼模型配置
 dashscope:
   key: sk-xxxx
-  model: qvq-max
+
+local:
+  images: xx
+
+
+
+  files: xx
+
+
 
 --- # Neo4j 知识图谱配置
 neo4j:

ruoyi-admin/src/main/resources/application.yml

@@ -156,6 +156,8 @@ security:
     # actuator 监控配置
     - /actuator
     - /actuator/**
+    - /workflow/**
+    - /admin/workflow/**
 # 多租户配置
 tenant:
   # 是否开启
@@ -328,3 +330,19 @@ spring:
           servers-configuration: classpath:mcp-server.json
         request-timeout: 300s
 
+# 向量库配置
+vector-store:
+  # 向量存储类型 可选(weaviate/milvus)
+  # 如需修改向量库类型，请修改此配置值!
+  type: weaviate
+
+  # Weaviate配置
+  weaviate:
+    protocol: http
+    host: 127.0.0.1:6038
+    classname: LocalKnowledge
+  # Milvus配置
+  milvus:
+    url: http://localhost:19530
+    collectionname: LocalKnowledge
+