58 lines
1.7 KiB
Markdown
58 lines
1.7 KiB
Markdown
|
# shjjy153 与 shccd159 分支对比
|
|||
|
|
|
|||
|
|
## 1. 提交差异
|
|||
|
|
|
|||
|
|
- **shjjy153 独有**：`0f02cb7 shjjy153: 新增 deploy-front-shjjy153.sh，更新配置`
|
|||
|
|
- **shccd159**：无此提交，因此没有 `deploy-front-shjjy153.sh`
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
|
|||
|
|
## 2. 文件差异
|
|||
|
|
|
|||
|
|
| 文件 | shjjy153 | shccd159 |
|
|||
|
|
|------|----------|----------|
|
|||
|
|
| **backend/shell/deploy-front-shjjy153.sh** | 存在 | 不存在 |
|
|||
|
|
| **backend/shell/deploy-front-shccd159.sh** | 存在 | 存在 |
|
|||
|
|
| **application.yml** `spring.profiles.active` | `shjjy153` | `shccd159` |
|
|||
|
|
| **single_uniapp22miao/config/app.js** | `jjy-jf.fwxgpt.com` | `ccd-jf.fwxgpt.com` |
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
|
|||
|
|
## 3. 配置差异
|
|||
|
|
|
|||
|
|
### application.yml（默认 profile）
|
|||
|
|
|
|||
|
|
```yaml
|
|||
|
|
# shjjy153
|
|||
|
|
spring.profiles.active: shjjy153
|
|||
|
|
|
|||
|
|
# shccd159
|
|||
|
|
spring.profiles.active: shccd159
|
|||
|
|
```
|
|||
|
|
|
|||
|
|
### single_uniapp22miao/config/app.js（API 与 H5 域名）
|
|||
|
|
|
|||
|
|
| 配置 | shjjy153 | shccd159 |
|
|||
|
|
|------|----------|----------|
|
|||
|
|
| domain | `https://jjy-jf.fwxgpt.com` | `https://ccd-jf.fwxgpt.com` |
|
|||
|
|
| HTTP_H5_URL | `https://jjy-jf.fwxgpt.com` | `https://ccd-jf.fwxgpt.com` |
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
|
|||
|
|
## 4. 部署环境（deploy.conf）
|
|||
|
|
|
|||
|
|
两分支的 `deploy.conf` 相同，均包含 shjjy153 与 shccd159 两套配置：
|
|||
|
|
|
|||
|
|
| 环境 | 服务器 | 域名 |
|
|||
|
|
|------|--------|------|
|
|||
|
|
| **shjjy153** | 101.132.245.153 | jjy-jf.fwxgpt.com / jjy-jfadmin.fwxgpt.com |
|
|||
|
|
| **shccd159** | 182.92.78.159 | ccd-jf.fwxgpt.com / ccd-jfadmin.fwxgpt.com |
|
|||
|
|
|
|||
|
|
---
|
|||
|
|
|
|||
|
|
## 5. 小结
|
|||
|
|
|
|||
|
|
- **shjjy153**：面向 jjy 项目，默认 profile=shjjy153，有 `deploy-front-shjjy153.sh`
|
|||
|
|
- **shccd159**：面向 ccd 项目，默认 profile=shccd159，无 `deploy-front-shjjy153.sh`
|
|||
|
|
- 其余代码与配置基本一致，差异集中在默认 profile、前端 API 域名及部署脚本
|