Commit Graph

336 Commits

Author SHA1 Message Date
ZhouYongyou
b908fac92f feat: 創建 adaptive.txt 自適應雙策略模板
新增 prompts/adaptive.txt 模板,包含:

## 核心特性
- 市場狀態判斷(震盪/趨勢,多指標交叉驗證)
- 雙策略系統:
  * 策略 A: 震盪交易(高勝率低盈虧比)
  * 策略 B: 趨勢跟隨(中等勝率高盈虧比)
- 技術位優先止盈機制(EMA20、前高前低、整數關口)
- 動態追踪止損(鎖定利潤,避免回撤)
- 夏普比率自我進化(交易質量 > 交易頻率)

## 使用方式
用戶可在 Web UI 選擇此模板,或繼續使用 default/nof1

## 技術實現
- 259 行完整策略指導
- 與現有模板系統兼容
- engine.go 保留硬編碼作為 fallback

相關文檔:TEMPLATE_MIGRATION_PLAN.md

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-02 01:06:11 +08:00
Ember
ba48298c03 ui(web): 对齐 #138 风格——用 Lucide/矢量图标替换表情与占位,增强空态/警告显示(ComparisonChart/Competition/AITraders/ConfigModal) 2025-11-02 01:02:15 +08:00
Ember
abcd215e19 feat(web): 重做 #138/#133 的前端改动(LOGO 替换 + Loading Logo + 校验优化保留),尽量不覆盖他人代码 2025-11-02 00:58:25 +08:00
ZhouYongyou
6553b81b94 fix: config.json.example 缺少 coin_pool_api_url 和 oi_top_api_url 字段
- 问题:config.json.example 与 main.go 的 ConfigFile 结构不一致
- 影响:新用户复制 example 时会缺少必要的配置字段
- 修复:添加 coin_pool_api_url 和 oi_top_api_url(空字符串)

相关提交:517d0ca (admin_mode config)
2025-11-02 00:40:21 +08:00
Ember
0a4fd06882 refactor(web): 拆分 LandingPage 为可复用组件(HeaderBar/Hero/AnimatedSection 等),新增 pages 结构并完成集成;构建通过 2025-11-02 00:36:37 +08:00
Ember
a3c6568137 refactor(web): 引入 pages 目录并迁移 LandingPage;修正 App 引用与相对路径,保持构建通过 2025-11-02 00:28:38 +08:00
ZhouYongyou
b1e4a7598a fix: 修复中文引号导致的 Go 编译错误
问题:
- Go 语言不识别中文双引号 ""
- 导致编译失败:syntax error: unexpected name

修复:
- 将所有中文双引号 "" 替换为英文单引号 ''
- 影响行:287, 365-369

错误示例:
- 错误:"趋势市场"
- 正确:'趋势市场'

🤖 Generated with Claude Code
2025-11-02 00:25:25 +08:00
ZhouYongyou
a58be23a29 fix: 修正盈亏百分比计算错误(未考虑杠杆)
问题:
- 旧算法只计算价格变化百分比,未考虑杠杆倍数
- 例:10倍杠杆,价格涨1% → 显示+1%(错误),实际应该是+10%
- 导致 AI 收到错误的盈亏数据,影响决策

修复:
- 使用实际盈亏除以保证金计算百分比
- 公式:pnlPct = (unrealizedPnl / marginUsed) * 100
- 优点:
  ✓ 考虑杠杆倍数
  ✓ 使用 API 提供的实际盈亏(含手续费、资金费率)
  ✓ 更准确反映真实盈亏百分比

示例对比:
- 入场:100,000,当前:101,000(+1%),10倍杠杆
- 旧算法:显示 +1%(错误)
- 新算法:显示 +10%(正确)

感谢用户反馈 @1711z

🤖 Generated with Claude Code
2025-11-02 00:23:59 +08:00
Ember
8d77f15d4d fix(web): 更新主图像文件以改善视觉效果 2025-11-02 00:19:49 +08:00
Ember
b5d4ff0fc2 fix(web): 优化落地页内容—移除多余空行,简化图片组件,更新支持方列表 2025-11-02 00:17:19 +08:00
Z
f02c5df2b6 Merge branch 'tinkle-community:dev' into dev 2025-11-02 00:08:58 +08:00
Ember
28b7edbc5c style(web): 对齐币安风格—移除渐变/发光,固化深色/面板色,新增 header 样式,按钮与卡片统一 2025-11-02 00:08:46 +08:00
ZhouYongyou
88a7055561 feat: 添加技术位优先止盈 + 追踪止损(阶段1)
解决问题:
- 固定百分比止盈经常在技术位前回撤
- 浮盈没有保护机制,从 +1.5% 回撤到止损

