From 86c0ffd1dbadb1571ef52bbb4f34b0acfc5c15c0 Mon Sep 17 00:00:00 2001
From: hjjjj <1311711287@qq.com>
Date: Mon, 2 Mar 2026 18:55:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E5=92=8C=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将部署脚本中的分支从main改为master
修正环境变量示例中的邮箱域名错误
---
 .env.example | 2 +-
 deploy.bat   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.example b/.env.example
index 8efa588..9fc646e 100644
--- a/.env.example
+++ b/.env.example
@@ -6,7 +6,7 @@ JWT_SECRET=your-jwt-secret-key-change-in-production
 JWT_EXPIRES_IN=7d
 
 # 登录白名单：固定验证码，不发邮件，多个邮箱用逗号分隔
-WHITELIST_EMAILS=1311711287@email.com
+WHITELIST_EMAILS=1311711287@qq.com
 WHITELIST_CODE=888888
 
 ALIYUN_ACCESS_KEY_ID=LTAI5tP7ufyq46H86SrzmxPL
diff --git a/deploy.bat b/deploy.bat
index a6cec24..0546522 100644
--- a/deploy.bat
+++ b/deploy.bat
@@ -1,7 +1,7 @@
 @echo off
 set "PATH=%PATH%;C:\Program Files\Git\cmd"
 git fetch origin
-git reset --hard origin/main
+git reset --hard origin/master
 npm install --omit=dev
 pm2 restart skills-market-server
 echo Deploy done.