Merge branch 'codex/brd-release-20260715' into codex/multi-tenant-knowledge-platform

# Conflicts: # AGENTS.md # README.md # backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/domain/AihrPracticeDto.java # backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrOrgSyncService.java # backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrPracticeSeedService.java # backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrUploadQueueService.java # backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrOrgSyncServiceTest.java # backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrPracticeSeedServiceTest.java # backend/ruoyi-modules/ruoyi-aihr/src/test/java/org/dromara/aihr/service/AihrUploadQueueServiceTest.java # docs/20260708/uni-app用户侧前端重建计划.md # docs/API_INTEGRATION.md # docs/BRD_IMPLEMENTATION_AUDIT.md # docs/BRD_PRODUCTION_MIGRATION_RUNBOOK.md # docs/DEMO_ACCEPTANCE.md # docs/DEV_SETUP.md # docs/FIGMA_IMPLEMENTATION_MATRIX.md # docs/README.md # frontend/src/views/knowledge/processing.vue # mobile-uni/src/pages/supervisor/assign/index.vue # mobile-uni/src/pages/supervisor/index/index.vue # mobile-uni/src/pages/supervisor/profile/index.vue # mobile-uni/src/pages/supervisor/review/index.vue # mobile-uni/src/pages/supervisor/reviews/index.vue # mobile-uni/src/pages/supervisor/team/index.vue # mobile-uni/src/pages/user/cases/index.vue # mobile-uni/src/pages/user/practice/index.vue # mobile-uni/src/pages/user/profile/index.vue # mobile-uni/src/pages/user/sop/index.vue # mobile-uni/src/pages/user/today/index.vue # mobile-uni/src/types/api.ts # scripts/tests/aihr-schema-migrations.test.sh
2026-07-22 08:41:49 +08:00
parent 1ffb1c7bd0 43974e3eea
commit c38a723ae4
27 changed files with 1011 additions and 38 deletions
@@ -4,6 +4,7 @@ set -euo pipefail
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 FRONTEND_URL="${FRONTEND_URL:-https://wygj-admin.localhost}"
 MOBILE_URL="${MOBILE_URL:-https://wygj-mobile-uni.localhost}"
+FRONTEND_API_PREFIX="${FRONTEND_API_PREFIX:-dev-api}"

 cd "$ROOT_DIR"

@@ -363,6 +364,7 @@ if [[ "${AIHR_DEMO_CHECK_LIBRARY_ONLY:-false}" == "true" ]]; then
 fi

 need curl
+[[ "$FRONTEND_API_PREFIX" =~ ^[A-Za-z0-9_-]+$ ]] || fail "invalid FRONTEND_API_PREFIX: $FRONTEND_API_PREFIX"

 check_url "frontend" "$FRONTEND_URL/"
 check_url "mobile-uni" "$MOBILE_URL/h5/"
@@ -371,11 +373,11 @@ contains docs/DEMO_ACCEPTANCE.md "capture-demo-screenshots.mjs"
 contains scripts/capture-demo-screenshots.mjs "Page.captureScreenshot"
 contains scripts/capture-demo-screenshots.mjs "wygj-ai-interview-flow.png"

-tenant_payload="$(curl -k -fsS "$FRONTEND_URL/dev-api/auth/tenant/list")"
+tenant_payload="$(curl -k -fsS "$FRONTEND_URL/$FRONTEND_API_PREFIX/auth/tenant/list")"
 [[ "$tenant_payload" == *'"tenantId":"000000"'* ]] || fail "tenant list missing tenant 000000"
 echo "OK: tenant list"

-code_payload="$(curl -k -fsS "$FRONTEND_URL/dev-api/auth/code")"
+code_payload="$(curl -k -fsS "$FRONTEND_URL/$FRONTEND_API_PREFIX/auth/code")"
 [[ "$code_payload" == *'"uuid"'* ]] || fail "captcha response missing uuid"
 echo "OK: captcha"

@@ -721,7 +723,7 @@ contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "AihrMultipartFiles.withOriginalFilename"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "deleteUploadedOssQuietly"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/controller/AihrSpeechController.java "AihrMultipartFiles.withOriginalFilename"
-contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "o.tenant_id = a.tenant_id"
+contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "binary o.tenant_id = binary a.tenant_id"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "where tenant_id = ? and oss_id = ? limit 1"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "deleteQdrantTenantPoints()"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "/points/count"
@@ -735,7 +737,8 @@ contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/controller/AihrSpeechController.java "asr audio upload failed（处理错误已隐藏）"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrModelSeedService.java "visionAllowed"
 contains backend/ruoyi-modules/ruoyi-aihr/src/main/java/org/dromara/aihr/service/AihrSopSeedService.java "!modelService.visionAllowed()"
-contains backend/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java '!environment.acceptsProfiles(Profiles.of("prod"))'
+contains backend/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java "shouldUseFixedSmsCode"
+contains backend/ruoyi-admin/src/main/java/org/dromara/web/controller/CaptchaController.java "smsProdFixedCodeEnabled"
 contains backend/ruoyi-admin/src/test/java/org/dromara/web/controller/CaptchaControllerSecurityTest.java "CaptchaControllerSecurityTest"
 contains backend/ruoyi-admin/src/main/resources/application-dev.yml "AIHR_MYSQL_PORT:13306"
 contains backend/ruoyi-admin/src/main/resources/application-dev.yml "AIHR_REDIS_PORT:16379"
@@ -24,6 +24,7 @@ assert_contains 'AIHR_PILOT_START_DATE'
 assert_contains 'AIHR_PILOT_END_DATE'
 assert_contains 'AIHR_PILOT_TENANT_ID'
 assert_contains 'AIHR_DEMO_CHECK_LIBRARY_ONLY'
+assert_contains 'FRONTEND_API_PREFIX'
 assert_contains 'safe_org AS'
 assert_contains 'HAVING SUM(s.session_count) >= 10'
 assert_contains 'HAVING COUNT(DISTINCT ext_party_id) = 1'