Merge upstream/main into feature/common-trace-rag-chat

ruoyi-admin/Dockerfile

@@ -1,31 +1,59 @@
-# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
+# FFmpeg-enabled variant of ruoyi-admin/Dockerfile.
 FROM bellsoft/liberica-openjdk-rocky:17.0.16-cds
-#FROM bellsoft/liberica-openjdk-rocky:21.0.8-cds
-#FROM findepi/graalvm:java17-native
 
 LABEL maintainer="Lion Li"
 
+# Rocky base repositories do not provide the full codec build. RPM Fusion Free
+# supplies ffmpeg with libx264, while the checks below prevent a reduced build
+# from reaching production unnoticed.
+RUN set -eux; \
+    dnf -y install dnf-plugins-core epel-release; \
+    . /etc/os-release; \
+    rocky_major="${VERSION_ID%%.*}"; \
+    if [ "${rocky_major}" -ge 9 ]; then \
+        dnf config-manager --set-enabled crb; \
+    else \
+        dnf config-manager --set-enabled powertools; \
+    fi; \
+    dnf -y install "https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-${rocky_major}.noarch.rpm"; \
+    dnf -y install ffmpeg; \
+    for filter in scale pad fps setsar format tpad trim settb setpts xfade \
+        aresample aformat apad atrim asetpts anullsrc concat acrossfade; do \
+        ffmpeg -hide_banner -filters 2>/dev/null | grep -Eq "[[:space:]]${filter}[[:space:]]"; \
+    done; \
+    ffmpeg -hide_banner -h filter=xfade 2>&1 | grep -q dissolve; \
+    ffmpeg -hide_banner -h filter=xfade 2>&1 | grep -q fadeblack; \
+    ffmpeg -hide_banner -h filter=xfade 2>&1 | grep -q slideleft; \
+    ffmpeg -hide_banner -encoders 2>/dev/null | grep -Eq '[[:space:]]libx264[[:space:]]'; \
+    ffmpeg -hide_banner -encoders 2>/dev/null | grep -Eq '[[:space:]]aac[[:space:]]'; \
+    ffprobe -hide_banner -version >/dev/null; \
+    dnf clean all; \
+    rm -rf /var/cache/dnf
+
 RUN mkdir -p /ruoyi/server/logs \
     /ruoyi/server/temp \
     /ruoyi/skywalking/agent
 
 WORKDIR /ruoyi/server
 
-ENV SERVER_PORT=8080 SNAIL_PORT=28080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+ENV SERVER_PORT=8080 \
+    SNAIL_PORT=28080 \
+    LANG=C.UTF-8 \
+    LC_ALL=C.UTF-8 \
+    JAVA_OPTS="" \
+    FFMPEG_PATH=/usr/bin/ffmpeg \
+    FFPROBE_PATH=/usr/bin/ffprobe
 
 EXPOSE ${SERVER_PORT}
-# 暴露 snail job 客户端端口 用于定时任务调度中心通信
 EXPOSE ${SNAIL_PORT}
 
 ADD ./target/ruoyi-admin.jar ./app.jar
 
 SHELL ["/bin/bash", "-c"]
 
-ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
+           -Djava.io.tmpdir=/ruoyi/server/temp \
+           -Dserver.port=${SERVER_PORT} \
            -Dsnail-job.port=${SNAIL_PORT} \
-           # 应用名称 如果想区分集群节点监控 改成不同的名称即可
-           #-Dskywalking.agent.service_name=ruoyi-server \
-           #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
            -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
            -jar app.jar
-

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

@@ -8,8 +8,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${MONITOR_USERNAME:ruoyi}
+  password: ${MONITOR_PASSWORD:123456}
 
 --- # mcp配置信息
 mcp:
@@ -27,12 +27,12 @@ snail-job:
   enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
-  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  # SnailJob 接入验证令牌 详见 docs/script/sql/ruoyi-ai-v3_mysql8.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
     host: 127.0.0.1
     port: 17888
-  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  # 命名空间UUID 详见 docs/script/sql/ruoyi-ai-v3_mysql8.sql `sj_namespace`表`unique_id`字段
   namespace: ${spring.profiles.active}
   # 随主应用端口漂移
   port: 2${server.port}
@@ -60,7 +60,7 @@ spring:
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
           url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: root
+          password: 123456
 #        agent:
 #          url: jdbc:mysql://127.0.0.1:3306/test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
 #          # url: jdbc:mysql://localhost:3306/agent_db

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

@@ -9,8 +9,8 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${MONITOR_USERNAME:ruoyi}
+  password: ${MONITOR_PASSWORD:123456}
 
 --- # mcp配置信息
 mcp:
@@ -28,12 +28,12 @@ snail-job:
   enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "ruoyi_group"
-  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  # SnailJob 接入验证令牌 详见 docs/script/sql/ruoyi-ai-v3_mysql8.sql `sj_group_config` 表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
     host: 127.0.0.1
     port: 17888
-  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  # 命名空间UUID 详见 docs/script/sql/ruoyi-ai-v3_mysql8.sql `sj_namespace`表`unique_id`字段
   namespace: ${spring.profiles.active}
   # 随主应用端口漂移
   port: 2${server.port}

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

@@ -20,6 +20,10 @@ server:
       # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
       worker: 256
 
