Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
282dcf05f0 | ||
|
|
f2b1fc0ace | ||
|
|
13b95049c3 | ||
|
|
d274c8cb14 | ||
|
|
e27c1acf79 | ||
|
|
f7a5cee262 | ||
|
|
106d8d8e57 | ||
|
|
b57334b82c | ||
|
|
e4db851b31 |
420
GIT_GUIDE.md
Normal file
420
GIT_GUIDE.md
Normal file
@@ -0,0 +1,420 @@
|
|||||||
|
# Sub2API 双 Remote Git 配置指南
|
||||||
|
|
||||||
|
## 📋 Git 仓库配置
|
||||||
|
|
||||||
|
### Remote 配置结构
|
||||||
|
|
||||||
|
```
|
||||||
|
upstream (官方仓库)
|
||||||
|
└── https://github.com/Wei-Shaw/sub2api.git
|
||||||
|
用途: 拉取官方更新
|
||||||
|
|
||||||
|
origin (你的仓库)
|
||||||
|
└── https://git.586vip.cn/oadmin/sub2api.git
|
||||||
|
用途: 保存你的二次开发代码
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 快速部署(一键完成)
|
||||||
|
|
||||||
|
### 方式 1:使用自动化脚本(推荐)
|
||||||
|
|
||||||
|
**在服务器上执行以下命令:**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 下载部署脚本
|
||||||
|
curl -o /tmp/deploy-sub2api.sh https://你的脚本地址/deploy-complete.sh
|
||||||
|
|
||||||
|
# 或者直接创建脚本
|
||||||
|
cat > /tmp/deploy-sub2api.sh << 'SCRIPT_END'
|
||||||
|
# [这里粘贴 deploy-complete.sh 的全部内容]
|
||||||
|
SCRIPT_END
|
||||||
|
|
||||||
|
# 赋予执行权限
|
||||||
|
chmod +x /tmp/deploy-sub2api.sh
|
||||||
|
|
||||||
|
# 运行脚本
|
||||||
|
bash /tmp/deploy-sub2api.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
脚本会自动完成:
|
||||||
|
- ✅ 克隆官方仓库
|
||||||
|
- ✅ 配置双 remote
|
||||||
|
- ✅ 推送到你的仓库
|
||||||
|
- ✅ 创建部署配置
|
||||||
|
- ✅ 启动 Docker 服务
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### 方式 2:手动分步执行
|
||||||
|
|
||||||
|
如果自动脚本有问题,可以手动执行:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 克隆官方仓库
|
||||||
|
cd /opt
|
||||||
|
git clone https://github.com/Wei-Shaw/sub2api.git sub2api-dev
|
||||||
|
cd sub2api-dev
|
||||||
|
|
||||||
|
# 2. 配置 Git Remote
|
||||||
|
git remote rename origin upstream
|
||||||
|
git remote add origin https://git.586vip.cn/oadmin/sub2api.git
|
||||||
|
|
||||||
|
# 3. 查看配置
|
||||||
|
git remote -v
|
||||||
|
# 应该看到:
|
||||||
|
# origin https://git.586vip.cn/oadmin/sub2api.git (fetch)
|
||||||
|
# origin https://git.586vip.cn/oadmin/sub2api.git (push)
|
||||||
|
# upstream https://github.com/Wei-Shaw/sub2api.git (fetch)
|
||||||
|
# upstream https://github.com/Wei-Shaw/sub2api.git (push)
|
||||||
|
|
||||||
|
# 4. 创建 main 分支
|
||||||
|
git checkout -b main
|
||||||
|
|
||||||
|
# 5. 推送到你的仓库
|
||||||
|
git push -u origin main
|
||||||
|
|
||||||
|
# 6. 配置部署文件
|
||||||
|
cd deploy
|
||||||
|
```
|
||||||
|
|
||||||
|
创建 `docker-compose.prod.yml`:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > docker-compose.prod.yml << 'EOF'
|
||||||
|
services:
|
||||||
|
sub2api:
|
||||||
|
image: weishaw/sub2api:latest
|
||||||
|
container_name: sub2api
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "2080:8080"
|
||||||
|
volumes:
|
||||||
|
- ./data:/app/data
|
||||||
|
environment:
|
||||||
|
- AUTO_SETUP=true
|
||||||
|
- SERVER_HOST=0.0.0.0
|
||||||
|
- SERVER_PORT=8080
|
||||||
|
- SERVER_MODE=release
|
||||||
|
- DATABASE_HOST=postgres
|
||||||
|
- DATABASE_PORT=5432
|
||||||
|
- DATABASE_USER=sub2api
|
||||||
|
- DATABASE_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
|
- DATABASE_DBNAME=sub2api
|
||||||
|
- DATABASE_SSLMODE=disable
|
||||||
|
- REDIS_HOST=host.docker.internal
|
||||||
|
- REDIS_PORT=6379
|
||||||
|
- REDIS_PASSWORD=redis_bJFKDk
|
||||||
|
- REDIS_DB=1
|
||||||
|
- ADMIN_EMAIL=${ADMIN_EMAIL}
|
||||||
|
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||||
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
|
depends_on:
|
||||||
|
- postgres
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgres:18-alpine
|
||||||
|
container_name: sub2api-postgres
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
environment:
|
||||||
|
- POSTGRES_USER=sub2api
|
||||||
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
|
- POSTGRES_DB=sub2api
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U sub2api"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres_data:
|
||||||
|
EOF
|
||||||
|
```
|
||||||
|
|
||||||
|
创建 `.env` 配置:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cat > .env << EOF
|
||||||
|
POSTGRES_USER=sub2api
|
||||||
|
POSTGRES_PASSWORD=$(openssl rand -base64 24)
|
||||||
|
POSTGRES_DB=sub2api
|
||||||
|
ADMIN_EMAIL=admin@example.com
|
||||||
|
ADMIN_PASSWORD=admin123
|
||||||
|
JWT_SECRET=$(openssl rand -hex 32)
|
||||||
|
JWT_EXPIRE_HOUR=24
|
||||||
|
TZ=Asia/Shanghai
|
||||||
|
SERVER_MODE=release
|
||||||
|
RUN_MODE=standard
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# 显示生成的密码
|
||||||
|
echo "===== 配置信息 ====="
|
||||||
|
cat .env
|
||||||
|
echo "===================="
|
||||||
|
```
|
||||||
|
|
||||||
|
启动服务:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 拉取镜像
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
|
||||||
|
# 启动服务
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
# 查看日志
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔄 日常工作流程
|
||||||
|
|
||||||
|
### 开发流程
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api-dev
|
||||||
|
|
||||||
|
# 1. 创建功能分支
|
||||||
|
git checkout -b feature/new-feature
|
||||||
|
|
||||||
|
# 2. 开发并提交
|
||||||
|
git add .
|
||||||
|
git commit -m "feat: 添加新功能"
|
||||||
|
|
||||||
|
# 3. 切回主分支
|
||||||
|
git checkout main
|
||||||
|
|
||||||
|
# 4. 合并功能分支
|
||||||
|
git merge feature/new-feature
|
||||||
|
|
||||||
|
# 5. 推送到你的仓库
|
||||||
|
git push origin main
|
||||||
|
|
||||||
|
# 6. 删除功能分支(可选)
|
||||||
|
git branch -d feature/new-feature
|
||||||
|
```
|
||||||
|
|
||||||
|
### 同步官方更新
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api-dev
|
||||||
|
|
||||||
|
# 1. 查看官方更新
|
||||||
|
git fetch upstream
|
||||||
|
git log HEAD..upstream/main --oneline
|
||||||
|
|
||||||
|
# 2. 查看详细差异
|
||||||
|
git diff HEAD..upstream/main
|
||||||
|
|
||||||
|
# 3. 合并官方更新
|
||||||
|
git merge upstream/main
|
||||||
|
|
||||||
|
# 4. 如果有冲突,解决后提交
|
||||||
|
git add .
|
||||||
|
git commit -m "merge: 合并官方更新 v1.x.x"
|
||||||
|
|
||||||
|
# 5. 推送到你的仓库
|
||||||
|
git push origin main
|
||||||
|
|
||||||
|
# 6. 重新部署(如果需要)
|
||||||
|
cd deploy
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### 查看分支和远程信息
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 查看所有分支
|
||||||
|
git branch -a
|
||||||
|
|
||||||
|
# 查看远程仓库
|
||||||
|
git remote -v
|
||||||
|
|
||||||
|
# 查看当前状态
|
||||||
|
git status
|
||||||
|
|
||||||
|
# 查看提交历史
|
||||||
|
git log --oneline --graph --all -10
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🛠️ 常见操作
|
||||||
|
|
||||||
|
### 回滚到某个版本
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 查看提交历史
|
||||||
|
git log --oneline
|
||||||
|
|
||||||
|
# 回滚到指定提交(软回滚,保留修改)
|
||||||
|
git reset --soft <commit-hash>
|
||||||
|
|
||||||
|
# 回滚到指定提交(硬回滚,丢弃修改)
|
||||||
|
git reset --hard <commit-hash>
|
||||||
|
|
||||||
|
# 推送到远程(需要强制推送)
|
||||||
|
git push -f origin main
|
||||||
|
```
|
||||||
|
|
||||||
|
### 对比官方版本
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 对比特定文件
|
||||||
|
git diff upstream/main -- backend/internal/service/gateway_service.go
|
||||||
|
|
||||||
|
# 对比整个目录
|
||||||
|
git diff upstream/main -- backend/internal/service/
|
||||||
|
|
||||||
|
# 生成 patch 文件
|
||||||
|
git diff upstream/main > my-changes.patch
|
||||||
|
|
||||||
|
# 查看改动的文件列表
|
||||||
|
git diff --name-only upstream/main
|
||||||
|
```
|
||||||
|
|
||||||
|
### 从官方仓库拉取特定分支/标签
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 拉取官方的所有标签
|
||||||
|
git fetch upstream --tags
|
||||||
|
|
||||||
|
# 查看所有标签
|
||||||
|
git tag -l
|
||||||
|
|
||||||
|
# 基于某个标签创建分支
|
||||||
|
git checkout -b v1.0.0 tags/v1.0.0
|
||||||
|
|
||||||
|
# 切回主分支
|
||||||
|
git checkout main
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📦 Docker 管理
|
||||||
|
|
||||||
|
### 服务管理
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api-dev/deploy
|
||||||
|
|
||||||
|
# 查看状态
|
||||||
|
docker-compose -f docker-compose.prod.yml ps
|
||||||
|
|
||||||
|
# 查看日志
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f
|
||||||
|
|
||||||
|
# 只看 sub2api 日志
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f sub2api
|
||||||
|
|
||||||
|
# 重启服务
|
||||||
|
docker-compose -f docker-compose.prod.yml restart
|
||||||
|
|
||||||
|
# 停止服务
|
||||||
|
docker-compose -f docker-compose.prod.yml down
|
||||||
|
|
||||||
|
# 完全清理(包括数据)
|
||||||
|
docker-compose -f docker-compose.prod.yml down -v
|
||||||
|
```
|
||||||
|
|
||||||
|
### 更新镜像
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 拉取最新镜像
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
|
||||||
|
# 重新创建容器
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
# 查看镜像信息
|
||||||
|
docker images | grep sub2api
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ⚠️ 注意事项
|
||||||
|
|
||||||
|
1. **定期备份**
|
||||||
|
- 备份 `.env` 文件
|
||||||
|
- 导出 PostgreSQL 数据库
|
||||||
|
- 提交代码到远程仓库
|
||||||
|
|
||||||
|
2. **合并冲突处理**
|
||||||
|
- 遇到冲突时,优先保留官方核心逻辑
|
||||||
|
- 调整你的二开代码以适配官方更新
|
||||||
|
|
||||||
|
3. **测试环境**
|
||||||
|
- 建议先在测试环境验证更新
|
||||||
|
- 确认无误后再应用到生产环境
|
||||||
|
|
||||||
|
4. **版本管理**
|
||||||
|
- 重要功能单独开分支
|
||||||
|
- 使用有意义的提交信息
|
||||||
|
- 定期推送到远程仓库
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔍 故障排查
|
||||||
|
|
||||||
|
### Git 问题
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 如果 push 被拒绝
|
||||||
|
git pull origin main --rebase
|
||||||
|
git push origin main
|
||||||
|
|
||||||
|
# 如果需要强制推送(危险!)
|
||||||
|
git push -f origin main
|
||||||
|
|
||||||
|
# 查看 Git 配置
|
||||||
|
git config --list
|
||||||
|
|
||||||
|
# 重置 remote
|
||||||
|
git remote remove origin
|
||||||
|
git remote add origin https://git.586vip.cn/oadmin/sub2api.git
|
||||||
|
```
|
||||||
|
|
||||||
|
### Docker 问题
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Redis 连接失败
|
||||||
|
# 修改 docker-compose.prod.yml 中的 REDIS_HOST
|
||||||
|
# 从 host.docker.internal 改为 172.17.0.1
|
||||||
|
|
||||||
|
# 查看容器详细信息
|
||||||
|
docker inspect sub2api
|
||||||
|
|
||||||
|
# 进入容器调试
|
||||||
|
docker exec -it sub2api sh
|
||||||
|
|
||||||
|
# 查看网络
|
||||||
|
docker network ls
|
||||||
|
docker network inspect bridge
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📞 快速命令速查
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Git
|
||||||
|
git status # 状态
|
||||||
|
git fetch upstream # 拉取官方更新
|
||||||
|
git merge upstream/main # 合并更新
|
||||||
|
git push origin main # 推送到你的仓库
|
||||||
|
|
||||||
|
# Docker
|
||||||
|
docker-compose -f docker-compose.prod.yml ps # 状态
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f # 日志
|
||||||
|
docker-compose -f docker-compose.prod.yml restart # 重启
|
||||||
|
docker-compose -f docker-compose.prod.yml down # 停止
|
||||||
|
```
|
||||||
276
GIT_WORKFLOW.md
Normal file
276
GIT_WORKFLOW.md
Normal file
@@ -0,0 +1,276 @@
|
|||||||
|
# Sub2API 二次开发指南
|
||||||
|
|
||||||
|
## 🔧 Git 工作流程
|
||||||
|
|
||||||
|
### 初始设置
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 克隆官方仓库
|
||||||
|
git clone https://github.com/Wei-Shaw/sub2api.git sub2api-dev
|
||||||
|
cd sub2api-dev
|
||||||
|
|
||||||
|
# 2. 配置远程仓库
|
||||||
|
git remote rename origin upstream # 官方仓库改名为 upstream
|
||||||
|
git remote add origin https://your-git.com/your-repo.git # 添加你的仓库
|
||||||
|
|
||||||
|
# 3. 创建开发分支
|
||||||
|
git checkout -b dev
|
||||||
|
|
||||||
|
# 4. 推送到你的仓库
|
||||||
|
git push -u origin dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### 远程仓库配置结果
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git remote -v
|
||||||
|
# upstream https://github.com/Wei-Shaw/sub2api.git (fetch)
|
||||||
|
# upstream https://github.com/Wei-Shaw/sub2api.git (push)
|
||||||
|
# origin https://your-git.com/your-repo.git (fetch)
|
||||||
|
# origin https://your-git.com/your-repo.git (push)
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔄 同步官方更新
|
||||||
|
|
||||||
|
### 方式 1:查看官方更新
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 拉取官方最新代码
|
||||||
|
git fetch upstream
|
||||||
|
|
||||||
|
# 查看官方更新内容
|
||||||
|
git log HEAD..upstream/main --oneline
|
||||||
|
|
||||||
|
# 查看详细差异
|
||||||
|
git diff HEAD..upstream/main
|
||||||
|
|
||||||
|
# 查看某个文件的差异
|
||||||
|
git diff HEAD..upstream/main -- backend/internal/service/gateway_service.go
|
||||||
|
```
|
||||||
|
|
||||||
|
### 方式 2:合并官方更新
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 确保工作区干净
|
||||||
|
git status
|
||||||
|
|
||||||
|
# 提交你的修改
|
||||||
|
git add .
|
||||||
|
git commit -m "feat: 我的二开功能"
|
||||||
|
|
||||||
|
# 拉取并合并官方更新
|
||||||
|
git fetch upstream
|
||||||
|
git merge upstream/main
|
||||||
|
|
||||||
|
# 如果有冲突,解决后:
|
||||||
|
git add .
|
||||||
|
git commit -m "merge: 合并官方更新"
|
||||||
|
|
||||||
|
# 推送到你的仓库
|
||||||
|
git push origin dev
|
||||||
|
```
|
||||||
|
|
||||||
|
### 方式 3:使用 Rebase(更清晰的历史)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 拉取官方更新
|
||||||
|
git fetch upstream
|
||||||
|
|
||||||
|
# 将你的提交重放到官方最新代码之上
|
||||||
|
git rebase upstream/main
|
||||||
|
|
||||||
|
# 如果有冲突,解决后:
|
||||||
|
git add .
|
||||||
|
git rebase --continue
|
||||||
|
|
||||||
|
# 强制推送到你的仓库(注意:rebase 会改变历史)
|
||||||
|
git push -f origin dev
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📦 部署流程
|
||||||
|
|
||||||
|
### 生产环境部署
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api-dev/deploy
|
||||||
|
|
||||||
|
# 运行自动部署脚本
|
||||||
|
chmod +x deploy-dev.sh
|
||||||
|
bash deploy-dev.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
### 手动部署
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. 进入部署目录
|
||||||
|
cd /opt/sub2api-dev/deploy
|
||||||
|
|
||||||
|
# 2. 创建配置(如果没有)
|
||||||
|
cp docker-compose.yml docker-compose.prod.yml
|
||||||
|
cp .env.example .env
|
||||||
|
|
||||||
|
# 3. 修改配置
|
||||||
|
nano docker-compose.prod.yml # 改端口为 2080,配置 Redis
|
||||||
|
nano .env # 设置密码等
|
||||||
|
|
||||||
|
# 4. 启动服务
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
# 5. 查看日志
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🛠️ 开发建议
|
||||||
|
|
||||||
|
### 目录结构
|
||||||
|
|
||||||
|
```
|
||||||
|
sub2api-dev/
|
||||||
|
├── .git/ # Git 仓库
|
||||||
|
├── backend/ # 后端代码(Go)
|
||||||
|
│ ├── cmd/server/ # 入口
|
||||||
|
│ ├── internal/ # 核心逻辑
|
||||||
|
│ └── ent/ # 数据模型
|
||||||
|
├── frontend/ # 前端代码(Vue)
|
||||||
|
│ └── src/
|
||||||
|
└── deploy/ # 部署配置
|
||||||
|
├── docker-compose.prod.yml
|
||||||
|
├── .env
|
||||||
|
└── deploy-dev.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
### 常见二开场景
|
||||||
|
|
||||||
|
#### 1. 修改后端逻辑
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 修改代码
|
||||||
|
vim backend/internal/service/gateway_service.go
|
||||||
|
|
||||||
|
# 提交
|
||||||
|
git add backend/
|
||||||
|
git commit -m "feat: 修改网关逻辑"
|
||||||
|
|
||||||
|
# 重新构建镜像(如果需要)
|
||||||
|
cd backend
|
||||||
|
docker build -t sub2api:custom .
|
||||||
|
|
||||||
|
# 修改 docker-compose.prod.yml 使用自定义镜像
|
||||||
|
# image: sub2api:custom
|
||||||
|
|
||||||
|
# 重启服务
|
||||||
|
cd ../deploy
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 2. 修改前端界面
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 修改代码
|
||||||
|
vim frontend/src/views/HomeView.vue
|
||||||
|
|
||||||
|
# 本地测试
|
||||||
|
cd frontend
|
||||||
|
npm install
|
||||||
|
npm run dev
|
||||||
|
|
||||||
|
# 构建
|
||||||
|
npm run build
|
||||||
|
|
||||||
|
# 提交
|
||||||
|
git add frontend/
|
||||||
|
git commit -m "feat: 修改首页界面"
|
||||||
|
|
||||||
|
# 后端重新构建(前端会被嵌入)
|
||||||
|
cd ../backend
|
||||||
|
go build -tags embed -o sub2api ./cmd/server
|
||||||
|
```
|
||||||
|
|
||||||
|
#### 3. 添加新功能
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 创建功能分支
|
||||||
|
git checkout -b feature/new-feature
|
||||||
|
|
||||||
|
# 开发...
|
||||||
|
# 提交
|
||||||
|
git add .
|
||||||
|
git commit -m "feat: 添加新功能"
|
||||||
|
|
||||||
|
# 合并到开发分支
|
||||||
|
git checkout dev
|
||||||
|
git merge feature/new-feature
|
||||||
|
|
||||||
|
# 推送
|
||||||
|
git push origin dev
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🔍 对比工具
|
||||||
|
|
||||||
|
### 使用 VS Code 对比
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 安装 VS Code Remote SSH 插件
|
||||||
|
# 然后在 VS Code 中:
|
||||||
|
# 1. 连接到服务器
|
||||||
|
# 2. 打开 /opt/sub2api-dev
|
||||||
|
# 3. 使用 Git 功能对比差异
|
||||||
|
```
|
||||||
|
|
||||||
|
### 命令行对比
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 对比某个文件
|
||||||
|
git diff upstream/main -- backend/internal/service/gateway_service.go
|
||||||
|
|
||||||
|
# 对比某个目录
|
||||||
|
git diff upstream/main -- backend/internal/service/
|
||||||
|
|
||||||
|
# 生成对比报告
|
||||||
|
git diff upstream/main > changes.patch
|
||||||
|
|
||||||
|
# 查看修改的文件列表
|
||||||
|
git diff --name-only upstream/main
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## ⚠️ 注意事项
|
||||||
|
|
||||||
|
1. **定期同步**: 建议每周拉取一次官方更新
|
||||||
|
2. **冲突处理**: 遇到冲突时,优先保留官方的核心逻辑,调整你的二开代码
|
||||||
|
3. **分支管理**: 重要功能单独开分支,测试通过后再合并
|
||||||
|
4. **备份数据**: 更新前备份数据库和配置文件
|
||||||
|
5. **测试环境**: 建议先在测试环境验证更新,再应用到生产
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 📋 常用命令速查
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Git 管理
|
||||||
|
git status # 查看状态
|
||||||
|
git log --oneline -10 # 查看提交历史
|
||||||
|
git fetch upstream # 拉取官方更新
|
||||||
|
git diff upstream/main # 对比差异
|
||||||
|
git merge upstream/main # 合并更新
|
||||||
|
|
||||||
|
# Docker 管理
|
||||||
|
docker-compose -f docker-compose.prod.yml ps # 查看状态
|
||||||
|
docker-compose -f docker-compose.prod.yml logs -f # 查看日志
|
||||||
|
docker-compose -f docker-compose.prod.yml restart # 重启
|
||||||
|
docker-compose -f docker-compose.prod.yml down # 停止
|
||||||
|
|
||||||
|
# 服务管理
|
||||||
|
docker-compose -f docker-compose.prod.yml pull # 更新镜像
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d # 启动
|
||||||
|
```
|
||||||
@@ -37,7 +37,7 @@ func (c *githubReleaseClient) FetchLatestRelease(ctx context.Context, repo strin
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
req.Header.Set("Accept", "application/vnd.github.v3+json")
|
req.Header.Set("Accept", "application/vnd.github.v3+json")
|
||||||
req.Header.Set("User-Agent", "Sub2API-Updater")
|
req.Header.Set("User-Agent", "TianShuAPI-Updater")
|
||||||
|
|
||||||
resp, err := c.httpClient.Do(req)
|
resp, err := c.httpClient.Do(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -236,7 +236,7 @@ func (s *GitHubReleaseServiceSuite) TestFetchLatestRelease_Success() {
|
|||||||
s.srv = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
s.srv = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
require.Equal(s.T(), "/repos/test/repo/releases/latest", r.URL.Path)
|
require.Equal(s.T(), "/repos/test/repo/releases/latest", r.URL.Path)
|
||||||
require.Equal(s.T(), "application/vnd.github.v3+json", r.Header.Get("Accept"))
|
require.Equal(s.T(), "application/vnd.github.v3+json", r.Header.Get("Accept"))
|
||||||
require.Equal(s.T(), "Sub2API-Updater", r.Header.Get("User-Agent"))
|
require.Equal(s.T(), "TianShuAPI-Updater", r.Header.Get("User-Agent"))
|
||||||
w.Header().Set("Content-Type", "application/json")
|
w.Header().Set("Content-Type", "application/json")
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
_, _ = w.Write([]byte(releaseJSON))
|
_, _ = w.Write([]byte(releaseJSON))
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ func (s *AuthService) SendVerifyCode(ctx context.Context, email string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取网站名称
|
// 获取网站名称
|
||||||
siteName := "Sub2API"
|
siteName := "TianShuAPI"
|
||||||
if s.settingService != nil {
|
if s.settingService != nil {
|
||||||
siteName = s.settingService.GetSiteName(ctx)
|
siteName = s.settingService.GetSiteName(ctx)
|
||||||
}
|
}
|
||||||
@@ -201,7 +201,7 @@ func (s *AuthService) SendVerifyCodeAsync(ctx context.Context, email string) (*S
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 获取网站名称
|
// 获取网站名称
|
||||||
siteName := "Sub2API"
|
siteName := "TianShuAPI"
|
||||||
if s.settingService != nil {
|
if s.settingService != nil {
|
||||||
siteName = s.settingService.GetSiteName(ctx)
|
siteName = s.settingService.GetSiteName(ctx)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*PublicSettings
|
|||||||
EmailVerifyEnabled: settings[SettingKeyEmailVerifyEnabled] == "true",
|
EmailVerifyEnabled: settings[SettingKeyEmailVerifyEnabled] == "true",
|
||||||
TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
|
TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
|
||||||
TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
|
TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
|
||||||
SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "Sub2API"),
|
SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "TianShuAPI"),
|
||||||
SiteLogo: settings[SettingKeySiteLogo],
|
SiteLogo: settings[SettingKeySiteLogo],
|
||||||
SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
|
SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
|
||||||
ApiBaseUrl: settings[SettingKeyApiBaseUrl],
|
ApiBaseUrl: settings[SettingKeyApiBaseUrl],
|
||||||
@@ -149,7 +149,7 @@ func (s *SettingService) IsEmailVerifyEnabled(ctx context.Context) bool {
|
|||||||
func (s *SettingService) GetSiteName(ctx context.Context) string {
|
func (s *SettingService) GetSiteName(ctx context.Context) string {
|
||||||
value, err := s.settingRepo.GetValue(ctx, SettingKeySiteName)
|
value, err := s.settingRepo.GetValue(ctx, SettingKeySiteName)
|
||||||
if err != nil || value == "" {
|
if err != nil || value == "" {
|
||||||
return "Sub2API"
|
return "TianShuAPI"
|
||||||
}
|
}
|
||||||
return value
|
return value
|
||||||
}
|
}
|
||||||
@@ -194,7 +194,7 @@ func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error {
|
|||||||
defaults := map[string]string{
|
defaults := map[string]string{
|
||||||
SettingKeyRegistrationEnabled: "true",
|
SettingKeyRegistrationEnabled: "true",
|
||||||
SettingKeyEmailVerifyEnabled: "false",
|
SettingKeyEmailVerifyEnabled: "false",
|
||||||
SettingKeySiteName: "Sub2API",
|
SettingKeySiteName: "TianShuAPI",
|
||||||
SettingKeySiteLogo: "",
|
SettingKeySiteLogo: "",
|
||||||
SettingKeyDefaultConcurrency: strconv.Itoa(s.cfg.Default.UserConcurrency),
|
SettingKeyDefaultConcurrency: strconv.Itoa(s.cfg.Default.UserConcurrency),
|
||||||
SettingKeyDefaultBalance: strconv.FormatFloat(s.cfg.Default.UserBalance, 'f', 8, 64),
|
SettingKeyDefaultBalance: strconv.FormatFloat(s.cfg.Default.UserBalance, 'f', 8, 64),
|
||||||
@@ -217,7 +217,7 @@ func (s *SettingService) parseSettings(settings map[string]string) *SystemSettin
|
|||||||
SmtpUseTLS: settings[SettingKeySmtpUseTLS] == "true",
|
SmtpUseTLS: settings[SettingKeySmtpUseTLS] == "true",
|
||||||
TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
|
TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
|
||||||
TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
|
TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
|
||||||
SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "Sub2API"),
|
SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "TianShuAPI"),
|
||||||
SiteLogo: settings[SettingKeySiteLogo],
|
SiteLogo: settings[SettingKeySiteLogo],
|
||||||
SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
|
SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
|
||||||
ApiBaseUrl: settings[SettingKeyApiBaseUrl],
|
ApiBaseUrl: settings[SettingKeyApiBaseUrl],
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ func RunCLI() error {
|
|||||||
|
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
fmt.Println("╔═══════════════════════════════════════════╗")
|
fmt.Println("╔═══════════════════════════════════════════╗")
|
||||||
fmt.Println("║ Sub2API Installation Wizard ║")
|
fmt.Println("║ TianShuAPI Installation Wizard ║")
|
||||||
fmt.Println("╚═══════════════════════════════════════════╝")
|
fmt.Println("╚═══════════════════════════════════════════╝")
|
||||||
fmt.Println()
|
fmt.Println()
|
||||||
|
|
||||||
|
|||||||
51
deploy/.env.1panel
Normal file
51
deploy/.env.1panel
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
# =============================================================================
|
||||||
|
# Sub2API 环境配置 - 1Panel 环境
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Server Configuration
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
BIND_HOST=0.0.0.0
|
||||||
|
SERVER_PORT=2080
|
||||||
|
SERVER_MODE=release
|
||||||
|
RUN_MODE=standard
|
||||||
|
TZ=Asia/Shanghai
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# PostgreSQL Configuration (REQUIRED - 请修改密码!)
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
POSTGRES_USER=sub2api
|
||||||
|
POSTGRES_PASSWORD=请修改为你的强密码
|
||||||
|
POSTGRES_DB=sub2api
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Redis Configuration - 使用你现有的 1Panel Redis
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# 方式1:如果使用 Docker 网络连接,填写容器名
|
||||||
|
REDIS_HOST=1Panel-redis-S1KH
|
||||||
|
# 方式2:如果上面不行,使用宿主机 IP(需要你填写服务器的内网 IP)
|
||||||
|
# REDIS_HOST=172.17.0.1
|
||||||
|
REDIS_PORT=6379
|
||||||
|
REDIS_PASSWORD=redis_bJFKDk
|
||||||
|
REDIS_DB=1
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Admin Account
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
ADMIN_EMAIL=oadmin
|
||||||
|
ADMIN_PASSWORD=oadmin@123
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# JWT Configuration
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# 使用下面的命令生成随机密钥:openssl rand -hex 32
|
||||||
|
JWT_SECRET=1fb3a3533039e0d1ea693f0508bbffca44b7157370f11dfe33ce352a5f07039a
|
||||||
|
JWT_EXPIRE_HOUR=24
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
# Gemini OAuth (可选 - 如果不使用 Gemini 可以忽略)
|
||||||
|
# -----------------------------------------------------------------------------
|
||||||
|
GEMINI_OAUTH_CLIENT_ID=
|
||||||
|
GEMINI_OAUTH_CLIENT_SECRET=
|
||||||
|
GEMINI_OAUTH_SCOPES=
|
||||||
|
GEMINI_QUOTA_POLICY=
|
||||||
136
deploy/README_DEPLOY.md
Normal file
136
deploy/README_DEPLOY.md
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
# Sub2API 部署指南 - 端口 2080
|
||||||
|
|
||||||
|
## 快速部署(推荐)
|
||||||
|
|
||||||
|
### 1. 上传文件到服务器
|
||||||
|
|
||||||
|
将 `deploy` 目录上传到服务器的 `/opt/sub2api`
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 在服务器上创建目录
|
||||||
|
mkdir -p /opt/sub2api
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 运行自动部署脚本
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api
|
||||||
|
chmod +x deploy.sh
|
||||||
|
bash deploy.sh
|
||||||
|
```
|
||||||
|
|
||||||
|
脚本会自动完成:
|
||||||
|
- ✅ 生成安全的密码和密钥
|
||||||
|
- ✅ 创建配置文件
|
||||||
|
- ✅ 拉取 Docker 镜像
|
||||||
|
- ✅ 启动服务
|
||||||
|
|
||||||
|
### 3. 访问系统
|
||||||
|
|
||||||
|
浏览器打开: `http://你的服务器IP:2080`
|
||||||
|
|
||||||
|
默认账号:
|
||||||
|
- 邮箱: `admin@example.com`
|
||||||
|
- 密码: `admin123`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 手动部署
|
||||||
|
|
||||||
|
如果自动脚本失败,可以手动部署:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd /opt/sub2api
|
||||||
|
|
||||||
|
# 1. 复制配置文件
|
||||||
|
cp docker-compose.2080.yml docker-compose.yml
|
||||||
|
cp .env.2080 .env
|
||||||
|
|
||||||
|
# 2. 生成密钥
|
||||||
|
sed -i "s/POSTGRES_PASSWORD=.*/POSTGRES_PASSWORD=$(openssl rand -base64 24)/" .env
|
||||||
|
sed -i "s/JWT_SECRET=.*/JWT_SECRET=$(openssl rand -hex 32)/" .env
|
||||||
|
|
||||||
|
# 3. 启动服务
|
||||||
|
docker-compose pull
|
||||||
|
docker-compose up -d
|
||||||
|
|
||||||
|
# 4. 查看日志
|
||||||
|
docker-compose logs -f
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 配置说明
|
||||||
|
|
||||||
|
### 端口映射
|
||||||
|
- 宿主机端口: `2080`
|
||||||
|
- 容器内端口: `8080`
|
||||||
|
|
||||||
|
### Redis 连接
|
||||||
|
- 使用现有的 1Panel Redis: `1Panel-redis-S1KH`
|
||||||
|
- 端口: `6379`
|
||||||
|
- 密码: `redis_bJFKDk`
|
||||||
|
- 数据库: `1` (避免与其他应用冲突)
|
||||||
|
|
||||||
|
### PostgreSQL
|
||||||
|
- 自动创建独立的 PostgreSQL 容器
|
||||||
|
- 数据持久化在 Docker volume 中
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 常用命令
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 查看服务状态
|
||||||
|
docker-compose ps
|
||||||
|
|
||||||
|
# 查看日志
|
||||||
|
docker-compose logs -f
|
||||||
|
|
||||||
|
# 重启服务
|
||||||
|
docker-compose restart
|
||||||
|
|
||||||
|
# 停止服务
|
||||||
|
docker-compose down
|
||||||
|
|
||||||
|
# 更新到最新版本
|
||||||
|
docker-compose pull
|
||||||
|
docker-compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 故障排查
|
||||||
|
|
||||||
|
### Redis 连接失败
|
||||||
|
|
||||||
|
如果日志显示 Redis 连接失败,尝试修改 `docker-compose.yml`:
|
||||||
|
|
||||||
|
将:
|
||||||
|
```yaml
|
||||||
|
- REDIS_HOST=host.docker.internal
|
||||||
|
```
|
||||||
|
|
||||||
|
改为:
|
||||||
|
```yaml
|
||||||
|
- REDIS_HOST=172.17.0.1
|
||||||
|
```
|
||||||
|
|
||||||
|
然后重启:
|
||||||
|
```bash
|
||||||
|
docker-compose down
|
||||||
|
docker-compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
### 查看详细日志
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 只看 sub2api 日志
|
||||||
|
docker-compose logs sub2api
|
||||||
|
|
||||||
|
# 只看 PostgreSQL 日志
|
||||||
|
docker-compose logs postgres
|
||||||
|
|
||||||
|
# 实时查看最新 50 行日志
|
||||||
|
docker-compose logs -f --tail=50
|
||||||
|
```
|
||||||
221
deploy/deploy-complete.sh
Normal file
221
deploy/deploy-complete.sh
Normal file
@@ -0,0 +1,221 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Sub2API 完整部署脚本 - 双 Git Remote 配置
|
||||||
|
# 官方仓库: https://github.com/Wei-Shaw/sub2api.git
|
||||||
|
# 你的仓库: https://git.586vip.cn/oadmin/sub2api.git
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "=========================================="
|
||||||
|
echo " Sub2API 二次开发环境部署"
|
||||||
|
echo " 端口: 2080"
|
||||||
|
echo " 双 Remote Git 配置"
|
||||||
|
echo "=========================================="
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 检查是否已经存在项目目录
|
||||||
|
if [ -d "/opt/sub2api-dev" ]; then
|
||||||
|
echo "⚠️ 目录 /opt/sub2api-dev 已存在"
|
||||||
|
read -p "是否删除并重新部署?(y/N): " confirm
|
||||||
|
if [[ $confirm == [yY] ]]; then
|
||||||
|
rm -rf /opt/sub2api-dev
|
||||||
|
else
|
||||||
|
echo "❌ 取消部署"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd /opt
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 1. 克隆官方仓库
|
||||||
|
# ===================================
|
||||||
|
echo "📥 克隆官方仓库..."
|
||||||
|
git clone https://github.com/Wei-Shaw/sub2api.git sub2api-dev
|
||||||
|
cd sub2api-dev
|
||||||
|
|
||||||
|
echo "✅ 官方仓库克隆完成"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 2. 配置双 Remote
|
||||||
|
# ===================================
|
||||||
|
echo "🔧 配置 Git Remote..."
|
||||||
|
|
||||||
|
# 将 origin 改名为 upstream(官方仓库)
|
||||||
|
git remote rename origin upstream
|
||||||
|
|
||||||
|
# 添加你的仓库为 origin
|
||||||
|
git remote add origin https://git.586vip.cn/oadmin/sub2api.git
|
||||||
|
|
||||||
|
# 显示配置结果
|
||||||
|
echo "✅ Git Remote 配置完成:"
|
||||||
|
git remote -v
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 3. 创建并切换到 main 分支
|
||||||
|
# ===================================
|
||||||
|
echo "🌿 创建 main 分支..."
|
||||||
|
git checkout -b main
|
||||||
|
|
||||||
|
echo "✅ 当前分支: $(git branch --show-current)"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 4. 首次推送到你的仓库
|
||||||
|
# ===================================
|
||||||
|
echo "📤 推送到你的仓库..."
|
||||||
|
git push -u origin main
|
||||||
|
|
||||||
|
echo "✅ 代码已推送到: https://git.586vip.cn/oadmin/sub2api.git"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 5. 配置部署文件
|
||||||
|
# ===================================
|
||||||
|
echo "📝 配置部署文件..."
|
||||||
|
|
||||||
|
cd deploy
|
||||||
|
|
||||||
|
# 创建生产环境 docker-compose 配置
|
||||||
|
cat > docker-compose.prod.yml << 'EOF'
|
||||||
|
services:
|
||||||
|
sub2api:
|
||||||
|
image: weishaw/sub2api:latest
|
||||||
|
container_name: sub2api
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "2080:8080"
|
||||||
|
volumes:
|
||||||
|
- ./data:/app/data
|
||||||
|
environment:
|
||||||
|
- AUTO_SETUP=true
|
||||||
|
- SERVER_HOST=0.0.0.0
|
||||||
|
- SERVER_PORT=8080
|
||||||
|
- SERVER_MODE=release
|
||||||
|
- DATABASE_HOST=postgres
|
||||||
|
- DATABASE_PORT=5432
|
||||||
|
- DATABASE_USER=sub2api
|
||||||
|
- DATABASE_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
|
- DATABASE_DBNAME=sub2api
|
||||||
|
- DATABASE_SSLMODE=disable
|
||||||
|
- REDIS_HOST=host.docker.internal
|
||||||
|
- REDIS_PORT=6379
|
||||||
|
- REDIS_PASSWORD=redis_bJFKDk
|
||||||
|
- REDIS_DB=1
|
||||||
|
- ADMIN_EMAIL=${ADMIN_EMAIL}
|
||||||
|
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||||
|
- JWT_SECRET=${JWT_SECRET}
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
|
depends_on:
|
||||||
|
- postgres
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
|
|
||||||
|
postgres:
|
||||||
|
image: postgres:18-alpine
|
||||||
|
container_name: sub2api-postgres
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
environment:
|
||||||
|
- POSTGRES_USER=sub2api
|
||||||
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
||||||
|
- POSTGRES_DB=sub2api
|
||||||
|
- TZ=Asia/Shanghai
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U sub2api"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
postgres_data:
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "✅ docker-compose.prod.yml 已创建"
|
||||||
|
|
||||||
|
# 创建 .env 文件
|
||||||
|
if [ ! -f ".env" ]; then
|
||||||
|
echo "🔐 生成配置文件..."
|
||||||
|
|
||||||
|
POSTGRES_PASS=$(openssl rand -base64 24)
|
||||||
|
JWT_KEY=$(openssl rand -hex 32)
|
||||||
|
|
||||||
|
cat > .env << EOF
|
||||||
|
# PostgreSQL 配置
|
||||||
|
POSTGRES_USER=sub2api
|
||||||
|
POSTGRES_PASSWORD=${POSTGRES_PASS}
|
||||||
|
POSTGRES_DB=sub2api
|
||||||
|
|
||||||
|
# 管理员账号
|
||||||
|
ADMIN_EMAIL=admin@example.com
|
||||||
|
ADMIN_PASSWORD=admin123
|
||||||
|
|
||||||
|
# JWT 配置
|
||||||
|
JWT_SECRET=${JWT_KEY}
|
||||||
|
JWT_EXPIRE_HOUR=24
|
||||||
|
|
||||||
|
# 其他配置
|
||||||
|
TZ=Asia/Shanghai
|
||||||
|
SERVER_MODE=release
|
||||||
|
RUN_MODE=standard
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "✅ .env 文件已创建"
|
||||||
|
echo ""
|
||||||
|
echo "🔑 生成的密钥(请保存):"
|
||||||
|
echo " PostgreSQL 密码: ${POSTGRES_PASS}"
|
||||||
|
echo " JWT Secret: ${JWT_KEY}"
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 6. 启动 Docker 服务
|
||||||
|
# ===================================
|
||||||
|
echo "🐳 拉取 Docker 镜像..."
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "🚀 启动服务..."
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "⏳ 等待服务启动..."
|
||||||
|
sleep 15
|
||||||
|
|
||||||
|
# ===================================
|
||||||
|
# 7. 显示部署结果
|
||||||
|
# ===================================
|
||||||
|
echo ""
|
||||||
|
echo "📊 服务状态:"
|
||||||
|
docker-compose -f docker-compose.prod.yml ps
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "=========================================="
|
||||||
|
echo " ✅ 部署完成!"
|
||||||
|
echo "=========================================="
|
||||||
|
echo ""
|
||||||
|
echo "🌐 访问信息:"
|
||||||
|
echo " URL: http://$(hostname -I | awk '{print $1}'):2080"
|
||||||
|
echo " 管理员: admin@example.com / admin123"
|
||||||
|
echo ""
|
||||||
|
echo "📋 Git 配置:"
|
||||||
|
echo " 官方仓库 (upstream): https://github.com/Wei-Shaw/sub2api.git"
|
||||||
|
echo " 你的仓库 (origin): https://git.586vip.cn/oadmin/sub2api.git"
|
||||||
|
echo " 当前分支: main"
|
||||||
|
echo ""
|
||||||
|
echo "🔄 同步官方更新:"
|
||||||
|
echo " cd /opt/sub2api-dev"
|
||||||
|
echo " git fetch upstream"
|
||||||
|
echo " git merge upstream/main"
|
||||||
|
echo " git push origin main"
|
||||||
|
echo ""
|
||||||
|
echo "📝 常用命令:"
|
||||||
|
echo " 查看日志: cd /opt/sub2api-dev/deploy && docker-compose -f docker-compose.prod.yml logs -f"
|
||||||
|
echo " 重启服务: docker-compose -f docker-compose.prod.yml restart"
|
||||||
|
echo " 停止服务: docker-compose -f docker-compose.prod.yml down"
|
||||||
|
echo ""
|
||||||
|
echo "🎉 访问 http://$(hostname -I | awk '{print $1}'):2080 开始使用!"
|
||||||
|
echo ""
|
||||||
120
deploy/deploy-dev.sh
Normal file
120
deploy/deploy-dev.sh
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Sub2API 二次开发部署脚本
|
||||||
|
# 使用方法: bash deploy-dev.sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "====================================="
|
||||||
|
echo " Sub2API 二开版本部署"
|
||||||
|
echo " 端口: 2080"
|
||||||
|
echo "====================================="
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 检查是否在 Git 仓库中
|
||||||
|
if [ ! -d ".git" ]; then
|
||||||
|
echo "❌ 错误: 当前目录不是 Git 仓库"
|
||||||
|
echo "请在项目根目录运行此脚本"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "📦 当前 Git 信息:"
|
||||||
|
echo " 分支: $(git branch --show-current)"
|
||||||
|
echo " 最新提交: $(git log -1 --oneline)"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 进入 deploy 目录
|
||||||
|
cd deploy
|
||||||
|
|
||||||
|
# 检查配置文件
|
||||||
|
if [ ! -f "docker-compose.prod.yml" ]; then
|
||||||
|
echo "📝 创建生产环境配置..."
|
||||||
|
cp docker-compose.yml docker-compose.prod.yml
|
||||||
|
|
||||||
|
# 修改端口为 2080
|
||||||
|
sed -i 's/\${SERVER_PORT:-8080}/2080/' docker-compose.prod.yml
|
||||||
|
|
||||||
|
# 添加 extra_hosts 配置(连接宿主机 Redis)
|
||||||
|
if ! grep -q "extra_hosts" docker-compose.prod.yml; then
|
||||||
|
sed -i '/depends_on:/i\ extra_hosts:\n - "host.docker.internal:host-gateway"' docker-compose.prod.yml
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 修改 Redis 配置
|
||||||
|
sed -i 's/REDIS_HOST=redis/REDIS_HOST=host.docker.internal/' docker-compose.prod.yml
|
||||||
|
sed -i 's/REDIS_PASSWORD=\${REDIS_PASSWORD:-}/REDIS_PASSWORD=redis_bJFKDk/' docker-compose.prod.yml
|
||||||
|
sed -i 's/REDIS_DB=\${REDIS_DB:-0}/REDIS_DB=1/' docker-compose.prod.yml
|
||||||
|
|
||||||
|
echo "✅ docker-compose.prod.yml 已创建"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 创建 .env 文件
|
||||||
|
if [ ! -f ".env" ]; then
|
||||||
|
echo "🔐 生成配置文件..."
|
||||||
|
|
||||||
|
cat > .env << EOF
|
||||||
|
# PostgreSQL 配置
|
||||||
|
POSTGRES_USER=sub2api
|
||||||
|
POSTGRES_PASSWORD=$(openssl rand -base64 24)
|
||||||
|
POSTGRES_DB=sub2api
|
||||||
|
|
||||||
|
# 管理员账号
|
||||||
|
ADMIN_EMAIL=admin@example.com
|
||||||
|
ADMIN_PASSWORD=admin123
|
||||||
|
|
||||||
|
# JWT 配置
|
||||||
|
JWT_SECRET=$(openssl rand -hex 32)
|
||||||
|
JWT_EXPIRE_HOUR=24
|
||||||
|
|
||||||
|
# 其他配置
|
||||||
|
TZ=Asia/Shanghai
|
||||||
|
SERVER_MODE=release
|
||||||
|
RUN_MODE=standard
|
||||||
|
EOF
|
||||||
|
|
||||||
|
echo "✅ .env 文件已创建"
|
||||||
|
echo ""
|
||||||
|
echo "📋 生成的配置(请保存):"
|
||||||
|
cat .env | grep -E "POSTGRES_PASSWORD|JWT_SECRET"
|
||||||
|
echo ""
|
||||||
|
else
|
||||||
|
echo "⚠️ .env 已存在,跳过创建"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 拉取镜像
|
||||||
|
echo ""
|
||||||
|
echo "📥 拉取 Docker 镜像..."
|
||||||
|
docker-compose -f docker-compose.prod.yml pull
|
||||||
|
|
||||||
|
# 启动服务
|
||||||
|
echo ""
|
||||||
|
echo "🚀 启动服务..."
|
||||||
|
docker-compose -f docker-compose.prod.yml up -d
|
||||||
|
|
||||||
|
# 等待启动
|
||||||
|
echo ""
|
||||||
|
echo "⏳ 等待服务启动..."
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
# 显示状态
|
||||||
|
echo ""
|
||||||
|
echo "📊 服务状态:"
|
||||||
|
docker-compose -f docker-compose.prod.yml ps
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "====================================="
|
||||||
|
echo " ✅ 部署完成!"
|
||||||
|
echo "====================================="
|
||||||
|
echo ""
|
||||||
|
echo "📝 访问信息:"
|
||||||
|
echo " URL: http://$(hostname -I | awk '{print $1}'):2080"
|
||||||
|
echo " 管理员: admin@example.com / admin123"
|
||||||
|
echo ""
|
||||||
|
echo "📋 常用命令:"
|
||||||
|
echo " 查看日志: docker-compose -f docker-compose.prod.yml logs -f"
|
||||||
|
echo " 重启服务: docker-compose -f docker-compose.prod.yml restart"
|
||||||
|
echo " 停止服务: docker-compose -f docker-compose.prod.yml down"
|
||||||
|
echo ""
|
||||||
|
echo "🔄 同步官方更新:"
|
||||||
|
echo " git fetch upstream"
|
||||||
|
echo " git merge upstream/main"
|
||||||
|
echo ""
|
||||||
104
deploy/deploy.sh
Normal file
104
deploy/deploy.sh
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Sub2API 自动部署脚本 - 端口 2080
|
||||||
|
# 使用方法: bash deploy.sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo "====================================="
|
||||||
|
echo " Sub2API 自动部署脚本"
|
||||||
|
echo " 端口: 2080"
|
||||||
|
echo "====================================="
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 检查是否在正确的目录
|
||||||
|
if [ ! -f "docker-compose.2080.yml" ]; then
|
||||||
|
echo "❌ 错误: 请在包含 docker-compose.2080.yml 的目录中运行此脚本"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 检查 Docker 是否安装
|
||||||
|
if ! command -v docker &> /dev/null; then
|
||||||
|
echo "❌ Docker 未安装,请先安装 Docker"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if ! command -v docker-compose &> /dev/null; then
|
||||||
|
echo "❌ Docker Compose 未安装,请先安装 Docker Compose"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "✅ Docker 环境检查通过"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# 复制配置文件
|
||||||
|
if [ ! -f ".env" ]; then
|
||||||
|
echo "📝 创建配置文件..."
|
||||||
|
cp .env.2080 .env
|
||||||
|
|
||||||
|
# 生成随机密码和密钥
|
||||||
|
echo "🔐 生成安全密钥..."
|
||||||
|
POSTGRES_PASS=$(openssl rand -base64 24)
|
||||||
|
JWT_KEY=$(openssl rand -hex 32)
|
||||||
|
|
||||||
|
# 更新 .env 文件
|
||||||
|
sed -i "s/POSTGRES_PASSWORD=.*/POSTGRES_PASSWORD=${POSTGRES_PASS}/" .env
|
||||||
|
sed -i "s/JWT_SECRET=.*/JWT_SECRET=${JWT_KEY}/" .env
|
||||||
|
|
||||||
|
echo "✅ 配置文件已创建: .env"
|
||||||
|
echo ""
|
||||||
|
echo "📋 生成的密码(请保存):"
|
||||||
|
echo " PostgreSQL 密码: ${POSTGRES_PASS}"
|
||||||
|
echo ""
|
||||||
|
else
|
||||||
|
echo "⚠️ .env 文件已存在,跳过创建"
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 复制 docker-compose 文件
|
||||||
|
if [ ! -f "docker-compose.yml" ]; then
|
||||||
|
echo "📝 创建 docker-compose.yml..."
|
||||||
|
cp docker-compose.2080.yml docker-compose.yml
|
||||||
|
echo "✅ docker-compose.yml 已创建"
|
||||||
|
echo ""
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 拉取镜像
|
||||||
|
echo "📥 拉取 Docker 镜像..."
|
||||||
|
docker-compose pull
|
||||||
|
|
||||||
|
# 启动服务
|
||||||
|
echo ""
|
||||||
|
echo "🚀 启动服务..."
|
||||||
|
docker-compose up -d
|
||||||
|
|
||||||
|
# 等待服务启动
|
||||||
|
echo ""
|
||||||
|
echo "⏳ 等待服务启动..."
|
||||||
|
sleep 10
|
||||||
|
|
||||||
|
# 检查服务状态
|
||||||
|
echo ""
|
||||||
|
echo "📊 服务状态:"
|
||||||
|
docker-compose ps
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "====================================="
|
||||||
|
echo " ✅ 部署完成!"
|
||||||
|
echo "====================================="
|
||||||
|
echo ""
|
||||||
|
echo "📝 访问信息:"
|
||||||
|
echo " URL: http://$(hostname -I | awk '{print $1}'):2080"
|
||||||
|
echo " 管理员邮箱: admin@example.com"
|
||||||
|
echo " 管理员密码: admin123"
|
||||||
|
echo ""
|
||||||
|
echo "⚠️ 安全建议:"
|
||||||
|
echo " 1. 登录后立即修改管理员密码"
|
||||||
|
echo " 2. 如需修改配置,编辑 .env 文件后执行: docker-compose restart"
|
||||||
|
echo ""
|
||||||
|
echo "📋 常用命令:"
|
||||||
|
echo " 查看日志: docker-compose logs -f"
|
||||||
|
echo " 重启服务: docker-compose restart"
|
||||||
|
echo " 停止服务: docker-compose down"
|
||||||
|
echo ""
|
||||||
|
echo "🎉 部署完成!请在浏览器中访问上述 URL"
|
||||||
130
deploy/docker-compose.1panel.yml
Normal file
130
deploy/docker-compose.1panel.yml
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
# =============================================================================
|
||||||
|
# Sub2API Docker Compose - 1Panel 环境配置
|
||||||
|
# =============================================================================
|
||||||
|
# 此配置文件适用于已有 1Panel 环境,复用现有 Redis
|
||||||
|
# =============================================================================
|
||||||
|
|
||||||
|
services:
|
||||||
|
# ===========================================================================
|
||||||
|
# Sub2API Application
|
||||||
|
# ===========================================================================
|
||||||
|
sub2api:
|
||||||
|
# 方式1:使用官方镜像(快速部署)
|
||||||
|
# image: weishaw/sub2api:latest
|
||||||
|
|
||||||
|
# 方式2:从本地代码构建(二次开发)
|
||||||
|
build:
|
||||||
|
context: ../
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
args:
|
||||||
|
- BUILD_TAGS=embed
|
||||||
|
image: sub2api:local
|
||||||
|
container_name: sub2api
|
||||||
|
restart: unless-stopped
|
||||||
|
ulimits:
|
||||||
|
nofile:
|
||||||
|
soft: 100000
|
||||||
|
hard: 100000
|
||||||
|
ports:
|
||||||
|
- "${BIND_HOST:-0.0.0.0}:${SERVER_PORT:-8080}:8080"
|
||||||
|
volumes:
|
||||||
|
- sub2api_data:/app/data
|
||||||
|
environment:
|
||||||
|
# Auto Setup
|
||||||
|
- AUTO_SETUP=true
|
||||||
|
|
||||||
|
# Server Configuration
|
||||||
|
- SERVER_HOST=0.0.0.0
|
||||||
|
- SERVER_PORT=8080
|
||||||
|
- SERVER_MODE=${SERVER_MODE:-release}
|
||||||
|
- RUN_MODE=${RUN_MODE:-standard}
|
||||||
|
|
||||||
|
# Database Configuration
|
||||||
|
- DATABASE_HOST=postgres
|
||||||
|
- DATABASE_PORT=5432
|
||||||
|
- DATABASE_USER=${POSTGRES_USER:-sub2api}
|
||||||
|
- DATABASE_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||||||
|
- DATABASE_DBNAME=${POSTGRES_DB:-sub2api}
|
||||||
|
- DATABASE_SSLMODE=disable
|
||||||
|
|
||||||
|
# Redis Configuration - 使用外部 Redis
|
||||||
|
- REDIS_HOST=${REDIS_HOST}
|
||||||
|
- REDIS_PORT=${REDIS_PORT:-6379}
|
||||||
|
- REDIS_PASSWORD=${REDIS_PASSWORD}
|
||||||
|
- REDIS_DB=${REDIS_DB:-0}
|
||||||
|
|
||||||
|
# Admin Account
|
||||||
|
- ADMIN_EMAIL=${ADMIN_EMAIL:-admin@sub2api.local}
|
||||||
|
- ADMIN_PASSWORD=${ADMIN_PASSWORD:-}
|
||||||
|
|
||||||
|
# JWT Configuration
|
||||||
|
- JWT_SECRET=${JWT_SECRET:-}
|
||||||
|
- JWT_EXPIRE_HOUR=${JWT_EXPIRE_HOUR:-24}
|
||||||
|
|
||||||
|
# Timezone
|
||||||
|
- TZ=${TZ:-Asia/Shanghai}
|
||||||
|
|
||||||
|
# Gemini OAuth (可选)
|
||||||
|
- GEMINI_OAUTH_CLIENT_ID=${GEMINI_OAUTH_CLIENT_ID:-}
|
||||||
|
- GEMINI_OAUTH_CLIENT_SECRET=${GEMINI_OAUTH_CLIENT_SECRET:-}
|
||||||
|
- GEMINI_OAUTH_SCOPES=${GEMINI_OAUTH_SCOPES:-}
|
||||||
|
- GEMINI_QUOTA_POLICY=${GEMINI_QUOTA_POLICY:-}
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
extra_hosts:
|
||||||
|
- "host.docker.internal:host-gateway"
|
||||||
|
networks:
|
||||||
|
- sub2api-network
|
||||||
|
- 1panel-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "curl", "-f", "http://localhost:8080/health"]
|
||||||
|
interval: 30s
|
||||||
|
timeout: 10s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
|
# ===========================================================================
|
||||||
|
# PostgreSQL Database
|
||||||
|
# ===========================================================================
|
||||||
|
postgres:
|
||||||
|
image: postgres:18-alpine
|
||||||
|
container_name: sub2api-postgres
|
||||||
|
restart: unless-stopped
|
||||||
|
ulimits:
|
||||||
|
nofile:
|
||||||
|
soft: 100000
|
||||||
|
hard: 100000
|
||||||
|
volumes:
|
||||||
|
- postgres_data:/var/lib/postgresql/data
|
||||||
|
environment:
|
||||||
|
- POSTGRES_USER=${POSTGRES_USER:-sub2api}
|
||||||
|
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD:?POSTGRES_PASSWORD is required}
|
||||||
|
- POSTGRES_DB=${POSTGRES_DB:-sub2api}
|
||||||
|
- TZ=${TZ:-Asia/Shanghai}
|
||||||
|
networks:
|
||||||
|
- sub2api-network
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-sub2api} -d ${POSTGRES_DB:-sub2api}"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
start_period: 10s
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# Volumes
|
||||||
|
# =============================================================================
|
||||||
|
volumes:
|
||||||
|
sub2api_data:
|
||||||
|
driver: local
|
||||||
|
postgres_data:
|
||||||
|
driver: local
|
||||||
|
|
||||||
|
# =============================================================================
|
||||||
|
# Networks
|
||||||
|
# =============================================================================
|
||||||
|
networks:
|
||||||
|
sub2api-network:
|
||||||
|
driver: bridge
|
||||||
|
1panel-network:
|
||||||
|
external: true
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/png" href="/logo.png" />
|
<link rel="icon" type="image/png" href="/logo.png" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>Sub2API - AI API Gateway</title>
|
<title>TianShuAPI - AI API Gateway</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* API Client for Sub2API Backend
|
* API Client for TianShuAPI Backend
|
||||||
* Central export point for all API modules
|
* Central export point for all API modules
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -154,23 +154,6 @@
|
|||||||
</svg>
|
</svg>
|
||||||
{{ t('nav.apiKeys') }}
|
{{ t('nav.apiKeys') }}
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
||||||
<a
|
|
||||||
href="https://github.com/Wei-Shaw/sub2api"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
@click="closeDropdown"
|
|
||||||
class="dropdown-item"
|
|
||||||
>
|
|
||||||
<svg class="h-4 w-4" fill="currentColor" viewBox="0 0 24 24">
|
|
||||||
<path
|
|
||||||
fill-rule="evenodd"
|
|
||||||
clip-rule="evenodd"
|
|
||||||
d="M12 2C6.477 2 2 6.477 2 12c0 4.42 2.865 8.17 6.839 9.49.5.092.682-.217.682-.482 0-.237-.008-.866-.013-1.7-2.782.604-3.369-1.34-3.369-1.34-.454-1.156-1.11-1.464-1.11-1.464-.908-.62.069-.608.069-.608 1.003.07 1.531 1.03 1.531 1.03.892 1.529 2.341 1.087 2.91.831.092-.646.35-1.086.636-1.336-2.22-.253-4.555-1.11-4.555-4.943 0-1.091.39-1.984 1.029-2.683-.103-.253-.446-1.27.098-2.647 0 0 .84-.269 2.75 1.025A9.578 9.578 0 0112 6.836c.85.004 1.705.114 2.504.336 1.909-1.294 2.747-1.025 2.747-1.025.546 1.377.203 2.394.1 2.647.64.699 1.028 1.592 1.028 2.683 0 3.842-2.339 4.687-4.566 4.935.359.309.678.919.678 1.852 0 1.336-.012 2.415-.012 2.743 0 .267.18.578.688.48C19.138 20.167 22 16.418 22 12c0-5.523-4.477-10-10-10z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
{{ t('nav.github') }}
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Contact Support (only show if configured) -->
|
<!-- Contact Support (only show if configured) -->
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
import { ref, computed, onMounted } from 'vue'
|
import { ref, computed, onMounted } from 'vue'
|
||||||
import { getPublicSettings } from '@/api/auth'
|
import { getPublicSettings } from '@/api/auth'
|
||||||
|
|
||||||
const siteName = ref('Sub2API')
|
const siteName = ref('TianShuAPI')
|
||||||
const siteLogo = ref('')
|
const siteLogo = ref('')
|
||||||
const siteSubtitle = ref('Subscription to API Conversion Platform')
|
const siteSubtitle = ref('Subscription to API Conversion Platform')
|
||||||
|
|
||||||
@@ -73,7 +73,7 @@ const currentYear = computed(() => new Date().getFullYear())
|
|||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
try {
|
try {
|
||||||
const settings = await getPublicSettings()
|
const settings = await getPublicSettings()
|
||||||
siteName.value = settings.site_name || 'Sub2API'
|
siteName.value = settings.site_name || 'TianShuAPI'
|
||||||
siteLogo.value = settings.site_logo || ''
|
siteLogo.value = settings.site_logo || ''
|
||||||
siteSubtitle.value = settings.site_subtitle || 'Subscription to API Conversion Platform'
|
siteSubtitle.value = settings.site_subtitle || 'Subscription to API Conversion Platform'
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -43,8 +43,8 @@ export default {
|
|||||||
|
|
||||||
// Setup Wizard
|
// Setup Wizard
|
||||||
setup: {
|
setup: {
|
||||||
title: 'Sub2API Setup',
|
title: 'TianShuAPI Setup',
|
||||||
description: 'Configure your Sub2API instance',
|
description: 'Configure your TianShuAPI instance',
|
||||||
database: {
|
database: {
|
||||||
title: 'Database Configuration',
|
title: 'Database Configuration',
|
||||||
host: 'Host',
|
host: 'Host',
|
||||||
@@ -1578,7 +1578,7 @@ export default {
|
|||||||
title: 'Site Settings',
|
title: 'Site Settings',
|
||||||
description: 'Customize site branding',
|
description: 'Customize site branding',
|
||||||
siteName: 'Site Name',
|
siteName: 'Site Name',
|
||||||
siteNamePlaceholder: 'Sub2API',
|
siteNamePlaceholder: 'TianShuAPI',
|
||||||
siteNameHint: 'Displayed in emails and page titles',
|
siteNameHint: 'Displayed in emails and page titles',
|
||||||
siteSubtitle: 'Site Subtitle',
|
siteSubtitle: 'Site Subtitle',
|
||||||
siteSubtitlePlaceholder: 'Subscription to API Conversion Platform',
|
siteSubtitlePlaceholder: 'Subscription to API Conversion Platform',
|
||||||
@@ -1618,7 +1618,7 @@ export default {
|
|||||||
fromEmail: 'From Email',
|
fromEmail: 'From Email',
|
||||||
fromEmailPlaceholder: "noreply{'@'}example.com",
|
fromEmailPlaceholder: "noreply{'@'}example.com",
|
||||||
fromName: 'From Name',
|
fromName: 'From Name',
|
||||||
fromNamePlaceholder: 'Sub2API',
|
fromNamePlaceholder: 'TianShuAPI',
|
||||||
useTls: 'Use TLS',
|
useTls: 'Use TLS',
|
||||||
useTlsHint: 'Enable TLS encryption for SMTP connection'
|
useTlsHint: 'Enable TLS encryption for SMTP connection'
|
||||||
},
|
},
|
||||||
@@ -1749,14 +1749,14 @@ export default {
|
|||||||
// Admin tour steps
|
// Admin tour steps
|
||||||
admin: {
|
admin: {
|
||||||
welcome: {
|
welcome: {
|
||||||
title: '👋 Welcome to Sub2API',
|
title: '👋 Welcome to TianShuAPI',
|
||||||
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">Sub2API is a powerful AI service gateway platform that helps you easily manage and distribute AI services.</p><p style="margin-bottom: 12px;"><b>🎯 Core Features:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>📦 <b>Group Management</b> - Create service tiers (VIP, Free Trial, etc.)</li><li>🔗 <b>Account Pool</b> - Connect multiple upstream AI service accounts</li><li>🔑 <b>Key Distribution</b> - Generate independent API Keys for users</li><li>💰 <b>Billing Control</b> - Flexible rate and quota management</li></ul><p style="color: #10b981; font-weight: 600;">Let\'s complete the initial setup in 3 minutes →</p></div>',
|
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">TianShuAPI is a powerful AI service gateway platform that helps you easily manage and distribute AI services.</p><p style="margin-bottom: 12px;"><b>🎯 Core Features:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>📦 <b>Group Management</b> - Create service tiers (VIP, Free Trial, etc.)</li><li>🔗 <b>Account Pool</b> - Connect multiple upstream AI service accounts</li><li>🔑 <b>Key Distribution</b> - Generate independent API Keys for users</li><li>💰 <b>Billing Control</b> - Flexible rate and quota management</li></ul><p style="color: #10b981; font-weight: 600;">Let\'s complete the initial setup in 3 minutes →</p></div>',
|
||||||
nextBtn: 'Start Setup 🚀',
|
nextBtn: 'Start Setup 🚀',
|
||||||
prevBtn: 'Skip'
|
prevBtn: 'Skip'
|
||||||
},
|
},
|
||||||
groupManage: {
|
groupManage: {
|
||||||
title: '📦 Step 1: Group Management',
|
title: '📦 Step 1: Group Management',
|
||||||
description: '<div style="line-height: 1.7;"><p style="margin-bottom: 12px;"><b>What is a Group?</b></p><p style="margin-bottom: 12px;">Groups are the core concept of Sub2API, like a "service package":</p><ul style="margin-left: 20px; margin-bottom: 12px; font-size: 13px;"><li>🎯 Each group can contain multiple upstream accounts</li><li>💰 Each group has independent billing multiplier</li><li>👥 Can be set as public or exclusive</li></ul><p style="margin-top: 12px; padding: 8px 12px; background: #f0fdf4; border-left: 3px solid #10b981; border-radius: 4px; font-size: 13px;"><b>💡 Example:</b> You can create "VIP Premium" (high rate) and "Free Trial" (low rate) groups</p><p style="margin-top: 16px; color: #10b981; font-weight: 600;">👉 Click "Group Management" on the left sidebar</p></div>'
|
description: '<div style="line-height: 1.7;"><p style="margin-bottom: 12px;"><b>What is a Group?</b></p><p style="margin-bottom: 12px;">Groups are the core concept of TianShuAPI, like a "service package":</p><ul style="margin-left: 20px; margin-bottom: 12px; font-size: 13px;"><li>🎯 Each group can contain multiple upstream accounts</li><li>💰 Each group has independent billing multiplier</li><li>👥 Can be set as public or exclusive</li></ul><p style="margin-top: 12px; padding: 8px 12px; background: #f0fdf4; border-left: 3px solid #10b981; border-radius: 4px; font-size: 13px;"><b>💡 Example:</b> You can create "VIP Premium" (high rate) and "Free Trial" (low rate) groups</p><p style="margin-top: 16px; color: #10b981; font-weight: 600;">👉 Click "Group Management" on the left sidebar</p></div>'
|
||||||
},
|
},
|
||||||
createGroup: {
|
createGroup: {
|
||||||
title: '➕ Create New Group',
|
title: '➕ Create New Group',
|
||||||
@@ -1849,8 +1849,8 @@ export default {
|
|||||||
// User tour steps
|
// User tour steps
|
||||||
user: {
|
user: {
|
||||||
welcome: {
|
welcome: {
|
||||||
title: '👋 Welcome to Sub2API',
|
title: '👋 Welcome to TianShuAPI',
|
||||||
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">Hello! Welcome to the Sub2API AI service platform.</p><p style="margin-bottom: 12px;"><b>🎯 Quick Start:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>🔑 Create API Key</li><li>📋 Copy key to your application</li><li>🚀 Start using AI services</li></ul><p style="color: #10b981; font-weight: 600;">Just 1 minute, let\'s get started →</p></div>',
|
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">Hello! Welcome to the TianShuAPI AI service platform.</p><p style="margin-bottom: 12px;"><b>🎯 Quick Start:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>🔑 Create API Key</li><li>📋 Copy key to your application</li><li>🚀 Start using AI services</li></ul><p style="color: #10b981; font-weight: 600;">Just 1 minute, let\'s get started →</p></div>',
|
||||||
nextBtn: 'Start 🚀',
|
nextBtn: 'Start 🚀',
|
||||||
prevBtn: 'Skip'
|
prevBtn: 'Skip'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ export default {
|
|||||||
|
|
||||||
// Setup Wizard
|
// Setup Wizard
|
||||||
setup: {
|
setup: {
|
||||||
title: 'Sub2API 安装向导',
|
title: 'TianShuAPI 安装向导',
|
||||||
description: '配置您的 Sub2API 实例',
|
description: '配置您的 TianShuAPI 实例',
|
||||||
database: {
|
database: {
|
||||||
title: '数据库配置',
|
title: '数据库配置',
|
||||||
host: '主机',
|
host: '主机',
|
||||||
@@ -1775,7 +1775,7 @@ export default {
|
|||||||
description: '自定义站点品牌',
|
description: '自定义站点品牌',
|
||||||
siteName: '站点名称',
|
siteName: '站点名称',
|
||||||
siteNameHint: '显示在邮件和页面标题中',
|
siteNameHint: '显示在邮件和页面标题中',
|
||||||
siteNamePlaceholder: 'Sub2API',
|
siteNamePlaceholder: 'TianShuAPI',
|
||||||
siteSubtitle: '站点副标题',
|
siteSubtitle: '站点副标题',
|
||||||
siteSubtitleHint: '显示在登录和注册页面',
|
siteSubtitleHint: '显示在登录和注册页面',
|
||||||
siteSubtitlePlaceholder: '订阅转 API 转换平台',
|
siteSubtitlePlaceholder: '订阅转 API 转换平台',
|
||||||
@@ -1813,7 +1813,7 @@ export default {
|
|||||||
fromEmail: '发件人邮箱',
|
fromEmail: '发件人邮箱',
|
||||||
fromEmailPlaceholder: "noreply{'@'}example.com",
|
fromEmailPlaceholder: "noreply{'@'}example.com",
|
||||||
fromName: '发件人名称',
|
fromName: '发件人名称',
|
||||||
fromNamePlaceholder: 'Sub2API',
|
fromNamePlaceholder: 'TianShuAPI',
|
||||||
useTls: '使用 TLS',
|
useTls: '使用 TLS',
|
||||||
useTlsHint: '为 SMTP 连接启用 TLS 加密'
|
useTlsHint: '为 SMTP 连接启用 TLS 加密'
|
||||||
},
|
},
|
||||||
@@ -1942,14 +1942,14 @@ export default {
|
|||||||
// Admin tour steps
|
// Admin tour steps
|
||||||
admin: {
|
admin: {
|
||||||
welcome: {
|
welcome: {
|
||||||
title: '👋 欢迎使用 Sub2API',
|
title: '👋 欢迎使用 TianShuAPI',
|
||||||
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">Sub2API 是一个强大的 AI 服务中转平台,让您轻松管理和分发 AI 服务。</p><p style="margin-bottom: 12px;"><b>🎯 核心功能:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>📦 <b>分组管理</b> - 创建不同的服务套餐(VIP、免费试用等)</li><li>🔗 <b>账号池</b> - 连接多个上游 AI 服务商账号</li><li>🔑 <b>密钥分发</b> - 为用户生成独立的 API Key</li><li>💰 <b>计费管理</b> - 灵活的费率和配额控制</li></ul><p style="color: #10b981; font-weight: 600;">接下来,我们将用 3 分钟带您完成首次配置 →</p></div>',
|
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">TianShuAPI 是一个强大的 AI 服务中转平台,让您轻松管理和分发 AI 服务。</p><p style="margin-bottom: 12px;"><b>🎯 核心功能:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>📦 <b>分组管理</b> - 创建不同的服务套餐(VIP、免费试用等)</li><li>🔗 <b>账号池</b> - 连接多个上游 AI 服务商账号</li><li>🔑 <b>密钥分发</b> - 为用户生成独立的 API Key</li><li>💰 <b>计费管理</b> - 灵活的费率和配额控制</li></ul><p style="color: #10b981; font-weight: 600;">接下来,我们将用 3 分钟带您完成首次配置 →</p></div>',
|
||||||
nextBtn: '开始配置 🚀',
|
nextBtn: '开始配置 🚀',
|
||||||
prevBtn: '跳过'
|
prevBtn: '跳过'
|
||||||
},
|
},
|
||||||
groupManage: {
|
groupManage: {
|
||||||
title: '📦 第一步:分组管理',
|
title: '📦 第一步:分组管理',
|
||||||
description: '<div style="line-height: 1.7;"><p style="margin-bottom: 12px;"><b>什么是分组?</b></p><p style="margin-bottom: 12px;">分组是 Sub2API 的核心概念,它就像一个"服务套餐":</p><ul style="margin-left: 20px; margin-bottom: 12px; font-size: 13px;"><li>🎯 每个分组可以包含多个上游账号</li><li>💰 每个分组有独立的计费倍率</li><li>👥 可以设置为公开或专属分组</li></ul><p style="margin-top: 12px; padding: 8px 12px; background: #f0fdf4; border-left: 3px solid #10b981; border-radius: 4px; font-size: 13px;"><b>💡 示例:</b>您可以创建"VIP专线"(高倍率)和"免费试用"(低倍率)两个分组</p><p style="margin-top: 16px; color: #10b981; font-weight: 600;">👉 点击左侧的"分组管理"开始</p></div>'
|
description: '<div style="line-height: 1.7;"><p style="margin-bottom: 12px;"><b>什么是分组?</b></p><p style="margin-bottom: 12px;">分组是 TianShuAPI 的核心概念,它就像一个"服务套餐":</p><ul style="margin-left: 20px; margin-bottom: 12px; font-size: 13px;"><li>🎯 每个分组可以包含多个上游账号</li><li>💰 每个分组有独立的计费倍率</li><li>👥 可以设置为公开或专属分组</li></ul><p style="margin-top: 12px; padding: 8px 12px; background: #f0fdf4; border-left: 3px solid #10b981; border-radius: 4px; font-size: 13px;"><b>💡 示例:</b>您可以创建"VIP专线"(高倍率)和"免费试用"(低倍率)两个分组</p><p style="margin-top: 16px; color: #10b981; font-weight: 600;">👉 点击左侧的"分组管理"开始</p></div>'
|
||||||
},
|
},
|
||||||
createGroup: {
|
createGroup: {
|
||||||
title: '➕ 创建新分组',
|
title: '➕ 创建新分组',
|
||||||
@@ -2042,8 +2042,8 @@ export default {
|
|||||||
// User tour steps
|
// User tour steps
|
||||||
user: {
|
user: {
|
||||||
welcome: {
|
welcome: {
|
||||||
title: '👋 欢迎使用 Sub2API',
|
title: '👋 欢迎使用 TianShuAPI',
|
||||||
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">您好!欢迎来到 Sub2API AI 服务平台。</p><p style="margin-bottom: 12px;"><b>🎯 快速开始:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>🔑 创建 API 密钥</li><li>📋 复制密钥到您的应用</li><li>🚀 开始使用 AI 服务</li></ul><p style="color: #10b981; font-weight: 600;">只需 1 分钟,让我们开始吧 →</p></div>',
|
description: '<div style="line-height: 1.8;"><p style="margin-bottom: 16px;">您好!欢迎来到 TianShuAPI AI 服务平台。</p><p style="margin-bottom: 12px;"><b>🎯 快速开始:</b></p><ul style="margin-left: 20px; margin-bottom: 16px;"><li>🔑 创建 API 密钥</li><li>📋 复制密钥到您的应用</li><li>🚀 开始使用 AI 服务</li></ul><p style="color: #10b981; font-weight: 600;">只需 1 分钟,让我们开始吧 →</p></div>',
|
||||||
nextBtn: '开始 🚀',
|
nextBtn: '开始 🚀',
|
||||||
prevBtn: '跳过'
|
prevBtn: '跳过'
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
* Vue Router configuration for Sub2API frontend
|
* Vue Router configuration for TianShuAPI frontend
|
||||||
* Defines all application routes with lazy loading and navigation guards
|
* Defines all application routes with lazy loading and navigation guards
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -303,9 +303,9 @@ router.beforeEach((to, _from, next) => {
|
|||||||
|
|
||||||
// Set page title
|
// Set page title
|
||||||
if (to.meta.title) {
|
if (to.meta.title) {
|
||||||
document.title = `${to.meta.title} - Sub2API`
|
document.title = `${to.meta.title} - TianShuAPI`
|
||||||
} else {
|
} else {
|
||||||
document.title = 'Sub2API'
|
document.title = 'TianShuAPI'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if route requires authentication
|
// Check if route requires authentication
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export const useAppStore = defineStore('app', () => {
|
|||||||
// Public settings cache state
|
// Public settings cache state
|
||||||
const publicSettingsLoaded = ref<boolean>(false)
|
const publicSettingsLoaded = ref<boolean>(false)
|
||||||
const publicSettingsLoading = ref<boolean>(false)
|
const publicSettingsLoading = ref<boolean>(false)
|
||||||
const siteName = ref<string>('Sub2API')
|
const siteName = ref<string>('TianShuAPI')
|
||||||
const siteLogo = ref<string>('')
|
const siteLogo = ref<string>('')
|
||||||
const siteVersion = ref<string>('')
|
const siteVersion = ref<string>('')
|
||||||
const contactInfo = ref<string>('')
|
const contactInfo = ref<string>('')
|
||||||
@@ -308,7 +308,7 @@ export const useAppStore = defineStore('app', () => {
|
|||||||
publicSettingsLoading.value = true
|
publicSettingsLoading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await fetchPublicSettingsAPI()
|
const data = await fetchPublicSettingsAPI()
|
||||||
siteName.value = data.site_name || 'Sub2API'
|
siteName.value = data.site_name || 'TianShuAPI'
|
||||||
siteLogo.value = data.site_logo || ''
|
siteLogo.value = data.site_logo || ''
|
||||||
siteVersion.value = data.version || ''
|
siteVersion.value = data.version || ''
|
||||||
contactInfo.value = data.contact_info || ''
|
contactInfo.value = data.contact_info || ''
|
||||||
|
|||||||
@@ -473,14 +473,6 @@
|
|||||||
>
|
>
|
||||||
{{ t('home.docs') }}
|
{{ t('home.docs') }}
|
||||||
</a>
|
</a>
|
||||||
<a
|
|
||||||
:href="githubUrl"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener noreferrer"
|
|
||||||
class="text-sm text-gray-500 transition-colors hover:text-gray-700 dark:text-dark-400 dark:hover:text-white"
|
|
||||||
>
|
|
||||||
GitHub
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
@@ -499,7 +491,7 @@ const { t } = useI18n()
|
|||||||
const authStore = useAuthStore()
|
const authStore = useAuthStore()
|
||||||
|
|
||||||
// Site settings
|
// Site settings
|
||||||
const siteName = ref('Sub2API')
|
const siteName = ref('TianShuAPI')
|
||||||
const siteLogo = ref('')
|
const siteLogo = ref('')
|
||||||
const siteSubtitle = ref('AI API Gateway Platform')
|
const siteSubtitle = ref('AI API Gateway Platform')
|
||||||
const docUrl = ref('')
|
const docUrl = ref('')
|
||||||
@@ -507,9 +499,6 @@ const docUrl = ref('')
|
|||||||
// Theme
|
// Theme
|
||||||
const isDark = ref(document.documentElement.classList.contains('dark'))
|
const isDark = ref(document.documentElement.classList.contains('dark'))
|
||||||
|
|
||||||
// GitHub URL
|
|
||||||
const githubUrl = 'https://github.com/Wei-Shaw/sub2api'
|
|
||||||
|
|
||||||
// Auth state
|
// Auth state
|
||||||
const isAuthenticated = computed(() => authStore.isAuthenticated)
|
const isAuthenticated = computed(() => authStore.isAuthenticated)
|
||||||
const userInitial = computed(() => {
|
const userInitial = computed(() => {
|
||||||
@@ -548,7 +537,7 @@ onMounted(async () => {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
const settings = await getPublicSettings()
|
const settings = await getPublicSettings()
|
||||||
siteName.value = settings.site_name || 'Sub2API'
|
siteName.value = settings.site_name || 'TianShuAPI'
|
||||||
siteLogo.value = settings.site_logo || ''
|
siteLogo.value = settings.site_logo || ''
|
||||||
siteSubtitle.value = settings.site_subtitle || 'AI API Gateway Platform'
|
siteSubtitle.value = settings.site_subtitle || 'AI API Gateway Platform'
|
||||||
docUrl.value = settings.doc_url || ''
|
docUrl.value = settings.doc_url || ''
|
||||||
|
|||||||
@@ -740,7 +740,7 @@ const form = reactive<SystemSettings>({
|
|||||||
email_verify_enabled: false,
|
email_verify_enabled: false,
|
||||||
default_balance: 0,
|
default_balance: 0,
|
||||||
default_concurrency: 1,
|
default_concurrency: 1,
|
||||||
site_name: 'Sub2API',
|
site_name: 'TianShuAPI',
|
||||||
site_logo: '',
|
site_logo: '',
|
||||||
site_subtitle: 'Subscription to API Conversion Platform',
|
site_subtitle: 'Subscription to API Conversion Platform',
|
||||||
api_base_url: '',
|
api_base_url: '',
|
||||||
|
|||||||
@@ -265,7 +265,7 @@ const hasRegisterData = ref<boolean>(false)
|
|||||||
// Public settings
|
// Public settings
|
||||||
const turnstileEnabled = ref<boolean>(false)
|
const turnstileEnabled = ref<boolean>(false)
|
||||||
const turnstileSiteKey = ref<string>('')
|
const turnstileSiteKey = ref<string>('')
|
||||||
const siteName = ref<string>('Sub2API')
|
const siteName = ref<string>('TianShuAPI')
|
||||||
|
|
||||||
// Turnstile for resend
|
// Turnstile for resend
|
||||||
const turnstileRef = ref<InstanceType<typeof TurnstileWidget> | null>(null)
|
const turnstileRef = ref<InstanceType<typeof TurnstileWidget> | null>(null)
|
||||||
@@ -299,7 +299,7 @@ onMounted(async () => {
|
|||||||
const settings = await getPublicSettings()
|
const settings = await getPublicSettings()
|
||||||
turnstileEnabled.value = settings.turnstile_enabled
|
turnstileEnabled.value = settings.turnstile_enabled
|
||||||
turnstileSiteKey.value = settings.turnstile_site_key || ''
|
turnstileSiteKey.value = settings.turnstile_site_key || ''
|
||||||
siteName.value = settings.site_name || 'Sub2API'
|
siteName.value = settings.site_name || 'TianShuAPI'
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load public settings:', error)
|
console.error('Failed to load public settings:', error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -297,7 +297,7 @@ const registrationEnabled = ref<boolean>(true)
|
|||||||
const emailVerifyEnabled = ref<boolean>(false)
|
const emailVerifyEnabled = ref<boolean>(false)
|
||||||
const turnstileEnabled = ref<boolean>(false)
|
const turnstileEnabled = ref<boolean>(false)
|
||||||
const turnstileSiteKey = ref<string>('')
|
const turnstileSiteKey = ref<string>('')
|
||||||
const siteName = ref<string>('Sub2API')
|
const siteName = ref<string>('TianShuAPI')
|
||||||
|
|
||||||
// Turnstile
|
// Turnstile
|
||||||
const turnstileRef = ref<InstanceType<typeof TurnstileWidget> | null>(null)
|
const turnstileRef = ref<InstanceType<typeof TurnstileWidget> | null>(null)
|
||||||
@@ -323,7 +323,7 @@ onMounted(async () => {
|
|||||||
emailVerifyEnabled.value = settings.email_verify_enabled
|
emailVerifyEnabled.value = settings.email_verify_enabled
|
||||||
turnstileEnabled.value = settings.turnstile_enabled
|
turnstileEnabled.value = settings.turnstile_enabled
|
||||||
turnstileSiteKey.value = settings.turnstile_site_key || ''
|
turnstileSiteKey.value = settings.turnstile_site_key || ''
|
||||||
siteName.value = settings.site_name || 'Sub2API'
|
siteName.value = settings.site_name || 'TianShuAPI'
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Failed to load public settings:', error)
|
console.error('Failed to load public settings:', error)
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
Reference in New Issue
Block a user