Commit Graph

51 Commits

Author SHA1 Message Date
dekun 42f2dad52a Remove contract profile from navigation and retire its routes.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 03:32:30 +08:00
dekun ab9987e4c7 Add personal license agreement and rename product section to tradable symbols.
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 02:52:45 +08:00
dekun bdfa21def8 Rename positions nav to order monitor and set as default landing page.
Remove stats recalculate button; login and home now open /positions without affecting refresh on other routes.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 01:51:22 +08:00
dekun 9f48f22d16 Gate order cancel to trading hours and sync trade logs from CTP.
Disable cancel UI outside sessions, query exchange fills for records, and label local vs counterparty rows.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 00:35:51 +08:00
dekun a23f2c80ca Track open orders as pending until CTP fill, with cancel and timeout.
Add configurable pending timeout in settings and clearer CTP password save feedback.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-26 00:05:45 +08:00
dekun ca541d5fc3 Auto-reconnect CTP with new front-end addresses after saving settings
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 17:51:18 +08:00
dekun 259d9e812d fix: CTP登录冷却持久化到数据库,取消页面自动连并刷新JS缓存
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 17:01:36 +08:00
dekun 5a6c89c662 feat: CTP/SimNow 配置迁入系统设置,登录失败即时报错
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 16:46:01 +08:00
dekun 240fbe7994 feat: 交易记录增加保证金占比与最新资金,上方展示资金曲线
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 16:17:22 +08:00
dekun 9772f3d986 feat: 计仓改为固定手数/固定金额,推荐过滤与CTP保证金,下单与持仓UI优化
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 15:31:34 +08:00
dekun 4d60b958ce fix: 开仓时间读CTP OpenDate,止盈止损持久化且重启不丢失
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 15:05:58 +08:00
dekun f31164076f feat: 非交易时段禁开仓、移动保本与交易结果分类。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 13:33:17 +08:00
dekun fc425c0e9f feat: 品种下拉统一展示推荐列表,与下方品种推荐表一致。
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 13:01:20 +08:00
dekun 9875ee6d44 本地监控止盈止损、盘前自动连CTP,并完善保证金与推荐手数。
- 止盈止损改为程序本地监控,触发后市价平仓(含跳空)
- 交易前30分钟后台自动连接 CTP
- 保证金占用上限默认30%,可在系统设置修改
- K线标准蜡烛图红跌绿涨,费率表全宽固定表头
- 品种推荐按保证金比例×总资金计算推荐手数

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-25 12:18:18 +08:00
dekun 049aaffdcf fix: CTP连接改后台异步,避免多路重连互相阻塞
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:49:25 +08:00
dekun 1d95950b5c fix: 手续费同步改为后台执行,避免阻塞 Web 请求
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:45:39 +08:00
dekun e01c011df5 feat: 手续费仅CTP每日后台同步入库,前端只读展示
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:33:14 +08:00
dekun de6815d481 fix: K线新浪历史补齐与手续费页布局及CTP批量同步
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:26:53 +08:00
dekun 3fe4add8e1 feat: 行情K线优先CTP tick聚合,修复手续费同步主力列表解析
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:18:43 +08:00
dekun eaca3d43ec ui: 手续费/设置布局优化,行情优先 CTP
手续费数据源与本地倍率并列双列;设置页去掉参考资金、缩小改密表单;CTP 连接时订阅柜台 tick 作为行情源。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 13:04:11 +08:00
dekun 528d9811e3 feat: 导航开关与 CTP 柜台手续费
系统设置可开关五类导航;手续费默认从 CTP 查询同步,本地/AKShare 作离线兜底;补充 FEES.md。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 12:19:56 +08:00
dekun d368317c1b fix: 强制设置有效 locale 修复 vnpy_ctp CTP 登录崩溃
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 11:38:19 +08:00
dekun f73d436077 fix: CTP 连接后 locale 崩溃,PM2 设置 LANG=C.UTF-8
vnpy_ctp C++ 扩展在缺 locale 时会 terminate;补充 SimNow 备用前置说明。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 11:32:20 +08:00
dekun 709801305f 恢复下单界面并排布局,品种推荐数据库缓存与 SSE 推送。
期货下单与持仓监控左右并排,推荐按资金过滤存库,后台刷新并通过 EventSource 推送。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 10:41:26 +08:00
dekun 55d95b4c39 进一步修复 SQLite 并发锁冲突,统一连接与重试机制。
新增 db_conn 模块、缓存 schema 初始化、positions 页 commit,风控读库自动重试。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 10:30:26 +08:00
dekun 1688452f3f 修复持仓轮询时 SQLite database is locked 错误。
单连接复用并提交风控写入,启用 WAL 与 busy_timeout,缓存风控表 schema 初始化。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 10:27:04 +08:00
dekun 7b8a660309 合并期货下单与持仓监控为统一界面,移除手工录入。
策略与 CTP 自动同步持仓,新增 /api/trading/live 聚合展示与平仓接口。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 10:18:00 +08:00
dekun 6e423eebfb 接入 SimNow 模拟盘与期货下单、策略及品种推荐功能。
新增 vnpy CTP 桥接、以损定仓/固定张数、趋势回调与滚仓策略、按资金推荐品种及交易风控;模拟盘走 SimNow,实盘预留期货公司配置。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-24 10:04:37 +08:00
dekun 9c0e5d9c57 修复主力合约识别:按持仓量判定并移除当月占位
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 18:28:51 +08:00
dekun 404872007f 行情K线:分类主力选择、图表指标与布局稳定
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 18:23:39 +08:00
dekun 65992eb35e K线后台自动刷新并通过SSE推送到前端,移除轮询
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 17:33:31 +08:00
dekun b804bd19a7 K线本地缓存、图表交互优化与交易记录表格修复
新增 kline_store 优先读本地库;修复加载中遮挡、支持缩放与交易时段刷新;修复交易记录操作列被裁切。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 17:27:31 +08:00
dekun 6f3ac3deb6 新增行情K线页,支持分时与多周期图表
扩展新浪K线拉取与合成逻辑,提供 ECharts 交互图表及实时报价 API。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 17:07:04 +08:00
dekun 28875078f1 三端自适应布局与 PWA 可安装支持
新增响应式样式、手机侧滑导航、manifest 与 Service Worker;补充根路径重定向与安装 App 入口。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 16:58:13 +08:00
dekun e8b4dbbaca 重构统计分析页:汇总指标、分项下拉与后台缓存
新增 stats_engine 与 stats_cache,提供 API 自动加载 8 种统计维度;交易与复盘变更时自动刷新缓存。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 16:46:06 +08:00
dekun b77f30b3ff 新增品种简介查询页,支持东方财富/新浪合约规格展示
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 15:54:38 +08:00
dekun bea7804d47 本地手续费配置(标准×2),持仓/交易记录/复盘/统计展示扣费后盈亏
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 15:22:40 +08:00
dekun 9ba9733523 持仓监控独立导航页,交易记录与复盘合并为同一页
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 15:06:18 +08:00
dekun 5aa9f11733 持仓监控平仓自动记入交易记录,新增交易记录页与实盘资金设置
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 14:56:21 +08:00
dekun 38ff40111a 关键位与今日计划列表实时现价及距区间距离(1s轮询)
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 14:30:01 +08:00
dekun 58020b6e9c 修复关键位sina_code字段;复盘详情全屏两行;开单计划表单布局优化
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 14:22:42 +08:00
dekun eaf72a13fc 开单计划增加决策理由;品种联想加速;复盘支持品种匹配
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 13:15:06 +08:00
dekun a35a08d2f6 复盘盈亏比自动计算与K线自动生成;居中页头导航
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 12:58:24 +08:00
dekun 9b4bbbe8a3 双栏布局:开单计划/关键位/复盘;复盘字段与情绪单
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 12:27:20 +08:00
dekun 9fc41b6a46 修复启动报错:expire_old_plans 在 init_db 前未定义
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:56:50 +08:00
dekun 0bebdd5717 顶部导航1800宽;开单计划按日失效与历史筛选;复盘表单
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:54:21 +08:00
dekun 471166bec3 支持从.env同步管理员密码;新增reset_admin.py
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:29:12 +08:00
dekun 314d3206c0 默认新浪行情,普通用户无需同花顺token
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:16:51 +08:00
dekun fb61153a4d 部署改回/opt;接入同花顺iFinD HTTP行情,新浪作回退
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:14:10 +08:00
dekun bd7f0da1ca 同花顺合约代码映射与/root部署路径
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-06-15 11:10:33 +08:00