Merge branch 'master' of http://82.157.175.59:3000/GenarrativeAI/Genarrative

server-rs/crates/api-server/src/app.rs

@@ -121,7 +121,7 @@ use crate::{
         claim_profile_task_reward, create_profile_recharge_order, get_profile_analytics_metric,
         get_profile_dashboard, get_profile_play_stats, get_profile_recharge_center,
         get_profile_referral_invite_center, get_profile_task_center, get_profile_wallet_ledger,
-        redeem_profile_referral_invite_code, redeem_profile_reward_code,
+        redeem_profile_referral_invite_code, redeem_profile_reward_code, submit_profile_feedback,
     },
     runtime_save::{
         delete_runtime_snapshot, get_runtime_snapshot, list_profile_save_archives,
@@ -165,6 +165,7 @@ use crate::{
 };
 
 const PUZZLE_REFERENCE_IMAGE_BODY_LIMIT_BYTES: usize = 12 * 1024 * 1024;
+const PROFILE_FEEDBACK_BODY_LIMIT_BYTES: usize = 6 * 1024 * 1024;
 
 // 统一由这里构造 Axum 路由树，后续再逐项挂接中间件与业务路由。
 pub fn build_router(state: AppState) -> Router {
@@ -1278,6 +1279,16 @@ pub fn build_router(state: AppState) -> Router {
                 require_bearer_auth,
             )),
         )
