daxiapi-cli 1.0.0 → 1.2.0

package/README.md

@@ -59,9 +59,6 @@ daxiapi market -v
 
 # 收盘新闻
 daxiapi market -n
-
-# 涨跌停股票池
-daxiapi market -z
 ```
 
 ### 指数K线

package/bin/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { program } = require('commander');
+const {program} = require('commander');
 const chalk = require('chalk');
 const config = require('../lib/config');
 const api = require('../lib/api');
@@ -71,11 +71,10 @@ program
     .option('-s, --style', '获取大小盘风格')
     .option('-v, --value', '获取指数估值')
     .option('-n, --news', '获取收盘新闻')
-    .option('-z, --zdt', '获取涨跌停股票池')
-    .action(async (options) => {
+    .action(async options => {
         showWelcome();
         const token = checkToken();
-        
+
         try {
             if (options.degree) {
                 const data = await api.getMarketDegree(token);
@@ -89,9 +88,6 @@ program
             } else if (options.news) {
                 const data = await api.getMarketNews(token);
                 output.newsList(data);
-            } else if (options.zdt) {
-                const data = await api.getZdtPool(token);
-                output.text(data);
             } else {
                 // 默认获取市场概览
                 const data = await api.getMarketData(token);
@@ -109,7 +105,7 @@ program
     .action(async () => {
         showWelcome();
         const token = checkToken();
-        
+
         try {
             const data = await api.getIndexK(token);
             output.klines(data);
@@ -126,10 +122,10 @@ program
     .option('-o, --order <field>', '排序字段', 'cs')
     .option('-l, --limit <days>', '天数', '5')
     .option('-g, --gn <gnId>', '概念代码，获取概念内个股')
-    .action(async (options) => {
+    .action(async options => {
         showWelcome();
         const token = checkToken();
-        
+
         try {
             if (options.code) {
                 const data = await api.getSectorRankStock(token, options.code, options.order);
@@ -154,7 +150,7 @@ program
     .action(async (codes, options) => {
         showWelcome();
         const token = checkToken();
-        
+
         try {
             const data = await api.getStockData(token, codes.join(','));
             if (options.json) {
@@ -175,7 +171,7 @@ program
     .action(async (keyword, options) => {
         showWelcome();
         const token = checkToken();
-        
+
         try {
             const data = await api.queryStock(token, keyword, options.type);
             output.searchResult(data);
@@ -184,4 +180,30 @@ program
         }
     });
 
+// ==================== K线数据命令 ====================
+program
+    .command('kline <code>')
+    .description('获取个股K线数据')
+    .option('-l, --limit <days>', '数据条数', '300')
+    .option('-t, --type <type>', 'K线类型: day/week/month', 'day')
+    .option('-j, --json', '输出JSON格式')
+    .option('-s, --simple', '简单输出格式')
+    .action(async (code, options) => {
+        showWelcome();
+        // K线数据不需要token，使用免费数据源
+
+        try {
+            const data = await api.getKline(code, parseInt(options.limit), options.type);
+            if (options.json) {
+                console.log(JSON.stringify(data, null, 2));
+            } else if (options.simple) {
+                output.klineSimple(data, 10);
+            } else {
+                output.klineData(data, 20);
+            }
+        } catch (err) {
+            output.error(err);
+        }
+    });
+
 program.parse();

package/lib/api.js

@@ -1,7 +1,20 @@
 const axios = require('axios');
 const config = require('./config');
 
-const BASE_URL = config.get('baseUrl') || 'https://daxiapi.com';
+const BASE_URL = config.getBaseUrl() || 'https://daxiapi.com';
+
+/**
+ * 获取市场类型前缀
+ */
+function getMarketPrefix(code) {
+    if (code.startsWith('688') || code.startsWith('689')) {
+        return 'sh';
+    }
+    if (code.startsWith('60')) {
+        return 'sh';
+    }
+    return 'sz';
+}
 
 /**
  * 创建请求实例
@@ -21,7 +34,7 @@ function createClient(token) {
  * GET 请求
  */
 async function get(client, path) {
-    const { data } = await client.get(path);
+    const {data} = await client.get(path);
     if (data.errCode !== 0) {
         throw new Error(data.errMsg || `API Error: ${data.errCode}`);
     }
@@ -32,7 +45,7 @@ async function get(client, path) {
  * POST 请求
  */
 async function post(client, path, body = {}) {
-    const { data } = await client.post(path, body);
+    const {data} = await client.post(path, body);
     if (data.errCode !== 0) {
         throw new Error(data.errMsg || `API Error: ${data.errCode}`);
     }
@@ -89,20 +102,12 @@ async function getMarketNews(token) {
     return get(client, '/get_market_end_news');
 }
 
-/**
- * 获取涨跌停股票池
- */
-async function getZdtPool(token) {
-    const client = createClient(token);
-    return post(client, '/get_zdt_pool');
-}
-
 /**
  * 获取板块热力图
  */
 async function getSectorData(token, orderBy = 'cs', lmt = 5) {
     const client = createClient(token);
-    return post(client, '/get_sector_data', { orderBy, lmt });
+    return post(client, '/get_sector_data', {orderBy, lmt});
 }
 
 /**
@@ -110,7 +115,7 @@ async function getSectorData(token, orderBy = 'cs', lmt = 5) {
  */
 async function getSectorRankStock(token, sectorCode, orderBy = 'cs') {
     const client = createClient(token);
-    return post(client, '/get_sector_rank_stock', { sectorCode, orderBy });
+    return post(client, '/get_sector_rank_stock', {sectorCode, orderBy});
 }
 
 /**
@@ -118,7 +123,7 @@ async function getSectorRankStock(token, sectorCode, orderBy = 'cs') {
  */
 async function getGainianStock(token, gnId) {
     const client = createClient(token);
-    return post(client, '/get_gainian_stock', { gnId });
+    return post(client, '/get_gainian_stock', {gnId});
 }
 
 /**
@@ -126,7 +131,7 @@ async function getGainianStock(token, gnId) {
  */
 async function getStockData(token, codes) {
     const client = createClient(token);
-    return post(client, '/get_stock_data', { code: codes });
+    return post(client, '/get_stock_data', {code: codes});
 }
 
 /**
@@ -134,7 +139,7 @@ async function getStockData(token, codes) {
  */
 async function queryStock(token, keyword, type = 'stock') {
     const client = createClient(token);
-    return post(client, '/query_stock_data', { q: keyword, type });
+    return post(client, '/query_stock_data', {q: keyword, type});
 }
 
 /**
@@ -145,6 +150,123 @@ async function getGnTable(token) {
     return post(client, '/get_gn_table');
 }
 
+// ==================== K线数据（多数据源） ====================
+
+/**
+ * 获取K线数据（首选腾讯，备选东方财富）
+ * @param {string} code - 股票代码
+ * @param {number} limit - 数据条数，默认300
+ * @param {string} type - K线类型: day(日线), week(周线), month(月线)
+ * @returns {Promise<Object>} K线数据
+ */
+async function getKline(code, limit = 300, type = 'day') {
+    // 首选腾讯
+    try {
+        const data = await getKlineFromQQ(code, limit, type);
+        return {source: 'qq', ...data};
+    } catch (err) {
+        console.log('腾讯数据源失败，切换到东方财富...');
+    }
+
+    // 备选东方财富
+    try {
+        const data = await getKlineFromEastmoney(code, limit, type);
+        return {source: 'eastmoney', ...data};
+    } catch (err) {
+        throw new Error('所有数据源均失败，请稍后重试');
+    }
+}
+
+/**
+ * 腾讯财经K线数据
+ * @param {string} code - 股票代码
+ * @param {number} limit - 数据条数
+ * @param {string} type - K线类型
+ */
+async function getKlineFromQQ(code, limit = 500, type = 'day') {
+    const market = getMarketPrefix(code);
+    const fullCode = `${market}${code}`;
+
+    // 腾讯接口限制最大2000条
+    if (limit > 2000) {
+        limit = 2000;
+    }
+
+    const url = `https://proxy.finance.qq.com/ifzqgtimg/appstock/app/newfqkline/get?_var=&param=${fullCode},${type},,,${limit},qfq&r=0.${Date.now()}`;
+
+    const {data} = await axios.get(url, {timeout: 10000});
+
+    if (!data.data || !data.data[fullCode]) {
+        throw new Error('腾讯数据源返回异常');
+    }
+
+    const klineData = data.data[fullCode].qfqday || data.data[fullCode].day;
+    if (!klineData || klineData.length === 0) {
+        throw new Error('无K线数据');
+    }
+
+    const klines = klineData.map(([date, open, close, high, low, volume, , , amount]) => ({
+        date,
+        open: parseFloat(open),
+        close: parseFloat(close),
+        high: parseFloat(high),
+        low: parseFloat(low),
+        volume: parseFloat(volume),
+        amount: parseFloat(amount)
+    }));
+
+    return {
+        code,
+        name: data.data[fullCode].qt?.[fullCode]?.[1] || code,
+        klines,
+        count: klines.length
+    };
+}
+
+/**
+ * 东方财富K线数据
+ * @param {string} code - 股票代码
+ * @param {number} limit - 数据条数
+ * @param {string} type - K线类型: day=101, week=102, month=103
+ */
+async function getKlineFromEastmoney(code, limit = 300, type = 'day') {
+    // K线类型映射
+    const kltMap = {day: '101', week: '102', month: '103'};
+    const klt = kltMap[type] || '101';
+
+    // 市场代码
+    const secid = code.startsWith('6') ? `1.${code}` : `0.${code}`;
+
+    const url = `https://push2his.eastmoney.com/api/qt/stock/kline/get?fields1=f1,f2,f3,f4,f5,f6&fields2=f51,f52,f53,f54,f55,f56,f57,f58,f61&ut=7eea3edcaed734bea9cbfc24409ed989&end=29991010&klt=${klt}&secid=${secid}&fqt=1&lmt=${limit}`;
+
+    const {data} = await axios.get(url, {timeout: 10000});
+
+    if (!data.data || !data.data.klines) {
+        throw new Error('东方财富数据源返回异常');
+    }
+
+    const klines = data.data.klines.map(line => {
+        const [date, open, close, high, low, volume, amount, , turnover] = line.split(',');
+        return {
+            date,
+            open: parseFloat(open),
+            close: parseFloat(close),
+            high: parseFloat(high),
+            low: parseFloat(low),
+            volume: parseFloat(volume),
+            amount: parseFloat(amount),
+            turnover: parseFloat(turnover) || 0
+        };
+    });
+
+    return {
+        code,
+        name: data.data.name || code,
+        klines,
+        count: klines.length
+    };
+}
+
 module.exports = {
     getIndexK,
     getMarketData,
@@ -152,11 +274,13 @@ module.exports = {
     getMarketStyle,
     getMarketValueData,
     getMarketNews,
-    getZdtPool,
     getSectorData,
     getSectorRankStock,
     getGainianStock,
     getStockData,
     queryStock,
-    getGnTable
+    getGnTable,
+    getKline,
+    getKlineFromQQ,
+    getKlineFromEastmoney
 };

package/lib/output.js

@@ -235,6 +235,46 @@ function searchResult(data) {
     }
 }
 
