diff --git a/config.py b/config.py index f83f66a..ec74865 100644 --- a/config.py +++ b/config.py @@ -58,7 +58,7 @@ OKX_MONITOR_CONFIG = { "ETH-USDT", "DOGE-USDT", ], - "bars": ["5m", "15m", "30m", "1H"], + "bars": ["1m", "5m", "15m", "30m", "1H"], "initial_date": "2025-05-15 00:00:00", }, "price_monitor": { diff --git a/market_data_main.py b/market_data_main.py index afea5f4..7d6d35f 100644 --- a/market_data_main.py +++ b/market_data_main.py @@ -62,7 +62,7 @@ class MarketDataMain: "symbols", ["XCH-USDT"] ) self.bars = OKX_MONITOR_CONFIG.get("volume_monitor", {}).get( - "bars", ["5m", "15m", "1H", "1D"] + "bars", ["1m", "5m", "15m", "1H", "1D"] ) self.initial_date = OKX_MONITOR_CONFIG.get("volume_monitor", {}).get( "initial_date", "2025-07-01 00:00:00" @@ -114,7 +114,12 @@ class MarketDataMain: logger.error(f"结束时间格式错误: {end_time}") return None - start_time_ts = transform_date_time_to_timestamp(start) + if bar == "1m": + # start为end_time_ts的前十五天 + start_time_ts = end_time_ts - 86400000 * 15 + start = timestamp_to_datetime(start_time_ts) + else: + start_time_ts = transform_date_time_to_timestamp(start) if start_time_ts is None: logger.error(f"开始时间格式错误: {start}") return None @@ -126,8 +131,10 @@ class MarketDataMain: # 如果bar为1D, 则end_time_ts与start_time_ts相差超过10天,则按照10天为单位 # 获取数据,直到end_time_ts threshold = None - if bar in ["5m", "15m", "30m", "1H"]: + if bar in ["1m", "5m", "15m", "30m", "1H"]: if self.is_us_stock: + if bar == "1m": + threshold = 86400000 * 2 if bar == "5m": threshold = 86400000 * 4 elif bar == "15m": diff --git a/sql/mysql_install.md b/sql/mysql_install.md index f7a2b98..85fce9e 100644 --- a/sql/mysql_install.md +++ b/sql/mysql_install.md @@ -155,6 +155,8 @@ chown mysql:mysql /tmp/mysql.sock ### 关键修复点说明 1. **目录结构修正**:将MySQL解压文件直接放在 `/mnt/0/mysql/` 下,避免多嵌套一层 `bin` 目录,确保 `share/errmsg.sys` 等核心文件能被正确找到。 2. **权限链修复**:不仅设置 `/mnt/0/mysql/` 的权限,还确保父目录 `/mnt/0` 有执行权限(`755`),解决 "Permission denied" 问题。 +sudo chown -R mysql:mysql /mnt/0/mysql +sudo chmod -R 755 /mnt/0/mysql 3. **路径参数修正**:`--basedir` 指向 `/mnt/0/mysql`(主目录),而非子目录,与MySQL原生目录结构匹配。 按照以上步骤操作,可彻底解决之前出现的路径错误和权限问题,确保MySQL正常安装和运行。 @@ -233,4 +235,36 @@ mysql -u xch -p USE okx; ``` -这样就完成了管理员账号 `xch` 的创建和 `okx` 数据库的创建。`xch` 账号拥有与 root 类似的全部权限,可以管理所有数据库。 \ No newline at end of file +这样就完成了管理员账号 `xch` 的创建和 `okx` 数据库的创建。`xch` 账号拥有与 root 类似的全部权限,可以管理所有数据库。 + + +# 服务器搬迁后mysql不正常怎么办? +如果3306端口没有生效,即: +netstat -tulpn | grep 3306 +无任何返回信息: +# 关键:修复权限链(包括父目录) +sudo chmod 755 /mnt/0 # 确保父目录可访问 +sudo chown -R mysql:mysql /mnt/0/mysql/ # 递归设置所有权 +sudo chmod 700 /mnt/0/mysql/data/ # 数据目录权限(仅所有者可访问) +``` +然后重启mysql: +systemctl restart mysql +查看mysql状态: +systemctl status mysql +返回类似信息: +(base) root@lckj:/mnt/0/mysql/conf# systemctl status mysql +● mysql.service - MySQL Server + Loaded: loaded (/etc/systemd/system/mysql.service; enabled; vendor preset: enabled) + Active: active (running) since Thu 2025-10-16 05:22:34 UTC; 4min 56s ago + Main PID: 590936 (mysqld) + Tasks: 39 (limit: 57298) + Memory: 380.4M + CPU: 1.294s + CGroup: /system.slice/mysql.service + └─590936 /mnt/0/mysql/bin/mysqld --defaults-file=/mnt/0/mysql/conf/my.cnf + +再执行netstat -tulpn | grep 3306 +返回类似信息即可: +(base) root@lckj:/mnt/0/mysql/conf# netstat -tulpn | grep 3306 +tcp 0 0 0.0.0.0:3306 0.0.0.0:* LISTEN 590936/mysqld +tcp6 0 0 :::33060 :::* LISTEN 590936/mysqld \ No newline at end of file