diff --git a/backend-adminend/.env.development b/backend-adminend/.env.development index fa322ae..a575db0 100644 --- a/backend-adminend/.env.development +++ b/backend-adminend/.env.development @@ -13,8 +13,8 @@ ENV = 'development' # shjjy153 项目 # VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com' -# byhlc112 项目 -VUE_APP_BASE_API = 'https://jf.lehoo6.com' +# bygsf212 项目 +VUE_APP_BASE_API = 'https://jf.b3y45.com' # hapr191 项目（淮安鹏然商贸） # VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' diff --git a/backend-adminend/.env.production b/backend-adminend/.env.production index 60b1d0c..dc2b932 100644 --- a/backend-adminend/.env.production +++ b/backend-adminend/.env.production @@ -13,8 +13,8 @@ ENV = 'production' # shjjy153 项目 # VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com' -# byhlc112 项目 -VUE_APP_BASE_API = 'https://jf.lehoo6.com' +# bygsf212 项目 +VUE_APP_BASE_API = 'https://jf.b3y45.com' # hapr191 项目（淮安鹏然商贸） # VUE_APP_BASE_API = 'http://jfadmin.hapengran.com' diff --git a/backend/crmeb-admin/src/main/resources/application-bygsf212.yml b/backend/crmeb-admin/src/main/resources/application-bygsf212.yml new file mode 100644 index 0000000..46a593a --- /dev/null +++ b/backend/crmeb-admin/src/main/resources/application-bygsf212.yml @@ -0,0 +1,60 @@ +# CRMEB 相关配置 +crmeb: + captchaOn: false # 是否开启行为验证码 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30032 + +# 订单同步配置（每个单商户实例需要配置不同的source-id和target-mer-id） +sync: + source-id: shop_18 + target-mer-id: 18 + +spring: + datasource: + name: bygsf212 + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 118.31.36.212 #地址 + port: 6379 #端口 + password: '123456' + timeout: 10000 # 连接超时时间（毫秒） + database: 2 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数（使用负值表示没有限制） + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 2 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./crmeb_log + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-admin/src/main/resources/application.yml b/backend/crmeb-admin/src/main/resources/application.yml index 0e86b2b..ec3b533 100644 --- a/backend/crmeb-admin/src/main/resources/application.yml +++ b/backend/crmeb-admin/src/main/resources/application.yml @@ -38,7 +38,7 @@ server: spring: profiles: - active: byhlc112 + active: bygsf212 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java index 3dcaf72..f360703 100644 --- a/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java +++ b/backend/crmeb-front/src/main/java/com/zbkj/front/controller/WaUserController.java @@ -70,7 +70,7 @@ public class WaUserController { private CrmebConfig crmebConfig; private String buildPublicFileUrl(String relativeUrl) { - String domain = StringUtils.defaultString(crmebConfig.getDomain(), "https://h5y2c.com").trim(); + String domain = StringUtils.defaultString(crmebConfig.getDomain(), "https://b3y45.com").trim(); if (!StringUtils.startsWithAny(domain, "http://", "https://")) { domain = "https://" + domain; } @@ -88,7 +88,7 @@ public class WaUserController { FileInputStream fileInputStream = null; try { // 读取模板PDF文件 - Resource resource = new ClassPathResource("pdf/sign_contract_byhlc112.pdf"); + Resource resource = new ClassPathResource("pdf/sign_contract_bygsf212.pdf"); InputStream pdfInputStream = resource.getInputStream(); document = PDDocument.load(pdfInputStream); pdfInputStream.close(); diff --git a/backend/crmeb-front/src/main/resources/application-bygsf212.yml b/backend/crmeb-front/src/main/resources/application-bygsf212.yml new file mode 100644 index 0000000..771ff7f --- /dev/null +++ b/backend/crmeb-front/src/main/resources/application-bygsf212.yml @@ -0,0 +1,55 @@ +crmeb: + imagePath: /www/wwwroot/b3y45.com/ # 服务器图片路径配置 斜杠结尾 + domain: https://b3y45.com/ # 当前项目域名，合同/PDF 等公开地址拼接使用 + asyncConfig: true #是否同步config表数据到redis + +server: + port: 30031 + +spring: + datasource: + name: bygsf212 + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + redis: + host: 118.31.36.212 #地址 + port: 6379 #端口 + password: '123456' + timeout: 10000 # 连接超时时间（毫秒） + database: 2 #默认数据库 + jedis: + pool: + max-active: 200 # 连接池最大连接数（使用负值表示没有限制） + max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制） + max-idle: 10 # 连接池中的最大空闲连接 + min-idle: 0 # 连接池中的最小空闲连接 + time-between-eviction-runs: -1 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1 + second: + database: 2 # 微信accessToken存储库 + +debug: true +logging: + level: + io.swagger.*: error + com.zbjk.crmeb: debug + org.springframework.boot.autoconfigure: ERROR + config: classpath:logback-spring.xml + file: + path: ./logs + +# mybatis 配置 +mybatis-plus: + # 配置sql打印日志 + configuration: + log-impl: + +#swagger 配置 +swagger: + basic: + enable: true #是否开启界面 + check: false #是否打开验证 + username: crmeb #访问swagger的账号 + password: crmeb.com #访问swagger的密码 diff --git a/backend/crmeb-front/src/main/resources/application.yml b/backend/crmeb-front/src/main/resources/application.yml index cec898f..1d66079 100644 --- a/backend/crmeb-front/src/main/resources/application.yml +++ b/backend/crmeb-front/src/main/resources/application.yml @@ -32,7 +32,7 @@ server: spring: profiles: - active: byhlc112 + active: bygsf212 servlet: multipart: max-file-size: 50MB #设置单个文件大小 diff --git a/backend/crmeb-front/src/main/resources/pdf/sign_contract_bygsf212.pdf b/backend/crmeb-front/src/main/resources/pdf/sign_contract_bygsf212.pdf new file mode 100644 index 0000000..4baff4f Binary files /dev/null and b/backend/crmeb-front/src/main/resources/pdf/sign_contract_bygsf212.pdf differ diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 634296b..b8efa55 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -8,6 +8,7 @@ |-----|------|------| | `czleilei240` 参考模板 | `deploy/docker/step1-integral` | `deploy/docker/step2-single-shop` | | `byhlc112` | `deploy/docker/step1-integral-byhlc112` | `deploy/docker/step2-single-shop-byhlc112` | +| `bygsf212`（鼎信汇商贸） | 待步骤一项目目录 | `deploy/docker/step2-single-shop-bygsf212` | ## 1. 准备环境变量 @@ -75,7 +76,8 @@ done ## 7. "fast" 模式（跳过前端构建，使用源码已有 dist） -如果源码目录里 `backend-adminend/dist` 和 `single_uniapp22miao/unpackage/dist/build/` 已经是最新构建产物，可加速： +- `single_uniapp22miao` 使用 HBuilder/HBuilderX 手动编译发布。 +- 如果源码目录里 `backend-adminend/dist` 和 `single_uniapp22miao/unpackage/dist/build/` 已经是最新构建产物，可加速： ```bash docker compose build --build-arg=BUILDKIT_INLINE_CACHE=1 \ diff --git a/deploy/docker/single-shop/application-docker.yml b/deploy/docker/single-shop/application-docker.yml index 7c984c4..8d811d3 100644 --- a/deploy/docker/single-shop/application-docker.yml +++ b/deploy/docker/single-shop/application-docker.yml @@ -9,7 +9,7 @@ server: crmeb: imagePath: /usr/local/crmeb/ - domain: https://h5y2c.com + domain: ${CRMEB_DOMAIN:https://b3y45.com/} captchaOn: false asyncConfig: true demoSite: false diff --git a/deploy/docker/step2-single-shop-bygsf212/.env.example b/deploy/docker/step2-single-shop-bygsf212/.env.example new file mode 100644 index 0000000..8e572ee --- /dev/null +++ b/deploy/docker/step2-single-shop-bygsf212/.env.example @@ -0,0 +1,42 @@ +# ============================================================= +# 步骤二：积分商城环境变量 — 鼎信汇商贸 bygsf212 +# 使用方法：cp .env.example .env 然后填入真实密码 +# .env 不入库（已加入 .gitignore） +# ============================================================= + +TZ=Asia/Shanghai + +# ---------- Redis（容器内，与步骤一独立） ---------- +REDIS_PASSWORD=change-me-redis + +# ---------- 阿里云 RDS ---------- +RDS_HOST=rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com +RDS_DB=bygsf212 +RDS_USER=yangtangyoupin +RDS_PASSWORD=change-me + +# ---------- 订单同步（多商户 source / target） ---------- +SYNC_SOURCE_ID=shop_18 +SYNC_TARGET_MER_ID=18 + +# ---------- Java JAR 宿主机路径（FTP 更新后 restart 容器即可） ---------- +SINGLE_FRONT_JAR=/www/wwwroot/javaapi/miao-front-2.2.jar +SINGLE_ADMIN_JAR=/www/wwwroot/javaapi/miao-admin-2.2.jar + +# ---------- Java 日志目录（bind-mount 到宿主机，直接 tail -f 查看） ---------- +SINGLE_FRONT_LOG_DIR=/www/wwwroot/javaapi/logs/front +SINGLE_ADMIN_LOG_DIR=/www/wwwroot/javaapi/logs/admin + +# ---------- 图片/PDF 目录（与步骤一 H5 Nginx 共享宿主机路径） ---------- +CRMEB_IMAGE_DIR=/www/wwwroot/b3y45.com +CRMEB_DOMAIN=https://b3y45.com/ + +# ---------- 前端静态目录（bind-mount，rsync 更新后立即生效） ---------- +# 积分商城 H5（uni-app/HBuilder 编译产物），对应域名 jf.b3y45.com +SINGLE_H5_DIR=/www/wwwroot/jf.b3y45.com +# 积分商城管理后台（Vue SPA），对应域名 jfadmin.b3y45.com +SINGLE_ADMIN_WEB_DIR=/www/wwwroot/jfadmin.b3y45.com + +# ---------- 宿主机暴露端口（供宝塔 Nginx 反代） ---------- +SINGLE_ADMIN_PORT=18081 +SINGLE_H5_PORT=18082 diff --git a/deploy/docker/step2-single-shop-bygsf212/.gitignore b/deploy/docker/step2-single-shop-bygsf212/.gitignore new file mode 100644 index 0000000..4c49bd7 --- /dev/null +++ b/deploy/docker/step2-single-shop-bygsf212/.gitignore @@ -0,0 +1 @@ +.env diff --git a/deploy/docker/step2-single-shop-bygsf212/README.md b/deploy/docker/step2-single-shop-bygsf212/README.md new file mode 100644 index 0000000..5b8ee17 --- /dev/null +++ b/deploy/docker/step2-single-shop-bygsf212/README.md @@ -0,0 +1,120 @@ +# 步骤二：积分商城 Docker 部署（鼎信汇商贸 bygsf212） + +项目：`single-shop-22`（积分商城） +服务：`redis` · `single-front-api`（Spring Boot）· `single-admin-api`（Spring Boot） +`single-admin-web`（Vue 管理后台）· `single-h5`（uni-app/HBuilder H5） + +步骤一（寄卖商城）与本步骤完全独立，可以单独部署、单独重启。 + +默认域名： +- 积分商城 H5：`jf.b3y45.com` +- 积分商城管理后台：`jfadmin.b3y45.com` + +--- + +## 部署前提：宿主机文件准备 + +### 1. Java JAR（Spring Boot API） + +```bash +mkdir -p /www/wwwroot/javaapi/logs/front +mkdir -p /www/wwwroot/javaapi/logs/admin + +scp single-shop-22/backend/crmeb-front/target/miao-front-2.2.jar root@118.31.36.212:/www/wwwroot/javaapi/ +scp single-shop-22/backend/crmeb-admin/target/miao-admin-2.2.jar root@118.31.36.212:/www/wwwroot/javaapi/ +``` + +### 2. 前端静态文件 + +`single_uniapp22miao` 使用 HBuilder/HBuilderX 编译 H5，把编译产物上传到积分商城 H5 目录。 + +```bash +mkdir -p /www/wwwroot/jf.b3y45.com +rsync -a --delete single-shop-22/single_uniapp22miao/unpackage/dist/build/h5/ \ + root@118.31.36.212:/www/wwwroot/jf.b3y45.com/ +chmod -R 755 /www/wwwroot/jf.b3y45.com/ + +mkdir -p /www/wwwroot/jfadmin.b3y45.com +rsync -a --delete single-shop-22/backend-adminend/dist/ \ + root@118.31.36.212:/www/wwwroot/jfadmin.b3y45.com/ +chmod -R 755 /www/wwwroot/jfadmin.b3y45.com/ +``` + +> 如果 HBuilderX 实际输出目录是 `unpackage/dist/build/web/`，把上面的 `build/h5/` 替换成 `build/web/`。 + +### 3. 图片/PDF 目录 + +```bash +mkdir -p /www/wwwroot/b3y45.com +``` + +--- + +## 快速部署 + +```bash +cd deploy/docker/step2-single-shop-bygsf212 + +cp .env.example .env +vim .env + +docker compose --env-file .env build +docker compose --env-file .env up -d + +docker compose --env-file .env ps +docker compose --env-file .env logs -f single-front-api +docker compose --env-file .env logs -f single-admin-api +``` + +--- + +## 域名与端口 + +| 域名 | 用途 | 宿主机端口 | +|---|---|---| +| `jf.b3y45.com` | 积分商城 H5（uni-app/HBuilder） | **18082** | +| `jfadmin.b3y45.com` | 积分商城管理后台（Vue） | **18081** | + +> Spring Boot API 端口（30032 / 30033）仅容器内监听，不对外暴露。 +> 宝塔 Nginx 通过域名反代到 `127.0.0.1:18081 / 18082`，再由容器内 Nginx 转发到 API。 +> 图片/PDF 实际落盘路径为宿主机 `/www/wwwroot/b3y45.com/crmebimage/public/...`。 + +--- + +## 验证 + +| 地址 | 预期 | +|------|------| +| `https://jf.b3y45.com/` | 积分商城 H5 | +| `https://jfadmin.b3y45.com/` | 积分商城管理后台 | +| `http://118.31.36.212:18082/` | H5 直连测试 | +| `http://118.31.36.212:18081/` | 管理后台直连测试 | + +--- + +## bind-mount 目录总览 + +| 宿主机路径 | 挂入容器路径 | 说明 | +|---|---|---| +| `/www/wwwroot/javaapi/miao-front-2.2.jar` | `/app/app.jar` | 用户端 API JAR | +| `/www/wwwroot/javaapi/miao-admin-2.2.jar` | `/app/app.jar` | 管理端 API JAR | +| `/www/wwwroot/javaapi/logs/front/` | `/app/log` | 用户端 API 日志 | +| `/www/wwwroot/javaapi/logs/admin/` | `/app/log` | 管理端 API 日志 | +| `/www/wwwroot/b3y45.com/` | `/usr/local/crmeb/` | 图片/PDF 写入目录 | +| `/www/wwwroot/jf.b3y45.com/` | `/usr/share/nginx/html` | H5 静态文件 | +| `/www/wwwroot/jfadmin.b3y45.com/` | `/usr/share/nginx/html` | 管理后台静态文件 | +| `../single-shop/application-docker.yml` | `/config/application-docker.yml` | Spring Boot 配置 | + +--- + +## bygsf212 关键配置对照 + +| 配置项 | 值 | +|---|---| +| RDS Host | `rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com` | +| DB / User | `bygsf212` / `yangtangyoupin` | +| imagePath 宿主机目录 | `/www/wwwroot/b3y45.com/` | +| CRMEB_DOMAIN | `https://b3y45.com/` | +| SYNC_SOURCE_ID | `shop_18` | +| SYNC_TARGET_MER_ID | `18` | +| Spring profile | `docker`（通过 `application-docker.yml` 注入） | diff --git a/deploy/docker/step2-single-shop-bygsf212/docker-compose.yml b/deploy/docker/step2-single-shop-bygsf212/docker-compose.yml new file mode 100644 index 0000000..3c20c07 --- /dev/null +++ b/deploy/docker/step2-single-shop-bygsf212/docker-compose.yml @@ -0,0 +1,164 @@ +# ============================================================= +# 步骤二：积分商城（single-shop-22）独立部署 +# 客户：鼎信汇商贸 bygsf212 +# 包含服务：redis · single-admin-api · single-front-api +# single-admin-web(Vue) · single-h5(uni-app/HBuilder) +# ============================================================= + +name: jifenmall-bygsf212 + +x-common: &common + restart: unless-stopped + environment: + TZ: ${TZ:-Asia/Shanghai} + logging: + driver: json-file + options: + max-size: "20m" + max-file: "5" + +x-spring-common: &spring-common + <<: *common + environment: + TZ: ${TZ:-Asia/Shanghai} + MYSQL_HOST: ${RDS_HOST} + MYSQL_DATABASE: ${RDS_DB} + MYSQL_USERNAME: ${RDS_USER} + MYSQL_PASSWORD: ${RDS_PASSWORD} + REDIS_HOST: redis + REDIS_PORT: 6379 + REDIS_PASSWORD: ${REDIS_PASSWORD} + CRMEB_DOMAIN: ${CRMEB_DOMAIN} + SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_18} + SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-18} + +networks: + single-net: + driver: bridge + +volumes: + single-redis-data: + +services: + redis: + <<: *common + build: + context: . + dockerfile: redis.Dockerfile + image: jifenmall-bygsf212/redis:local + container_name: single-redis-bygsf212 + command: ["--requirepass", "${REDIS_PASSWORD}", "--appendonly", "yes"] + volumes: + - single-redis-data:/data + networks: [single-net] + healthcheck: + test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"] + interval: 10s + timeout: 3s + retries: 5 + + single-front-api: + <<: *spring-common + build: + context: . + dockerfile: ../single-shop/front-api.Dockerfile + image: jifenmall-bygsf212/front-api:local + container_name: single-front-api-bygsf212 + networks: [single-net] + ports: + - "127.0.0.1:30033:30033" + volumes: + - ${SINGLE_FRONT_JAR}:/app/app.jar:ro + - ${CRMEB_IMAGE_DIR}:/usr/local/crmeb + - ${SINGLE_FRONT_LOG_DIR}:/app/log + - ../single-shop/application-docker.yml:/config/application-docker.yml:ro + environment: + TZ: ${TZ:-Asia/Shanghai} + MYSQL_HOST: ${RDS_HOST} + MYSQL_DATABASE: ${RDS_DB} + MYSQL_USERNAME: ${RDS_USER} + MYSQL_PASSWORD: ${RDS_PASSWORD} + REDIS_HOST: redis + REDIS_PORT: 6379 + REDIS_PASSWORD: ${REDIS_PASSWORD} + CRMEB_DOMAIN: ${CRMEB_DOMAIN} + SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_18} + SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-18} + SERVER_PORT: 30033 + depends_on: + redis: + condition: service_healthy + healthcheck: + test: ["CMD-SHELL", "curl -sf http://localhost:30033/actuator/health || exit 1"] + interval: 30s + timeout: 10s + retries: 5 + start_period: 90s + + single-admin-api: + <<: *spring-common + build: + context: . + dockerfile: ../single-shop/admin-api.Dockerfile + image: jifenmall-bygsf212/admin-api:local + container_name: single-admin-api-bygsf212 + networks: [single-net] + ports: + - "127.0.0.1:30032:30032" + volumes: + - ${SINGLE_ADMIN_JAR}:/app/app.jar:ro + - ${CRMEB_IMAGE_DIR}:/usr/local/crmeb + - ${SINGLE_ADMIN_LOG_DIR}:/app/log + - ../single-shop/application-docker.yml:/config/application-docker.yml:ro + environment: + TZ: ${TZ:-Asia/Shanghai} + MYSQL_HOST: ${RDS_HOST} + MYSQL_DATABASE: ${RDS_DB} + MYSQL_USERNAME: ${RDS_USER} + MYSQL_PASSWORD: ${RDS_PASSWORD} + REDIS_HOST: redis + REDIS_PORT: 6379 + REDIS_PASSWORD: ${REDIS_PASSWORD} + CRMEB_DOMAIN: ${CRMEB_DOMAIN} + SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_18} + SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-18} + SERVER_PORT: 30032 + depends_on: + redis: + condition: service_healthy + healthcheck: + test: ["CMD-SHELL", "curl -sf http://localhost:30032/actuator/health || exit 1"] + interval: 30s + timeout: 10s + retries: 5 + start_period: 90s + + single-admin-web: + <<: *common + build: + context: . + dockerfile: ../single-shop/admin-web.Dockerfile + image: jifenmall-bygsf212/admin-web:local + container_name: single-admin-web-bygsf212 + networks: [single-net] + ports: + - "${SINGLE_ADMIN_PORT:-18081}:80" + volumes: + - ${SINGLE_ADMIN_WEB_DIR}:/usr/share/nginx/html + depends_on: + - single-admin-api + + single-h5: + <<: *common + build: + context: . + dockerfile: ../single-shop/h5.Dockerfile + image: jifenmall-bygsf212/h5:local + container_name: single-h5-bygsf212 + networks: [single-net] + ports: + - "${SINGLE_H5_PORT:-18082}:80" + volumes: + - ${SINGLE_H5_DIR}:/usr/share/nginx/html + depends_on: + - single-front-api diff --git a/deploy/docker/step2-single-shop-bygsf212/redis.Dockerfile b/deploy/docker/step2-single-shop-bygsf212/redis.Dockerfile new file mode 100644 index 0000000..d18299a --- /dev/null +++ b/deploy/docker/step2-single-shop-bygsf212/redis.Dockerfile @@ -0,0 +1,18 @@ +# ============================================================= +# Redis（Alpine + apk 安装，绕过 Docker Hub 镜像拉取问题） +# 与 step1 方案一致：不依赖 docker.io，只需 registry-1.docker.io 拉 alpine:3.19 +# ============================================================= + +FROM alpine:3.19 + +RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ + && apk add --no-cache redis tzdata \ + && cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ + && echo "Asia/Shanghai" > /etc/timezone \ + && rm -f /etc/apk/cache/*.apk + +VOLUME /data +WORKDIR /data +EXPOSE 6379 + +ENTRYPOINT ["redis-server"] diff --git a/docs/com-bygsf212-data-imgration.md b/docs/com-bygsf212-data-imgration.md new file mode 100644 index 0000000..67eab73 --- /dev/null +++ b/docs/com-bygsf212-data-imgration.md @@ -0,0 +1,59 @@ +## 公司名称： 宝应桂圣富商贸/鼎信汇商贸 + +- host ip: 118.31.36.212 + +## mysql数据库配置信息 + +datasource: + rds: rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com + name: bygsf212 + username: yangtangyoupin + password: 5Fn8eWrbYFtAhCZw + +## 数据清理任务 + +- **用户数据范围**：`wa_users.id` / `eb_user.uid` 保留名单： + `92688, 92880, 92904, 92964, 93098, 93141, 93164, 93235, 93251, 93259, 93267, 93270, 93272, 93273, 93276, 93284, 93292, 93300` + + 来源核对： + - 博森元团队成员信息表.xlsx / bsy-yangtangyoupin dump：`92688, 92904, 92964, 93164, 93251, 93259, 93272, 93273, 93276` + - 金雅文团队成员信息表.xlsx / jyw-yangtangyoupin dump：`92880, 93098, 93141, 93235, 93259, 93267, 93270, 93284, 93292, 93300` + - 备注：`93259` 在两份源 dump 中均存在，但对应不同人员；上方保留名单按 `wa_users.id` / `eb_user.uid` 去重后记录。 + +- 保留wa_users表中id在用户id数据范围的 ，删除其余用户数据 +- 保留eb_user表中uid在用户id数据范围的 ，删除其余用户数据 + +- wa_order +清空wa_order表中数据 + +- wa_merchandise +从源数据dump文件中提取“created_at >= 2026-06-12”并且seller_id或buyer_id在用户id数据范围的寄售商品，删除其余数据 +（当前库表字段为 `user_id` 表示卖家，实现时按 `user_id` 与日期条件过滤。） + +- wa_selfbonus_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_sharebonus_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_coupon_log +只保留 `user_id` 在用户id数据范围内的记录，删除其余数据 + +- wa_withdraw +清空wa_withdraw表中数据 + +- eb_store_order +清空eb_store_order表中数据 + +- eb_user_integral_record +只保留用户在名单内的记录；表字段为 `uid`（与 `wa_users.id` / `eb_user.uid` 对应），实现按 `uid` 过滤。 + + +## 相关文件 + +- 源数据 dump： + - `/Users/mac/Works26/miao-july/宝应鼎信汇/bsy-yangtangyoupin_2026-06-14_14-25-01_mysql_data.sql` + - `/Users/mac/Works26/miao-july/宝应鼎信汇/jyw-yangtangyoupin_2026-06-14_14-55-01_mysql_data.sql` +- 团队成员信息： + - `/Users/mac/Works26/miao-july/宝应鼎信汇/博森元团队成员信息表.xlsx` + - `/Users/mac/Works26/miao-july/宝应鼎信汇/金雅文团队成员信息表.xlsx` diff --git a/docs/com-bygsf212.md b/docs/com-bygsf212.md new file mode 100644 index 0000000..90c6a33 --- /dev/null +++ b/docs/com-bygsf212.md @@ -0,0 +1,65 @@ +## 公司名称： 宝应桂圣富商贸/鼎信汇商贸 + +- host ip: 118.31.36.212 + +### **修改任务** + +- 新建分支：bygsf212 ，合并分支"byhlc112"的最新代码到该分支，并根据上述信息修改相关需要变更项，使符合该新公司项目环境 +- 在新建分支下修改 + +--- + +### 相关配置 + +- mysql数据库使用阿里云rds：rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com +- mysql rds中数据库名：bygsf212 + +- 积分商城地址：https://jf.b3y45.com +- **云服务器积分商城目录**：/www/wwwroot/jf.b3y45.com +- **云服务器jar存放目录**：/www/wwwroot/javaapi + + +--- + + +### backend/crmeb-front模块变更 + +- 1. profile: bygsf212 +- 2. profile file: application-bygsf212.yml, mysql连接信息修改，redis主机ip修改。 +- 3. **PDF合同模板文件路径**：pdf/sign_contract_bygsf212.pdf +- 4. 用户PDF合同url地址前缀/落库域名：https://b3y45.com/ +- 5. imagePath: /www/wwwroot/b3y45.com/ + +### uniapp前端配置变更 + +- 1. 积分商城domain：https://jf.b3y45.com +- 2. 抢购页面跳转地址：https://b3y45.com +- 3. **PDF合同预览文件路径**： /static/sign_contract_bygsf212.pdf +- 4. **手动使用HBuilder编译发布** + +--- + +### backend/crmeb-admin模块变更 + +- 1. profile: bygsf212 +- 2. profile file: application-bygsf212.yml, mysql和redis主机ip修改，sync: source-id: shop_18， target-mer-id: 18 + +### 积分商城后台backend-adminend配置变更 + +- 1. backend-adminend/.env.development文件中VUE_APP_BASE_API改为https://jf.b3y45.com +- 2. backend-adminend/.env.production文件中VUE_APP_BASE_API改为https://jf.b3y45.com + +--- + + +## 相关文件 + +、、、启动积分商城api服务 +cd /www/wwwroot/javaapi +nohup java -Xms128m -Xmx256m -jar miao-front-2.2.jar > front.log & tail -f front.log +、、、 + +、、、启动积分商城后台api服务 +cd /www/wwwroot/javaapi +nohup java -Xms128m -Xmx256m -jar miao-admin-2.2.jar > admin.log & tail -f admin.log +、、、 diff --git a/docs/contract/sign_contract_bygsf212.docx b/docs/contract/sign_contract_bygsf212.docx new file mode 100644 index 0000000..f185ee2 Binary files /dev/null and b/docs/contract/sign_contract_bygsf212.docx differ diff --git a/docs/contract/sign_contract_bygsf212.pdf b/docs/contract/sign_contract_bygsf212.pdf new file mode 100644 index 0000000..4baff4f Binary files /dev/null and b/docs/contract/sign_contract_bygsf212.pdf differ diff --git a/single_uniapp22miao/config/app.js b/single_uniapp22miao/config/app.js index d09ed12..29764b5 100644 --- a/single_uniapp22miao/config/app.js +++ b/single_uniapp22miao/config/app.js @@ -6,8 +6,8 @@ // let domain = 'https://jfanyue.szxingming.com' // let domain = 'https://jf.wenjinhui.com' // let domain = 'https://jjy-jf.fwxgpt.com' -// byhlc112 项目 -let domain = 'https://jf.h5y2c.com' +// bygsf212 项目 +let domain = 'https://jf.b3y45.com' // let domain = 'https://jf.jinyawen.com' // let domain = 'https://jf.hapengran.com' // let domain = 'https://jjy-jf.uj345.com' @@ -19,7 +19,7 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - HTTP_H5_URL: 'https://jf.h5y2c.com', + HTTP_H5_URL: 'https://jf.b3y45.com', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, diff --git a/single_uniapp22miao/pages/index/index.vue b/single_uniapp22miao/pages/index/index.vue index d265419..6bda495 100644 --- a/single_uniapp22miao/pages/index/index.vue +++ b/single_uniapp22miao/pages/index/index.vue @@ -34,7 +34,7 @@ export default { data() { return { - pdfUrl: '/static/sign_contract_byhlc112.pdf', + pdfUrl: '/static/sign_contract_bygsf212.pdf', userId: '', isMobile: false, usePdfJs: false, diff --git a/single_uniapp22miao/pages/integral/points.vue b/single_uniapp22miao/pages/integral/points.vue index 5ce9d2a..e00c8a4 100644 --- a/single_uniapp22miao/pages/integral/points.vue +++ b/single_uniapp22miao/pages/integral/points.vue @@ -343,12 +343,12 @@ export default { // window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index' //window.location.href = 'https://anyue.szxingming.com/?#/pages/personal/index' // window.location.href = 'https://xiashengjun.com/?#/pages/personal/index' - window.location.href = 'https://h5y2c.com/?#/pages/personal/index' + window.location.href = 'https://b3y45.com/?#/pages/personal/index' // window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index' // #endif // #ifndef H5 uni.navigateTo({ - url: '/pages/web-view/index?url=' + encodeURIComponent('https://h5y2c.com/?#/pages/personal/index') + url: '/pages/web-view/index?url=' + encodeURIComponent('https://b3y45.com/?#/pages/personal/index') }) // #endif }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue index 4b5193e..e4c5ab9 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign-preview.vue @@ -16,7 +16,7 @@ export default { }, onLoad(options) { - const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_byhlc112.pdf' + const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_bygsf212.pdf' this.pdfUrl = url }, diff --git a/single_uniapp22miao/pages/sub-pages/webview/sign.vue b/single_uniapp22miao/pages/sub-pages/webview/sign.vue index 4c03543..7820aab 100644 --- a/single_uniapp22miao/pages/sub-pages/webview/sign.vue +++ b/single_uniapp22miao/pages/sub-pages/webview/sign.vue @@ -364,7 +364,7 @@ export default { // window.location.href = 'https://shop.wenjinhui.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://anyue.szxingming.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') - window.location.href = 'https://h5y2c.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') + window.location.href = 'https://b3y45.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') // window.location.href = 'https://shop.uj345.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '') }, 1000) // 返回签名信息给上一页面 diff --git a/single_uniapp22miao/static/sign_contract_bygsf212.pdf b/single_uniapp22miao/static/sign_contract_bygsf212.pdf new file mode 100644 index 0000000..4baff4f Binary files /dev/null and b/single_uniapp22miao/static/sign_contract_bygsf212.pdf differ