核心改进:
1. 技术位优先止盈:
   - 震荡策略:技术位 < 2% → 止盈设在技术位前 0.1%
   - 趋势策略:技术位 < 5% → 止盈设在技术位前 0.2%
   - 技术位识别:EMA20、最近高低点、整数关口

2. 追踪止损机制:
   - 震荡:浮盈 0.8% → 止损移到成本价,浮盈 1.2% → 止损移到 +0.5%
   - 趋势:浮盈 2% → 止损移到成本价,浮盈 5% → 止损移到 +2.5%
   - 价格接近技术位 → 主动平仓避免回撤

3. 分批止盈预留:
   - 趋势策略:技术位在 5-10% → 分两批止盈
   - 为阶段2分批止盈做准备

预期效果:
- 减少"快到止盈就回撤"的情况
- 锁定浮盈,避免全部回撤
- 提高实际盈亏比

实施方式:纯提示词改进,基于已有数据(EMA20、K线高低点)

🤖 Generated with Claude Code
2025-11-02 00:03:20 +08:00
SkywalkerJi
6c03d247e1 Docker port mapping prompts. 2025-11-02 00:03:19 +08:00
Ember
e6fc60c464 fix(web): 去除残留 undefined(文本最终清洗)并将启动命令改为顶层 README 流程(start.sh + compose) 2025-11-02 00:01:38 +08:00
Ember
493fd559dc fix(web): Typewriter 更稳健—charAt防越界、sanitizedLines防空值、pre-wrap防换行丢失 2025-11-01 23:58:48 +08:00
Ember
f5dfb1bb61 feat(web): Typewriter 优化(修复 undefined、矩阵绿样式、降低速度)并更新启动指令为 README 前端开发流程 2025-11-01 23:53:17 +08:00
Ember
8c57b6b1e7 feat(web): 落地页“启动输出”加入打字机效果(Typewriter) 2025-11-01 23:45:27 +08:00
Ember
9d4e86cbf5 feat(web): 新增 Landing 页面与 UI 优化\n\n- 新增 LandingPage、CryptoFeatureCard 等组件\n- 登录/注册页面与样式优化\n- 静态资源 images/main.png 2025-11-01 23:36:28 +08:00
tinkle-community
775446d939 Merge pull request #201 from SkywalkerJi/dev
Mapping the prompts folder in Docker.
2025-11-01 22:33:30 +08:00
SkywalkerJi
24a9a4b2a3 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev 2025-11-01 22:31:09 +08:00
SkywalkerJi
cee927a46d Docker port mapping prompts. 2025-11-01 22:28:49 +08:00
原始
c39eb4a0e2 Merge branch 'tinkle-community:dev' into dev 2025-11-01 22:07:25 +08:00
Z
e51cbf4092 Merge branch 'tinkle-community:dev' into dev 2025-11-01 21:03:57 +08:00
ZhouYongyou
e708c99db2 feat: 添加自适应双策略系统(震荡 + 趋势)
根据 ADAPTIVE_STRATEGY_DESIGN.md 方案 A(简单版)实现:

新增功能:
1. 市场状态判断(3个指标交叉验证):
   - 多时间框架一致性(15m/1h/4h MACD 方向)
   - 价格波动率(最近 10 根 K线波动幅度)
   - 买卖压力极端值(BuySellRatio 连续性)

2. 双策略系统:
   - 策略 A(震荡交易):止盈 1-2%,止损 0.8-1%,盈亏比 1:1.5-1:2
   - 策略 B(趋势跟随):止盈 5-10%,止损 1.5-2%,盈亏比 1:3-1:5

3. 策略选择指导:AI 必须在思维链中明确说明市场状态判断和策略选择

改进效果:
- 让 AI 根据市场状态动态调整止盈止损
- 震荡市场快进快出,趋势市场让利润奔跑
- 预期提升胜率和盈亏比,降低最大回撤

实施方式:纯提示词改进(无代码变更),耗时 30 分钟

🤖 Generated with Claude Code
2025-11-01 20:40:31 +08:00
tinkle-community
17c927b04a Merge pull request #194 from Icyoung/dev
Remote auth for prompt templates
2025-11-01 20:34:32 +08:00
tinkle-community
37dff0b3f0 Merge pull request #192 from Icyoung/dev
Dev Bug fix
2025-11-01 20:28:06 +08:00
icy
2cc91d1701 Remote auth for prompt templates 2025-11-01 20:25:55 +08:00
原始
128182ce7c Merge branch 'tinkle-community:dev' into dev 2025-11-01 20:24:59 +08:00
Z
4fbb4ecea5 Merge branch 'dev' into dev 2025-11-01 20:17:20 +08:00
icy
2538d2f928 Merge branch 'dev' of https://github.com/tinkle-community/nofx 2025-11-01 20:09:17 +08:00
tinkle-community
6659625da1 Merge pull request #189 from SkywalkerJi/dev
Supports custom system prompts and custom models.
2025-11-01 19:49:26 +08:00
SkywalkerJi
798133e479 Merge branch 'tinkle-community:dev' into dev 2025-11-01 20:46:33 +09:00
SkywalkerJi
4250c11ddf Supports custom system prompts and custom models. 2025-11-01 19:45:54 +08:00
icy
01ee3d57d9 Fixed i18n lint 2025-11-01 19:39:27 +08:00
icy
996b152eba Resolve merge conflicts in AITradersPage.tsx
- Fixed import statement conflict (using 'type Language')
- Merged exchange configuration logic preserving support for multiple exchange types
- Kept comprehensive form handling for Binance, Hyperliquid, Aster, and OKX exchanges
- Updated security warning messages to use proper translation keys

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 19:01:44 +08:00
icy
f413f87f39 Fixed health check; Fixed dex config; Add rank trader info view; 2025-11-01 18:58:32 +08:00
原始
b70df0ffe2 Merge branch 'tinkle-community:dev' into dev 2025-11-01 18:46:27 +08:00
SkywalkerJi
5be7106eb2 Rename the model. 2025-11-01 17:10:36 +08:00
SkywalkerJi
7bc936880c Reordering system prompts. 2025-11-01 16:25:36 +08:00
tinkle-community
c24a9e57cb Merge pull request #177 from SkywalkerJi/dev
Fixed the custom model URL. Added functionality for custom model names.
2025-11-01 16:13:37 +08:00
SkywalkerJi
ebe7882205 Merge branch 'tinkle-community:dev' into dev 2025-11-01 17:09:55 +09:00
SkywalkerJi
48d1320209 * Fixed the custom model URL.
*   Added functionality for custom model names.
2025-11-01 16:09:15 +08:00
yuanshi2016
2c08e1f10b 新增内置AI评分
修改market/data.go Get函数获取K线为流式获取(可以解决传入币种比较多的情况下耗时问题)
market目录下新增文件
main.go 新增运行入口
通过inside_coins=true控制
该评分默认初始化大约需要2分钟左右(因为币种列表比较多,api有限速)
使用时应该注意engine.go下的流动性过滤问题
2025-11-01 15:58:54 +08:00
tinkle-community
2d99dda666 Merge pull request #172 from SkywalkerJi/dev
Eliminating Model Shorting Bias.
2025-11-01 14:55:26 +08:00
SkywalkerJi
db782eb314 Eliminating Model Shorting Bias. 2025-11-01 14:44:07 +08:00
tinkle
faa6818092 merge main fix Conflict 2025-11-01 13:14:22 +08:00
tinkle-community
a090040519 Merge pull request #162 from tangmengqiu/fix/i18n-english-display
Fix/i18n english display
2025-11-01 12:20:25 +08:00
tangmengqiu
7bde647112 fix: Remove duplicate selectExchange key in translations
Fixed TypeScript compilation error TS1117 caused by duplicate
'selectExchange' key in both English and Chinese translation objects.

The key was already defined in the "AI Traders Management" section,
so removed the duplicate from "AI Traders Page - Additional" section.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-01 00:02:00 -04:00
tangmengqiu
8bc06ae619 fix: Complete i18n implementation for English language display
This commit addresses the issue where switching to English still showed Chinese text in many UI elements.

Changes made:
- Added 40+ missing translation keys to translations.ts for both English and Chinese
- Updated App.tsx to use t() function for all hardcoded text (logout button, loading message)
- Updated AITradersPage.tsx extensively:
  - Replaced all alert/confirm messages with translation keys
  - Updated status labels (inUse, enabled, configured)
  - Updated all modal components (SignalSource, ModelConfig, ExchangeConfig)
  - Added language prop to all modal components
  - Replaced all Chinese UI text with translation function calls

The implementation now properly supports language switching between English and Chinese throughout the entire application.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-10-31 23:58:44 -04:00