+/**
+ * K线数据输出（增强版）
+ */
+function klineData(data, limit = 20) {
+    console.log(chalk.bold.cyan(`📊 ${data.name} (${data.code}) K线数据\n`));
+    console.log(chalk.gray(`数据源: ${data.source === 'qq' ? '腾讯财经' : '东方财富'}`));
+    console.log(chalk.gray(`数据条数: ${data.count}\n`));
+    
+    if (data.klines && data.klines.length > 0) {
+        const displayData = data.klines.slice(-limit);
+        const tableData = displayData.map(item => ({
+            '日期': item.date,
+            '开盘': item.open?.toFixed(2),
+            '收盘': item.close?.toFixed(2),
+            '最高': item.high?.toFixed(2),
+            '最低': item.low?.toFixed(2),
+            '涨跌幅': formatPercent(item.close && item.open ? ((item.close - item.open) / item.open * 100) : null),
+            '成交量': formatVolume(item.volume),
+            '成交额': formatAmount(item.amount)
+        }));
+        console.table(tableData);
+    }
+}
+
+/**
+ * K线简单输出（最近N天）
+ */
+function klineSimple(data, limit = 10) {
+    if (data.klines && data.klines.length > 0) {
+        const displayData = data.klines.slice(-limit);
+        console.log(chalk.bold(`${data.name} (${data.code}) 最近${displayData.length}日K线 [${data.source}]:`));
+        
+        displayData.forEach(item => {
+            const change = item.close && item.open ? ((item.close - item.open) / item.open * 100) : 0;
+            const changeStr = change >= 0 ? chalk.red(`+${change.toFixed(2)}%`) : chalk.green(`${change.toFixed(2)}%`);
+            console.log(`  ${item.date} | 开${item.open?.toFixed(2)} 收${item.close?.toFixed(2)} 高${item.high?.toFixed(2)} 低${item.low?.toFixed(2)} | ${changeStr}`);
+        });
+    }
+}
+
 // ==================== 辅助函数 ====================
 
 function formatPercent(value) {
@@ -264,6 +304,13 @@ function formatVolume(vol) {
     return vol.toString();
 }
 
+function formatAmount(amount) {
+    if (!amount) return '-';
+    if (amount >= 100000000) return (amount / 100000000).toFixed(2) + '亿';
+    if (amount >= 10000) return (amount / 10000).toFixed(2) + '万';
+    return amount.toFixed(2);
+}
+
 module.exports = {
     error,
     text,
@@ -275,5 +322,7 @@ module.exports = {
     sectorHeatmap,
     stockList,
     stockDetail,
-    searchResult
+    searchResult,
+    klineData,
+    klineSimple
 };

package/package.json

@@ -1,28 +1,28 @@
 {
-  "name": "daxiapi-cli",
-  "version": "1.0.0",
-  "description": "大虾皮(daxiapi.com)金融数据API命令行工具",
-  "bin": {
-    "daxiapi": "./bin/index.js",
-    "dxp": "./bin/index.js"
-  },
-  "scripts": {
-    "test": "node bin/index.js"
-  },
-  "keywords": [
-    "stock",
-    "api",
-    "daxiapi",
-    "cli",
-    "finance"
-  ],
-  "author": "daxiapi.com",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^1.6.0",
-    "chalk": "^4.1.2",
-    "commander": "^11.1.0",
-    "conf": "^10.2.0",
-    "console.table": "^0.10.0"
-  }
-}
+    "name": "daxiapi-cli",
+    "version": "1.2.0",
+    "description": "大虾皮(daxiapi.com)金融数据API命令行工具",
+    "bin": {
+        "daxiapi": "./bin/index.js",
+        "dxp": "./bin/index.js"
+    },
+    "scripts": {
+        "test": "node bin/index.js"
+    },
+    "keywords": [
+        "stock",
+        "api",
+        "daxiapi",
+        "cli",
+        "finance"
+    ],
+    "author": "daxiapi.com",
+    "license": "MIT",
+    "dependencies": {
+        "axios": "^1.6.0",
+        "chalk": "^4.1.2",
+        "commander": "^11.1.0",
+        "conf": "^10.2.0",
+        "console.table": "^0.10.0"
+    }
+}