From a2db220f192e0a75b36f2181ffb3f5770254e865 Mon Sep 17 00:00:00 2001 From: apple Date: Thu, 19 Mar 2026 09:48:06 +0800 Subject: [PATCH] =?UTF-8?q?shjjy153:=20=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E6=94=AF=E5=AF=B9=E6=AF=94=E6=96=87=E6=A1=A3=20compare-shjjy15?= =?UTF-8?q?3-shccd159.md=EF=BC=8C=E6=9B=B4=E6=96=B0=20config/app.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made-with: Cursor --- compare-shjjy153-shccd159.md | 57 +++++++++++++++++++++++++++++++ single_uniapp22miao/config/app.js | 7 ++-- 2 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 compare-shjjy153-shccd159.md diff --git a/compare-shjjy153-shccd159.md b/compare-shjjy153-shccd159.md new file mode 100644 index 0000000..27d65da --- /dev/null +++ b/compare-shjjy153-shccd159.md @@ -0,0 +1,57 @@ +# 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 域名及部署脚本 diff --git a/single_uniapp22miao/config/app.js b/single_uniapp22miao/config/app.js index ad897ba..d7fbde4 100644 --- a/single_uniapp22miao/config/app.js +++ b/single_uniapp22miao/config/app.js @@ -5,8 +5,9 @@ // let domain = 'https://jf.bosenyuan.com' // let domain = 'https://jfanyue.szxingming.com' // let domain = 'https://jf.wenjinhui.com' -let domain = 'https://jjy-jf.fwxgpt.com' -// let domain = 'https://ccd-jf.fwxgpt.com' +// let domain = 'https://jjy-jf.fwxgpt.com' +let domain = 'https://jjy-jf.uj345.com' +// let domain = 'https://ccd-jf.cichude.com' module.exports = { // 请求域名 格式: https://您的域名 @@ -14,7 +15,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'https://jjy-jf.fwxgpt.com', + HTTP_H5_URL: 'https://jjy-jf.uj345.com', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain,