From a36062c5c439b158a23110b4b59332ca3de0bf7a Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 14 Aug 2025 15:58:19 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat=20(core):=20=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/setting/Language.vue | 152 +++------------
 src/composables/usePluginConfig.ts  | 280 ++++++++++++++++++++++++++++
 2 files changed, 309 insertions(+), 123 deletions(-)
 create mode 100644 src/composables/usePluginConfig.ts

diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
index 54389be2..5ea38b8d 100644
--- a/src/components/setting/Language.vue
+++ b/src/components/setting/Language.vue
@@ -1,13 +1,23 @@
 <template>
   <div class="-mt-2">
-    <Tabs v-model="activePlugin" type="card" size="md" position="left" :tab-button-class="['w-36']" :tabs="tabsPluginData" @change="handleTabChange">
+    <Tabs v-model="activePlugin"
+          type="card"
+          size="md"
+          position="left"
+          :tab-button-class="['w-36']"
+          :tabs="tabsPluginData"
+          @change="handleTabChange">
       <template #[activePlugin]="{ tab }">
         <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4 flex items-center">
           <LanguagesIcon class="w-5 h-5 mr-2"/>
           {{ `语言 [ ${ tab.label } ] 配置` }}
         </h3>
 
-        <Tabs v-model="activeTab" type="card" size="md" :tabs="tabsData" :nav-class="['w-full', 'justify-center']">
+        <Tabs v-model="activeTab"
+              type="card"
+              size="md"
+              :tabs="tabsData"
+              :nav-class="['w-full', 'justify-center']">
           <template #general>
             <div class="space-y-4">
               <div>
@@ -119,14 +129,11 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref, watch } from 'vue'
-import { invoke } from '@tauri-apps/api/core'
-import { debounce } from 'lodash-es'
-import { open as openDialog } from '@tauri-apps/plugin-dialog'
+import { onMounted } from 'vue'
 import { ContainerIcon, FileIcon, Folder, LanguagesIcon, PickaxeIcon, Settings2 } from 'lucide-vue-next'
 import Button from '../../ui/Button.vue'
-import { useToast } from '../../plugins/toast'
 import Tabs from '../../ui/Tabs.vue'
