feat: 商品详情页、XLS导入修复、分页选择器、导出功能
后端： - 新增 product_images 表，支持每商品最多5张图（服务端压缩至1200px/JPEG85%） - products 表新增 public_id(UUID)、description 字段 - 新增商品详情接口、二维码接口、公开商品接口（无鉴权） - 修复 XLS 导入：OLE2 magic bytes 检测 + 临时文件解析，兼容 extrame/xls - 修复商品/名称/系列/规格三张表导入数据为0（LastCol()=0 bug） - 所有导入接口返回 total/imported/skipped 统计 - config 新增 StorageConfig，支持 STORAGE_* 环境变量覆盖 - 种子数据修复：products 补 public_id、新增 product_images TRUNCATE、schema.sql 表名修正 前端： - 商品详情页：图片上传/删除、描述内联编辑、二维码弹窗、公开链接复制 - 公开商品页：无鉴权路由 /product/:public_id，Flutter Web SPA - 商品详情列表（批次追踪）商品名超链接跳转详情页 - 导航「商品管理」改名「商品详情」 - 所有列表表格新增每页条数选择（10/20/50/100） - 表格列头内嵌筛选（FilterableColumnHeader） - 导出 Excel 功能（入库/出库/库存/财务/批次/往来单位） - 网络恢复自动刷新 + 离线缓存展示 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
wangjia
@@ -0,0 +1,64 @@
|
||||
#!/bin/bash
|
||||
# 本地一键构建 + 部署脚本
|
||||
# 用法：bash deploy/deploy.sh
|
||||
set -e
|
||||
|
||||
EC2_HOST="18.136.60.128"
|
||||
EC2_USER="ec2-user"
|
||||
EC2_KEY="$HOME/.ssh/wangjia.pem"
|
||||
DOMAIN="jiu.51yanmei.com"
|
||||
|
||||
export PATH="/opt/homebrew/bin:$PATH"
|
||||
|
||||
REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo "=== 运行后端测试 ==="
|
||||
cd backend
|
||||
go test ./...
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo "=== 运行前端测试 ==="
|
||||
cd client
|
||||
flutter test
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo "=== 编译 Go 后端（linux/amd64） ==="
|
||||
cd backend
|
||||
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o jiu-server .
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo "=== 编译 Flutter Web ==="
|
||||
cd client
|
||||
flutter build web --release --dart-define=BASE_URL=https://$DOMAIN
|
||||
cd "$REPO_ROOT"
|
||||
|
||||
echo "=== 上传后端二进制 ==="
|
||||
scp -i "$EC2_KEY" backend/jiu-server $EC2_USER@$EC2_HOST:/tmp/jiu-server
|
||||
|
||||
echo "=== 上传前端静态文件 ==="
|
||||
rsync -avz --delete -e "ssh -i $EC2_KEY" \
|
||||
client/build/web/ $EC2_USER@$EC2_HOST:/tmp/jiu-web-new/
|
||||
|
||||
echo "=== 切换文件并重启服务 ==="
|
||||
ssh -i "$EC2_KEY" $EC2_USER@$EC2_HOST bash << 'REMOTE'
|
||||
set -e
|
||||
|
||||
# 后端
|
||||
mv /tmp/jiu-server /opt/jiu/backend/jiu-server
|
||||
chmod +x /opt/jiu/backend/jiu-server
|
||||
sudo systemctl restart jiu
|
||||
sleep 3
|
||||
curl -sf http://localhost:8080/health || { echo "健康检查失败！"; exit 1; }
|
||||
echo "后端重启成功"
|
||||
|
||||
# 前端（原子替换）
|
||||
rm -rf /opt/jiu/web_old
|
||||
mv /opt/jiu/web /opt/jiu/web_old 2>/dev/null || true
|
||||
mv /tmp/jiu-web-new /opt/jiu/web
|
||||
sudo systemctl reload nginx
|
||||
echo "前端已更新"
|
||||
REMOTE
|
||||
|
||||
echo ""
|
||||
echo "部署完成：https://$DOMAIN"
|
||||
@@ -0,0 +1,17 @@
|
||||
version: "3.9"
|
||||
services:
|
||||
jiu-mysql:
|
||||
image: mysql:8.0
|
||||
container_name: jiu_mysql
|
||||
restart: always
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${DB_PASSWORD}
|
||||
MYSQL_DATABASE: jiu_db
|
||||
ports:
|
||||
- "127.0.0.1:3306:3306"
|
||||
volumes:
|
||||
- jiu_mysql_data:/var/lib/mysql
|
||||
command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
|
||||
volumes:
|
||||
jiu_mysql_data:
|
||||
@@ -0,0 +1,15 @@
|
||||
[Unit]
|
||||
Description=Jiu Backend
|
||||
After=network.target docker.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=ec2-user
|
||||
WorkingDirectory=/opt/jiu
|
||||
ExecStart=/opt/jiu/backend/jiu-server
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
EnvironmentFile=/opt/jiu/config/production.env
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -0,0 +1,38 @@
|
||||
server {
|
||||
listen 127.0.0.1:8445 ssl;
|
||||
server_name jiu.51yanmei.com;
|
||||
|
||||
ssl_certificate /etc/letsencrypt/live/jiu.51yanmei.com/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/jiu.51yanmei.com/privkey.pem;
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
|
||||
root /opt/jiu/web;
|
||||
index index.html;
|
||||
|
||||
# 商品图片静态文件
|
||||
location /images/ {
|
||||
alias /opt/jiu/images/;
|
||||
expires 30d;
|
||||
add_header Cache-Control "public, immutable";
|
||||
}
|
||||
|
||||
# API 反向代理
|
||||
location ~ ^/(api|health|version) {
|
||||
proxy_pass http://127.0.0.1:8080;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_read_timeout 30s;
|
||||
}
|
||||
|
||||
# Flutter SPA fallback
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name jiu.51yanmei.com;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
SERVER_MODE=release
|
||||
SERVER_PORT=8080
|
||||
SERVER_CORS_ORIGIN=https://jiu.51yanmei.com
|
||||
DATABASE_DSN=root:CHANGE_ME_DB_PASS@tcp(127.0.0.1:3306)/jiu_db?charset=utf8mb4&parseTime=True&loc=Local
|
||||
JWT_SECRET=CHANGE_ME_RANDOM_32CHARS
|
||||
JWT_ACCESS_EXPIRE_MIN=60
|
||||
JWT_REFRESH_EXPIRE_H=168
|
||||
LICENSE_HMAC_SECRET=CHANGE_ME_RANDOM_32CHARS
|
||||
STORAGE_UPLOAD_DIR=/opt/jiu/images
|
||||
STORAGE_BASE_URL=https://jiu.51yanmei.com/images
|
||||
DB_PASSWORD=CHANGE_ME_DB_PASS
|
||||
@@ -0,0 +1,56 @@
|
||||
#!/bin/bash
|
||||
# EC2 一次性初始化脚本（Amazon Linux 2023）
|
||||
# 前提：以下文件已 scp 到 /opt/jiu/config/
|
||||
# - production.env（填好真实密钥）
|
||||
# - docker-compose.jiu.yml
|
||||
# - nginx-jiu.conf
|
||||
# - jiu.service
|
||||
set -e
|
||||
|
||||
echo "=== Step 0: 清理 Docker 悬空镜像 ==="
|
||||
docker image prune -f
|
||||
|
||||
echo "=== Step 1: 创建目录结构 ==="
|
||||
sudo mkdir -p /opt/jiu/{backend,web,config}
|
||||
sudo chown -R ec2-user:ec2-user /opt/jiu
|
||||
|
||||
echo "=== Step 2: 启动 MySQL ==="
|
||||
cd /opt/jiu/config
|
||||
# 从 production.env 读取 DB_PASSWORD 并写入临时 .env 供 docker-compose 使用
|
||||
grep ^DB_PASSWORD production.env | sed 's/^DB_PASSWORD=/DB_PASSWORD=/' > .env
|
||||
docker-compose -f docker-compose.jiu.yml up -d
|
||||
rm -f .env
|
||||
echo "等待 MySQL 就绪（20秒）..."
|
||||
sleep 20
|
||||
docker ps | grep jiu_mysql && echo "MySQL 已启动" || { echo "MySQL 启动失败！"; exit 1; }
|
||||
|
||||
echo "=== Step 3: 安装 systemd 服务 ==="
|
||||
sudo cp /opt/jiu/config/jiu.service /etc/systemd/system/
|
||||
sudo systemctl daemon-reload
|
||||
sudo systemctl enable jiu
|
||||
echo "jiu.service 已注册（首次部署后再 start）"
|
||||
|
||||
echo "=== Step 4: 获取 SSL 证书 ==="
|
||||
echo "注意：需要 jiu.51yanmei.com 的 DNS A 记录已指向此 EC2"
|
||||
sudo certbot certonly --standalone \
|
||||
--pre-hook "systemctl stop nginx" \
|
||||
--post-hook "systemctl start nginx" \
|
||||
-d jiu.51yanmei.com \
|
||||
--non-interactive --agree-tos -m admin@51yanmei.com
|
||||
|
||||
echo "=== Step 5: 安装 Nginx 配置 ==="
|
||||
sudo cp /opt/jiu/config/nginx-jiu.conf /etc/nginx/conf.d/jiu.conf
|
||||
|
||||
echo "=== Step 6: 在 stream.conf 添加 SNI 路由 ==="
|
||||
if grep -q "jiu.51yanmei.com" /etc/nginx/stream.conf; then
|
||||
echo "SNI 路由已存在，跳过"
|
||||
else
|
||||
sudo sed -i '/default.*10443/i\ jiu.51yanmei.com 127.0.0.1:8445;' /etc/nginx/stream.conf
|
||||
echo "SNI 路由已添加"
|
||||
fi
|
||||
|
||||
sudo nginx -t && sudo systemctl reload nginx
|
||||
|
||||
echo ""
|
||||
echo "=== EC2 初始化完成 ==="
|
||||
echo "请在 Mac 上运行：bash deploy/deploy.sh"
|
||||
Reference in New Issue
Block a user