+        .route(
+            "/api/profile/feedback",
+            post(submit_profile_feedback)
+                // 中文注释：反馈首版允许最多四张 1MB Data URL 图片，只给该接口放宽 body limit。
+                .layer(DefaultBodyLimit::max(PROFILE_FEEDBACK_BODY_LIMIT_BYTES))
+                .route_layer(middleware::from_fn_with_state(
+                    state.clone(),
+                    require_bearer_auth,
+                )),
+        )
         .route(
             "/api/profile/referrals/invite-center",
             get(get_profile_referral_invite_center).route_layer(middleware::from_fn_with_state(

server-rs/crates/api-server/src/main.rs

@@ -107,7 +107,7 @@ fn main() -> Result<(), io::Error> {
 
 async fn run_server() -> Result<(), io::Error> {
     // 运行本地开发与联调时，优先从仓库根目录加载本地变量。
-    // 只尊重外层 shell 先注入的变量；.env.local 需要能覆盖 .env。
+    // 只尊重外层 shell 先注入的变量；后续本地文件需要能覆盖前序本地文件。
     load_local_env_files();
 
     // 统一先从配置对象读取监听地址，避免后续把环境变量读取散落到入口和路由层。

server-rs/crates/api-server/src/runtime_profile.rs

@@ -5,7 +5,9 @@ use axum::{
     response::Response,
 };
 use module_runtime::{
-    AnalyticsGranularity, PROFILE_RECHARGE_PAYMENT_CHANNEL_MOCK, RuntimeProfileInviteCodeRecord,
+    AnalyticsGranularity, PROFILE_RECHARGE_PAYMENT_CHANNEL_MOCK,
+    RuntimeProfileFeedbackEvidenceRecord, RuntimeProfileFeedbackEvidenceSnapshot,
+    RuntimeProfileFeedbackSubmissionRecord, RuntimeProfileInviteCodeRecord,
     RuntimeProfileMembershipBenefitRecord, RuntimeProfileRechargeCenterRecord,
     RuntimeProfileRechargeOrderRecord, RuntimeProfileRechargeProductRecord,
     RuntimeProfileRedeemCodeMode, RuntimeProfileRedeemCodeRecord,
@@ -23,8 +25,8 @@ use shared_contracts::runtime::{
     AdminUpsertProfileRedeemCodeRequest, AdminUpsertProfileTaskConfigRequest,
     AnalyticsBucketMetricResponse, AnalyticsMetricQueryResponse, ClaimProfileTaskRewardResponse,
     CreateProfileRechargeOrderRequest, CreateProfileRechargeOrderResponse,
-    PROFILE_TASK_CYCLE_DAILY, PROFILE_TASK_STATUS_CLAIMABLE, PROFILE_TASK_STATUS_CLAIMED,
-    PROFILE_TASK_STATUS_DISABLED, PROFILE_TASK_STATUS_INCOMPLETE,
+    PROFILE_FEEDBACK_STATUS_OPEN, PROFILE_TASK_CYCLE_DAILY, PROFILE_TASK_STATUS_CLAIMABLE,
+    PROFILE_TASK_STATUS_CLAIMED, PROFILE_TASK_STATUS_DISABLED, PROFILE_TASK_STATUS_INCOMPLETE,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_ASSET_OPERATION_CONSUME,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_ASSET_OPERATION_REFUND,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_DAILY_TASK_REWARD,
@@ -35,6 +37,7 @@ use shared_contracts::runtime::{
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_PUZZLE_AUTHOR_INCENTIVE_CLAIM,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_REDEEM_CODE_REWARD,
     PROFILE_WALLET_LEDGER_SOURCE_TYPE_SNAPSHOT_SYNC, ProfileDashboardSummaryResponse,
+    ProfileFeedbackEvidenceItemResponse, ProfileFeedbackSubmissionResponse,
     ProfileInviteCodeAdminListResponse, ProfileInviteCodeAdminResponse,
     ProfileMembershipBenefitResponse, ProfileMembershipResponse, ProfilePlayStatsResponse,
     ProfilePlayedWorkSummaryResponse, ProfileRechargeCenterResponse, ProfileRechargeOrderResponse,
@@ -44,8 +47,9 @@ use shared_contracts::runtime::{
     ProfileTaskConfigAdminListResponse, ProfileTaskConfigAdminResponse, ProfileTaskItemResponse,
     ProfileWalletLedgerEntryResponse, ProfileWalletLedgerResponse,
     RedeemProfileReferralInviteCodeRequest, RedeemProfileReferralInviteCodeResponse,
-    RedeemProfileRewardCodeRequest, RedeemProfileRewardCodeResponse, TRACKING_SCOPE_KIND_MODULE,
-    TRACKING_SCOPE_KIND_SITE, TRACKING_SCOPE_KIND_USER, TRACKING_SCOPE_KIND_WORK,
+    RedeemProfileRewardCodeRequest, RedeemProfileRewardCodeResponse, SubmitProfileFeedbackRequest,
+    SubmitProfileFeedbackResponse, TRACKING_SCOPE_KIND_MODULE, TRACKING_SCOPE_KIND_SITE,
+    TRACKING_SCOPE_KIND_USER, TRACKING_SCOPE_KIND_WORK,
 };
 use shared_kernel::{offset_datetime_to_unix_micros, parse_rfc3339};
 use spacetime_client::SpacetimeClientError;
@@ -208,6 +212,51 @@ pub async fn create_profile_recharge_order(
     ))
 }
 
+pub async fn submit_profile_feedback(
+    State(state): State<AppState>,
+    Extension(request_context): Extension<RequestContext>,
+    Extension(authenticated): Extension<AuthenticatedAccessToken>,
+    Json(payload): Json<SubmitProfileFeedbackRequest>,
+) -> Result<Json<Value>, Response> {
+    let user_id = authenticated.claims().user_id().to_string();
+    let created_at_micros = OffsetDateTime::now_utc().unix_timestamp_nanos() / 1_000;
+    let evidence_items = payload
+        .evidence_items
+        .into_iter()
+        .map(|item| RuntimeProfileFeedbackEvidenceSnapshot {
+            evidence_id: String::new(),
+            file_name: item.file_name,
+            content_type: item.content_type,
+            size_bytes: item.size_bytes,
+            data_url: item.data_url,
+        })
+        .collect();
+
+    let record = state
+        .spacetime_client()
+        .submit_profile_feedback(
+            user_id,
+            payload.description,
+            payload.contact_phone,
+            evidence_items,
+            created_at_micros as i64,
+        )
+        .await
+        .map_err(|error| {
+            runtime_profile_error_response(
+                &request_context,
+                map_runtime_profile_client_error(error),
+            )
+        })?;
+
+    Ok(json_success_body(
+        Some(&request_context),
+        SubmitProfileFeedbackResponse {
+            feedback: build_profile_feedback_submission_response(record),
+        },
+    ))
+}
+
 pub async fn get_profile_referral_invite_center(
     State(state): State<AppState>,
     Extension(request_context): Extension<RequestContext>,
@@ -782,6 +831,36 @@ fn build_profile_recharge_order_response(
     }
 }
 
+fn build_profile_feedback_submission_response(
+    record: RuntimeProfileFeedbackSubmissionRecord,
+) -> ProfileFeedbackSubmissionResponse {
+    ProfileFeedbackSubmissionResponse {
+        feedback_id: record.feedback_id,
+        status: match record.status {
+            module_runtime::RuntimeProfileFeedbackStatus::Open => {
+                PROFILE_FEEDBACK_STATUS_OPEN.to_string()
+            }
+        },
+        created_at: record.created_at,
+        evidence_items: record
+            .evidence_items
+            .into_iter()
+            .map(build_profile_feedback_evidence_response)
+            .collect(),
+    }
+}
+
+fn build_profile_feedback_evidence_response(
+    record: RuntimeProfileFeedbackEvidenceRecord,
+) -> ProfileFeedbackEvidenceItemResponse {
+    ProfileFeedbackEvidenceItemResponse {
+        evidence_id: record.evidence_id,
+        file_name: record.file_name,
+        content_type: record.content_type,
+        size_bytes: record.size_bytes,
+    }
+}
+
 fn build_profile_referral_invite_center_response(
     record: RuntimeReferralInviteCenterRecord,
 ) -> ProfileReferralInviteCenterResponse {
@@ -1245,6 +1324,27 @@ mod tests {
         assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
     }
 
+    #[tokio::test]
+    async fn profile_feedback_requires_authentication() {
+        let app = build_router(AppState::new(AppConfig::default()).expect("state should build"));
+
+        let response = app
+            .oneshot(
+                Request::builder()
+                    .method("POST")
+                    .uri("/api/profile/feedback")
+                    .header("content-type", "application/json")
+                    .body(Body::from(
+                        r#"{"description":"反馈页面上传图片后没有显示预览"}"#,
+                    ))
+                    .expect("request should build"),
+            )
+            .await
+            .expect("request should succeed");
+
+        assert_eq!(response.status(), StatusCode::UNAUTHORIZED);
+    }
+
     #[tokio::test]
     async fn profile_referral_invite_center_requires_authentication() {
         let app = build_router(AppState::new(AppConfig::default()).expect("state should build"));
@@ -1345,6 +1445,7 @@ mod tests {
             "/api/runtime/profile/wallet-ledger",
             "/api/runtime/profile/recharge-center",
             "/api/runtime/profile/recharge/orders",
+            "/api/runtime/profile/feedback",
             "/api/runtime/profile/referrals/invite-center",
             "/api/runtime/profile/referrals/redeem-code",
             "/api/runtime/profile/redeem-codes/redeem",