feat(plugin-schedule): add DB-driven plugin scheduler and xiuren scheduled push
This commit is contained in:
85
admin/dashboard/blueprints/plugin_schedules.py
Normal file
85
admin/dashboard/blueprints/plugin_schedules.py
Normal file
@@ -0,0 +1,85 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from flask import Blueprint, current_app, jsonify, render_template, request
|
||||
|
||||
from .auth import login_required
|
||||
|
||||
|
||||
plugin_schedules_bp = Blueprint("plugin_schedules", __name__, url_prefix="/plugin_schedules")
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/")
|
||||
@login_required
|
||||
def page_plugin_schedules():
|
||||
return render_template("plugin_schedules.html")
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/schedules", methods=["GET"])
|
||||
@login_required
|
||||
def api_list_schedules():
|
||||
server = current_app.dashboard_server
|
||||
data = server.plugin_schedule_manager.list_schedules_with_runtime()
|
||||
return jsonify({"success": True, "data": data})
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/actions", methods=["GET"])
|
||||
@login_required
|
||||
def api_list_actions():
|
||||
server = current_app.dashboard_server
|
||||
data = server.plugin_schedule_manager.get_available_plugin_actions()
|
||||
return jsonify({"success": True, "data": data})
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/schedules/<int:schedule_id>", methods=["PUT"])
|
||||
@login_required
|
||||
def api_update_schedule(schedule_id: int):
|
||||
server = current_app.dashboard_server
|
||||
payload = request.get_json(silent=True) or {}
|
||||
|
||||
updates = {}
|
||||
for key in (
|
||||
"action_name",
|
||||
"description",
|
||||
"trigger_type",
|
||||
"trigger_config",
|
||||
"target_scope",
|
||||
"target_config",
|
||||
"payload",
|
||||
"enabled",
|
||||
):
|
||||
if key in payload:
|
||||
updates[key] = payload[key]
|
||||
|
||||
if not updates:
|
||||
return jsonify({"success": False, "message": "没有可更新字段"}), 400
|
||||
|
||||
ok = server.plugin_schedule_manager.update_schedule(schedule_id, updates)
|
||||
if not ok:
|
||||
return jsonify({"success": False, "message": "更新失败"}), 500
|
||||
|
||||
return jsonify({"success": True, "message": "更新成功"})
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/schedules/<int:schedule_id>/trigger", methods=["POST"])
|
||||
@login_required
|
||||
def api_trigger_schedule(schedule_id: int):
|
||||
server = current_app.dashboard_server
|
||||
ok, msg = server.plugin_schedule_manager.trigger_now(schedule_id)
|
||||
code = 200 if ok else 400
|
||||
return jsonify({"success": ok, "message": msg}), code
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/schedules/<int:schedule_id>/logs", methods=["GET"])
|
||||
@login_required
|
||||
def api_schedule_logs(schedule_id: int):
|
||||
server = current_app.dashboard_server
|
||||
limit = int(request.args.get("limit", 100))
|
||||
logs = server.plugin_schedule_manager.get_logs(schedule_id, limit=limit)
|
||||
return jsonify({"success": True, "data": logs})
|
||||
|
||||
|
||||
@plugin_schedules_bp.route("/api/reload", methods=["POST"])
|
||||
@login_required
|
||||
def api_reload_schedules():
|
||||
server = current_app.dashboard_server
|
||||
server.plugin_schedule_manager.reload_from_db()
|
||||
return jsonify({"success": True, "message": "已按数据库配置重载插件调度"})
|
||||
@@ -48,6 +48,8 @@ class DashboardServer:
|
||||
self.task_db: TaskDBOperator = TaskDBOperator(self.db_manager)
|
||||
self.system_job_db = robot_instance.system_job_db
|
||||
self.system_job_loader = robot_instance.system_job_loader
|
||||
self.plugin_schedule_db = robot_instance.plugin_schedule_db
|
||||
self.plugin_schedule_manager = robot_instance.plugin_schedule_manager
|
||||
# 获取联系人管理器实例
|
||||
self.contact_manager = robot_instance.contact_manager
|
||||
self.plugin_manager = robot_instance.plugin_manager
|
||||
@@ -151,6 +153,7 @@ class DashboardServer:
|
||||
from admin.dashboard.blueprints.message_push import message_push_bp
|
||||
from admin.dashboard.blueprints.friend_circle import friend_circle_bp
|
||||
from admin.dashboard.blueprints.system_jobs import system_jobs_bp
|
||||
from admin.dashboard.blueprints.plugin_schedules import plugin_schedules_bp
|
||||
|
||||
# 在app.register_blueprint部分添加
|
||||
app.register_blueprint(virtual_group_bp, url_prefix='/virtual_group')
|
||||
@@ -166,6 +169,7 @@ class DashboardServer:
|
||||
app.register_blueprint(message_push_bp)
|
||||
app.register_blueprint(friend_circle_bp)
|
||||
app.register_blueprint(system_jobs_bp)
|
||||
app.register_blueprint(plugin_schedules_bp)
|
||||
|
||||
self.LOG.info("所有蓝图已注册")
|
||||
|
||||
|
||||
@@ -814,6 +814,7 @@
|
||||
items: [
|
||||
{ label: '插件统计', path: '/plugins' },
|
||||
{ label: '插件管理', path: '/plugins_manage' },
|
||||
{ label: '插件定时任务', path: '/plugin_schedules' },
|
||||
{ label: '接口文档', path: '/api_docs' }
|
||||
]
|
||||
},
|
||||
|
||||
280
admin/dashboard/templates/plugin_schedules.html
Normal file
280
admin/dashboard/templates/plugin_schedules.html
Normal file
@@ -0,0 +1,280 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}插件定时任务 - 机器人管理后台{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="page-shell">
|
||||
<div class="page-hero">
|
||||
<div class="page-hero-copy">
|
||||
<div class="page-eyebrow">Plugin Scheduler</div>
|
||||
<h1>插件定时任务</h1>
|
||||
<p>统一管理插件的定时动作配置(如秀人群发),支持按群范围执行、立即触发与执行日志追踪。</p>
|
||||
</div>
|
||||
<div class="page-hero-actions">
|
||||
<el-button type="primary" plain @click="reloadSchedules">按表重载</el-button>
|
||||
<el-button type="success" @click="loadSchedules">刷新</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-card shadow="hover">
|
||||
<el-table :data="schedules" style="width:100%" v-loading="loading">
|
||||
<el-table-column prop="id" label="ID" width="70"></el-table-column>
|
||||
<el-table-column prop="plugin_name" label="插件" min-width="120"></el-table-column>
|
||||
<el-table-column prop="action_name" label="动作" min-width="140"></el-table-column>
|
||||
<el-table-column prop="trigger_text" label="调度" min-width="170"></el-table-column>
|
||||
<el-table-column prop="target_scope" label="目标范围" width="150"></el-table-column>
|
||||
<el-table-column label="启用" width="90" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="scope.row.enabled ? 'success' : 'info'">{% raw %}{{ scope.row.enabled ? '是' : '否' }}{% endraw %}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="next_run_at" label="下次执行" min-width="165"></el-table-column>
|
||||
<el-table-column prop="last_run_at" label="上次执行" min-width="165"></el-table-column>
|
||||
<el-table-column label="最近结果" width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-tag :type="statusTag(scope.row.last_status)">{% raw %}{{ scope.row.last_status || 'never' }}{% endraw %}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" min-width="280">
|
||||
<template slot-scope="scope">
|
||||
<div class="action-row">
|
||||
<el-button size="mini" type="primary" plain @click="openEdit(scope.row)">编辑</el-button>
|
||||
<el-button size="mini" type="success" plain @click="triggerNow(scope.row)">立即触发</el-button>
|
||||
<el-button size="mini" type="text" @click="viewLogs(scope.row)">日志</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
||||
<el-dialog title="编辑插件调度" :visible.sync="editDialogVisible" width="560px">
|
||||
<el-form :model="editForm" label-width="110px">
|
||||
<el-form-item label="动作名称"><el-input v-model="editForm.action_name"></el-input></el-form-item>
|
||||
<el-form-item label="动作说明"><el-input v-model="editForm.description"></el-input></el-form-item>
|
||||
<el-form-item label="启用"><el-switch v-model="editForm.enabled"></el-switch></el-form-item>
|
||||
<el-form-item label="触发类型">
|
||||
<el-select v-model="editForm.trigger_type">
|
||||
<el-option label="每天固定时间" value="at_times"></el-option>
|
||||
<el-option label="固定间隔(秒)" value="every_seconds"></el-option>
|
||||
<el-option label="每周固定时间" value="every_weekday_time"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.trigger_type === 'at_times'" label="时间列表">
|
||||
<el-input v-model="editForm.time_list_text" placeholder="09:00,21:00"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.trigger_type === 'every_seconds'" label="间隔秒">
|
||||
<el-input-number v-model="editForm.seconds" :min="1"></el-input-number>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.trigger_type === 'every_weekday_time'" label="星期">
|
||||
<el-select v-model="editForm.weekday">
|
||||
<el-option label="周一" :value="0"></el-option>
|
||||
<el-option label="周二" :value="1"></el-option>
|
||||
<el-option label="周三" :value="2"></el-option>
|
||||
<el-option label="周四" :value="3"></el-option>
|
||||
<el-option label="周五" :value="4"></el-option>
|
||||
<el-option label="周六" :value="5"></el-option>
|
||||
<el-option label="周日" :value="6"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.trigger_type === 'every_weekday_time'" label="时间">
|
||||
<el-input v-model="editForm.time_str" placeholder="10:00"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标范围">
|
||||
<el-select v-model="editForm.target_scope">
|
||||
<el-option label="所有开启群" value="all_enabled_groups"></el-option>
|
||||
<el-option label="群白名单" value="group_whitelist"></el-option>
|
||||
<el-option label="单个群" value="single_group"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.target_scope === 'group_whitelist'" label="群ID列表">
|
||||
<el-input v-model="editForm.group_ids_text" placeholder="群ID逗号分隔"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item v-if="editForm.target_scope === 'single_group'" label="群ID">
|
||||
<el-input v-model="editForm.single_group_id"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="Payload(JSON)">
|
||||
<el-input type="textarea" :rows="4" v-model="editForm.payload_text"></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer">
|
||||
<el-button @click="editDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="saveEdit">保存</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog title="调度日志" :visible.sync="logsDialogVisible" width="860px">
|
||||
<el-table :data="logs" style="width:100%">
|
||||
<el-table-column prop="triggered_at" label="触发时间" width="180"></el-table-column>
|
||||
<el-table-column prop="status" label="状态" width="100"></el-table-column>
|
||||
<el-table-column prop="summary" label="摘要" min-width="220"></el-table-column>
|
||||
<el-table-column label="详情">
|
||||
<template slot-scope="scope">
|
||||
<pre class="detail-pre">{% raw %}{{ JSON.stringify(scope.row.detail_json || {}, null, 2) }}{% endraw %}</pre>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}
|
||||
<script>
|
||||
new Vue({
|
||||
el: '#app',
|
||||
mixins: [baseApp],
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
schedules: [],
|
||||
editDialogVisible: false,
|
||||
logsDialogVisible: false,
|
||||
logs: [],
|
||||
currentId: 0,
|
||||
editForm: {
|
||||
action_name: '',
|
||||
description: '',
|
||||
enabled: false,
|
||||
trigger_type: 'at_times',
|
||||
time_list_text: '',
|
||||
seconds: 60,
|
||||
weekday: 0,
|
||||
time_str: '09:00',
|
||||
target_scope: 'all_enabled_groups',
|
||||
group_ids_text: '',
|
||||
single_group_id: '',
|
||||
payload_text: '{}'
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.loadSchedules()
|
||||
},
|
||||
methods: {
|
||||
statusTag(status) {
|
||||
if (status === 'success') return 'success'
|
||||
if (status === 'failed') return 'danger'
|
||||
if (status === 'running') return 'warning'
|
||||
return 'info'
|
||||
},
|
||||
async loadSchedules() {
|
||||
this.loading = true
|
||||
try {
|
||||
const resp = await axios.get('/plugin_schedules/api/schedules')
|
||||
if (resp.data.success) this.schedules = resp.data.data || []
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
},
|
||||
openEdit(row) {
|
||||
this.currentId = row.id
|
||||
const trigger = row.trigger_config || {}
|
||||
const target = row.target_config || {}
|
||||
this.editForm.action_name = row.action_name || ''
|
||||
this.editForm.description = row.description || ''
|
||||
this.editForm.enabled = !!row.enabled
|
||||
this.editForm.trigger_type = row.trigger_type || 'at_times'
|
||||
this.editForm.time_list_text = (trigger.time_list || []).join(',')
|
||||
this.editForm.seconds = Number(trigger.seconds || 60)
|
||||
this.editForm.weekday = Number(trigger.weekday || 0)
|
||||
this.editForm.time_str = trigger.time_str || '09:00'
|
||||
this.editForm.target_scope = row.target_scope || 'all_enabled_groups'
|
||||
this.editForm.group_ids_text = (target.group_ids || []).join(',')
|
||||
this.editForm.single_group_id = target.group_id || ''
|
||||
this.editForm.payload_text = JSON.stringify(row.payload || {}, null, 2)
|
||||
this.editDialogVisible = true
|
||||
},
|
||||
buildTriggerConfig() {
|
||||
if (this.editForm.trigger_type === 'at_times') {
|
||||
return {
|
||||
time_list: String(this.editForm.time_list_text || '').split(',').map(x => x.trim()).filter(Boolean)
|
||||
}
|
||||
}
|
||||
if (this.editForm.trigger_type === 'every_seconds') {
|
||||
return { seconds: Number(this.editForm.seconds || 60) }
|
||||
}
|
||||
if (this.editForm.trigger_type === 'every_weekday_time') {
|
||||
return { weekday: Number(this.editForm.weekday || 0), time_str: String(this.editForm.time_str || '09:00') }
|
||||
}
|
||||
return {}
|
||||
},
|
||||
buildTargetConfig() {
|
||||
if (this.editForm.target_scope === 'single_group') {
|
||||
return { group_id: String(this.editForm.single_group_id || '').trim() }
|
||||
}
|
||||
if (this.editForm.target_scope === 'group_whitelist') {
|
||||
return {
|
||||
group_ids: String(this.editForm.group_ids_text || '').split(',').map(x => x.trim()).filter(Boolean)
|
||||
}
|
||||
}
|
||||
return {}
|
||||
},
|
||||
async saveEdit() {
|
||||
let payloadObj = {}
|
||||
try {
|
||||
payloadObj = JSON.parse(this.editForm.payload_text || '{}')
|
||||
} catch (e) {
|
||||
this.$message.error('Payload 不是合法 JSON')
|
||||
return
|
||||
}
|
||||
|
||||
const payload = {
|
||||
action_name: this.editForm.action_name,
|
||||
description: this.editForm.description,
|
||||
enabled: this.editForm.enabled,
|
||||
trigger_type: this.editForm.trigger_type,
|
||||
trigger_config: this.buildTriggerConfig(),
|
||||
target_scope: this.editForm.target_scope,
|
||||
target_config: this.buildTargetConfig(),
|
||||
payload: payloadObj
|
||||
}
|
||||
const resp = await axios.put(`/plugin_schedules/api/schedules/${this.currentId}`, payload)
|
||||
if (resp.data.success) {
|
||||
this.$message.success('保存成功')
|
||||
this.editDialogVisible = false
|
||||
await this.loadSchedules()
|
||||
} else {
|
||||
this.$message.error(resp.data.message || '保存失败')
|
||||
}
|
||||
},
|
||||
async triggerNow(row) {
|
||||
const resp = await axios.post(`/plugin_schedules/api/schedules/${row.id}/trigger`)
|
||||
if (resp.data.success) {
|
||||
this.$message.success(resp.data.message || '触发成功')
|
||||
} else {
|
||||
this.$message.warning(resp.data.message || '触发失败')
|
||||
}
|
||||
await this.loadSchedules()
|
||||
},
|
||||
async viewLogs(row) {
|
||||
const resp = await axios.get(`/plugin_schedules/api/schedules/${row.id}/logs`)
|
||||
if (resp.data.success) {
|
||||
this.logs = resp.data.data || []
|
||||
this.logsDialogVisible = true
|
||||
}
|
||||
},
|
||||
async reloadSchedules() {
|
||||
const resp = await axios.post('/plugin_schedules/api/reload')
|
||||
if (resp.data.success) {
|
||||
this.$message.success(resp.data.message || '重载成功')
|
||||
await this.loadSchedules()
|
||||
} else {
|
||||
this.$message.error(resp.data.message || '重载失败')
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block styles %}
|
||||
<style>
|
||||
.page-shell{display:flex;flex-direction:column;gap:16px}
|
||||
.page-hero{display:flex;align-items:flex-end;justify-content:space-between;gap:18px;padding:24px 26px;border-radius:24px;background:linear-gradient(135deg, rgba(79,70,229,.10), rgba(59,130,246,.08), rgba(255,255,255,.9));border:1px solid rgba(148,163,184,.16);box-shadow:0 18px 40px rgba(15,23,42,.06)}
|
||||
.page-hero-actions{display:flex;align-items:center;gap:12px}
|
||||
.page-eyebrow{font-size:12px;text-transform:uppercase;letter-spacing:.08em;color:#6366f1;font-weight:700;margin-bottom:8px}
|
||||
.page-hero-copy h1{font-size:30px;line-height:1.1;margin-bottom:10px;color:#0f172a}
|
||||
.page-hero-copy p{color:#64748b;font-size:14px}
|
||||
.action-row{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
|
||||
.detail-pre{white-space:pre-wrap;word-break:break-word;background:rgba(248,250,252,.85);border:1px solid rgba(148,163,184,.12);border-radius:14px;padding:10px;color:#334155}
|
||||
</style>
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user