diff --git a/src/oj/problem/components/SubmitCode.vue b/src/oj/problem/components/SubmitCode.vue
index 1b8ab3e..c471ca5 100644
--- a/src/oj/problem/components/SubmitCode.vue
+++ b/src/oj/problem/components/SubmitCode.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
 import { Icon } from "@iconify/vue"
 import { storeToRefs } from "pinia"
-import { getComment, submitCode, updateProblemSetProgress } from "oj/api"
+import {
+  formatCode,
+  getComment,
+  submitCode,
+  updateProblemSetProgress,
+} from "oj/api"
 import { useCodeStore } from "oj/store/code"
 import { useProblemStore } from "oj/store/problem"
 import { useFireworks } from "oj/problem/composables/useFireworks"
 import { useSubmissionMonitor } from "oj/problem/composables/useSubmissionMonitor"
-import { SubmissionStatus } from "utils/constants"
+import { LANGUAGE_FORMAT_VALUE, SubmissionStatus } from "utils/constants"
 import type { SubmitCodePayload } from "utils/types"
 import SubmissionResult from "./SubmissionResult.vue"
 import { useBreakpoints } from "shared/composables/breakpoints"
@@ -119,6 +124,25 @@ async function submit() {
     }
   }
 
+  // 0.5 提交前自动格式化（Python3 用 ruff，C/C++ 用 clang-format）
+  const formatLang = LANGUAGE_FORMAT_VALUE[codeStore.code.language]
+  if (["python", "c", "cpp"].includes(formatLang)) {
+    try {
+      const res = await formatCode({
+        code: codeStore.code.value,
+        language: formatLang,
+      })
+      codeStore.setCode(res.data.code)
+    } catch (e: any) {
+      if (e?.error === "format-error") {
+        // 仅 Python3 会出现：代码本身存在语法错误
+        message.warning(`代码格式化失败：${e.data}，请检查代码后重试`)
+        return
+      }
+      // server-error / 网络异常：格式化工具问题，静默降级，提交原代码
+    }
+  }
+
   // 1. 构建提交数据
   const data: SubmitCodePayload = {
     problem_id: problem.value!.id,