+import { usePluginConfig } from '../../composables/usePluginConfig'
 import type PluginConfig from '../../types/plugin'
 
 const emit = defineEmits<{
@@ -134,12 +141,17 @@ const emit = defineEmits<{
   'error': [message: string]
 }>()
 
-const toast = useToast()
-
-const activePlugin = ref('')
-const tabsPluginData = ref([] as any[])
-
-const activeTab = ref('general')
+const {
+  activePlugin,
+  activeTab,
+  tabsPluginData,
+  pluginConfig,
+  handleTabChange,
+  selectExecuteHome,
+  initializePlugin
+} = usePluginConfig(emit)
+
+// 标签页数据
 const tabsData = [
   {
     key: 'general',
@@ -147,9 +159,9 @@ const tabsData = [
     icon: Settings2
   },
   {
-    'key': 'environment',
-    'label': '环境配置',
-    'icon': ContainerIcon
+    key: 'environment',
+    label: '环境配置',
+    icon: ContainerIcon
   },
   {
     key: 'template',
@@ -163,113 +175,7 @@ const tabsData = [
   }
 ]
 
-const globalConfig = ref(null as any)
-const pluginConfig = ref<PluginConfig>({
-  enabled: false,
-  execute_home: '',
-  extension: '',
-  language: '',
-  before_compile: '',
-  after_compile: '',
-  run_command: '',
-  template: '',
-  timeout: 30
-})
-
-const getSupportedLanguages = async () => {
-  try {
-    const languages = await invoke<any[]>('get_supported_languages')
-    tabsPluginData.value = languages.map((language) => ({
-      key: language.value,
-      label: language.name,
-      svgUrl: `/icons/${ language.value.replace(/\d+$/, '') }.svg`
-    }))
-
-    if (tabsPluginData.value.length > 0 && !activePlugin.value) {
-      activePlugin.value = tabsPluginData.value[0].key
-    }
-  }
-  catch (error) {
-    toast.error('获取支持的语言失败 - 错误信息: ' + error)
-    tabsPluginData.value = []
-  }
-}
-
-const getConfigure = async () => {
-  try {
-    globalConfig.value = await invoke<any>('get_app_config')
-
-    handleTabChange()
-  }
-  catch (error) {
-    toast.error('获取配置失败 - 错误信息: ' + error)
-  }
-}
-
-const handleTabChange = () => {
-  if (globalConfig.value && globalConfig.value.plugins) {
-    pluginConfig.value = globalConfig.value.plugins.find((plugin: any) => plugin.language === activePlugin.value)
-  }
-}
-
-const selectExecuteHome = async () => {
-  try {
-    const selected = await openDialog({
-      directory: true,
-      multiple: false,
-      title: '选择语言环境目录'
-    })
-
-    if (selected) {
-      pluginConfig.value.execute_home = selected as string
-    }
-  }
-  catch (error) {
-    console.error('Failed to select directory:', error)
-    emit('error', '选择目录失败')
-  }
-}
-
-const updateGlobalConfig = async (updatedPlugin: PluginConfig) => {
-  if (!globalConfig.value || !globalConfig.value.plugins) {
-    return
-  }
-
-  const pluginIndex = globalConfig.value.plugins.findIndex(
-      (plugin: any) => plugin.language === updatedPlugin.language
-  )
-
-  if (pluginIndex !== -1) {
-    globalConfig.value.plugins[pluginIndex] = { ...updatedPlugin }
-  }
-
-  try {
-    await invoke('update_app_config', { config: globalConfig.value })
-    toast.success(`${ tabsPluginData.value.find((tab: any) => tab.key === updatedPlugin.language).label } 配置已保存`)
-    emit('settings-changed', updatedPlugin)
-  }
-  catch (error) {
-    toast.error('保存配置失败 - 错误信息: ' + error)
-    emit('error', '保存配置失败')
-  }
-}
-
-watch(pluginConfig, (newConfig, oldConfig) => {
-  if (oldConfig && newConfig.language) {
-    // 防抖处理，避免频繁保存
-    debounceUpdate(newConfig)
-  }
-}, {
-  deep: true,
-  flush: 'post'
-})
-
-const debounceUpdate = debounce((config: PluginConfig) => {
-  updateGlobalConfig(config)
-}, 1000)
-
 onMounted(async () => {
-  await getSupportedLanguages()
-  await getConfigure()
+  await initializePlugin()
 })
 </script>
diff --git a/src/composables/usePluginConfig.ts b/src/composables/usePluginConfig.ts
new file mode 100644
index 00000000..253135f8
--- /dev/null
+++ b/src/composables/usePluginConfig.ts
@@ -0,0 +1,280 @@
+import { ref, watch } from 'vue'
+import { invoke } from '@tauri-apps/api/core'
+import { debounce } from 'lodash-es'
+import { open as openDialog } from '@tauri-apps/plugin-dialog'
+import { useToast } from '../plugins/toast'
+import type PluginConfig from '../types/plugin'
+
+interface Language
+{
+    name: string
+    value: string
+}
+
+interface TabData
+{
+    key: string
+    label: string
+    svgUrl?: string
+}
+
+export function usePluginConfig(emit?: any)
+{
+    const toast = useToast()
+
+    // 状态管理
+    const activePlugin = ref('')
+    const activeTab = ref('general')
+    const tabsPluginData = ref<TabData[]>([])
+    const globalConfig = ref<any>(null)
+
+    const pluginConfig = ref<PluginConfig>({
+        enabled: false,
+        execute_home: '',
+        extension: '',
+        language: '',
+        before_compile: '',
+        after_compile: '',
+        run_command: '',
+        template: '',
+        timeout: 30
+    })
+
+    // 获取支持的语言列表
+    const getSupportedLanguages = async () => {
+        try {
+            const languages = await invoke<Language[]>('get_supported_languages')
+            tabsPluginData.value = languages.map((language) => ({
+                key: language.value,
+                label: language.name,
+                svgUrl: `/icons/${ language.value.replace(/\d+$/, '') }.svg`
+            }))
+
+            // 设置默认选中的插件
+            if (tabsPluginData.value.length > 0 && !activePlugin.value) {
+                activePlugin.value = tabsPluginData.value[0].key
+            }
+
+            console.log('支持的语言列表:', tabsPluginData.value)
+        }
+        catch (error) {
+            console.error('获取支持的语言失败:', error)
+            toast.error('获取支持的语言失败 - 错误信息: ' + error)
+            tabsPluginData.value = []
+        }
+    }
+
+    // 获取全局配置
+    const getGlobalConfig = async () => {
+        try {
+            globalConfig.value = await invoke<any>('get_app_config')
+            console.log('全局配置加载成功:', globalConfig.value)
+
+            // 配置加载后处理当前插件配置
+            handleTabChange()
+        }
+        catch (error) {
+            console.error('获取配置失败:', error)
+            toast.error('获取配置失败 - 错误信息: ' + error)
+        }
+    }
+
+    // 处理标签页切换
+    const handleTabChange = () => {
+        if (globalConfig.value && globalConfig.value.plugins && activePlugin.value) {
+            const foundPlugin = globalConfig.value.plugins.find(
+                (plugin: any) => plugin.language === activePlugin.value
+            )
+
+            if (foundPlugin) {
+                pluginConfig.value = { ...foundPlugin }
+                console.log('切换到插件配置:', activePlugin.value, foundPlugin)
+            }
+            else {
+                console.warn('未找到插件配置:', activePlugin.value)
+                // 创建默认配置
+                pluginConfig.value = {
+                    enabled: false,
+                    execute_home: '',
+                    extension: '',
+                    language: activePlugin.value,
+                    before_compile: '',
+                    after_compile: '',
+                    run_command: '',
+                    template: '',
+                    timeout: 30
+                }
+            }
+        }
+    }
+
+    // 选择执行环境目录
+    const selectExecuteHome = async () => {
+        try {
+            const selected = await openDialog({
+                directory: true,
+                multiple: false,
+                title: '选择语言环境目录'
+            })
+
+            if (selected) {
+                pluginConfig.value.execute_home = selected as string
+                console.log('选择的执行环境目录:', selected)
+            }
+        }
+        catch (error) {
+            console.error('选择目录失败:', error)
+            if (emit) {
+                emit('error', '选择目录失败')
+            }
+        }
+    }
+
+    // 更新全局配置
+    const updateGlobalConfig = async (updatedPlugin: PluginConfig) => {
+        if (!globalConfig.value || !globalConfig.value.plugins) {
+            console.error('全局配置未加载或插件列表为空')
+            return
+        }
+
+        try {
+            const pluginIndex = globalConfig.value.plugins.findIndex(
+                (plugin: any) => plugin.language === updatedPlugin.language
+            )
+
+            if (pluginIndex !== -1) {
+                // 更新现有插件配置
+                globalConfig.value.plugins[pluginIndex] = { ...updatedPlugin }
+            }
+            else {
+                // 添加新的插件配置
+                globalConfig.value.plugins.push({ ...updatedPlugin })
+            }
+
+            await invoke('update_app_config', { config: globalConfig.value })
+
+            const pluginLabel = tabsPluginData.value.find(
+                (tab: any) => tab.key === updatedPlugin.language
+            )?.label || updatedPlugin.language
+
+            toast.success(`${ pluginLabel } 配置已保存`)
+
+            if (emit) {
+                emit('settings-changed', updatedPlugin)
+            }
+
+            console.log('插件配置保存成功:', updatedPlugin)
+        }
+        catch (error) {
+            console.error('保存配置失败:', error)
+            toast.error('保存配置失败 - 错误信息: ' + error)
+
+            if (emit) {
+                emit('error', '保存配置失败')
+            }
+        }
+    }
+
+    // 防抖更新
+    const debouncedUpdate = debounce((config: PluginConfig) => {
+        updateGlobalConfig(config)
+    }, 1000)
+
+    // 手动保存配置
+    const saveConfig = async () => {
+        if (pluginConfig.value.language) {
+            await updateGlobalConfig(pluginConfig.value)
+        }
+    }
+
+    // 重置插件配置
+    const resetPluginConfig = (language: string) => {
+        pluginConfig.value = {
+            enabled: false,
+            execute_home: '',
+            extension: '',
+            language: language,
+            before_compile: '',
+            after_compile: '',
+            run_command: '',
+            template: '',
+            timeout: 30
+        }
+    }
+
+    // 获取插件配置
+    const getPluginConfig = (language: string) => {
+        if (globalConfig.value && globalConfig.value.plugins) {
+            return globalConfig.value.plugins.find(
+                (plugin: any) => plugin.language === language
+            )
+        }
+        return null
+    }
+
+    // 验证插件配置
+    const validatePluginConfig = (config: PluginConfig): boolean => {
+        if (!config.language) {
+            toast.error('语言不能为空')
+            return false
+        }
+
+        if (!config.run_command) {
+            toast.error('执行命令不能为空')
+            return false
+        }
+
+        if (config.timeout && (config.timeout < 1 || config.timeout > 300)) {
+            toast.error('超时时间必须在 1-300 秒之间')
+            return false
+        }
+
+        return true
+    }
+
+    // 初始化插件管理器
+    const initializePlugin = async () => {
+        await getSupportedLanguages()
+        await getGlobalConfig()
+    }
+
+    // 监听插件配置变化
+    watch(pluginConfig, (newConfig, oldConfig) => {
+        if (oldConfig && newConfig.language) {
+            console.log('插件配置变化:', oldConfig, '->', newConfig)
+            debouncedUpdate(newConfig)
+        }
+    }, {
+        deep: true,
+        flush: 'post'
+    })
+
+    // 监听活动插件变化
+    watch(activePlugin, (newPlugin, oldPlugin) => {
+        if (newPlugin && newPlugin !== oldPlugin) {
+            console.log('切换插件:', oldPlugin, '->', newPlugin)
+            handleTabChange()
+        }
+    })
+
+    return {
+        // 状态
+        activePlugin,
+        activeTab,
+        tabsPluginData,
+        globalConfig,
+        pluginConfig,
+
+        // 方法
+        getSupportedLanguages,
+        getGlobalConfig,
+        handleTabChange,
+        selectExecuteHome,
+        updateGlobalConfig,
+        saveConfig,
+        resetPluginConfig,
+        getPluginConfig,
+        validatePluginConfig,
+        initializePlugin
+    }
+}

From 0ad08ecc06c8aba8b1a625d45c3017f17ffcaea5 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 14 Aug 2025 16:49:47 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat=20(language):=20=E6=94=AF=E6=8C=81=20J?=
 =?UTF-8?q?ava=20=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/plugin.rs          | 17 +++++++++-
 src-tauri/src/plugins/java.rs    | 54 ++++++++++++++++++++++++++++++++
 src-tauri/src/plugins/manager.rs |  2 ++
 src-tauri/src/plugins/mod.rs     |  2 ++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src-tauri/src/plugins/java.rs

diff --git a/src-tauri/src/plugin.rs b/src-tauri/src/plugin.rs
index 78904093..b9f645ce 100644
--- a/src-tauri/src/plugin.rs
+++ b/src-tauri/src/plugin.rs
@@ -32,6 +32,11 @@ pub async fn get_info(
     debug!("获取环境 -> 插件 [ {} ] 命令 {}", language, cmd);
 
     let version_output = Command::new(&cmd).args(plugin.get_version_args()).output();
+    debug!(
+        "获取环境 -> 插件 [ {} ] 版本, 结果 {:?}",
+        plugin.get_language_key(),
+        version_output
+    );
     if let Ok(version_out) = version_output {
         if version_out.status.success() {
             let path_result = Command::new(&cmd)
@@ -39,10 +44,20 @@ pub async fn get_info(
                 .arg(plugin.get_path_command())
                 .output();
 
-            let version = String::from_utf8_lossy(&version_out.stdout)
+            let mut version = String::from_utf8_lossy(&version_out.stdout)
                 .trim()
                 .to_string();
 
+            if version.is_empty() {
+                info!(
+                    "获取环境 -> 调用插件 [ {} ] 版本为空，通过 stderr 获取",
+                    language
+                );
+                version = String::from_utf8_lossy(&version_out.stderr)
+                    .trim()
+                    .to_string();
+            }
+
             let path = if let Ok(path_out) = path_result {
                 if path_out.status.success() {
                     String::from_utf8_lossy(&path_out.stdout).trim().to_string()
diff --git a/src-tauri/src/plugins/java.rs b/src-tauri/src/plugins/java.rs
new file mode 100644
index 00000000..08ca7e54
--- /dev/null
+++ b/src-tauri/src/plugins/java.rs
@@ -0,0 +1,54 @@
+use super::{LanguagePlugin, PluginConfig};
+use std::vec;
+
+pub struct JavaPlugin;
+
+impl LanguagePlugin for JavaPlugin {
+    fn get_order(&self) -> i32 {
+        2
+    }
+
+    fn get_language_name(&self) -> &'static str {
+        "Java"
+    }
+
+    fn get_language_key(&self) -> &'static str {
+        "java"
+    }
+
+    fn get_file_extension(&self) -> String {
+        self.get_config()
+            .map(|config| config.extension.clone())
+            .unwrap_or_else(|| "java".to_string())
+    }
+
+    fn get_version_args(&self) -> Vec<&'static str> {
+        vec!["-version"]
+    }
+
+    fn get_path_command(&self) -> String {
+        "System.out.println(System.getProperty(\"java.home\"));".to_string()
+    }
+
+    fn get_default_config(&self) -> PluginConfig {
+        PluginConfig {
+            enabled: true,
+            language: String::from("java"),
+            before_compile: None,
+            extension: String::from("java"),
+            execute_home: None,
+            run_command: Some(String::from("java $filename")),
+            after_compile: Some(String::from("rm -f *.class")),
+            template: Some(String::from(
+                "public class Main {\n    public static void main(String[] args) {\n        System.out.println(\"Hello, World!\");\n    }\n}",
+            )),
+            timeout: Some(30),
+        }
+    }
+
+    fn get_default_command(&self) -> String {
+        self.get_config()
+            .and_then(|config| config.run_command.clone())
+            .unwrap_or_else(|| "java".to_string())
+    }
+}
diff --git a/src-tauri/src/plugins/manager.rs b/src-tauri/src/plugins/manager.rs
index a55c180b..fa746616 100644
--- a/src-tauri/src/plugins/manager.rs
+++ b/src-tauri/src/plugins/manager.rs
@@ -2,6 +2,7 @@ use super::{
     LanguagePlugin, PluginConfig, go::GoPlugin, nodejs::NodeJSPlugin, python2::Python2Plugin,
     python3::Python3Plugin,
 };
+use crate::plugins::java::JavaPlugin;
 use std::collections::HashMap;
 
 pub struct PluginManager {
@@ -16,6 +17,7 @@ impl PluginManager {
         plugins.insert("python3".to_string(), Box::new(Python3Plugin));
         plugins.insert("nodejs".to_string(), Box::new(NodeJSPlugin));
         plugins.insert("go".to_string(), Box::new(GoPlugin));
+        plugins.insert("java".to_string(), Box::new(JavaPlugin));
 
         Self { plugins }
     }
diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
index 7c9ee409..6c204437 100644
--- a/src-tauri/src/plugins/mod.rs
+++ b/src-tauri/src/plugins/mod.rs
@@ -1,6 +1,7 @@
 use crate::config::get_app_config_internal;
 use log::{debug, info};
 use serde::{Deserialize, Serialize};
+use std::format;
 use std::path::PathBuf;
 
 // 通用结构定义
@@ -329,6 +330,7 @@ pub trait LanguagePlugin: Send + Sync {
 
 // 重新导出子模块
 pub mod go;
+pub mod java;
 pub mod manager;
 pub mod nodejs;
 pub mod python2;

From 7465a3d22faf0d12ec7a8d8e20decef13afd5b27 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 14 Aug 2025 17:17:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat=20(language):=20=E5=A2=9E=E5=8A=A0=20J?=
 =?UTF-8?q?ava=20=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                           |  1 +
 public/icons/java.svg                  |  7 ++
 src-tauri/src/plugins/java.rs          |  2 +-
 src/App.vue                            | 14 +++-
 src/composables/useCodeMirrorEditor.ts |  3 +
 src/composables/useEventManager.ts     | 97 +++++++-------------------
 6 files changed, 51 insertions(+), 73 deletions(-)
 create mode 100644 public/icons/java.svg

diff --git a/package.json b/package.json
index b94bdb21..8260682b 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
   "dependencies": {
     "@babel/runtime": "^7.28.2",
     "@codemirror/lang-go": "^6.0.1",
+    "@codemirror/lang-java": "^6.0.2",
     "@codemirror/lang-javascript": "^6.2.4",
     "@codemirror/lang-python": "^6.2.1",
     "@codemirror/state": "^6.5.2",
diff --git a/public/icons/java.svg b/public/icons/java.svg
new file mode 100644
index 00000000..9dbba1ec
--- /dev/null
+++ b/public/icons/java.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+    <path fill="#0074BD" d="M47.617 98.12s-4.767 2.774 3.397 3.71c9.892 1.13 14.947.968 25.845-1.092 0 0 2.871 1.795 6.873 3.351-24.439 10.47-55.308-.607-36.115-5.969zm-2.988-13.665s-5.348 3.959 2.823 4.805c10.567 1.091 18.91 1.18 33.354-1.6 0 0 1.993 2.025 5.132 3.131-29.542 8.64-62.446.68-41.309-6.336z" />
+    <path fill="#EA2D2E" d="M69.802 61.271c6.025 6.935-1.58 13.17-1.58 13.17s15.289-7.891 8.269-17.777c-6.559-9.215-11.587-13.792 15.635-29.58 0 .001-42.731 10.67-22.324 34.187z" />
+    <path fill="#0074BD" d="M102.123 108.229s3.529 2.91-3.888 5.159c-14.102 4.272-58.706 5.56-71.094.171-4.451-1.938 3.899-4.625 6.526-5.192 2.739-.593 4.303-.485 4.303-.485-4.953-3.487-32.013 6.85-13.743 9.815 49.821 8.076 90.817-3.637 77.896-9.468zM49.912 70.294s-22.686 5.389-8.033 7.348c6.188.828 18.518.638 30.011-.326 9.39-.789 18.813-2.474 18.813-2.474s-3.308 1.419-5.704 3.053c-23.042 6.061-67.544 3.238-54.731-2.958 10.832-5.239 19.644-4.643 19.644-4.643zm40.697 22.747c23.421-12.167 12.591-23.86 5.032-22.285-1.848.385-2.677.72-2.677.72s.688-1.079 2-1.543c14.953-5.255 26.451 15.503-4.823 23.725 0-.002.359-.327.468-.617z" />
+    <path fill="#EA2D2E" d="M76.491 1.587S89.459 14.563 64.188 34.51c-20.266 16.006-4.621 25.13-.007 35.559-11.831-10.673-20.509-20.07-14.688-28.815C58.041 28.42 81.722 22.195 76.491 1.587z" />
+    <path fill="#0074BD" d="M52.214 126.021c22.476 1.437 57-.8 57.817-11.436 0 0-1.571 4.032-18.577 7.231-19.186 3.612-42.854 3.191-56.887.874 0 .001 2.875 2.381 17.647 3.331z" />
+</svg>
\ No newline at end of file
diff --git a/src-tauri/src/plugins/java.rs b/src-tauri/src/plugins/java.rs
index 08ca7e54..5e124963 100644
--- a/src-tauri/src/plugins/java.rs
+++ b/src-tauri/src/plugins/java.rs
@@ -5,7 +5,7 @@ pub struct JavaPlugin;
 
 impl LanguagePlugin for JavaPlugin {
     fn get_order(&self) -> i32 {
-        2
+        5
     }
 
     fn get_language_name(&self) -> &'static str {
diff --git a/src/App.vue b/src/App.vue
index fba64584..b9cfd72d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -82,7 +82,12 @@ const {
   lastExecutionTime,
   runCode,
   stopCode,
-  clearOutput
+  clearOutput,
+  handleRealtimeOutput,
+  handleExecutionComplete,
+  handleExecutionStopped,
+  handleExecutionTimeout,
+  handleExecutionError
 } = useCodeExecution(toast)
 
 const {
@@ -113,7 +118,12 @@ const { initializeEventListeners, cleanupEventListeners } = useEventManager({
   isSuccess,
   lastExecutionTime,
   currentLanguage,
-  toast
+  toast,
+  handleRealtimeOutput,
+  handleExecutionComplete,
+  handleExecutionStopped,
+  handleExecutionTimeout,
+  handleExecutionError
 })
 
 // 禁用右键菜单
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index 6e645912..f38aee02 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -2,6 +2,7 @@ import { nextTick, ref, watch } from 'vue'
 import { python } from '@codemirror/lang-python'
 import { javascript } from '@codemirror/lang-javascript'
 import { go } from '@codemirror/lang-go'
+import { java } from '@codemirror/lang-java'
 import {
     abcdef,
     abyss,
@@ -155,6 +156,8 @@ export function useCodeMirrorEditor(props: Props, _emit: Emit)
                 return javascript()
             case 'go':
                 return go()
+            case 'java':
+                return java()
             default:
                 return null
         }
diff --git a/src/composables/useEventManager.ts b/src/composables/useEventManager.ts
index 22f2c80b..edddc2b4 100644
--- a/src/composables/useEventManager.ts
+++ b/src/composables/useEventManager.ts
@@ -1,5 +1,4 @@
 import type { Ref } from 'vue'
-import { ref } from 'vue'
 import { listen, UnlistenFn } from '@tauri-apps/api/event'
 import { CodeOutputEvent } from '../types/app.ts'
 
@@ -14,6 +13,11 @@ interface EventManagerOptions
     lastExecutionTime: Ref<number>
     currentLanguage: Ref<string>
     toast: any
+    handleRealtimeOutput: (currentLanguage: string, data: any) => void
+    handleExecutionComplete: (currentLanguage: string, data: any) => void
+    handleExecutionStopped: (currentLanguage: string, data: any) => void
+    handleExecutionTimeout: (currentLanguage: string, data: any) => void
+    handleExecutionError: (currentLanguage: string, data: any) => void
 }
 
 export function useEventManager(options: EventManagerOptions)
@@ -22,12 +26,12 @@ export function useEventManager(options: EventManagerOptions)
         showAbout,
         showSettings,
         showUpdate,
-        output,
-        isRunning,
-        isSuccess,
-        lastExecutionTime,
         currentLanguage,
-        toast
+        handleRealtimeOutput,
+        handleExecutionComplete,
+        handleExecutionStopped,
+        handleExecutionTimeout,
+        handleExecutionError
     } = options
 
     // 事件监听器引用
@@ -41,40 +45,11 @@ export function useEventManager(options: EventManagerOptions)
     let unlistenExecutionTimeoutFn: UnlistenFn | null = null
     let unlistenExecutionErrorFn: UnlistenFn | null = null
 
-    // 实时输出相关
-    const realTimeOutput = ref('')
-    const realTimeStderr = ref('')
-
     // 处理实时输出
-    const handleRealtimeOutput = (event: any) => {
+    const handleRealtimeOutputWrapper = (event: any) => {
         const data: CodeOutputEvent = event.payload
         console.log('实时输出:', data)
-
-        // 只处理当前语言的输出
-        if (data.language !== currentLanguage.value) {
-            return
-        }
-
-        if (data.type === 'stdout') {
-            realTimeOutput.value += data.content + '\n'
-        }
-        else if (data.type === 'stderr') {
-            realTimeStderr.value += data.content + '\n'
-        }
-
-        // 合并输出显示
-        let combinedOutput = ''
-        if (realTimeOutput.value) {
-            combinedOutput += realTimeOutput.value
-        }
-        if (realTimeStderr.value) {
-            if (combinedOutput) {
-                combinedOutput += '\n'
-            }
-            combinedOutput += realTimeStderr.value
-        }
-
-        output.value = combinedOutput
+        handleRealtimeOutput(currentLanguage.value, data)
     }
 
     // 处理执行状态事件
@@ -85,44 +60,26 @@ export function useEventManager(options: EventManagerOptions)
         }
     }
 
-    const handleExecutionComplete = (event: any) => {
+    const handleExecutionCompleteWrapper = (event: any) => {
         const data = event.payload
-        if (data.language === currentLanguage.value) {
-            isRunning.value = false
-            isSuccess.value = data.success
-            if (data.execution_time) {
-                lastExecutionTime.value = data.execution_time
-            }
-            console.log('代码执行完成')
-        }
+        console.log('代码执行完成')
+        handleExecutionComplete(currentLanguage.value, data)
     }
 
-    const handleExecutionStopped = (event: any) => {
+    const handleExecutionStoppedWrapper = (event: any) => {
         const data = event.payload
-        if (data.language === currentLanguage.value) {
-            isRunning.value = false
-            output.value += '\n\n🛑 代码执行已被用户停止'
-            toast.warning('代码执行已停止')
-            console.log('代码执行已停止')
-        }
+        console.log('代码执行已停止')
+        handleExecutionStopped(currentLanguage.value, data)
     }
 
-    const handleExecutionTimeout = (event: any) => {
+    const handleExecutionTimeoutWrapper = (event: any) => {
         const data = event.payload
-        if (data.language === currentLanguage.value) {
-            isRunning.value = false
-            output.value += '\n\n⚠️ 代码执行超时（30秒）'
-            toast.error('代码执行超时')
-        }
+        handleExecutionTimeout(currentLanguage.value, data)
     }
 
-    const handleExecutionError = (event: any) => {
+    const handleExecutionErrorWrapper = (event: any) => {
         const data = event.payload
-        if (data.language === currentLanguage.value) {
-            isRunning.value = false
-            output.value += `\n\n❌ 执行错误: ${ data.error }`
-            toast.error('代码执行出错')
-        }
+        handleExecutionError(currentLanguage.value, data)
     }
 
     const initializeEventListeners = async () => {
@@ -140,14 +97,14 @@ export function useEventManager(options: EventManagerOptions)
         })
 
         // 监听实时输出事件
-        unlistenOutputFn = await listen('code-output', handleRealtimeOutput)
+        unlistenOutputFn = await listen('code-output', handleRealtimeOutputWrapper)
 
         // 监听执行状态事件
         unlistenExecutionStartFn = await listen('code-execution-start', handleExecutionStart)
-        unlistenExecutionCompleteFn = await listen('code-execution-complete', handleExecutionComplete)
-        unlistenExecutionStoppedFn = await listen('code-execution-stopped', handleExecutionStopped)
-        unlistenExecutionTimeoutFn = await listen('code-execution-timeout', handleExecutionTimeout)
-        unlistenExecutionErrorFn = await listen('code-execution-error', handleExecutionError)
+        unlistenExecutionCompleteFn = await listen('code-execution-complete', handleExecutionCompleteWrapper)
+        unlistenExecutionStoppedFn = await listen('code-execution-stopped', handleExecutionStoppedWrapper)
+        unlistenExecutionTimeoutFn = await listen('code-execution-timeout', handleExecutionTimeoutWrapper)
+        unlistenExecutionErrorFn = await listen('code-execution-error', handleExecutionErrorWrapper)
     }
 
     const cleanupEventListeners = () => {

From c89116fab5bd38d10e7271a09f15970b5d30dec5 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 14 Aug 2025 17:52:32 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat=20(core):=20=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CodeEditor.vue          |   2 +-
 src/components/setting/Language.vue    | 116 ++++++++++++++++++++++---
 src/composables/useCodeMirrorEditor.ts |   7 +-
 3 files changed, 104 insertions(+), 21 deletions(-)

diff --git a/src/components/CodeEditor.vue b/src/components/CodeEditor.vue
index 25851c0a..7a781bbb 100644
--- a/src/components/CodeEditor.vue
+++ b/src/components/CodeEditor.vue
@@ -29,7 +29,7 @@ const {
   extensions,
   editorConfig,
   initializeEditor
-} = useCodeMirrorEditor(props, emit)
+} = useCodeMirrorEditor(props)
 
 const handleInput = (value: string) => {
   emit('update:modelValue', value)
diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
index 5ea38b8d..223590be 100644
--- a/src/components/setting/Language.vue
+++ b/src/components/setting/Language.vue
@@ -8,9 +8,9 @@
           :tabs="tabsPluginData"
           @change="handleTabChange">
       <template #[activePlugin]="{ tab }">
-        <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4 flex items-center">
-          <LanguagesIcon class="w-5 h-5 mr-2"/>
-          {{ `语言 [ ${ tab.label } ] 配置` }}
+        <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4 flex items-center space-x-2">
+          <img :src="`/icons/${activePlugin.replace(/\d+$/, '')}.svg`" class="w-6 h-6" :alt="tab.label"/>
+          <span>{{ `语言 [ ${ tab.label } ] 配置` }}</span>
         </h3>
 
         <Tabs v-model="activeTab"
@@ -96,15 +96,14 @@
           </template>
 
           <template #template>
-            <div>
-              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-                文件模板
-              </label>
-              <div class="flex">
-                <textarea v-model="pluginConfig.template"
-                          placeholder="文件模板"
-                          rows="20"
-                          class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+            <div class="w-[98%]">
+              <Codemirror v-if="isEditorReady && pluginConfig.template !== undefined"
+                          style="width: 100%; height: 380px"
+                          v-model="pluginConfig.template"
+                          :extensions="currentExtensions"
+                          class="flex-1 border border-gray-300 dark:border-gray-600 rounded-md overflow-hidden"/>
+              <div v-else class="flex-1 flex items-center justify-center h-64 border border-gray-300 dark:border-gray-600 rounded-md">
+                <div class="text-gray-500">加载编辑器中...</div>
               </div>
             </div>
           </template>
@@ -129,12 +128,14 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted } from 'vue'
-import { ContainerIcon, FileIcon, Folder, LanguagesIcon, PickaxeIcon, Settings2 } from 'lucide-vue-next'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
+import { ContainerIcon, FileIcon, Folder, PickaxeIcon, Settings2 } from 'lucide-vue-next'
+import { Codemirror } from 'vue-codemirror'
 import Button from '../../ui/Button.vue'
 import Tabs from '../../ui/Tabs.vue'
 import { usePluginConfig } from '../../composables/usePluginConfig'
 import type PluginConfig from '../../types/plugin'
+import { useCodeMirrorEditor } from '../../composables/useCodeMirrorEditor.ts'
 
 const emit = defineEmits<{
   'settings-changed': [config: PluginConfig]
@@ -151,6 +152,78 @@ const {
   initializePlugin
 } = usePluginConfig(emit)
 
+// 编辑器状态
+const isEditorReady = ref(false)
+const currentExtensions = ref<any[]>([])
+
+// 创建 computed 来响应式地获取当前语言
+const currentLanguage = computed(() => {
+  return activePlugin.value || ''
+})
+
+// 创建 computed 来响应式地获取模板内容
+const templateContent = computed({
+  get: () => pluginConfig.value?.template || '',
+  set: (value: string) => {
+    if (pluginConfig.value) {
+      pluginConfig.value.template = value
+    }
+  }
+})
+
+// 使用 useCodeMirrorEditor composable
+const {
+  initializeEditor,
+  getLanguageExtension,
+  getThemeExtension
+} = useCodeMirrorEditor(
+    {
+      modelValue: templateContent.value,
+      language: currentLanguage.value
+    },
+    // emit 函数用于更新 modelValue
+    (event: 'update:modelValue', value: string) => {
+      templateContent.value = value
+    }
+)
+
+// 更新扩展的函数
+const updateExtensions = async () => {
+  const newExtensions = []
+
+  // 添加主题扩展
+  const themeExtension = getThemeExtension()
+  newExtensions.push(themeExtension)
+
+  // 添加语言扩展
+  if (currentLanguage.value) {
+    const langExtension = getLanguageExtension(currentLanguage.value)
+    if (langExtension) {
+      newExtensions.push(langExtension)
+    }
+  }
+
+  currentExtensions.value = newExtensions
+
+  if (!isEditorReady.value) {
+    await nextTick()
+    isEditorReady.value = true
+  }
+}
+
+// 监听语言变化
+watch(currentLanguage, async (newLanguage) => {
+  console.log('Language changed to:', newLanguage)
+  if (newLanguage) {
+    await updateExtensions()
+  }
+}, { immediate: false })
+
+// 监听插件配置变化
+watch(() => pluginConfig.value?.template, (newTemplate) => {
+  console.log('Template changed:', newTemplate)
+}, { immediate: false })
+
 // 标签页数据
 const tabsData = [
   {
@@ -176,6 +249,21 @@ const tabsData = [
 ]
 
 onMounted(async () => {
+  console.log('Component mounted')
+
+  // 先初始化插件配置
   await initializePlugin()
+  console.log('Plugin initialized:', {
+    activePlugin: activePlugin.value,
+    template: pluginConfig.value?.template
+  })
+
+  // 再初始化编辑器
+  await initializeEditor()
+  console.log('Editor initialized')
+
+  // 更新扩展
+  await updateExtensions()
+  console.log('Extensions updated:', currentExtensions.value)
 })
 </script>
diff --git a/src/composables/useCodeMirrorEditor.ts b/src/composables/useCodeMirrorEditor.ts
index f38aee02..00b1558e 100644
--- a/src/composables/useCodeMirrorEditor.ts
+++ b/src/composables/useCodeMirrorEditor.ts
@@ -67,12 +67,7 @@ interface Props
     language?: string
 }
 
-interface Emit
-{
-    (event: 'update:modelValue', value: string): void
-}
-
-export function useCodeMirrorEditor(props: Props, _emit: Emit)
+export function useCodeMirrorEditor(props: Props)
 {
     const toast = useToast()
 

From 983bcaf45fa71ced86fe547e58ec7d770c993ff2 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Thu, 14 Aug 2025 17:55:42 +0800
Subject: [PATCH 5/5] =?UTF-8?q?fix=20(core):=20=E4=BF=AE=E5=A4=8D=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BB=A3=E7=A0=81=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/setting/Language.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
index 223590be..9fa60851 100644
--- a/src/components/setting/Language.vue
+++ b/src/components/setting/Language.vue
@@ -180,10 +180,6 @@ const {
     {
       modelValue: templateContent.value,
       language: currentLanguage.value
-    },
-    // emit 函数用于更新 modelValue
-    (event: 'update:modelValue', value: string) => {
-      templateContent.value = value
     }
 )