+--- # 小程序对话 WebSocket 兜底默认模型（前端未传 model 且无智能体绑定时使用）
+chat:
+  default-model: deepseek-v4-flash
+
 captcha:
   # 是否启用验证码校验
   enable: false
@@ -35,7 +39,7 @@ captcha:
 # 日志配置
 logging:
   level:
-    org.ruoyi: @logging.level@
+    org.ruoyi: ${LOGGING_LEVEL_ORG_RUOYI:info}
     org.springframework: warn
     org.mybatis.spring.mapper: error
     org.apache.fury: warn
@@ -75,7 +79,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles:
-    active: @profiles.active@
+    active: ${SPRING_PROFILES_ACTIVE:dev}
   # 文件上传
   servlet:
     multipart:
@@ -125,6 +129,7 @@ security:
     - /*/api-docs/**
     - /warm-flow-ui/config
     - /workflow/run
+    - /coding/**
 # 多租户配置
 tenant:
   # 是否开启
@@ -314,11 +319,12 @@ warm-flow:
 vector-store:
   # 向量存储类型 可选(weaviate/milvus/qdrant)
   # 如需修改向量库类型，请修改此配置值!
-  type: milvus
+  # 注意：需与 docker-compose 实际部署的向量库保持一致（当前 compose 内置 weaviate，映射端口 28080）
+  type: weaviate
   # Weaviate配置
   weaviate:
     protocol: http
-    host: 127.0.0.1:6038
+    host: 127.0.0.1:28080
     classname: LocalKnowledge
   # Milvus配置
   milvus:
@@ -331,3 +337,38 @@ vector-store:
     collectionname: LocalKnowledge
     api-key:
     use-tls: false
+
+# 短剧成片合成
+short-drama:
+  composition:
+    ffmpeg-path: ${FFMPEG_PATH:ffmpeg}
+    ffprobe-path: ${FFPROBE_PATH:ffprobe}
+    fps: ${SHORT_DRAMA_COMPOSITION_FPS:30}
+    audio-sample-rate: ${SHORT_DRAMA_COMPOSITION_AUDIO_SAMPLE_RATE:48000}
+    video-codec: ${SHORT_DRAMA_COMPOSITION_VIDEO_CODEC:libx264}
+    audio-codec: ${SHORT_DRAMA_COMPOSITION_AUDIO_CODEC:aac}
+    preset: ${SHORT_DRAMA_COMPOSITION_PRESET:medium}
+    crf: ${SHORT_DRAMA_COMPOSITION_CRF:20}
+    audio-bitrate: ${SHORT_DRAMA_COMPOSITION_AUDIO_BITRATE:192k}
+    max-clips: ${SHORT_DRAMA_COMPOSITION_MAX_CLIPS:100}
+    max-transition-seconds: ${SHORT_DRAMA_COMPOSITION_MAX_TRANSITION_SECONDS:2.0}
+    minimum-output-bytes: ${SHORT_DRAMA_COMPOSITION_MINIMUM_OUTPUT_BYTES:1024}
+    max-process-output-bytes: ${SHORT_DRAMA_COMPOSITION_MAX_PROCESS_OUTPUT_BYTES:1048576}
+    max-source-bytes: ${SHORT_DRAMA_COMPOSITION_MAX_SOURCE_BYTES:536870912}
+    max-total-source-bytes: ${SHORT_DRAMA_COMPOSITION_MAX_TOTAL_SOURCE_BYTES:2147483648}
+    probe-timeout: ${SHORT_DRAMA_COMPOSITION_PROBE_TIMEOUT:30s}
+    process-timeout: ${SHORT_DRAMA_COMPOSITION_PROCESS_TIMEOUT:30m}
+    job-stale-after: ${SHORT_DRAMA_COMPOSITION_JOB_STALE_AFTER:45m}
+    watermark-font-file: ${SHORT_DRAMA_COMPOSITION_WATERMARK_FONT_FILE:}
+    worker-core-size: ${SHORT_DRAMA_COMPOSITION_WORKER_CORE_SIZE:1}
+    worker-max-size: ${SHORT_DRAMA_COMPOSITION_WORKER_MAX_SIZE:2}
+    worker-queue-capacity: ${SHORT_DRAMA_COMPOSITION_WORKER_QUEUE_CAPACITY:8}
+    storage-mode: ${SHORT_DRAMA_COMPOSITION_STORAGE_MODE:local}
+    local-output-directory: ${SHORT_DRAMA_COMPOSITION_LOCAL_OUTPUT_DIRECTORY:logs/short-drama-compositions}
+    download:
+      connect-timeout: ${SHORT_DRAMA_DOWNLOAD_CONNECT_TIMEOUT:30s}
+      call-timeout: ${SHORT_DRAMA_DOWNLOAD_CALL_TIMEOUT:10m}
+      max-redirects: ${SHORT_DRAMA_DOWNLOAD_MAX_REDIRECTS:5}
+      # 生产环境建议配置为视频供应商或 OSS/CDN 域名，多个值用逗号分隔。
+      allowed-hosts: ${SHORT_DRAMA_DOWNLOAD_ALLOWED_HOSTS:}
+      fake-ip-allowed-hosts: ${SHORT_DRAMA_DOWNLOAD_FAKE_IP_ALLOWED_HOSTS:atlas-media.oss-us-west-1.aliyuncs.com}