-## System architecture
-
----
-
-
-
-## Stargazers over time
+## Documentation
---
-[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
+[Extended documentation for MetaForge](https://metaforge.devlive.org)
## Join Us
@@ -131,11 +213,11 @@ Please visit [Issues 950](https://github.com/devlive-community/metaforge/issues/
[](https://www.rainbond.com/)
[](https://vuejs.org/)
-## Installation and Configuration
+## Stargazers over time
---
-[Extended documentation for MetaForge](https://metaforge.devlive.org)
+[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
## Contributors
diff --git a/README.ru.md b/README.ru.md
index de30f8eca8..525539e4da 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -4,16 +4,14 @@
# MetaForge
----
+**Интегрированное программное обеспечение для преобразования, интеграции и визуализации данных**
-
-[](https://github.com/EdurtIO/metaforge)
-
+---
[](https://opensource.org/licenses/Apache-2.0)
-
+
-
+[](https://hub.docker.com/r/devliveorg/metaforge)
@@ -23,35 +21,124 @@
-### Что такое MetaForge?
+## Что такое MetaForge?
---
-MetaForge — это интегрированное программное обеспечение для преобразования, интеграции и визуализации данных. Поддержка нескольких источников данных, типов файлов, баз данных, связанных с большими данными, реляционных баз данных, баз данных NoSQL и многого другого. С помощью программного обеспечения может быть реализовано управление несколькими источниками данных, а также могут выполняться различные операции с данными в источнике, могут быть построены диаграммы данных, могут быть обнаружены источники данных и могут быть выполнены другие функции.
+MetaForge — это интегрированное программное обеспечение для преобразования, интеграции и визуализации данных. Оно поддерживает самые разные источники данных — реляционные СУБД, NoSQL-базы данных, big data движки, очереди сообщений и файловые системы — и позволяет управлять множеством источников из единой консоли, запрашивать и преобразовывать данные, строить наборы данных, диаграммы и представления мониторинга.
+
+## Возможности
+
+---
+
+- **Управление источниками данных** — подключение, проверка и управление 50+ источниками из единой консоли
+- **SQL-консоль** — редактор в стиле IDE с подсветкой синтаксиса, форматированием, историей выполнения и экспортом
+- **Наборы данных** — создание переиспользуемых наборов из таблиц или произвольных запросов, предпросмотр данных и метаданные столбцов
+- **Визуализация** — дашборды с перетаскиванием: таблицы, круговые диаграммы и другие типы графиков
+- **Отчёты** — планирование и совместный доступ к отчётам
+- **Рабочие процессы** — объединение задач обработки данных в повторяемые workflow
+- **Файловое хранилище** — чтение и запись файлов через Aliyun OSS, Amazon S3, HDFS, локальное хранилище и другие
+- **Уведомления** — DingTalk, электронная почта и другие каналы для событий задач и системы
+- **AI-ассистент** — общайтесь со своими данными через настроенных AI-провайдеров
+- **Плагинная архитектура** — каждый коннектор, конвертер и хранилище являются подключаемыми плагинами
+- **Администрирование** — пользователи, роли, меню и конфигурация среды выполнения с тонкой настройкой прав
+
+## Требования
+
+---
-| Имя пользователя | пароль |
-|:----------------:|:------------|
-| `metaforge` | `123456789` |
-| `admin` | `12345678` |
+| Зависимость | Версия |
+|:------------|:----------------------------------|
+| JDK | 21 |
+| Maven | 3.9+ (в комплекте `./mvnw`) |
+| Node.js | 20 |
+| pnpm | 9.13.2 |
-### просьба
+## Быстрый старт
---
-> Обязательный к прочтению пользователь: обязательно клонируйте код локально и выполните следующую команду
+> Обязательно к прочтению: после клонирования кода обязательно выполните следующие команды
```bash
cp configure/git-hook/* .git/hooks
chmod 700 .git/hooks/*
```
+### Запуск бэкенда (разработка)
+
+Запустите главный класс `org.devlive.metaforge.server.MetaForge` (модуль `core/metaforge-server`) в своей IDE.
+Сервер доступен на [http://localhost:9096](http://localhost:9096). При первом запуске мастер установки поможет выбрать
+базу метаданных (по умолчанию встроенная H2, также MySQL / PostgreSQL / SQL Server / Oracle) и создать
+учётную запись администратора.
+
+### Запуск фронтенда (разработка)
+
+```bash
+pnpm install
+pnpm --filter metaforge-web dev
+```
+
+Веб-консоль доступна на [http://localhost:3001](http://localhost:3001) и проксирует API-запросы к бэкенду.
+
+### Сборка для продакшена
+
+```bash
+# Фронтенд
+pnpm --filter metaforge-web build
+
+# Бэкенд + дистрибутив (сервер отдаёт собранный фронтенд
+# из core/metaforge-web/dist; архив попадает в dist/)
+./mvnw -T1C clean package -DskipTests
+```
+
+## Docker
+
+---
+
+```bash
+docker pull devliveorg/metaforge:latest
+docker run -d --name metaforge -p 9096:9096 devliveorg/metaforge:latest
+```
+
+Либо распакуйте собранный локально дистрибутив (`dist/metaforge-server-2026.0.0-bin.tar.gz`) и запустите `bin/startup.sh`.
+
+## Структура проекта
+
+---
+
+```
+metaforge
+├── client # Консольный клиент
+├── configure # Конфигурация по умолчанию и манифесты плагинов
+├── core
+│ ├── metaforge-captcha # Генерация капчи
+│ ├── metaforge-common # Общие утилиты и перечисления
+│ ├── metaforge-condor # Интеграция планировщика
+│ ├── metaforge-server # Сервер Spring Boot (точка входа REST API)
+│ ├── metaforge-service # Доменные сервисы и хранение данных
+│ ├── metaforge-security # Конфигурация безопасности
+│ ├── metaforge-sql # Конструкторы SQL-запросов
+│ ├── metaforge-spi # Контракты plugin SPI
+│ ├── metaforge-web # Веб-консоль Vue 3 + Tailwind
+├── convert # Конвертеры данных (JSON, CSV, XML, ...)
+├── driver # Драйверы баз данных (Redis, MongoDB, ...)
+├── executor # Движки выполнения
+├── fs # Плагины файловых хранилищ (OSS, S3, локальное, ...)
+├── lib # Общие библиотеки (HTTP-клиент, логирование, shell)
+├── notify # Каналы уведомлений (DingTalk, ...)
+├── parser # SQL-парсеры (MySQL, Trino, ...)
+├── plugin # Плагины источников данных (50+ коннекторов)
+└── shaded # Shaded сторонние интеграции
+```
+
## Поддерживаемые коннекторы
---
-MetaForge может запрашивать данные из любого хранилища данных или движка данных (ClickHouse, MySQL, Presto и т.д.), использующего SQL.
+MetaForge может запрашивать данные из любого SQL-хранилища или движка данных (ClickHouse, MySQL, Presto и др.).
-Ниже приведены некоторые из основных поддерживаемых решений для баз данных.
+Ниже представлены некоторые из основных поддерживаемых решений для баз данных:
@@ -105,25 +192,19 @@ MetaForge может запрашивать данные из любого хр
-
-## Атлас вкладов
-
----
-
-[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
+[Расширенная документация по MetaForge](https://metaforge.devlive.org)
## Присоединяйтесь к нам
---
-Вид [Issues 950](https://github.com/devlive-community/metaforge/issues/950)
+Посетите [Issues 950](https://github.com/devlive-community/metaforge/issues/950)
-## Признание
+## Благодарности
---
@@ -131,13 +212,13 @@ MetaForge может запрашивать данные из любого хр
[](https://www.rainbond.com/)
[](https://vuejs.org/)
-## Установка и настройка
+## История звёзд
---
-[Расширенная документация по MetaForge](https://metaforge.devlive.org)
+[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
-## Участников
+## Участники
---
diff --git a/README.zh_CN.md b/README.zh_CN.md
index 9f4c79574b..993dffe945 100644
--- a/README.zh_CN.md
+++ b/README.zh_CN.md
@@ -4,16 +4,14 @@
# MetaForge
----
+**用于数据转换、集成和可视化的集成软件**
-
-[](https://github.com/EdurtIO/metaforge)
-
+---
[](https://opensource.org/licenses/Apache-2.0)
-
+
-
+[](https://hub.docker.com/r/devliveorg/metaforge)
@@ -23,18 +21,40 @@
-### 什么是 metaforge?
+## 什么是 MetaForge?
---
-MetaForge 是用于数据转换、集成和可视化的集成软件。支持多种数据源、文件类型、大数据相关数据库、关系数据库、NoSQL数据库等。通过软件可以实现多数据源的管理，对源下的数据进行各种操作转换、制作数据图表、监控数据源和其他功能。
+MetaForge 是用于数据转换、集成和可视化的集成软件。支持多种数据源 —— 关系型数据库、NoSQL 数据库、大数据引擎、消息队列和文件系统 —— 让您在一个控制台中管理多个数据源，查询和转换数据、构建数据集，并创建图表和监控视图。
+
+## 功能特性
+
+---
+
+- **数据源管理** — 在单一控制台中连接、测试和管理 50+ 数据源
+- **SQL 查询控制台** — IDE 风格的编辑器，支持语法高亮、格式化、执行历史和导出
+- **数据集** — 基于表或临时查询构建可复用的数据集，预览数据并定义列元数据
+- **可视化** — 拖拽式仪表盘，支持表格、饼图等多种图表类型
+- **报表** — 定时调度并分享报表
+- **工作流** — 将数据任务串联为可重复执行的工作流
+- **文件存储** — 通过阿里云 OSS、Amazon S3、HDFS、本地存储等读写文件
+- **通知** — 钉钉、邮件等渠道的任务与系统事件通知
+- **AI 助手** — 通过配置的 AI 提供商与您的数据对话
+- **插件架构** — 每个连接器、转换器和存储后端都是可热加载的插件
+- **系统管理** — 用户、角色、菜单与运行时配置，支持细粒度权限
+
+## 环境要求
+
+---
-| 用户名 | 密码 |
-|:---------:|:------------|
-| `metaforge` | `123456789` |
-| `admin` | `12345678` |
+| 依赖 | 版本 |
+|:---------|:------------------------------|
+| JDK | 21 |
+| Maven | 3.9+（已内置 `./mvnw`） |
+| Node.js | 20 |
+| pnpm | 9.13.2 |
-### 要求
+## 快速开始
---
@@ -45,6 +65,72 @@ cp configure/git-hook/* .git/hooks
chmod 700 .git/hooks/*
```
+### 运行后端（开发）
+
+在 IDE 中运行主类 `org.devlive.metaforge.server.MetaForge`（模块 `core/metaforge-server`）。
+服务启动后访问 [http://localhost:9096](http://localhost:9096)。首次启动时，安装向导会引导您选择元数据库
+（默认内嵌 H2，也可选择 MySQL / PostgreSQL / SQL Server / Oracle）并创建管理员账号。
+
+### 运行前端（开发）
+
+```bash
+pnpm install
+pnpm --filter metaforge-web dev
+```
+
+Web 控制台启动在 [http://localhost:3001](http://localhost:3001)，API 请求会代理到后端。
+
+### 生产构建
+
+```bash
+# 前端
+pnpm --filter metaforge-web build
+
+# 后端 + 发行包（服务端会直接加载 core/metaforge-web/dist
+# 下构建好的前端；压缩包输出到 dist/）
+./mvnw -T1C clean package -DskipTests
+```
+
+## Docker
+
+---
+
+```bash
+docker pull devliveorg/metaforge:latest
+docker run -d --name metaforge -p 9096:9096 devliveorg/metaforge:latest
+```
+
+或者解压本地构建的发行包（`dist/metaforge-server-2026.0.0-bin.tar.gz`），运行 `bin/startup.sh`。
+
+## 项目结构
+
+---
+
+```
+metaforge
+├── client # 命令行客户端
+├── configure # 默认配置与插件清单
+├── core
+│ ├── metaforge-captcha # 验证码生成
+│ ├── metaforge-common # 通用工具与枚举
+│ ├── metaforge-condor # 调度集成
+│ ├── metaforge-server # Spring Boot 服务端（REST API 入口）
+│ ├── metaforge-service # 领域服务与持久化
+│ ├── metaforge-security # 安全配置
+│ ├── metaforge-sql # SQL 语句构建器
+│ ├── metaforge-spi # 插件 SPI 契约
+│ ├── metaforge-web # Vue 3 + Tailwind Web 控制台
+├── convert # 数据转换器（JSON、CSV、XML 等）
+├── driver # 数据库驱动（Redis、MongoDB 等）
+├── executor # 执行引擎
+├── fs # 文件存储插件（OSS、S3、本地存储等）
+├── lib # 共享库（HTTP 客户端、日志、Shell）
+├── notify # 通知渠道（钉钉等）
+├── parser # SQL 解析器（MySQL、Trino 等）
+├── plugin # 数据源插件（50+ 连接器）
+└── shaded # 第三方集成 Shade 封装
+```
+
## 支持的连接器
---
@@ -105,17 +191,11 @@ MetaForge 可以从任何使用 SQL 的数据存储或数据引擎（ClickHouse
-## 系统架构
+## 文档
---
-
-
-## 贡献图谱
-
----
-
-[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
+[MetaForge 的扩展文档](https://metaforge.devlive.org)
## 加入我们
@@ -131,11 +211,11 @@ MetaForge 可以从任何使用 SQL 的数据存储或数据引擎（ClickHouse
[](https://www.rainbond.com/)
[](https://vuejs.org/)
-## 安装和配置
+## Star 历史
---
-[MetaForge 的扩展文档](https://metaforge.devlive.org)
+[](https://star-history.dera.page/#devlive-community/metaforge&Timeline)
## 贡献者
diff --git a/configure/docker/application.properties b/configure/docker/application.properties
index f4e51ed0a4..063f19b4e5 100644
--- a/configure/docker/application.properties
+++ b/configure/docker/application.properties
@@ -96,6 +96,7 @@ metaforge.parser.sql.defaultEngine=Trino
################################# File System configure #################################
# For the file storage type, please refer to metaforge-fs-). Each is offered
+// when the plugin declares any of the listed management capabilities.
+const FEATURES = [
+ ['query', ['query:execute']],
+ ['database', ['database:list', 'database:info', 'database:alter']],
+ ['browse', ['table:list', 'table:info', 'table:read', 'tab:data']],
+ ['schema', ['table:create', 'table:alter', 'table:drop', 'table:truncate', 'column:create', 'column:modify', 'column:drop', 'column:reorder']],
+ ['ddl', ['table:statement', 'tab:statement']],
+ ['index', ['index:read', 'index:create', 'index:drop']],
+ ['foreignKey', ['foreign-key:read', 'foreign-key:create', 'foreign-key:drop']],
+ ['trigger', ['trigger:read', 'trigger:create', 'trigger:drop']],
+ ['dataEdit', ['data:insert', 'data:modify', 'data:delete']],
+ ['export', ['table:export']],
+ ['erDiagram', ['tab:er-diagram']],
+ ['keyValue', ['namespace:list', 'key:list', 'key:read']],
+ ['objectStorage', ['object:list', 'object:read', 'object:download']],
+]
+
+function args(argv) {
+ const out = { out: join(ROOT, 'configure/metadata.json') }
+ for (let i = 0; i < argv.length; i++) {
+ const flag = argv[i]
+ if (flag === '--strict') { out.strict = true; continue }
+ const value = argv[++i]
+ if (!flag.startsWith('--') || value === undefined) throw new Error(`Unknown or incomplete argument: ${flag}`)
+ out[flag.slice(2)] = value
+ }
+ return out
+}
+
+function projectVersion() {
+ const pom = readFileSync(join(ROOT, 'pom.xml'), 'utf8')
+ const project = pom.slice(pom.indexOf('metaforge '))
+ const match = project.match(/([^<]+)<\/version>/)
+ if (!match) throw new Error('Cannot read the project version from pom.xml')
+ return match[1].trim()
+}
+
+// The CDN layout of configure/publish/publish-oss-artifact.sh.
+function cdnDirectory(key) {
+ for (const type of ['executor', 'convert', 'fs', 'parser', 'scheduler']) {
+ if (key.startsWith(`metaforge-${type}-`)) return type
+ }
+ return 'plugin'
+}
+
+function features(moduleDir, extra) {
+ const file = join(moduleDir, CAPABILITIES)
+ const declared = new Set(existsSync(file) ? JSON.parse(readFileSync(file, 'utf8')).capabilities ?? [] : [])
+ const codes = FEATURES.filter(([, caps]) => caps.some(cap => declared.has(cap))).map(([code]) => code)
+ return [...codes, ...(Array.isArray(extra) ? extra.filter(item => typeof item === 'string' && item.trim()) : [])]
+}
+
+function sha256(file) {
+ return new Promise((done, fail) => {
+ const hash = createHash('sha256')
+ createReadStream(file).on('data', chunk => hash.update(chunk)).on('error', fail).on('end', () => done(hash.digest('hex')))
+ })
+}
+
+function modules() {
+ const found = []
+ for (const root of MODULE_ROOTS) {
+ const base = join(ROOT, root)
+ if (!existsSync(base)) continue
+ for (const name of readdirSync(base)) {
+ const dir = join(base, name)
+ if (existsSync(join(dir, DESCRIPTOR)) && existsSync(join(dir, 'pom.xml'))) found.push({ key: name, dir })
+ }
+ }
+ return found
+}
+
+async function main() {
+ const opts = args(process.argv.slice(2))
+ const version = opts.version ?? projectVersion()
+ const released = opts.released === 'now' ? new Date().toISOString().replace('T', ' ').replace(/\.\d+Z$/, '') : opts.released
+ const children = []
+ const packages = []
+ const missing = []
+ for (const { key, dir } of modules()) {
+ const config = JSON.parse(readFileSync(join(dir, DESCRIPTOR), 'utf8'))
+ if (typeof config.label !== 'string' || !config.label.trim()) throw new Error(`${key}/${DESCRIPTOR} needs a label`)
+ const mavenPath = `${GROUP_PATH}/${key}/${version}/${key}-${version}-bin.tar.gz`
+ const cdnPath = `${version}/${cdnDirectory(key)}/${key}-bin.tar.gz`
+ const entry = {
+ key,
+ label: config.label,
+ description: config.description,
+ i18nFormat: config.i18nFormat === true,
+ type: config.type,
+ version,
+ requires: config.requires ?? version,
+ author: config.author,
+ logo: config.logo,
+ released,
+ supportVersion: Array.isArray(config.supportVersion) ? config.supportVersion : undefined,
+ features: features(dir, config.features),
+ // url stays the Maven Central package for MetaForge versions before the
+ // multi-source store; newer servers pick from sources.
+ url: `${MAVEN_BASE}/${mavenPath}`,
+ sources: { maven: `${MAVEN_BASE}/${mavenPath}`, cdn: `${CDN_BASE}/${cdnPath}` },
+ order: Number.isFinite(config.order) ? config.order : Number.MAX_SAFE_INTEGER,
+ }
+ if (opts.dist) {
+ const archive = join(resolve(opts.dist), `${key}-bin.tar.gz`)
+ if (existsSync(archive)) {
+ entry.size = statSync(archive).size
+ entry.sha256 = await sha256(archive)
+ packages.push({ id: key, version, sha256: entry.sha256, size: entry.size, status: 'active', sources: { maven: mavenPath, cdn: cdnPath } })
+ }
+ else {
+ missing.push(key)
+ }
+ }
+ children.push(entry)
+ }
+ if (opts.strict && missing.length) throw new Error(`Missing built packages: ${missing.join(', ')}`)
+ children.sort((a, b) => a.order - b.order || a.key.localeCompare(b.key))
+ for (const entry of children) delete entry.order
+ const metadata = {
+ key: 'plugin',
+ label: 'common.plugin.list.name',
+ description: 'common.plugin.list.description',
+ i18nFormat: true,
+ version,
+ children: JSON.parse(JSON.stringify(children)),
+ }
+ writeFileSync(resolve(opts.out), JSON.stringify(metadata, null, 2) + '\n')
+ console.log(`metadata: ${children.length} plugin(s) -> ${opts.out}${missing.length ? ` (${missing.length} without built package)` : ''}`)
+ if (opts.catalog) {
+ if (!/^[0-9a-f]{40}$/.test(opts.commit ?? '') || !/^[1-9]\d*$/.test(opts.generation ?? '')) {
+ throw new Error('--catalog needs --commit <40 hex> and --generation ')
+ }
+ if (!packages.length) throw new Error('--catalog needs --dist with built packages')
+ const catalog = { schemaVersion: 2, app: 'metaforge', sourceCommit: opts.commit, generation: Number(opts.generation), plugins: packages }
+ writeFileSync(resolve(opts.catalog), JSON.stringify(catalog, null, 2) + '\n')
+ console.log(`catalog: ${packages.length} package(s) -> ${opts.catalog}`)
+ }
+}
+
+main().catch(error => {
+ console.error(error.message)
+ process.exit(1)
+})
diff --git a/configure/publish/publish-artifact.sh b/configure/publish/publish-artifact.sh
index 51bd3c0563..f6d86208bc 100644
--- a/configure/publish/publish-artifact.sh
+++ b/configure/publish/publish-artifact.sh
@@ -36,8 +36,11 @@ for file in "$HOME/dist"/*bin.tar.gz; do
fi
done
-# Handle metadata file
-METADATA_FILE="${HOME}/configure/metadata.json"
+# Handle metadata file: built from the packages uploaded below (size, SHA-256,
+# sources, features). Release CI publishes the same file automatically; the
+# statistics catalog is imported only by CI, from the Maven Central archives.
+METADATA_FILE="${HOME}/dist/metadata.json"
+node "${HOME}/configure/publish/build-metadata.mjs" --dist "$PLUGIN_DIR" --out "$METADATA_FILE" --released now || exit 1
if [ -f "$METADATA_FILE" ]; then
# Upload new metadata file
echo "Uploading metadata file"
diff --git a/configure/publish/publish-oss-artifact.sh b/configure/publish/publish-oss-artifact.sh
index fb14ae314d..3965f9efa0 100644
--- a/configure/publish/publish-oss-artifact.sh
+++ b/configure/publish/publish-oss-artifact.sh
@@ -50,8 +50,11 @@ for file in "$HOME/dist"/*bin.tar.gz; do
fi
done
-# Handle metadata file
-METADATA_FILE="${HOME}/configure/metadata.json"
+# Handle metadata file: built from the packages uploaded below (size, SHA-256,
+# sources, features). Release CI publishes the same file automatically; the
+# statistics catalog is imported only by CI, from the Maven Central archives.
+METADATA_FILE="${HOME}/dist/metadata.json"
+node "${HOME}/configure/publish/build-metadata.mjs" --dist "$PLUGIN_DIR" --out "$METADATA_FILE" --released now || exit 1
if [ -f "$METADATA_FILE" ]; then
# Upload new metadata file
echo "Uploading metadata file"
diff --git a/convert/metaforge-convert-csv/src/main/kotlin/org/devlive/metaforge/convert/csv/CsvConvertService.kt b/convert/metaforge-convert-csv/src/main/kotlin/org/devlive/metaforge/convert/csv/CsvConvertService.kt
index e6a1a19585..00df35c9f7 100644
--- a/convert/metaforge-convert-csv/src/main/kotlin/org/devlive/metaforge/convert/csv/CsvConvertService.kt
+++ b/convert/metaforge-convert-csv/src/main/kotlin/org/devlive/metaforge/convert/csv/CsvConvertService.kt
@@ -4,7 +4,9 @@ import com.google.common.base.Preconditions.checkState
import org.devlive.metaforge.common.utils.DateUtils
import org.devlive.metaforge.convert.ConvertService
import org.devlive.metaforge.convert.FileConvert
+import org.devlive.metaforge.convert.model.ConvertOption
import org.devlive.metaforge.convert.model.ConvertRequest
+import org.devlive.metaforge.convert.model.choice
import org.devlive.metaforge.convert.model.ConvertResponse
import org.apache.commons.csv.CSVFormat
import org.apache.commons.io.FileUtils
@@ -75,6 +77,18 @@ class CsvConvertService : ConvertService
return response
}
+ override fun options(): List
+ {
+ return listOf(
+ ConvertOption("delimiter", mapOf("zh" to "分隔符", "en" to "Delimiter"), ",",
+ listOf(choice(",", "逗号 ,", "Comma ,"), choice(";", "分号 ;", "Semicolon ;"), choice("\t", "制表符", "Tab"), choice("|", "竖线 |", "Pipe |"))),
+ ConvertOption("header", mapOf("zh" to "首行字段名", "en" to "Header row"), "true",
+ listOf(choice("true", "包含", "Included"), choice("false", "不包含", "Left out"))),
+ ConvertOption("nulls", mapOf("zh" to "NULL 值处理", "en" to "NULL values"), "empty",
+ listOf(choice("empty", "空单元格", "Empty cell"), choice("NULL", "写为 NULL", "Write NULL")))
+ )
+ }
+
override fun writer(request: ConvertRequest): ConvertResponse
{
val response = ConvertResponse()
@@ -83,23 +97,29 @@ class CsvConvertService : ConvertService
log.info("${name()} writer start time [ ${DateUtils.now()} ]")
response.headers = request.headers
val file = FileConvert.formatFile(request, name())
- FileUtils.writeStringToFile(file, response.headers.joinToString(","), Charsets.UTF_8)
+ val delimiter = request.option("delimiter", ",").replace("\\t", "\t")
+ val nullText = if (request.excludeNull) "" else request.option("nulls", "empty").let { if (it == "NULL") "NULL" else "" }
+ val lines = mutableListOf()
+ if (request.option("header", "true") != "false")
+ {
+ lines.add(response.headers.joinToString(delimiter) { csvCell(it.toString(), delimiter) })
+ }
// The column types follow the header as a second line.
if (request.includeStructure)
{
- FileUtils.writeStringToFile(file, "\n" + request.headers.indices.joinToString(",") { request.types.getOrNull(it)?.toString() ?: "" }, Charsets.UTF_8, true)
+ lines.add(request.headers.indices.joinToString(delimiter) { csvCell(request.types.getOrNull(it)?.toString() ?: "", delimiter) })
}
val columns = mutableListOf()
request.columns
.forEach {
- FileUtils.writeStringToFile(file, "\n", Charsets.UTF_8, true)
when (it)
{
- is List<*> -> FileUtils.writeStringToFile(file, it.joinToString(separator = ",") { value -> if (value == null && request.excludeNull) "" else value.toString() }, Charsets.UTF_8, true)
- else -> FileUtils.writeStringToFile(file, it.toString(), Charsets.UTF_8, true)
+ is List<*> -> lines.add(it.joinToString(separator = delimiter) { value -> if (value == null) nullText else csvCell(value.toString(), delimiter) })
+ else -> lines.add(it.toString())
}
}
+ FileUtils.writeStringToFile(file, lines.joinToString("\n"), Charsets.UTF_8)
response.columns = columns
log.info("${name()} writer end time [ ${DateUtils.now()} ]")
response.successful = true
@@ -145,3 +165,13 @@ class CsvConvertService : ConvertService
return response
}
}
+
+/** A cell quoted when it holds the delimiter, a quote or a line break, quotes doubled (RFC 4180). */
+internal fun csvCell(value: String, delimiter: String): String
+{
+ return if (value.contains(delimiter) || value.contains('"') || value.contains('\n') || value.contains('\r'))
+ {
+ "\"" + value.replace("\"", "\"\"") + "\""
+ }
+ else value
+}
diff --git a/convert/metaforge-convert-csv/src/main/resources/org/devlive/metaforge/plugin/plugin.json b/convert/metaforge-convert-csv/src/main/resources/org/devlive/metaforge/plugin/plugin.json
new file mode 100644
index 0000000000..756b24ecf8
--- /dev/null
+++ b/convert/metaforge-convert-csv/src/main/resources/org/devlive/metaforge/plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+ "label": "Csv Convert",
+ "description": "A CSV file conversion plugin for MetaForge.",
+ "i18nFormat": true,
+ "type": "Converter",
+ "author": "metaforge-community",
+ "logo": "http://devlive-cdn.oss-cn-beijing.aliyuncs.com/applications/metaforge/resources/logo/convert/csv.svg",
+ "supportVersion": [
+ "ALL"
+ ],
+ "order": 51
+}
diff --git a/convert/metaforge-convert-json/src/main/kotlin/org/devlive/metaforge/convert/json/JsonConvertService.kt b/convert/metaforge-convert-json/src/main/kotlin/org/devlive/metaforge/convert/json/JsonConvertService.kt
index 6868f709e4..e8b0515236 100644
--- a/convert/metaforge-convert-json/src/main/kotlin/org/devlive/metaforge/convert/json/JsonConvertService.kt
+++ b/convert/metaforge-convert-json/src/main/kotlin/org/devlive/metaforge/convert/json/JsonConvertService.kt
@@ -2,6 +2,8 @@ package org.devlive.metaforge.convert.json
import com.fasterxml.jackson.core.JsonEncoding
import com.fasterxml.jackson.core.JsonFactory
+import com.fasterxml.jackson.core.util.DefaultIndenter
+import com.fasterxml.jackson.core.util.DefaultPrettyPrinter
import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.node.ObjectNode
@@ -9,13 +11,16 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
import org.devlive.metaforge.common.utils.DateUtils
import org.devlive.metaforge.convert.ConvertService
import org.devlive.metaforge.convert.FileConvert.formatFile
+import org.devlive.metaforge.convert.model.ConvertOption
import org.devlive.metaforge.convert.model.ConvertRequest
+import org.devlive.metaforge.convert.model.choice
import org.devlive.metaforge.convert.model.ConvertResponse
import org.slf4j.LoggerFactory.getLogger
import java.io.BufferedReader
import java.io.IOException
import java.io.InputStreamReader
import java.time.LocalDateTime
+import java.time.ZoneId
import java.time.format.DateTimeFormatter
import java.time.format.DateTimeParseException
import java.util.Objects.requireNonNull
@@ -131,6 +136,20 @@ class JsonConvertService : ConvertService
return response
}
+ override fun options(): List
+ {
+ return listOf(
+ ConvertOption("root", mapOf("zh" to "JSON 根结构", "en" to "JSON root"), "array",
+ listOf(choice("array", "数组 Array", "Array"), choice("lines", "每行一个对象 JSON Lines", "One object per line (JSON Lines)"))),
+ ConvertOption("indent", mapOf("zh" to "缩进格式", "en" to "Indentation"), "2",
+ listOf(choice("0", "不缩进", "None"), choice("2", "2 个空格", "2 spaces"), choice("4", "4 个空格", "4 spaces"))),
+ ConvertOption("dateFormat", mapOf("zh" to "日期输出格式", "en" to "Date format"), "iso",
+ listOf(choice("iso", "ISO 8601", "ISO 8601"), choice("datetime", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm:ss"), choice("epoch", "时间戳（毫秒）", "Epoch milliseconds"))),
+ ConvertOption("nulls", mapOf("zh" to "NULL 值处理", "en" to "NULL values"), "keep",
+ listOf(choice("keep", "保留 null", "Keep null"), choice("omit", "省略字段", "Leave the field out")))
+ )
+ }
+
override fun writer(request: ConvertRequest): ConvertResponse
{
val response = ConvertResponse()
@@ -141,9 +160,20 @@ class JsonConvertService : ConvertService
val file = formatFile(request, name())
log.info("${name()} writer file absolute path [ ${file.absolutePath} ]")
+ val lines = request.option("root", "array") == "lines"
+ val indent = request.option("indent", "2").toIntOrNull() ?: 2
+ val dateFormat = request.option("dateFormat", "iso")
+ val omitNull = request.excludeNull || request.option("nulls", "keep") == "omit"
val factory = JsonFactory()
+ factory.setRootValueSeparator(if (lines) "\n" else " ")
factory.createGenerator(file, JsonEncoding.UTF8).use { generator ->
generator.codec = ObjectMapper()
+ // JSON Lines keeps every record on its own line, so it is never indented.
+ if (indent > 0 && ! lines)
+ {
+ val indenter = DefaultIndenter(" ".repeat(indent), DefaultIndenter.SYS_LF)
+ generator.prettyPrinter = DefaultPrettyPrinter().withObjectIndenter(indenter).withArrayIndenter(indenter)
+ }
if (request.includeStructure)
{
generator.writeStartObject()
@@ -155,9 +185,19 @@ class JsonConvertService : ConvertService
generator.writeEndObject()
}
generator.writeEndArray()
- generator.writeFieldName("rows")
+ if (lines)
+ {
+ generator.writeEndObject()
+ }
+ else
+ {
+ generator.writeFieldName("rows")
+ }
+ }
+ if (! lines)
+ {
+ generator.writeStartArray()
}
- generator.writeStartArray()
request.columns.forEach { column ->
generator.writeStartObject()
for (headerIndex in request.headers.indices)
@@ -167,25 +207,18 @@ class JsonConvertService : ConvertService
{
is List<*> ->
{
- val value = column[headerIndex]
- if (value == null && request.excludeNull)
+ val value = dateValue(column[headerIndex], dateFormat)
+ if (value == null && omitNull)
{
continue
}
- if (value is LocalDateTime)
- {
- generator.writeStringField(header, value.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME))
- }
- else
- {
- generator.writeObjectField(header, value)
- }
+ generator.writeObjectField(header, value)
}
is ObjectNode ->
{
val value = column.get(header)
- if ((value == null || value.isNull) && request.excludeNull)
+ if ((value == null || value.isNull) && omitNull)
{
continue
}
@@ -212,10 +245,13 @@ class JsonConvertService : ConvertService
}
generator.writeEndObject()
}
- generator.writeEndArray()
- if (request.includeStructure)
+ if (! lines)
{
- generator.writeEndObject()
+ generator.writeEndArray()
+ if (request.includeStructure)
+ {
+ generator.writeEndObject()
+ }
}
}
@@ -232,7 +268,25 @@ class JsonConvertService : ConvertService
return response
}
- private fun isDateTime(text: String): Boolean
+ /** A date or time value in the chosen format: ISO 8601, yyyy-MM-dd HH:mm:ss or epoch milliseconds. */
+private fun dateValue(value: Any?, format: String): Any?
+{
+ val time = when (value)
+ {
+ is LocalDateTime -> value
+ is java.sql.Timestamp -> value.toLocalDateTime()
+ is java.util.Date -> LocalDateTime.ofInstant(value.toInstant(), ZoneId.systemDefault())
+ else -> return value
+ }
+ return when (format)
+ {
+ "epoch" -> time.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()
+ "datetime" -> time.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
+ else -> time.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+ }
+}
+
+private fun isDateTime(text: String): Boolean
{
return try
{
diff --git a/convert/metaforge-convert-json/src/main/resources/org/devlive/metaforge/plugin/plugin.json b/convert/metaforge-convert-json/src/main/resources/org/devlive/metaforge/plugin/plugin.json
new file mode 100644
index 0000000000..23f06a63c9
--- /dev/null
+++ b/convert/metaforge-convert-json/src/main/resources/org/devlive/metaforge/plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+ "label": "Json Convert",
+ "description": "A JSON file conversion plugin for MetaForge.",
+ "i18nFormat": true,
+ "type": "Converter",
+ "author": "metaforge-community",
+ "logo": "http://devlive-cdn.oss-cn-beijing.aliyuncs.com/applications/metaforge/resources/logo/convert/json.svg",
+ "supportVersion": [
+ "ALL"
+ ],
+ "order": 53
+}
diff --git a/convert/metaforge-convert-none/src/main/resources/org/devlive/metaforge/plugin/plugin.json b/convert/metaforge-convert-none/src/main/resources/org/devlive/metaforge/plugin/plugin.json
new file mode 100644
index 0000000000..5a3f6906d3
--- /dev/null
+++ b/convert/metaforge-convert-none/src/main/resources/org/devlive/metaforge/plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+ "label": "None Convert",
+ "description": "A multidimensional arrays file conversion plugin for MetaForge.",
+ "i18nFormat": true,
+ "type": "Converter",
+ "author": "metaforge-community",
+ "logo": "http://devlive-cdn.oss-cn-beijing.aliyuncs.com/applications/metaforge/resources/logo/convert/none.svg",
+ "supportVersion": [
+ "ALL"
+ ],
+ "order": 55
+}
diff --git a/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/ConvertService.kt b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/ConvertService.kt
index 70890a4e90..0d7b2fa512 100644
--- a/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/ConvertService.kt
+++ b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/ConvertService.kt
@@ -1,5 +1,6 @@
package org.devlive.metaforge.convert
+import org.devlive.metaforge.convert.model.ConvertOption
import org.devlive.metaforge.convert.model.ConvertRequest
import org.devlive.metaforge.convert.model.ConvertResponse
import org.devlive.metaforge.plugin.Service
@@ -18,6 +19,18 @@ interface ConvertService : Service
return "Integrate ${name()} format convert"
}
+ /** Writer settings the plugin offers; values arrive in [ConvertRequest.options]. */
+ fun options(): List
+ {
+ return listOf()
+ }
+
+ /** Extension of the files the writer produces. */
+ fun extension(): String
+ {
+ return name().lowercase()
+ }
+
fun format(request: ConvertRequest): ConvertResponse
fun formatStream(request: ConvertRequest): ConvertResponse
diff --git a/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertOption.kt b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertOption.kt
new file mode 100644
index 0000000000..a682054d54
--- /dev/null
+++ b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertOption.kt
@@ -0,0 +1,23 @@
+package org.devlive.metaforge.convert.model
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
+
+/**
+ * A setting a convert plugin declares for its writer, shown by the export page as a field: a
+ * choice among [choices] or free text when there are none. Labels are keyed by language (zh, en).
+ */
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "EI_EXPOSE_REP2"], justification = "Read-only description of a plugin setting")
+data class ConvertOption(
+ val name: String,
+ val labels: Map,
+ val defaultValue: String,
+ val choices: List = listOf()
+)
+
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "EI_EXPOSE_REP2"], justification = "Read-only description of a choice")
+data class ConvertChoice(
+ val value: String,
+ val labels: Map
+)
+
+fun choice(value: String, zh: String, en: String) = ConvertChoice(value, mapOf("zh" to zh, "en" to en))
diff --git a/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertRequest.kt b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertRequest.kt
index 93749726c9..b3f1fcdb25 100644
--- a/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertRequest.kt
+++ b/convert/metaforge-convert-spi/src/main/kotlin/org/devlive/metaforge/convert/model/ConvertRequest.kt
@@ -1,7 +1,9 @@
package org.devlive.metaforge.convert.model
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
import java.io.InputStream
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "EI_EXPOSE_REP2"], justification = "A request carries the caller's values")
class ConvertRequest
{
private var _headers: List = listOf()
@@ -15,6 +17,15 @@ class ConvertRequest
// Currently only valid for txt format
var delimiter: String? = null
+ // Values of the plugin's declared options (see ConvertService.options), by option name
+ var options: Map = mapOf()
+
+ /** An option's value, or [fallback] when it was not given. */
+ fun option(name: String, fallback: String): String
+ {
+ return options[name]?.takeIf { it.isNotEmpty() } ?: fallback
+ }
+
// The format type of the original data
var format: String? = null
diff --git a/convert/metaforge-convert-txt/src/main/kotlin/org/devlive/metaforge/convert/TxtConvertService.kt b/convert/metaforge-convert-txt/src/main/kotlin/org/devlive/metaforge/convert/TxtConvertService.kt
index 54f7c2c49e..c5cbf7f855 100644
--- a/convert/metaforge-convert-txt/src/main/kotlin/org/devlive/metaforge/convert/TxtConvertService.kt
+++ b/convert/metaforge-convert-txt/src/main/kotlin/org/devlive/metaforge/convert/TxtConvertService.kt
@@ -3,7 +3,9 @@ package org.devlive.metaforge.convert
import com.google.common.base.Preconditions.checkArgument
import com.google.common.base.Preconditions.checkState
import org.devlive.metaforge.common.utils.DateUtils
+import org.devlive.metaforge.convert.model.ConvertOption
import org.devlive.metaforge.convert.model.ConvertRequest
+import org.devlive.metaforge.convert.model.choice
import org.devlive.metaforge.convert.model.ConvertResponse
import org.apache.commons.io.FileUtils
import org.apache.commons.lang3.ObjectUtils.isNotEmpty
@@ -96,12 +98,28 @@ class TxtConvertService : ConvertService
return response
}
+ override fun options(): List
+ {
+ return listOf(
+ ConvertOption("delimiter", mapOf("zh" to "分隔符", "en" to "Delimiter"), "\t",
+ listOf(choice("\t", "制表符", "Tab"), choice(",", "逗号 ,", "Comma ,"), choice(" ", "空格", "Space"), choice("|", "竖线 |", "Pipe |"))),
+ ConvertOption("header", mapOf("zh" to "首行字段名", "en" to "Header row"), "true",
+ listOf(choice("true", "包含", "Included"), choice("false", "不包含", "Left out"))),
+ ConvertOption("nulls", mapOf("zh" to "NULL 值处理", "en" to "NULL values"), "empty",
+ listOf(choice("empty", "留空", "Empty"), choice("NULL", "写为 NULL", "Write NULL")))
+ )
+ }
+
override fun writer(request: ConvertRequest): ConvertResponse
{
val response = ConvertResponse()
try
{
+ // A declared delimiter option wins over the request's delimiter.
+ request.options["delimiter"]?.takeIf { it.isNotEmpty() }?.let { request.delimiter = it.replace("\\t", "\t") }
checkArgument(isNotEmpty(request.delimiter), "Delimiter must not be empty")
+ val header = request.option("header", "true") != "false"
+ val nullText = if (request.excludeNull) "" else request.option("nulls", "empty").let { if (it == "NULL") "NULL" else "" }
log.info("${name()} writer origin path [ ${request.path} ]")
log.info("${name()} writer start time [ ${DateUtils.now()} ]")
@@ -111,10 +129,7 @@ class TxtConvertService : ConvertService
request.delimiter
?.let { delimiter ->
log.info("${name()} writer file headers start")
- request.headers
- .let { headers ->
- FileUtils.writeStringToFile(file, headers.joinToString(separator = delimiter), Charsets.UTF_8)
- }
+ FileUtils.writeStringToFile(file, if (header) request.headers.joinToString(separator = delimiter) else "", Charsets.UTF_8)
// The column types follow the header as a second line.
if (request.includeStructure)
{
@@ -129,7 +144,7 @@ class TxtConvertService : ConvertService
FileUtils.writeStringToFile(file, "\n", Charsets.UTF_8, true)
when (it)
{
- is List<*> -> FileUtils.writeStringToFile(file, it.joinToString(separator = delimiter) { value -> if (value == null && request.excludeNull) "" else value.toString() },
+ is List<*> -> FileUtils.writeStringToFile(file, it.joinToString(separator = delimiter) { value -> value?.toString() ?: nullText },
Charsets.UTF_8, true)
else -> FileUtils.writeStringToFile(file, it.toString(), Charsets.UTF_8, true)
}
diff --git a/convert/metaforge-convert-txt/src/main/resources/org/devlive/metaforge/plugin/plugin.json b/convert/metaforge-convert-txt/src/main/resources/org/devlive/metaforge/plugin/plugin.json
new file mode 100644
index 0000000000..89c7b95926
--- /dev/null
+++ b/convert/metaforge-convert-txt/src/main/resources/org/devlive/metaforge/plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+ "label": "Txt Convert",
+ "description": "A TXT file conversion plugin for MetaForge.",
+ "i18nFormat": true,
+ "type": "Converter",
+ "author": "metaforge-community",
+ "logo": "http://devlive-cdn.oss-cn-beijing.aliyuncs.com/applications/metaforge/resources/logo/convert/txt.svg",
+ "supportVersion": [
+ "ALL"
+ ],
+ "order": 52
+}
diff --git a/convert/metaforge-convert-xml/src/main/kotlin/org/devlive/metaforge/convert/xml/XmlConvertService.kt b/convert/metaforge-convert-xml/src/main/kotlin/org/devlive/metaforge/convert/xml/XmlConvertService.kt
index 10e180da54..b37c9faa99 100644
--- a/convert/metaforge-convert-xml/src/main/kotlin/org/devlive/metaforge/convert/xml/XmlConvertService.kt
+++ b/convert/metaforge-convert-xml/src/main/kotlin/org/devlive/metaforge/convert/xml/XmlConvertService.kt
@@ -6,7 +6,9 @@ import com.fasterxml.jackson.dataformat.xml.XmlMapper
import org.devlive.metaforge.common.utils.DateUtils
import org.devlive.metaforge.convert.ConvertService
import org.devlive.metaforge.convert.FileConvert.formatFile
+import org.devlive.metaforge.convert.model.ConvertOption
import org.devlive.metaforge.convert.model.ConvertRequest
+import org.devlive.metaforge.convert.model.choice
import org.devlive.metaforge.convert.model.ConvertResponse
import org.slf4j.LoggerFactory.getLogger
import java.io.ByteArrayOutputStream
@@ -66,6 +68,16 @@ class XmlConvertService : ConvertService
TODO("Not yet implemented")
}
+ override fun options(): List
+ {
+ return listOf(
+ ConvertOption("rootElement", mapOf("zh" to "根元素名", "en" to "Root element"), root),
+ ConvertOption("rowElement", mapOf("zh" to "行元素名", "en" to "Row element"), node),
+ ConvertOption("nulls", mapOf("zh" to "NULL 值处理", "en" to "NULL values"), "keep",
+ listOf(choice("keep", "写为 null", "Write null"), choice("omit", "省略属性", "Leave the attribute out")))
+ )
+ }
+
override fun writer(request: ConvertRequest): ConvertResponse
{
val response = ConvertResponse()
@@ -80,7 +92,9 @@ class XmlConvertService : ConvertService
.use { generator ->
generator.codec = XmlMapper()
val staxWriter = generator.staxWriter
- staxWriter.writeStartElement(root)
+ val rowElement = request.option("rowElement", node)
+ val omitNull = request.excludeNull || request.option("nulls", "keep") == "omit"
+ staxWriter.writeStartElement(request.option("rootElement", root))
if (request.includeStructure)
{
staxWriter.writeStartElement("Columns")
@@ -94,7 +108,7 @@ class XmlConvertService : ConvertService
}
request.columns
.forEach { column ->
- staxWriter.writeStartElement(node)
+ staxWriter.writeStartElement(rowElement)
for (headerIndex in request.headers.indices)
{
when (column)
@@ -102,7 +116,7 @@ class XmlConvertService : ConvertService
is List<*> ->
{
val value = column[headerIndex]
- if (value != null || !request.excludeNull)
+ if (value != null || ! omitNull)
{
staxWriter.writeAttribute(request.headers[headerIndex].toString(), value.toString())
}
diff --git a/convert/metaforge-convert-xml/src/main/resources/org/devlive/metaforge/plugin/plugin.json b/convert/metaforge-convert-xml/src/main/resources/org/devlive/metaforge/plugin/plugin.json
new file mode 100644
index 0000000000..e8007c2faf
--- /dev/null
+++ b/convert/metaforge-convert-xml/src/main/resources/org/devlive/metaforge/plugin/plugin.json
@@ -0,0 +1,12 @@
+{
+ "label": "Xml Convert",
+ "description": "A XML file conversion plugin for MetaForge.",
+ "i18nFormat": true,
+ "type": "Converter",
+ "author": "metaforge-community",
+ "logo": "http://devlive-cdn.oss-cn-beijing.aliyuncs.com/applications/metaforge/resources/logo/convert/xml.svg",
+ "supportVersion": [
+ "ALL"
+ ],
+ "order": 54
+}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/Plugin.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/Plugin.java
index dc9c714e22..efe297be27 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/Plugin.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/Plugin.java
@@ -231,6 +231,42 @@ public java.util.List testRuntimeConfigures(java.util.Map values)
+ {
+ java.util.List problems = new java.util.ArrayList<>();
+ for (org.devlive.metaforge.plugin.configure.RuntimeConfigureField field : runtimeConfigures()) {
+ String value = values.get(field.getName());
+ if (value == null || value.trim().isEmpty()) {
+ continue;
+ }
+ if (field.getType() == org.devlive.metaforge.plugin.configure.RuntimeConfigureFieldType.NUMBER) {
+ try {
+ Double.parseDouble(value.trim());
+ }
+ catch (NumberFormatException e) {
+ problems.add(field.getName() + " is not a number: " + value);
+ }
+ }
+ else if (field.getType() == org.devlive.metaforge.plugin.configure.RuntimeConfigureFieldType.BOOLEAN
+ && !"true".equalsIgnoreCase(value.trim()) && !"false".equalsIgnoreCase(value.trim())) {
+ problems.add(field.getName() + " is not true or false: " + value);
+ }
+ else if (field.getType() == org.devlive.metaforge.plugin.configure.RuntimeConfigureFieldType.SELECT
+ && field.getOptions() != null && !field.getOptions().contains(value.trim())) {
+ problems.add(field.getName() + " must be one of " + field.getOptions() + ": " + value);
+ }
+ }
+ return problems;
+ }
+
/**
* 声明该插件的数据源表单配置字段（字段名 / 类型 / 必填 / 默认值 / 分组 / pipelines 等）。
* 连接器插件默认返回通用 JDBC 字段（原 default.yaml 语义），转换等其余类型返回 null。
@@ -353,7 +389,7 @@ public T getService(Class serviceClass, String name)
}
// 获取所有服务
-// Get all services
+ // Get all services
public Set getAllServices(Class serviceClass)
{
validateInjector();
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginDescriptor.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginDescriptor.java
new file mode 100644
index 0000000000..7edda43f8d
--- /dev/null
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginDescriptor.java
@@ -0,0 +1,130 @@
+package org.devlive.metaforge.plugin;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.security.CodeSource;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * The store details a plugin ships in {@code org/devlive/metaforge/plugin/plugin.json}, next to its
+ * capabilities.json: label, description, logo, type, author, supported data source versions, the
+ * minimum MetaForge version and extra features. The release build turns the same file into the
+ * store catalogue, so an installed plugin can still describe itself when the catalogue is
+ * unavailable or does not list it (self-built plugins).
+ */
+@Slf4j
+public final class PluginDescriptor
+{
+ /** The descriptor path inside every plugin jar or classes directory. */
+ public static final String FILE = "org/devlive/metaforge/plugin/plugin.json";
+
+ private static final Set TEXT = Set.of("label", "description", "logo", "type", "author", "requires");
+ private static final Set LISTS = Set.of("supportVersion", "features");
+ private static final ObjectMapper JSON = new ObjectMapper();
+
+ // Read once per plugin class: the file ships inside the plugin and never changes while it is loaded.
+ private static final ClassValue> DECLARED = new ClassValue<>()
+ {
+ @Override
+ protected Map computeValue(Class type)
+ {
+ return load(type);
+ }
+ };
+
+ private PluginDescriptor()
+ {
+ }
+
+ /** The descriptor of the plugin the class belongs to; empty when the plugin has none. */
+ public static Map of(Class plugin)
+ {
+ return plugin == null ? Collections.emptyMap() : DECLARED.get(plugin);
+ }
+
+ private static Map load(Class plugin)
+ {
+ URL descriptor = descriptor(plugin);
+ if (descriptor == null) {
+ return Collections.emptyMap();
+ }
+ try {
+ URLConnection connection = descriptor.openConnection();
+ // Plugins are reloaded from their jars; a cached jar would stay open and stale.
+ connection.setUseCaches(false);
+ try (InputStream stream = connection.getInputStream()) {
+ return read(stream);
+ }
+ }
+ catch (FileNotFoundException error) {
+ return Collections.emptyMap();
+ }
+ catch (IOException error) {
+ // A broken descriptor only costs the offline store details, never the plugin itself.
+ log.warn("Ignoring unreadable plugin descriptor {}: {}", descriptor, error.getMessage());
+ return Collections.emptyMap();
+ }
+ }
+
+ /** Keeps the known fields with the expected types; anything else is ignored. */
+ static Map read(InputStream stream)
+ throws IOException
+ {
+ JsonNode root = JSON.readTree(stream);
+ if (root == null || !root.isObject()) {
+ return Collections.emptyMap();
+ }
+ Map out = new LinkedHashMap<>();
+ root.fields().forEachRemaining(field -> {
+ JsonNode value = field.getValue();
+ if (TEXT.contains(field.getKey()) && value.isTextual() && !value.asText().isBlank()) {
+ out.put(field.getKey(), value.asText());
+ }
+ else if (LISTS.contains(field.getKey()) && value.isArray()) {
+ List items = new ArrayList<>();
+ value.forEach(item -> {
+ if (item.isTextual() && !item.asText().isBlank()) {
+ items.add(item.asText());
+ }
+ });
+ out.put(field.getKey(), Collections.unmodifiableList(items));
+ }
+ else if ("i18nFormat".equals(field.getKey()) && value.isBoolean()) {
+ out.put(field.getKey(), value.asBoolean());
+ }
+ });
+ return Collections.unmodifiableMap(out);
+ }
+
+ /**
+ * The plugin.json in the jar or classes directory the class comes from. Every plugin uses the
+ * same path, so a lookup by name could find another plugin's file on a shared class path.
+ */
+ private static URL descriptor(Class type)
+ {
+ CodeSource source = type.getProtectionDomain() == null ? null : type.getProtectionDomain().getCodeSource();
+ if (source == null || source.getLocation() == null) {
+ return null;
+ }
+ try {
+ String location = source.getLocation().toString();
+ return location.endsWith(".jar") ? new URL("jar:" + location + "!/" + FILE) : new URL(source.getLocation(), FILE);
+ }
+ catch (MalformedURLException error) {
+ return null;
+ }
+ }
+}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginManager.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginManager.java
index 20e06ea477..7a2d0caeab 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginManager.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginManager.java
@@ -44,6 +44,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
@Slf4j
@SuppressFBWarnings(value = {"NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE", "EI_EXPOSE_REP2"})
@@ -78,6 +79,13 @@ public class PluginManager
// Default version
private static final String DEFAULT_VERSION = "1.0.0";
+ // 已改名插件的旧名称 → 新名称，仅在按旧名称找不到插件时使用
+ // Former plugin names to their current names, used only when nothing is registered under the former name
+ private static final Map RENAMED_PLUGINS = Map.of(
+ "Local", "MetaForge",
+ "LocalExecutor", "MetaForge"
+ );
+
// 插件监视器
// Plugin watcher
private final ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(r -> {
@@ -202,30 +210,32 @@ public boolean installPlugin(Path sourcePath, String targetDirectory)
// Handle installation based on plugin type
installed = processPluginInstallation(sourcePath, tempDir);
- if (installed) {
- // 创建最终目标目录
- // Create final target directory
- Path targetPath = config.getPluginsDir().resolve(targetDirectory);
-
- // 如果目标目录已存在，先备份
- // Backup existing target directory if it exists
- if (Files.exists(targetPath)) {
- backupExistingPlugin(targetPath);
- }
+ if (!installed) {
+ return false;
+ }
- // 将临时目录移动到最终位置
- // Move temporary directory to final location
+ Path targetPath = config.getPluginsDir().resolve(targetDirectory);
+ Path backup = backupExistingPlugin(targetPath);
+ boolean loaded = false;
+ try {
moveDirectory(tempDir, targetPath);
-
- // 加载新安装的插件
- // Load newly installed plugin
- loadPluginFromDirectory(targetPath);
-
+ List modules = preparePlugins(targetPath);
+ if (modules.isEmpty()) {
+ return false;
+ }
+ modules.forEach(this::registerPlugin);
+ loaded = true;
log.info("Successfully installed plugin from {} to {}", sourcePath, targetPath);
return true;
}
-
- return false;
+ finally {
+ if (!loaded) {
+ deleteDirectory(targetPath);
+ if (backup != null) {
+ moveDirectory(backup, targetPath);
+ }
+ }
+ }
}
catch (Exception e) {
log.error("Failed to install plugin from: {} to {}", sourcePath, targetDirectory, e);
@@ -263,7 +273,7 @@ private boolean processPluginInstallation(Path sourcePath, Path tempDir)
}
// Properties 插件
// Properties plugin
- if ("properties".equals(extension)) {
+ else if ("properties".equals(extension)) {
installed.set(installPropertiesPlugin(sourcePath, tempDir));
}
// POM 插件
@@ -306,21 +316,21 @@ else if (isSpiPlugin(sourcePath)) {
// 备份现有插件
// Backup existing plugin
- private void backupExistingPlugin(Path pluginPath)
+ private Path backupExistingPlugin(Path pluginPath)
throws IOException
{
- if (Files.exists(pluginPath)) {
- String timestamp = DateUtils.formatYMDHMS();
- Path backupPath = pluginPath.getParent().resolve(pluginPath.getFileName() + ".backup." + timestamp);
-
- try {
- Files.move(pluginPath, backupPath, StandardCopyOption.REPLACE_EXISTING);
- log.info("Created backup of existing plugin: {}", backupPath);
- }
- catch (IOException e) {
- log.error("Failed to create backup of existing plugin: {}", pluginPath, e);
- throw e;
- }
+ if (!Files.exists(pluginPath)) {
+ return null;
+ }
+ Path backup = Files.createTempDirectory(pluginPath.getParent(), pluginPath.getFileName() + ".backup.");
+ try {
+ Files.move(pluginPath, backup, StandardCopyOption.REPLACE_EXISTING);
+ log.info("Created backup of existing plugin: {}", backup);
+ return backup;
+ }
+ catch (IOException e) {
+ Files.deleteIfExists(backup);
+ throw e;
}
}
@@ -490,43 +500,21 @@ private boolean installSpiPlugin(Path sourcePath, Path targetPath)
private boolean installTarPlugin(Path sourcePath, Path tempDir)
throws IOException
{
- // 直接使用 TarPluginLoader 处理
- // Directly use TarPluginLoader to handle
- TarPluginLoader tarPluginLoader = new TarPluginLoader();
- // 先加载插件到临时目录
- // Load plugins to temporary directory
- List plugins = tarPluginLoader.load(sourcePath, tempDir, config.getParentClassLoaderPackages());
- if (!plugins.isEmpty()) {
- // 查找解压后的子目录
- // Find extracted subdirectory
- try (Stream paths = Files.list(tempDir)) {
- Optional subDir = paths
- .filter(Files::isDirectory)
- .findFirst();
-
- if (subDir.isPresent()) {
- // 如果存在子目录，将其内容移动到临时目录根目录
- // If subdirectory exists, move its contents to temp directory root
- Path source = subDir.get();
- try (Stream files = Files.list(source)) {
- files.forEach(file -> {
- try {
- Path target = tempDir.resolve(file.getFileName());
- Files.move(file, target);
- }
- catch (IOException e) {
- log.error("Failed to move file: {} to {}", file, tempDir, e);
- }
- });
- }
- // 删除空的子目录
- // Delete empty subdirectory
- Files.delete(source);
+ new TarPluginLoader().extractArchive(sourcePath, tempDir);
+ List entries;
+ try (Stream paths = Files.list(tempDir)) {
+ entries = paths.collect(Collectors.toList());
+ }
+ if (entries.size() == 1 && Files.isDirectory(entries.get(0))) {
+ Path directory = entries.get(0);
+ try (Stream files = Files.list(directory)) {
+ for (Path file : files.collect(Collectors.toList())) {
+ Files.move(file, tempDir.resolve(file.getFileName()));
}
}
- return true;
+ Files.delete(directory);
}
- return false;
+ return !entries.isEmpty();
}
// 复制目录
@@ -655,6 +643,8 @@ private List discoverPluginPaths()
try (Stream paths = Files.walk(root, config.getScanDepth() == 0 ? 1 : config.getScanDepth())) {
candidates = paths.filter(Files::isDirectory)
.filter(path -> !path.equals(root))
+ .filter(path -> StreamSupport.stream(root.relativize(path).spliterator(), false)
+ .noneMatch(segment -> isPluginStagingDirectory(segment.toString())))
.sorted()
.collect(Collectors.toList());
}
@@ -698,11 +688,9 @@ private void expandPluginPath(Path path, Set paths, Set manifests)
}
}
- // 安装时仍同步加载；启动/监视扫描复用同一初始化过程
- // Installation remains synchronous; startup and watcher scans share preparation
- private void loadPluginFromDirectory(Path pluginDir)
+ private static boolean isPluginStagingDirectory(String name)
{
- preparePlugins(pluginDir).forEach(this::registerPlugin);
+ return name.startsWith(TEMP_DIR_PREFIX) || name.contains(".backup.") || name.contains(".unload.");
}
private List preparePlugins(Path pluginDir)
@@ -773,8 +761,13 @@ private void registerPlugin(PluginMetadata metadata)
synchronized (installLock) {
String name = metadata.getName();
PluginMetadata oldPlugin = plugins.remove(name);
- if (oldPlugin != null && oldPlugin.getClassLoader() != metadata.getClassLoader()) {
- closePluginClassLoader(oldPlugin);
+ if (oldPlugin != null) {
+ if (oldPlugin.getState() == PluginState.STOPPED) {
+ metadata.setState(PluginState.STOPPED);
+ }
+ if (oldPlugin.getClassLoader() != metadata.getClassLoader()) {
+ closePluginClassLoader(oldPlugin);
+ }
}
PluginClassLoader loader = (PluginClassLoader) metadata.getClassLoader();
pluginClassLoaders.put(name, loader);
@@ -862,7 +855,16 @@ public void destroy()
// Get plugin by name
public Optional getPlugin(String name)
{
- return Optional.ofNullable(plugins.get(name))
+ PluginMetadata metadata = plugins.get(name);
+ if (metadata == null && name != null && RENAMED_PLUGINS.containsKey(name)) {
+ metadata = plugins.get(RENAMED_PLUGINS.get(name));
+ }
+ if (metadata != null && metadata.getState() == PluginState.STOPPED) {
+ // 禁用后的插件不再对外提供服务，直到重新启用
+ // A stopped plugin is out of service until it is enabled again
+ return Optional.empty();
+ }
+ return Optional.ofNullable(metadata)
.map(info -> (Plugin) info.getInstance());
}
@@ -887,6 +889,29 @@ public List getPluginInfos()
return new ArrayList<>(plugins.values());
}
+ // 启用或禁用插件（仅切换运行状态标记，不卸载类加载器）
+ // Enable or disable a plugin (toggle the runtime flag only; class loaders stay loaded)
+ public boolean setPluginState(String name, boolean enabled)
+ {
+ if (name == null || name.trim().isEmpty()) {
+ log.warn("Plugin name cannot be null or empty");
+ return false;
+ }
+ synchronized (installLock) {
+ PluginMetadata metadata = plugins.get(name);
+ if (metadata == null && RENAMED_PLUGINS.containsKey(name)) {
+ metadata = plugins.get(RENAMED_PLUGINS.get(name));
+ }
+ if (metadata == null || metadata.getInstance() == null
+ || metadata.getState() == PluginState.UNLOADED || metadata.getState() == PluginState.FAILED) {
+ return false;
+ }
+ metadata.setState(enabled ? PluginState.STARTED : PluginState.STOPPED);
+ log.info("Plugin {} state changed to {}", name, metadata.getState());
+ return true;
+ }
+ }
+
// 卸载指定名称的插件
// Unload plugin by name
public boolean uninstallPlugin(String name)
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginMetadata.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginMetadata.java
index 3b7ca56720..ba4c38673f 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginMetadata.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/PluginMetadata.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.nio.file.Path;
+import java.util.Map;
@Data
@Builder
@@ -30,4 +31,13 @@ public class PluginMetadata
@JsonIgnore
private Path location;
+
+ /**
+ * Store details the plugin ships in its own plugin.json (see {@link PluginDescriptor}), so the
+ * store can describe an installed plugin without the remote catalogue.
+ */
+ public Map getStore()
+ {
+ return instance == null ? Map.of() : PluginDescriptor.of(instance.getClass());
+ }
}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureField.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureField.java
index a688331f4f..894259f2d4 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureField.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureField.java
@@ -1,16 +1,21 @@
package org.devlive.metaforge.plugin.configure;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.List;
+
/**
* 描述一个插件可配置字段。所有插件类型（Executor / Scheduler / FS / …）共用。
* - name: 字段 key，序列化到 JSON 配置中的属性名
- * - type: 字段类型，决定 UI 渲染（文本框 / 数字 / 开关 / 密码）
+ * - type: 字段类型，决定 UI 渲染（文本框 / 数字 / 开关 / 密码 / 下拉）
* - defaultValue: 默认值的字符串表示；调用方按 type 解析
* - description: 字段说明，UI tooltip 用
* - tunable: true = 普通用户在触发任务时可临时覆盖；false = 仅管理员可在系统配置改
+ * - options: SELECT 类型的可选值
+ * - group: 字段分组 key，UI 按组展示；为空表示不分组
*
* Generic configurable-field descriptor used by any plugin category.
* - tunable=false fields are administrator-only.
@@ -19,6 +24,7 @@
@Data
@NoArgsConstructor
@AllArgsConstructor
+@SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
public class RuntimeConfigureField
{
private String name;
@@ -26,9 +32,21 @@ public class RuntimeConfigureField
private String defaultValue;
private String description;
private boolean tunable;
+ private List options;
+ private String group;
public RuntimeConfigureField(String name, RuntimeConfigureFieldType type, String defaultValue, String description)
{
this(name, type, defaultValue, description, false);
}
+
+ public RuntimeConfigureField(String name, RuntimeConfigureFieldType type, String defaultValue, String description, boolean tunable)
+ {
+ this(name, type, defaultValue, description, tunable, null, null);
+ }
+
+ public RuntimeConfigureField(String name, RuntimeConfigureFieldType type, String defaultValue, String description, boolean tunable, String group)
+ {
+ this(name, type, defaultValue, description, tunable, null, group);
+ }
}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureFieldType.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureFieldType.java
index 654f076f1a..49e39b46cb 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureFieldType.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/configure/RuntimeConfigureFieldType.java
@@ -13,5 +13,6 @@ public enum RuntimeConfigureFieldType
STRING,
NUMBER,
BOOLEAN,
- PASSWORD
+ PASSWORD,
+ SELECT
}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoader.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoader.java
index 599c245387..786e078198 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoader.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoader.java
@@ -6,6 +6,7 @@
import org.devlive.metaforge.plugin.utils.VersionUtils;
import java.io.File;
+import java.io.IOException;
import java.lang.reflect.Modifier;
import java.net.URL;
import java.nio.file.Files;
@@ -48,7 +49,6 @@ public List load(Path path, Set parentClassLoaderPackages)
// 获取编译后的类路径
// Get compiled classpath
Path targetClasses = path.resolve("target/classes");
- Path targetDependencies = path.resolve("target/dependency");
// 如果已编译的类不存在，直接返回空列表
// If compiled classes don't exist, return empty list
@@ -59,7 +59,7 @@ public List load(Path path, Set parentClassLoaderPackages)
// 创建类加载器
// Create class loader
- PluginClassLoader classLoader = createProjectClassLoader(targetClasses, targetDependencies, path, parentClassLoaderPackages);
+ PluginClassLoader classLoader = createProjectClassLoader(targetClasses, path, parentClassLoaderPackages);
// 查找并加载插件类
// Find and load plugin classes
@@ -73,35 +73,15 @@ public List load(Path path, Set parentClassLoaderPackages)
// 创建项目类加载器
// Create project class loader
- private PluginClassLoader createProjectClassLoader(Path targetClasses, Path targetDependencies, Path module, Set parentClassLoaderPackages)
+ private PluginClassLoader createProjectClassLoader(Path targetClasses, Path module, Set parentClassLoaderPackages)
throws Exception
{
List urls = new ArrayList<>();
-
- // 添加编译后的类路径
- // Add compiled classes path
log.debug("Adding classes directory to classpath: {}", targetClasses);
urls.add(targetClasses.toUri().toURL());
-
- // 添加所有依赖jar（如果存在）
- // Add all dependency jars (if exist)
- if (Files.exists(targetDependencies)) {
- log.debug("Adding dependencies from: {}", targetDependencies);
- try (Stream paths = Files.walk(targetDependencies)) {
- paths.filter(path -> path.toString().endsWith(".jar"))
- .forEach(path -> {
- try {
- log.debug("Adding dependency to classpath: {}", path);
- urls.add(path.toUri().toURL());
- }
- catch (Exception e) {
- log.error("Failed to add dependency jar to classpath: {}", path, e);
- }
- });
- }
- }
- else {
- log.debug("Dependencies directory not found: {}", targetDependencies);
+ for (Path jar : dependencyJars(module)) {
+ log.debug("Adding dependency to classpath: {}", jar);
+ urls.add(jar.toUri().toURL());
}
// Path.getFileName() may return null for empty paths, fall back to
@@ -166,4 +146,25 @@ private String getClassName(Path baseDir, Path classFile)
return relativePath.replace(File.separatorChar, '.')
.replace(".class", "");
}
+
+ /**
+ * The module's dependency jars: the plugin builds copy them to target/dependencies, while
+ * `mvn dependency:copy-dependencies` run by hand writes target/dependency. Without them a plugin
+ * finds only the drivers that happen to be on the server's own class path.
+ */
+ static List dependencyJars(Path module)
+ throws IOException
+ {
+ List jars = new ArrayList<>();
+ for (String directory : new String[] {"target/dependencies", "target/dependency"}) {
+ Path dependencies = module.resolve(directory);
+ if (!Files.isDirectory(dependencies)) {
+ continue;
+ }
+ try (Stream paths = Files.walk(dependencies)) {
+ paths.filter(path -> path.toString().endsWith(".jar")).sorted().forEach(jars::add);
+ }
+ }
+ return jars;
+ }
}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginClassLoader.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginClassLoader.java
index 7e0bad871d..e80bdf2e67 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginClassLoader.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginClassLoader.java
@@ -67,7 +67,14 @@ protected Class loadClass(String name, boolean resolve)
// Add Plugin related packages to parent-first list
|| (parentFirst && name.startsWith("org.devlive.metaforge.plugin"))
) {
- return super.loadClass(name, resolve);
+ try {
+ return super.loadClass(name, resolve);
+ }
+ catch (ClassNotFoundException e) {
+ // 父加载器没有时再尝试插件自身的 jar（如驱动类）
+ // Fall back to the plugin's own jars (e.g. driver classes)
+ return findClass(name);
+ }
}
// 其他所有类先尝试从当前类加载器加载
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginLoaderFactory.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginLoaderFactory.java
index 2c26a0108d..44adae9462 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginLoaderFactory.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/PluginLoaderFactory.java
@@ -111,7 +111,17 @@ public static List loadPlugins(Path pluginDir, Set parentClassLo
List modules = loader.load(pluginDir, parentClassLoaderPackages);
if (modules != null && !modules.isEmpty()) {
log.info("Successfully loaded [ {} ] plugin(s) using loader type [ {} ]", modules.size(), type);
- modules.forEach(v -> v.setClassLoader(loader.getClass().getName()));
+ // 开发模式的 pom/编译目录加载器不设置 key，商店只能靠类名匹配目录清单而出现重复行；
+ // 统一以模块目录名（与 metadata.json 的 key 一致）兜底
+ // Development loaders leave the key unset, so the store matched by class name and listed
+ // plugins twice. Fall back to the module directory name, which equals the catalogue key.
+ Path module = pluginDir.toString().endsWith("pom.xml") && pluginDir.getParent() != null ? pluginDir.getParent() : pluginDir;
+ modules.forEach(v -> {
+ v.setClassLoader(loader.getClass().getName());
+ if (v.getKey() == null || v.getKey().isBlank()) {
+ v.setKey(loader.extractPluginName(module));
+ }
+ });
return modules;
}
}
diff --git a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/TarPluginLoader.java b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/TarPluginLoader.java
index 6a54f3954a..2e5addbf14 100644
--- a/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/TarPluginLoader.java
+++ b/core/metaforge-plugin/src/main/java/org/devlive/metaforge/plugin/loader/TarPluginLoader.java
@@ -8,19 +8,14 @@
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.apache.http.ssl.SSLContextBuilder;
import org.devlive.metaforge.plugin.Plugin;
import org.devlive.metaforge.plugin.PluginContextManager;
import org.devlive.metaforge.plugin.SpiType;
import org.devlive.metaforge.plugin.utils.PluginClassLoaderUtils;
import org.devlive.metaforge.plugin.utils.VersionUtils;
-import javax.net.ssl.SSLContext;
-
import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
@@ -28,9 +23,6 @@
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.security.KeyManagementException;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.List;
import java.util.ServiceLoader;
@@ -92,43 +84,48 @@ public List load(Path path, Set parentClassLoaderPackages)
*/
public List load(Path path, Path targetDir, Set parentClassLoaderPackages)
{
+ Path extractDir = targetDir;
try {
- if (isValidTarPath(path)) {
- // 如果是 URL 路径，先下载到本地
- // If it's a URL path, download it first
- if (path.toString().startsWith("http") || path.toString().startsWith("https")) {
- path = downloadTarFile(path.toString().replace(":/", "://"));
- }
-
- if (isValidTarFile(path)) {
- // 使用指定的目录或创建临时目录
- // Use specified directory or create temporary directory
- Path extractDir = targetDir != null ? targetDir : createTempDirectory();
-
- // 解压 tar 文件
- // Extract tar file
- extractTarFile(path, extractDir);
-
- // 从解压目录加载插件
- // Load plugins from extracted directory
- List plugins = loadPluginsFromDirectory(extractDir, parentClassLoaderPackages);
-
- // 如果使用的是临时目录，则清理
- // Clean up if using temporary directory
- if (targetDir == null) {
- cleanupTempDirectory(extractDir);
- }
-
- return plugins;
- }
+ if (!isValidTarPath(path)) {
+ return List.of();
}
-
- return List.of();
+ if (extractDir == null) {
+ extractDir = createTempDirectory();
+ }
+ extractArchive(path, extractDir);
+ return loadPluginsFromDirectory(extractDir, parentClassLoaderPackages);
}
catch (Exception e) {
log.error("Failed to load plugins from tar file: {}", path, e);
return List.of();
}
+ finally {
+ if (targetDir == null && extractDir != null) {
+ cleanupTempDirectory(extractDir);
+ }
+ }
+ }
+
+ /** Extract without creating a class loader. The manager loads from the final install path. */
+ public void extractArchive(Path source, Path destination)
+ throws IOException
+ {
+ if (!isValidTarPath(source)) {
+ throw new IOException("Invalid plugin archive path");
+ }
+ Path archive = source;
+ boolean remote = isRemote(source);
+ if (remote) {
+ archive = downloadTarFile(source.toString().replaceFirst("^(https?):/+(?=[^/])", "$1://"));
+ }
+ try {
+ extractTarFile(archive, destination);
+ }
+ finally {
+ if (remote) {
+ Files.deleteIfExists(archive);
+ }
+ }
}
/**
@@ -217,24 +214,7 @@ private Path downloadTarFile(String url)
Path tempFile = Files.createTempFile(TEMP_DIR_PREFIX, ".tar");
try {
- // 创建信任所有证书的 SSL 上下文
- // Create SSL context that trusts all certificates
- SSLContext sslContext = SSLContextBuilder.create()
- .loadTrustMaterial(null, (cert, authType) -> true)
- .build();
-
- // 创建允许所有主机名的验证器
- // Create verifier that allows all hostnames
- SSLConnectionSocketFactory sslFactory = new SSLConnectionSocketFactory(
- sslContext,
- NoopHostnameVerifier.INSTANCE
- );
-
- // 创建 HttpClient
- // Create HttpClient
- try (CloseableHttpClient httpClient = HttpClients.custom()
- .setSSLSocketFactory(sslFactory)
- .build()) {
+ try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
// 创建 GET 请求
// Create GET request
HttpGet request = new HttpGet(url);
@@ -263,7 +243,7 @@ private Path downloadTarFile(String url)
return tempFile;
}
- catch (IOException | NoSuchAlgorithmException | KeyStoreException | KeyManagementException e) {
+ catch (IOException e) {
try {
Files.deleteIfExists(tempFile);
}
@@ -298,17 +278,19 @@ private void extractTarFile(Path tarFile, Path destDir)
{
log.info("Extracting tar file to: {}", destDir);
- try (InputStream fileIn = Files.newInputStream(tarFile);
- BufferedInputStream buffIn = new BufferedInputStream(fileIn);
- GZIPInputStream gzipIn = new GZIPInputStream(buffIn);
- TarArchiveInputStream tarIn = new TarArchiveInputStream(gzipIn)) {
+ Path root = destDir.toAbsolutePath().normalize();
+ try (BufferedInputStream file = new BufferedInputStream(Files.newInputStream(tarFile));
+ TarArchiveInputStream tarIn = new TarArchiveInputStream(archiveStream(file))) {
TarArchiveEntry entry;
while ((entry = tarIn.getNextEntry()) != null) {
if (entry.isDirectory()) {
continue;
}
- Path outPath = destDir.resolve(entry.getName());
+ Path outPath = root.resolve(entry.getName()).normalize();
+ if (!outPath.startsWith(root) || !entry.isFile()) {
+ throw new IOException("Invalid plugin archive entry");
+ }
Files.createDirectories(outPath.getParent());
try (OutputStream out = Files.newOutputStream(outPath)) {
@@ -346,28 +328,22 @@ private void cleanupTempDirectory(Path directory)
private boolean isValidTarPath(Path path)
{
String pathStr = path.toString();
- return (pathStr.startsWith("http") || pathStr.startsWith("https"))
- && (pathStr.endsWith("tar.gz") || pathStr.endsWith("tar") || pathStr.endsWith("tgz"));
+ return (isRemote(path) || Files.isRegularFile(path))
+ && (pathStr.endsWith(".tar.gz") || pathStr.endsWith(".tgz") || pathStr.endsWith(".tar"));
}
- /**
- * 检查是否合法的 Tar 文件，通过解压文件头检查
- * Check if it's a valid Tar file, by checking the file header
- *
- * @param path file path
- * @return true if it's a valid Tar file
- */
- private boolean isValidTarFile(Path path)
+ private static boolean isRemote(Path path)
{
- try (InputStream fileIn = Files.newInputStream(path);
- BufferedInputStream buffIn = new BufferedInputStream(fileIn);
- GZIPInputStream gzipIn = new GZIPInputStream(buffIn)) {
- log.debug("Validating tar file: {}", path);
- log.debug("Tar file header: {}", gzipIn.readNBytes(512));
- return true;
- }
- catch (IOException e) {
- return false;
- }
+ String value = path.toString();
+ return value.startsWith("http:/") || value.startsWith("https:/");
+ }
+
+ private static InputStream archiveStream(BufferedInputStream file)
+ throws IOException
+ {
+ file.mark(2);
+ boolean compressed = file.read() == 0x1f && file.read() == 0x8b;
+ file.reset();
+ return compressed ? new GZIPInputStream(file) : file;
}
}
diff --git a/core/metaforge-plugin/src/test/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoaderTest.java b/core/metaforge-plugin/src/test/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoaderTest.java
index 5919b7b0b1..cf7b817770 100644
--- a/core/metaforge-plugin/src/test/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoaderTest.java
+++ b/core/metaforge-plugin/src/test/java/org/devlive/metaforge/plugin/loader/CompiledPomPluginLoaderTest.java
@@ -15,6 +15,8 @@
import java.nio.file.Path;
import java.util.List;
import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
public class CompiledPomPluginLoaderTest
{
@@ -50,6 +52,43 @@ public void compiledPluginsKeepTheirActualClassLoader()
plugin.getPluginClassLoader().close();
}
+ @Test
+ public void developmentModulesUseTheirDirectoryAsCatalogueKey()
+ throws Exception
+ {
+ // metaforge-fs-local registers as "LocalFs"; only the directory name matches the catalogue key.
+ Path root = module("LocalFsPlugin", "FILESYSTEM");
+ Path module = Files.move(root, root.resolveSibling("metaforge-fs-local"));
+ List loaded = PluginLoaderFactory.loadPlugins(module.resolve("pom.xml"), Set.of("java.", "org.devlive.metaforge.plugin."));
+ Assert.assertEquals(1, loaded.size());
+ Assert.assertEquals("metaforge-fs-local", loaded.get(0).getKey());
+ loaded.get(0).getPluginClassLoader().close();
+ }
+
+ @Test
+ public void everyPluginReadsTheStoreDescriptorShippedInItsOwnClasses()
+ throws Exception
+ {
+ Path first = module("FirstStorePlugin", "EXECUTOR");
+ Path second = module("SecondStorePlugin", "SCHEDULER");
+ Path descriptor = first.resolve("target/classes").resolve(org.devlive.metaforge.plugin.PluginDescriptor.FILE);
+ Files.createDirectories(first.resolve("target/classes/org/devlive/metaforge/plugin"));
+ Files.writeString(descriptor, "{\"label\":\"First\",\"features\":[\"cron\",7],\"order\":1,\"secret\":\"x\"}");
+ Path manifest = temporary.getRoot().toPath().resolve("store.properties");
+ Files.writeString(manifest, "first=" + first.resolve("pom.xml") + "\nsecond=" + second.resolve("pom.xml") + "\n");
+ PluginManager manager = new PluginManager(PluginConfigure.builder().pluginsDir(manifest).autoCleanup(false).build());
+ try {
+ manager.start();
+ java.util.Map> stores = new java.util.HashMap<>();
+ manager.getPluginInfos().forEach(plugin -> stores.put(plugin.getName(), plugin.getStore()));
+ Assert.assertEquals(java.util.Map.of("label", "First", "features", List.of("cron")), stores.get("FirstStore"));
+ Assert.assertEquals(java.util.Map.of(), stores.get("SecondStore"));
+ }
+ finally {
+ manager.stop();
+ }
+ }
+
@Test
public void aManifestRegistersAllCompiledExecutorsAndSchedulers()
throws Exception
@@ -69,4 +108,28 @@ public void aManifestRegistersAllCompiledExecutorsAndSchedulers()
manager.stop();
}
}
+
+ @Test
+ public void dependencyJarsCopiedByThePluginBuildAreOnTheClassPath()
+ throws Exception
+ {
+ // A plugin build copies its driver to target/dependencies; the plugin must load it from there.
+ Path root = module("DriverProbePlugin", "EXECUTOR");
+ Path sources = temporary.newFolder("driver-sources").toPath();
+ Path classes = temporary.newFolder("driver-classes").toPath();
+ Path source = sources.resolve("ProbeDriver.java");
+ Files.writeString(source, "package fixtures.driver; public class ProbeDriver {}");
+ Assert.assertEquals(0, ToolProvider.getSystemJavaCompiler().run(null, null, null, "-d", classes.toString(), source.toString()));
+ Path dependencies = Files.createDirectories(root.resolve("target/dependencies"));
+ try (JarOutputStream jar = new JarOutputStream(Files.newOutputStream(dependencies.resolve("probe-driver.jar")))) {
+ jar.putNextEntry(new JarEntry("fixtures/driver/ProbeDriver.class"));
+ jar.write(Files.readAllBytes(classes.resolve("fixtures/driver/ProbeDriver.class")));
+ jar.closeEntry();
+ }
+
+ Assert.assertEquals(List.of(dependencies.resolve("probe-driver.jar")), CompiledPomPluginLoader.dependencyJars(root));
+ Plugin plugin = new CompiledPomPluginLoader().load(root, Set.of("java.", "org.devlive.metaforge.plugin.")).get(0);
+ Assert.assertNotNull(plugin.getPluginClassLoader().loadClass("fixtures.driver.ProbeDriver"));
+ plugin.getPluginClassLoader().close();
+ }
}
diff --git a/core/metaforge-security/src/main/java/org/devlive/metaforge/security/SecurityConfigure.java b/core/metaforge-security/src/main/java/org/devlive/metaforge/security/SecurityConfigure.java
index aa90b41bbe..e00ce9c7d2 100644
--- a/core/metaforge-security/src/main/java/org/devlive/metaforge/security/SecurityConfigure.java
+++ b/core/metaforge-security/src/main/java/org/devlive/metaforge/security/SecurityConfigure.java
@@ -13,6 +13,10 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.header.writers.DelegatingRequestMatcherHeaderWriter;
+import org.springframework.security.web.header.writers.frameoptions.XFrameOptionsHeaderWriter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.util.matcher.NegatedRequestMatcher;
@Configuration
@EnableWebSecurity
@@ -64,18 +68,28 @@ public PasswordEncoder passwordEncoder()
protected void configure(HttpSecurity http)
throws Exception
{
+ // /assets/** is the web UI's build output (scripts, styles, images); browsers fetch CSS images without a token.
http.cors().and().csrf().disable()
.exceptionHandling().authenticationEntryPoint(unauthorizedHandler).and()
.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
.authorizeRequests()
- .antMatchers("/", "/**/*.js", "/**/*.css", "/api/auth/**", "/fonts/**", "/static/**", "/h2-console/**", "/api/v1/captcha", "/api/v1/table/dataDownload/**", "/upload/**", "/api/v1/setup/**")
+ .antMatchers("/", "/**/*.js", "/**/*.css", "/assets/**", "/api/auth/**", "/fonts/**", "/static/**", "/h2-console/**", "/api/v1/captcha", "/api/v1/table/dataDownload/**", "/upload/**", "/api/v1/setup/**",
+ // Shared reports: token-addressed public API and the pages that render it
+ "/api/v1/public/**", "/share/**", "/embed/**")
+ .permitAll()
+ // Pages of the history-routed web UI; their API calls stay authenticated
+ .requestMatchers(new WebUiRequestMatcher())
.permitAll()
.requestMatchers(new AdminApiRequestMatcher())
.hasAuthority("ADMIN")
.anyRequest()
.authenticated();
- // Fixed load denied by X-Frame-Options
- http.headers().frameOptions().sameOrigin();
+ // Same-origin framing everywhere except embedded report pages, whose CSP frame-ancestors
+ // carries the sites the report owner allowed.
+ http.headers().frameOptions().disable()
+ .addHeaderWriter(new DelegatingRequestMatcherHeaderWriter(
+ new NegatedRequestMatcher(new AntPathRequestMatcher("/embed/**")),
+ new XFrameOptionsHeaderWriter(XFrameOptionsHeaderWriter.XFrameOptionsMode.SAMEORIGIN)));
http.addFilterBefore(authenticationJwtTokenFilter(), UsernamePasswordAuthenticationFilter.class);
}
}
diff --git a/core/metaforge-security/src/main/java/org/devlive/metaforge/security/WebUiRequestMatcher.java b/core/metaforge-security/src/main/java/org/devlive/metaforge/security/WebUiRequestMatcher.java
new file mode 100644
index 0000000000..137108b2ad
--- /dev/null
+++ b/core/metaforge-security/src/main/java/org/devlive/metaforge/security/WebUiRequestMatcher.java
@@ -0,0 +1,48 @@
+package org.devlive.metaforge.security;
+
+import org.springframework.security.web.util.matcher.RequestMatcher;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * A browser asking for a page of the web UI. The UI uses history routing (/query, /admin/user ...),
+ * so every such address returns the UI document and the app routes it; the page itself needs no
+ * sign-in, the APIs it calls do. API paths, static files and anything with a file extension are not
+ * pages.
+ */
+public class WebUiRequestMatcher
+ implements RequestMatcher
+{
+ private static final String[] NOT_PAGES = {"/api/", "/assets/", "/static/", "/fonts/", "/upload/", "/h2-console", "/share/", "/embed/"};
+
+ @Override
+ public boolean matches(HttpServletRequest request)
+ {
+ if (!"GET".equals(request.getMethod()) && !"HEAD".equals(request.getMethod())) {
+ return false;
+ }
+ return isPage(path(request));
+ }
+
+ public static boolean isPage(String path)
+ {
+ if (path == null || path.isEmpty() || !path.startsWith("/") || "/api".equals(path)) {
+ return false;
+ }
+ for (String prefix : NOT_PAGES) {
+ if (path.startsWith(prefix)) {
+ return false;
+ }
+ }
+ // Files carry an extension in their last segment (favicon.ico, robots.txt, index.html).
+ String last = path.substring(path.lastIndexOf('/') + 1);
+ return !last.contains(".");
+ }
+
+ static String path(HttpServletRequest request)
+ {
+ String uri = request.getRequestURI();
+ String context = request.getContextPath();
+ return context != null && !context.isEmpty() && uri.startsWith(context) ? uri.substring(context.length()) : uri;
+ }
+}
diff --git a/core/metaforge-server/pom.xml b/core/metaforge-server/pom.xml
index ea1309082e..46824f4086 100644
--- a/core/metaforge-server/pom.xml
+++ b/core/metaforge-server/pom.xml
@@ -201,6 +201,20 @@
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+
+
+ application.properties
+
+
+
com.github.eirslett
frontend-maven-plugin
diff --git a/core/metaforge-server/src/main/java/org/devlive/metaforge/server/controller/CaptchaController.java b/core/metaforge-server/src/main/java/org/devlive/metaforge/server/controller/CaptchaController.java
index 4f40d30048..4e5710c43e 100644
--- a/core/metaforge-server/src/main/java/org/devlive/metaforge/server/controller/CaptchaController.java
+++ b/core/metaforge-server/src/main/java/org/devlive/metaforge/server/controller/CaptchaController.java
@@ -1,24 +1,29 @@
package org.devlive.metaforge.server.controller;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.lang3.ObjectUtils;
import org.devlive.metaforge.captcha.CalculateUtils;
import org.devlive.metaforge.captcha.entity.ResultEntity;
import org.devlive.metaforge.common.response.CommonResponse;
import org.devlive.metaforge.service.initializer.InitializerConfigure;
+import org.devlive.metaforge.service.service.SystemSettingService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController()
+@SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
@RequestMapping(value = "/api/v1/captcha")
public class CaptchaController
{
private final InitializerConfigure initializer;
+ private final SystemSettingService settings;
- public CaptchaController(InitializerConfigure initializer)
+ public CaptchaController(InitializerConfigure initializer, SystemSettingService settings)
{
this.initializer = initializer;
+ this.settings = settings;
}
@GetMapping
@@ -28,7 +33,7 @@ public CommonResponse