feat(byhlc112): add project deployment configuration
This commit is contained in:
@@ -13,8 +13,8 @@ ENV = 'development'
|
|||||||
# shjjy153 项目
|
# shjjy153 项目
|
||||||
# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com'
|
# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com'
|
||||||
|
|
||||||
# czleilei240 项目
|
# byhlc112 项目
|
||||||
VUE_APP_BASE_API = 'https://leilei-jf.czchunfang.com'
|
VUE_APP_BASE_API = 'https://jf.lehoo6.com'
|
||||||
|
|
||||||
# hapr191 项目(淮安鹏然商贸)
|
# hapr191 项目(淮安鹏然商贸)
|
||||||
# VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
# VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ ENV = 'production'
|
|||||||
# shjjy153 项目
|
# shjjy153 项目
|
||||||
# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com'
|
# VUE_APP_BASE_API = 'http://jjy-jfadmin.fwxgpt.com'
|
||||||
|
|
||||||
# czleilei240 项目
|
# byhlc112 项目
|
||||||
VUE_APP_BASE_API = 'https://leilei-jf.czchunfang.com'
|
VUE_APP_BASE_API = 'https://jf.lehoo6.com'
|
||||||
|
|
||||||
# hapr191 项目(淮安鹏然商贸)
|
# hapr191 项目(淮安鹏然商贸)
|
||||||
# VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
# VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
||||||
|
|||||||
@@ -0,0 +1,60 @@
|
|||||||
|
# CRMEB 相关配置
|
||||||
|
crmeb:
|
||||||
|
captchaOn: false # 是否开启行为验证码
|
||||||
|
asyncConfig: true #是否同步config表数据到redis
|
||||||
|
|
||||||
|
server:
|
||||||
|
port: 30032
|
||||||
|
|
||||||
|
# 订单同步配置(每个单商户实例需要配置不同的source-id和target-mer-id)
|
||||||
|
sync:
|
||||||
|
source-id: shop_16
|
||||||
|
target-mer-id: 16
|
||||||
|
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
name: byhlc112
|
||||||
|
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: 39.97.236.112 #地址
|
||||||
|
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的密码
|
||||||
@@ -38,7 +38,7 @@ server:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: czleilei240
|
active: byhlc112
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 50MB #设置单个文件大小
|
max-file-size: 50MB #设置单个文件大小
|
||||||
@@ -172,4 +172,4 @@ aj:
|
|||||||
# local定时清除过期缓存(单位秒),设置为0代表不执行
|
# local定时清除过期缓存(单位秒),设置为0代表不执行
|
||||||
timing-clear: 3600
|
timing-clear: 3600
|
||||||
|
|
||||||
history-data-clear-enable: false
|
history-data-clear-enable: false
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class WaUserController {
|
|||||||
FileInputStream fileInputStream = null;
|
FileInputStream fileInputStream = null;
|
||||||
try {
|
try {
|
||||||
// 读取模板PDF文件
|
// 读取模板PDF文件
|
||||||
Resource resource = new ClassPathResource("pdf/sign_contract_czleilei240.pdf");
|
Resource resource = new ClassPathResource("pdf/sign_contract_byhlc112.pdf");
|
||||||
InputStream pdfInputStream = resource.getInputStream();
|
InputStream pdfInputStream = resource.getInputStream();
|
||||||
document = PDDocument.load(pdfInputStream);
|
document = PDDocument.load(pdfInputStream);
|
||||||
pdfInputStream.close();
|
pdfInputStream.close();
|
||||||
@@ -199,7 +199,7 @@ public class WaUserController {
|
|||||||
// user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl());
|
||||||
// user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl());
|
||||||
// user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl());
|
||||||
user.setContract("https://leilei.czchunfang.com/"+pdfResultVo.getUrl());
|
user.setContract("https://lehoo6.com/"+pdfResultVo.getUrl());
|
||||||
waUsersDao.updateById(user);
|
waUsersDao.updateById(user);
|
||||||
}
|
}
|
||||||
return CommonResult.success(pdfResultVo);
|
return CommonResult.success(pdfResultVo);
|
||||||
@@ -265,4 +265,4 @@ public class WaUserController {
|
|||||||
public CommonResult<Boolean> changePassword(@RequestBody @Validated PasswordRequest request) {
|
public CommonResult<Boolean> changePassword(@RequestBody @Validated PasswordRequest request) {
|
||||||
return CommonResult.success(waUserService.changePassword(request));
|
return CommonResult.success(waUserService.changePassword(request));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
crmeb:
|
||||||
|
imagePath: /www/wwwroot/lehoo6.com/ # 服务器图片路径配置 斜杠结尾
|
||||||
|
asyncConfig: true #是否同步config表数据到redis
|
||||||
|
|
||||||
|
server:
|
||||||
|
port: 30031
|
||||||
|
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
name: byhlc112
|
||||||
|
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: 39.97.236.112 #地址
|
||||||
|
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的密码
|
||||||
@@ -32,7 +32,7 @@ server:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: czleilei240
|
active: byhlc112
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 50MB #设置单个文件大小
|
max-file-size: 50MB #设置单个文件大小
|
||||||
|
|||||||
Binary file not shown.
@@ -2,6 +2,13 @@
|
|||||||
|
|
||||||
> 详细方案见仓库根目录的 `DOCKER_DEPLOY.md`。本文件只列必要操作。
|
> 详细方案见仓库根目录的 `DOCKER_DEPLOY.md`。本文件只列必要操作。
|
||||||
|
|
||||||
|
## 已提供的项目化部署目录
|
||||||
|
|
||||||
|
| 项目 | 步骤一 | 步骤二 |
|
||||||
|
|-----|------|------|
|
||||||
|
| `czleilei240` 参考模板 | `deploy/docker/step1-integral` | `deploy/docker/step2-single-shop` |
|
||||||
|
| `byhlc112` | `deploy/docker/step1-integral-byhlc112` | `deploy/docker/step2-single-shop-byhlc112` |
|
||||||
|
|
||||||
## 1. 准备环境变量
|
## 1. 准备环境变量
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -110,4 +117,3 @@ ssh-copy-id root@116.62.83.240
|
|||||||
|
|
||||||
> 用密码模式需要先 `brew install hudochenkov/sshpass/sshpass`(macOS)。
|
> 用密码模式需要先 `brew install hudochenkov/sshpass/sshpass`(macOS)。
|
||||||
> 用 SSH key 模式则任何依赖都不需要。
|
> 用 SSH key 模式则任何依赖都不需要。
|
||||||
|
|
||||||
|
|||||||
93
deploy/docker/integral-resell/h5.Dockerfile
Normal file
93
deploy/docker/integral-resell/h5.Dockerfile
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 寄卖商城 H5 静态站运行时镜像
|
||||||
|
# 静态文件通过 bind-mount 挂入 /usr/share/nginx/html
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
FROM nginx:1.25-alpine
|
||||||
|
|
||||||
|
ENV TZ=Asia/Shanghai
|
||||||
|
|
||||||
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
|
||||||
|
&& apk add --no-cache tzdata \
|
||||||
|
&& cp /usr/share/zoneinfo/$TZ /etc/localtime \
|
||||||
|
&& echo $TZ > /etc/timezone \
|
||||||
|
&& rm -f /etc/apk/cache/*.apk
|
||||||
|
|
||||||
|
RUN cat > /etc/nginx/conf.d/default.conf <<'NGX'
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name _;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
|
||||||
|
location ~* \.(?:js|css|png|jpg|jpeg|gif|svg|woff2?|ttf|map|pdf)$ {
|
||||||
|
expires 30d;
|
||||||
|
add_header Cache-Control "public, max-age=2592000";
|
||||||
|
try_files $uri =404;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass http://integral-houtai:8785/api/;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /upload/ {
|
||||||
|
proxy_pass http://integral-houtai:8785/upload/;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
NGX
|
||||||
|
|
||||||
|
RUN cat > /docker-entrypoint.d/90-integral-configs.sh <<'SH' \
|
||||||
|
&& chmod +x /docker-entrypoint.d/90-integral-configs.sh
|
||||||
|
#!/bin/sh
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
CONFIG_FILE=/usr/share/nginx/html/static/configs.js
|
||||||
|
|
||||||
|
[ -f "$CONFIG_FILE" ] || exit 0
|
||||||
|
|
||||||
|
escape_sed() {
|
||||||
|
printf '%s' "$1" | sed 's/[\/&]/\\&/g'
|
||||||
|
}
|
||||||
|
|
||||||
|
replace_js_string() {
|
||||||
|
key="$1"
|
||||||
|
value="$2"
|
||||||
|
[ -n "$value" ] || return 0
|
||||||
|
sed -i -E "s#(${key}:[[:space:]]*)'[^']*'#\1'$(escape_sed "$value")'#" "$CONFIG_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
replace_js_number() {
|
||||||
|
key="$1"
|
||||||
|
value="$2"
|
||||||
|
[ -n "$value" ] || return 0
|
||||||
|
sed -i -E "s#(${key}:[[:space:]]*)[0-9]+#\1${value}#" "$CONFIG_FILE"
|
||||||
|
}
|
||||||
|
|
||||||
|
replace_js_string TITLE "${INTEGRAL_TITLE:-}"
|
||||||
|
replace_js_string BASE_URL "${INTEGRAL_API_PUBLIC_URL:-}/api"
|
||||||
|
replace_js_string IMG_URL "${INTEGRAL_IMG_PUBLIC_URL:-}"
|
||||||
|
replace_js_string H5_URL "${INTEGRAL_H5_PUBLIC_URL:-}"
|
||||||
|
replace_js_number sn_id "${INTEGRAL_SN_ID:-}"
|
||||||
|
replace_js_string appStr "${INTEGRAL_APP_STR:-}"
|
||||||
|
SH
|
||||||
|
|
||||||
|
EXPOSE 80
|
||||||
20
deploy/docker/integral-resell/houtai.Dockerfile
Normal file
20
deploy/docker/integral-resell/houtai.Dockerfile
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 寄卖商城 Webman 后端运行时镜像
|
||||||
|
# 应用目录通过 bind-mount 挂入 /app,镜像只提供基础运行环境
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
FROM alpine:3.19
|
||||||
|
|
||||||
|
ENV TZ=Asia/Shanghai
|
||||||
|
|
||||||
|
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \
|
||||||
|
&& apk add --no-cache bash curl tzdata ca-certificates \
|
||||||
|
&& cp /usr/share/zoneinfo/$TZ /etc/localtime \
|
||||||
|
&& echo $TZ > /etc/timezone \
|
||||||
|
&& rm -f /etc/apk/cache/*.apk
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
EXPOSE 8785
|
||||||
|
|
||||||
|
CMD ["sh", "-c", "chmod +x /app/webman.bin && exec /app/webman.bin start"]
|
||||||
54
deploy/docker/nginx/admin.lehoo6.com.conf
Normal file
54
deploy/docker/nginx/admin.lehoo6.com.conf
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
upstream resell_api {
|
||||||
|
server 127.0.0.1:18085;
|
||||||
|
keepalive 10240;
|
||||||
|
}
|
||||||
|
|
||||||
|
server
|
||||||
|
{
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl http2;
|
||||||
|
server_name admin.lehoo6.com;
|
||||||
|
index index.html index.htm default.htm default.html;
|
||||||
|
root /www/wwwroot/admin.lehoo6.com;
|
||||||
|
include /www/server/panel/vhost/nginx/extension/admin.lehoo6.com/*.conf;
|
||||||
|
#CERT-APPLY-CHECK--START
|
||||||
|
include /www/server/panel/vhost/nginx/well-known/admin.lehoo6.com.conf;
|
||||||
|
#CERT-APPLY-CHECK--END
|
||||||
|
|
||||||
|
#SSL-START
|
||||||
|
set $isRedcert 1;
|
||||||
|
if ($server_port != 443) {
|
||||||
|
set $isRedcert 2;
|
||||||
|
}
|
||||||
|
if ( $uri ~ /\.well-known/ ) {
|
||||||
|
set $isRedcert 1;
|
||||||
|
}
|
||||||
|
if ($isRedcert != 1) {
|
||||||
|
rewrite ^(/.*)$ https://$host$1 permanent;
|
||||||
|
}
|
||||||
|
ssl_certificate /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.key;
|
||||||
|
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_session_tickets on;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
add_header Strict-Transport-Security "max-age=31536000";
|
||||||
|
error_page 497 https://$host$request_uri;
|
||||||
|
#SSL-END
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://resell_api;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
access_log /www/wwwlogs/admin.lehoo6.com.log;
|
||||||
|
error_log /www/wwwlogs/admin.lehoo6.com.error.log;
|
||||||
|
}
|
||||||
92
deploy/docker/nginx/jf.lehoo6.com.conf
Normal file
92
deploy/docker/nginx/jf.lehoo6.com.conf
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
upstream jifenmall_h5 {
|
||||||
|
server 127.0.0.1:18082;
|
||||||
|
keepalive 10240;
|
||||||
|
}
|
||||||
|
|
||||||
|
server
|
||||||
|
{
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl http2;
|
||||||
|
server_name jf.lehoo6.com;
|
||||||
|
index index.html index.htm default.htm default.html;
|
||||||
|
root /www/wwwroot/jf.lehoo6.com;
|
||||||
|
include /www/server/panel/vhost/nginx/extension/jf.lehoo6.com/*.conf;
|
||||||
|
#CERT-APPLY-CHECK--START
|
||||||
|
include /www/server/panel/vhost/nginx/well-known/jf.lehoo6.com.conf;
|
||||||
|
#CERT-APPLY-CHECK--END
|
||||||
|
|
||||||
|
#SSL-START
|
||||||
|
set $isRedcert 1;
|
||||||
|
if ($server_port != 443) {
|
||||||
|
set $isRedcert 2;
|
||||||
|
}
|
||||||
|
if ( $uri ~ /\.well-known/ ) {
|
||||||
|
set $isRedcert 1;
|
||||||
|
}
|
||||||
|
if ($isRedcert != 1) {
|
||||||
|
rewrite ^(/.*)$ https://$host$1 permanent;
|
||||||
|
}
|
||||||
|
ssl_certificate /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.key;
|
||||||
|
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_session_tickets on;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
add_header Strict-Transport-Security "max-age=31536000";
|
||||||
|
error_page 497 https://$host$request_uri;
|
||||||
|
#SSL-END
|
||||||
|
|
||||||
|
#REWRITE-START
|
||||||
|
include /www/server/panel/vhost/rewrite/html_jf.lehoo6.com.conf;
|
||||||
|
#REWRITE-END
|
||||||
|
|
||||||
|
location /api/front {
|
||||||
|
proxy_pass http://127.0.0.1:30033/api/front;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /api/admin {
|
||||||
|
proxy_pass http://127.0.0.1:30032/api/admin;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /api/external {
|
||||||
|
proxy_pass http://127.0.0.1:30032/api/external;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_read_timeout 120s;
|
||||||
|
client_max_body_size 50m;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ^~ / {
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Connection "";
|
||||||
|
if (!-f $request_filename) {
|
||||||
|
proxy_pass http://jifenmall_h5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
access_log /www/wwwlogs/jf.lehoo6.com.log;
|
||||||
|
error_log /www/wwwlogs/jf.lehoo6.com.error.log;
|
||||||
|
}
|
||||||
59
deploy/docker/nginx/jfadmin.lehoo6.com.conf
Normal file
59
deploy/docker/nginx/jfadmin.lehoo6.com.conf
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
upstream jifenmall_admin {
|
||||||
|
server 127.0.0.1:18081;
|
||||||
|
keepalive 10240;
|
||||||
|
}
|
||||||
|
|
||||||
|
server
|
||||||
|
{
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl http2;
|
||||||
|
server_name jfadmin.lehoo6.com;
|
||||||
|
index index.html index.htm default.htm default.html;
|
||||||
|
root /www/wwwroot/jfadmin.lehoo6.com;
|
||||||
|
include /www/server/panel/vhost/nginx/extension/jfadmin.lehoo6.com/*.conf;
|
||||||
|
#CERT-APPLY-CHECK--START
|
||||||
|
include /www/server/panel/vhost/nginx/well-known/jfadmin.lehoo6.com.conf;
|
||||||
|
#CERT-APPLY-CHECK--END
|
||||||
|
|
||||||
|
#SSL-START
|
||||||
|
set $isRedcert 1;
|
||||||
|
if ($server_port != 443) {
|
||||||
|
set $isRedcert 2;
|
||||||
|
}
|
||||||
|
if ( $uri ~ /\.well-known/ ) {
|
||||||
|
set $isRedcert 1;
|
||||||
|
}
|
||||||
|
if ($isRedcert != 1) {
|
||||||
|
rewrite ^(/.*)$ https://$host$1 permanent;
|
||||||
|
}
|
||||||
|
ssl_certificate /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.key;
|
||||||
|
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_session_tickets on;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
add_header Strict-Transport-Security "max-age=31536000";
|
||||||
|
error_page 497 https://$host$request_uri;
|
||||||
|
#SSL-END
|
||||||
|
|
||||||
|
#REWRITE-START
|
||||||
|
include /www/server/panel/vhost/rewrite/html_jfadmin.lehoo6.com.conf;
|
||||||
|
#REWRITE-END
|
||||||
|
|
||||||
|
location ^~ / {
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Connection "";
|
||||||
|
if (!-f $request_filename) {
|
||||||
|
proxy_pass http://jifenmall_admin;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
access_log /www/wwwlogs/jfadmin.lehoo6.com.log;
|
||||||
|
error_log /www/wwwlogs/jfadmin.lehoo6.com.error.log;
|
||||||
|
}
|
||||||
55
deploy/docker/nginx/lehoo6.com.conf
Normal file
55
deploy/docker/nginx/lehoo6.com.conf
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
upstream resell_h5 {
|
||||||
|
server 127.0.0.1:18080;
|
||||||
|
keepalive 10240;
|
||||||
|
}
|
||||||
|
|
||||||
|
server
|
||||||
|
{
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl http2;
|
||||||
|
server_name lehoo6.com;
|
||||||
|
index index.html index.htm default.htm default.html;
|
||||||
|
root /www/wwwroot/lehoo6.com;
|
||||||
|
include /www/server/panel/vhost/nginx/extension/lehoo6.com/*.conf;
|
||||||
|
#CERT-APPLY-CHECK--START
|
||||||
|
include /www/server/panel/vhost/nginx/well-known/lehoo6.com.conf;
|
||||||
|
#CERT-APPLY-CHECK--END
|
||||||
|
|
||||||
|
#SSL-START
|
||||||
|
set $isRedcert 1;
|
||||||
|
if ($server_port != 443) {
|
||||||
|
set $isRedcert 2;
|
||||||
|
}
|
||||||
|
if ( $uri ~ /\.well-known/ ) {
|
||||||
|
set $isRedcert 1;
|
||||||
|
}
|
||||||
|
if ($isRedcert != 1) {
|
||||||
|
rewrite ^(/.*)$ https://$host$1 permanent;
|
||||||
|
}
|
||||||
|
ssl_certificate /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /www/wwwroot/integral-shop/deploy/docker/ssl-cert/lehoo6.com_cert/nginx/lehoo6.com.key;
|
||||||
|
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
|
||||||
|
ssl_ciphers EECDH+CHACHA20:EECDH+CHACHA20-draft:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
|
||||||
|
ssl_prefer_server_ciphers on;
|
||||||
|
ssl_session_tickets on;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
add_header Strict-Transport-Security "max-age=31536000";
|
||||||
|
error_page 497 https://$host$request_uri;
|
||||||
|
#SSL-END
|
||||||
|
|
||||||
|
location ^~ / {
|
||||||
|
proxy_set_header Host $http_host;
|
||||||
|
proxy_set_header X-Forwarded-For $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Connection "";
|
||||||
|
if (!-f $request_filename) {
|
||||||
|
proxy_pass http://resell_h5;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
access_log /www/wwwlogs/lehoo6.com.log;
|
||||||
|
error_log /www/wwwlogs/lehoo6.com.error.log;
|
||||||
|
}
|
||||||
31
deploy/docker/step1-integral-byhlc112/.env.example
Normal file
31
deploy/docker/step1-integral-byhlc112/.env.example
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 步骤一:寄卖商城环境变量 — 宝应宏煜春商贸 byhlc112
|
||||||
|
# cp .env.example .env 并填入真实密码
|
||||||
|
# .env 不入库
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
TZ=Asia/Shanghai
|
||||||
|
|
||||||
|
# ---------- Redis(容器内) ----------
|
||||||
|
REDIS_PASSWORD=change-me-redis
|
||||||
|
|
||||||
|
# ---------- H5 对外域名(浏览器可达) ----------
|
||||||
|
INTEGRAL_TITLE=宝应宏煜春商贸
|
||||||
|
INTEGRAL_API_PUBLIC_URL=https://admin.lehoo6.com
|
||||||
|
INTEGRAL_IMG_PUBLIC_URL=https://admin.lehoo6.com
|
||||||
|
INTEGRAL_H5_PUBLIC_URL=https://lehoo6.com/
|
||||||
|
INTEGRAL_SN_ID=17533260260529
|
||||||
|
INTEGRAL_APP_STR=ZFyTNQTWEkCBbyhlc1120529
|
||||||
|
INTEGRAL_CONTRACT_PAGE=10012
|
||||||
|
|
||||||
|
# ---------- 宿主机暴露端口 ----------
|
||||||
|
INTEGRAL_H5_PORT=18080
|
||||||
|
# webman API 直连端口(宝塔 Nginx admin.lehoo6.com → 此端口)
|
||||||
|
RESELL_API_PORT=18085
|
||||||
|
|
||||||
|
# ---------- 宿主机目录映射(bind mount,与原部署路径一致)----------
|
||||||
|
# 寄卖商城 H5 静态文件目录(手动改 JS/configs.js 直接生效,无需重建镜像)
|
||||||
|
RESELL_H5_DIR=/www/wwwroot/lehoo6.com
|
||||||
|
# webman 后台完整应用目录(FTP 上传新 webman.bin/public/ 后 restart 容器即可更新)
|
||||||
|
# 上传图片、public/upload 等均包含在此目录内,无需单独挂载
|
||||||
|
RESELL_HOUTAI_DIR=/www/wwwroot/admin.lehoo6.com
|
||||||
2
deploy/docker/step1-integral-byhlc112/.gitignore
vendored
Normal file
2
deploy/docker/step1-integral-byhlc112/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
.env
|
||||||
|
houtai.env
|
||||||
99
deploy/docker/step1-integral-byhlc112/README.md
Normal file
99
deploy/docker/step1-integral-byhlc112/README.md
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
# 步骤一:寄卖商城 Docker 部署(宝应宏煜春商贸 byhlc112)
|
||||||
|
|
||||||
|
项目:`integral-resell`(寄卖商城)
|
||||||
|
服务:`redis` · `integral-houtai`(Webman PHP 8.0)· `integral-h5`(Nginx 静态站)· `edge-nginx`(Docker HTTPS 入口)
|
||||||
|
|
||||||
|
步骤二(积分商城)与本步骤完全独立,可以单独部署、单独重启。
|
||||||
|
|
||||||
|
> 这套目录结构与 `deploy/docker/step1-integral` 保持一致,按 `czleilei240` 已验证方案复制而来。
|
||||||
|
> 当前默认域名假设为:
|
||||||
|
> - 寄卖商城 H5:`lehoo6.com`
|
||||||
|
> - 寄卖商城后台/API:`admin.lehoo6.com`
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 快速部署
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd deploy/docker/step1-integral-byhlc112
|
||||||
|
|
||||||
|
# 1. 准备环境变量
|
||||||
|
cp .env.example .env
|
||||||
|
cp houtai.env.example houtai.env
|
||||||
|
vim .env
|
||||||
|
vim houtai.env
|
||||||
|
|
||||||
|
# 2. 首次部署:在服务器上确保宿主机目录存在
|
||||||
|
mkdir -p /www/wwwroot/lehoo6.com
|
||||||
|
mkdir -p /www/wwwroot/admin.lehoo6.com/public/upload
|
||||||
|
|
||||||
|
# 3. 将 H5 静态文件同步到宿主机目录(首次 / 每次前端更新后)
|
||||||
|
rsync -av integral-resell/h5/ /www/wwwroot/lehoo6.com/
|
||||||
|
|
||||||
|
# 4. 构建并启动,edge-nginx 会在宿主机监听 80/443
|
||||||
|
docker compose --env-file .env up -d --build
|
||||||
|
|
||||||
|
# 5. 查看状态
|
||||||
|
docker compose --env-file .env ps
|
||||||
|
docker compose --env-file .env logs -f integral-houtai
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 目录映射
|
||||||
|
|
||||||
|
| 宿主机路径 | 容器路径 | 用途 |
|
||||||
|
|---|---|---|
|
||||||
|
| `/www/wwwroot/lehoo6.com` | `/usr/share/nginx/html` | H5 静态文件,手动改 JS 即时生效 |
|
||||||
|
| `/www/wwwroot/admin.lehoo6.com` | `/app` | webman 后台完整应用目录 |
|
||||||
|
| `./houtai.env` | `/app/.env` | 运行时配置,只读挂入 |
|
||||||
|
| `integral-runtime`(named vol)| `/app/runtime` | webman PID、session 等运行时数据 |
|
||||||
|
|
||||||
|
| 域名 | 用途 | Docker 容器端口 | 宿主机端口 | Docker 入口 |
|
||||||
|
|---|---|---|---|---|
|
||||||
|
| `lehoo6.com` | 寄卖商城 H5 | integral-h5:80 | **80/443**,直连测试 **18080** | `edge-nginx` |
|
||||||
|
| `admin.lehoo6.com` | 寄卖商城 API / 后台 | integral-houtai:**8785** | **80/443**,直连测试 **18085** | `edge-nginx` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 验证
|
||||||
|
|
||||||
|
| 地址 | 预期 |
|
||||||
|
|------|------|
|
||||||
|
| `https://lehoo6.com/` | 寄卖商城 H5 首页 |
|
||||||
|
| `https://admin.lehoo6.com/api/...` | 寄卖商城 API |
|
||||||
|
| `http://39.97.236.112:18080/` | H5 直连测试 |
|
||||||
|
| `ss -lntp \| grep -E ':(80\|443)'` | 看到 Docker Nginx 监听宿主机 80/443 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 常用命令
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose --env-file .env restart integral-houtai
|
||||||
|
docker compose --env-file .env restart edge-nginx
|
||||||
|
docker compose --env-file .env logs -f integral-houtai
|
||||||
|
docker compose --env-file .env logs -f edge-nginx
|
||||||
|
docker compose --env-file .env exec integral-houtai bash
|
||||||
|
docker compose --env-file .env down
|
||||||
|
docker compose --env-file .env down -v
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 关键一致性检查
|
||||||
|
|
||||||
|
| 位置 | 值 |
|
||||||
|
|---|---|
|
||||||
|
| `.env` INTEGRAL_API_PUBLIC_URL | `https://admin.lehoo6.com` |
|
||||||
|
| `.env` INTEGRAL_H5_PUBLIC_URL | `https://lehoo6.com/` |
|
||||||
|
| `.env` INTEGRAL_APP_STR | `ZFyTNQTWEkCBbyhlc1120529` |
|
||||||
|
| `houtai.env` APP_SECRET | 同上 |
|
||||||
|
| `.env` INTEGRAL_SN_ID | `17533260260529` |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 待确认项
|
||||||
|
|
||||||
|
- 短信当前使用阿里云签名 `宝应宏煜春商贸`、模板 `SMS_334545236`,如更换短信账号需同步更新 `houtai.env`
|
||||||
|
- 如果寄卖后台域名不是 `admin.lehoo6.com`,请统一替换 `.env.example`、README 和入口 Nginx 配置
|
||||||
100
deploy/docker/step1-integral-byhlc112/docker-compose.yml
Normal file
100
deploy/docker/step1-integral-byhlc112/docker-compose.yml
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 步骤一:寄卖商城(integral-resell)独立部署
|
||||||
|
# 客户:宝应宏煜春商贸 byhlc112
|
||||||
|
# 包含服务:redis · integral-houtai(webman) · integral-h5(Nginx) · edge-nginx(HTTPS入口)
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
name: resell-byhlc112
|
||||||
|
|
||||||
|
x-common: &common
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
TZ: ${TZ:-Asia/Shanghai}
|
||||||
|
logging:
|
||||||
|
driver: json-file
|
||||||
|
options:
|
||||||
|
max-size: "20m"
|
||||||
|
max-file: "5"
|
||||||
|
|
||||||
|
networks:
|
||||||
|
integral-net:
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
integral-redis-data:
|
||||||
|
integral-runtime:
|
||||||
|
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
<<: *common
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: redis.Dockerfile
|
||||||
|
image: resell-byhlc112/redis:local
|
||||||
|
container_name: integral-redis-byhlc112
|
||||||
|
command: ["--requirepass", "${REDIS_PASSWORD}", "--appendonly", "yes"]
|
||||||
|
volumes:
|
||||||
|
- integral-redis-data:/data
|
||||||
|
networks: [integral-net]
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD", "redis-cli", "-a", "${REDIS_PASSWORD}", "ping"]
|
||||||
|
interval: 10s
|
||||||
|
timeout: 3s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
integral-houtai:
|
||||||
|
<<: *common
|
||||||
|
build:
|
||||||
|
context: ../integral-resell
|
||||||
|
dockerfile: houtai.Dockerfile
|
||||||
|
image: resell-byhlc112/houtai:latest
|
||||||
|
container_name: integral-houtai-byhlc112
|
||||||
|
networks: [integral-net]
|
||||||
|
ports:
|
||||||
|
- "${RESELL_API_PORT:-18085}:8785"
|
||||||
|
volumes:
|
||||||
|
- ${RESELL_HOUTAI_DIR}:/app
|
||||||
|
- ./houtai.env:/app/.env:ro
|
||||||
|
- integral-runtime:/app/runtime
|
||||||
|
depends_on:
|
||||||
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
|
integral-h5:
|
||||||
|
<<: *common
|
||||||
|
build:
|
||||||
|
context: ../integral-resell
|
||||||
|
dockerfile: h5.Dockerfile
|
||||||
|
image: resell-byhlc112/h5:latest
|
||||||
|
container_name: integral-h5-byhlc112
|
||||||
|
networks: [integral-net]
|
||||||
|
environment:
|
||||||
|
TZ: ${TZ:-Asia/Shanghai}
|
||||||
|
INTEGRAL_TITLE: ${INTEGRAL_TITLE}
|
||||||
|
INTEGRAL_API_PUBLIC_URL: ${INTEGRAL_API_PUBLIC_URL}
|
||||||
|
INTEGRAL_IMG_PUBLIC_URL: ${INTEGRAL_IMG_PUBLIC_URL}
|
||||||
|
INTEGRAL_H5_PUBLIC_URL: ${INTEGRAL_H5_PUBLIC_URL}
|
||||||
|
INTEGRAL_SN_ID: ${INTEGRAL_SN_ID}
|
||||||
|
INTEGRAL_APP_STR: ${INTEGRAL_APP_STR}
|
||||||
|
INTEGRAL_CONTRACT_PAGE: ${INTEGRAL_CONTRACT_PAGE}
|
||||||
|
volumes:
|
||||||
|
- ${RESELL_H5_DIR}:/usr/share/nginx/html
|
||||||
|
ports:
|
||||||
|
- "${INTEGRAL_H5_PORT:-18080}:80"
|
||||||
|
depends_on:
|
||||||
|
- integral-houtai
|
||||||
|
|
||||||
|
edge-nginx:
|
||||||
|
<<: *common
|
||||||
|
image: nginx:1.25-alpine
|
||||||
|
container_name: edge-nginx-byhlc112
|
||||||
|
networks: [integral-net]
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
- "443:443"
|
||||||
|
volumes:
|
||||||
|
- ./nginx-edge.conf:/etc/nginx/conf.d/default.conf:ro
|
||||||
|
- ../ssl-cert/lehoo6.com_cert/nginx:/etc/nginx/ssl/lehoo6.com_cert:ro
|
||||||
|
depends_on:
|
||||||
|
- integral-h5
|
||||||
|
- integral-houtai
|
||||||
37
deploy/docker/step1-integral-byhlc112/houtai.env.example
Normal file
37
deploy/docker/step1-integral-byhlc112/houtai.env.example
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# =============================================================
|
||||||
|
# Webman 后端运行时配置 — 宝应宏煜春商贸 byhlc112(寄卖商城)
|
||||||
|
# cp houtai.env.example houtai.env 并填入真实密码
|
||||||
|
# houtai.env 不入库,由 docker-compose volumes: 挂入 /app/.env
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
# MySQL(阿里云 RDS)
|
||||||
|
DB_HOST = 'rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com'
|
||||||
|
DB_PORT = 3306
|
||||||
|
DB_DATABASE = 'byhlc112'
|
||||||
|
DB_USERNAME = 'yangtangyoupin'
|
||||||
|
DB_PASSWORD = 'change-me'
|
||||||
|
|
||||||
|
# Redis(指向同 compose 内的 redis 容器)
|
||||||
|
REDIS_HOST = 'redis'
|
||||||
|
REDIS_PORT = 6379
|
||||||
|
REDIS_PASSWORD = 'change-me-redis'
|
||||||
|
|
||||||
|
# 短信(需按该项目实际通道填写)
|
||||||
|
SMS_CHANNEL = 'alibaba'
|
||||||
|
SMS_SIGNNAME = '宝应宏煜春商贸'
|
||||||
|
SMS_TEMPLATE = 'SMS_334545236'
|
||||||
|
SMS_KEYID = 'change-me'
|
||||||
|
SMS_KEYSECRET = 'change-me'
|
||||||
|
SMS_SDKAPPID = ''
|
||||||
|
|
||||||
|
# OSS(不启用则走本地 public/upload)
|
||||||
|
FILE_STORAGE = 'public'
|
||||||
|
OSS_ACCESS_ID = ''
|
||||||
|
OSS_ACCESS_SECRET = ''
|
||||||
|
OSS_BUCKET = ''
|
||||||
|
OSS_ENDPOINT = ''
|
||||||
|
OSS_URL = ''
|
||||||
|
|
||||||
|
# 业务标识(须与 H5 configs.js 的 sn_id / appStr 以及积分商城 admin 后台一致)
|
||||||
|
APP_SIGN = '1'
|
||||||
|
APP_SECRET = 'ZFyTNQTWEkCBbyhlc1120529'
|
||||||
54
deploy/docker/step1-integral-byhlc112/nginx-edge.conf
Normal file
54
deploy/docker/step1-integral-byhlc112/nginx-edge.conf
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name lehoo6.com admin.lehoo6.com;
|
||||||
|
|
||||||
|
return 301 https://$host$request_uri;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name lehoo6.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key;
|
||||||
|
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
|
||||||
|
client_max_body_size 50m;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://integral-h5:80;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 443 ssl;
|
||||||
|
http2 on;
|
||||||
|
server_name admin.lehoo6.com;
|
||||||
|
|
||||||
|
ssl_certificate /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.pem;
|
||||||
|
ssl_certificate_key /etc/nginx/ssl/lehoo6.com_cert/lehoo6.com.key;
|
||||||
|
|
||||||
|
ssl_protocols TLSv1.2 TLSv1.3;
|
||||||
|
ssl_session_cache shared:SSL:10m;
|
||||||
|
ssl_session_timeout 10m;
|
||||||
|
|
||||||
|
client_max_body_size 50m;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
proxy_pass http://integral-houtai:8785;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
|
proxy_set_header X-Forwarded-Proto https;
|
||||||
|
}
|
||||||
|
}
|
||||||
13
deploy/docker/step1-integral-byhlc112/redis.Dockerfile
Normal file
13
deploy/docker/step1-integral-byhlc112/redis.Dockerfile
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# 使用 Alpine 通过 apk 安装 Redis,绕过镜像源问题
|
||||||
|
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
|
||||||
|
|
||||||
|
VOLUME /data
|
||||||
|
WORKDIR /data
|
||||||
|
EXPOSE 6379
|
||||||
|
|
||||||
|
ENTRYPOINT ["redis-server"]
|
||||||
41
deploy/docker/step2-single-shop-byhlc112/.env.example
Normal file
41
deploy/docker/step2-single-shop-byhlc112/.env.example
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 步骤二:积分商城环境变量 — 宝应宏煜春商贸 byhlc112
|
||||||
|
# 使用方法: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=byhlc112
|
||||||
|
RDS_USER=yangtangyoupin
|
||||||
|
RDS_PASSWORD=change-me
|
||||||
|
|
||||||
|
# ---------- 订单同步(多商户 source / target) ----------
|
||||||
|
SYNC_SOURCE_ID=shop_16
|
||||||
|
SYNC_TARGET_MER_ID=16
|
||||||
|
|
||||||
|
# ---------- 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/lehoo6.com/crmebimage
|
||||||
|
|
||||||
|
# ---------- 前端静态目录(bind-mount,rsync 更新后立即生效) ----------
|
||||||
|
# 积分商城 H5(uni-app SPA),对应域名 jf.lehoo6.com
|
||||||
|
SINGLE_H5_DIR=/www/wwwroot/jf.lehoo6.com
|
||||||
|
# 积分商城管理后台(Vue SPA),对应域名 jfadmin.lehoo6.com
|
||||||
|
SINGLE_ADMIN_WEB_DIR=/www/wwwroot/jfadmin.lehoo6.com
|
||||||
|
|
||||||
|
# ---------- 宿主机暴露端口(供宝塔 Nginx 反代) ----------
|
||||||
|
SINGLE_ADMIN_PORT=18081
|
||||||
|
SINGLE_H5_PORT=18082
|
||||||
1
deploy/docker/step2-single-shop-byhlc112/.gitignore
vendored
Normal file
1
deploy/docker/step2-single-shop-byhlc112/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.env
|
||||||
122
deploy/docker/step2-single-shop-byhlc112/README.md
Normal file
122
deploy/docker/step2-single-shop-byhlc112/README.md
Normal file
@@ -0,0 +1,122 @@
|
|||||||
|
# 步骤二:积分商城 Docker 部署(宝应宏煜春商贸 byhlc112)
|
||||||
|
|
||||||
|
项目:`single-shop-22`(积分商城)
|
||||||
|
服务:`redis` · `single-front-api`(Spring Boot)· `single-admin-api`(Spring Boot)
|
||||||
|
`single-admin-web`(Vue 管理后台)· `single-h5`(uni-app H5)
|
||||||
|
|
||||||
|
步骤一(寄卖商城)与本步骤完全独立,可以单独部署、单独重启。
|
||||||
|
|
||||||
|
> 这套方案参考 `deploy/docker/step2-single-shop`,按 `czleilei240` 已验证结构复制。
|
||||||
|
> 当前默认域名假设为:
|
||||||
|
> - 积分商城 H5:`jf.lehoo6.com`
|
||||||
|
> - 积分商城管理后台:`jfadmin.lehoo6.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@39.97.236.112:/www/wwwroot/javaapi/
|
||||||
|
scp single-shop-22/backend/crmeb-admin/target/miao-admin-2.2.jar root@39.97.236.112:/www/wwwroot/javaapi/
|
||||||
|
```
|
||||||
|
|
||||||
|
### 2. 前端静态文件
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir -p /www/wwwroot/jf.lehoo6.com
|
||||||
|
rsync -a --delete single-shop-22/single_uniapp22miao/unpackage/dist/build/web/ \
|
||||||
|
root@39.97.236.112:/www/wwwroot/jf.lehoo6.com/
|
||||||
|
chmod -R 755 /www/wwwroot/jf.lehoo6.com/
|
||||||
|
|
||||||
|
mkdir -p /www/wwwroot/jfadmin.lehoo6.com
|
||||||
|
rsync -a --delete single-shop-22/backend-adminend/dist/ \
|
||||||
|
root@39.97.236.112:/www/wwwroot/jfadmin.lehoo6.com/
|
||||||
|
chmod -R 755 /www/wwwroot/jfadmin.lehoo6.com/
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. 图片/PDF 目录
|
||||||
|
|
||||||
|
```bash
|
||||||
|
mkdir -p /www/wwwroot/lehoo6.com/crmebimage
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 快速部署
|
||||||
|
|
||||||
|
```bash
|
||||||
|
cd deploy/docker/step2-single-shop-byhlc112
|
||||||
|
|
||||||
|
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.lehoo6.com` | 积分商城 H5(uni-app) | **18082** |
|
||||||
|
| `jfadmin.lehoo6.com` | 积分商城管理后台(Vue) | **18081** |
|
||||||
|
|
||||||
|
> Spring Boot API 端口(30032 / 30033)仅容器内监听,不对外暴露。
|
||||||
|
> 宝塔 Nginx 通过域名反代到 `127.0.0.1:18081 / 18082`,再由容器内 Nginx 转发到 API。
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 验证
|
||||||
|
|
||||||
|
| 地址 | 预期 |
|
||||||
|
|------|------|
|
||||||
|
| `https://jf.lehoo6.com/` | 积分商城 H5 |
|
||||||
|
| `https://jfadmin.lehoo6.com/` | 积分商城管理后台 |
|
||||||
|
| `http://39.97.236.112:18082/` | H5 直连测试 |
|
||||||
|
| `http://39.97.236.112: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/lehoo6.com/crmebimage/` | `/usr/local/crmeb/crmebimage/` | 图片/PDF 写入目录 |
|
||||||
|
| `/www/wwwroot/jf.lehoo6.com/` | `/usr/share/nginx/html` | H5 静态文件 |
|
||||||
|
| `/www/wwwroot/jfadmin.lehoo6.com/` | `/usr/share/nginx/html` | 管理后台静态文件 |
|
||||||
|
| `../single-shop/application-docker.yml` | `/config/application-docker.yml` | Spring Boot 配置 |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## byhlc112 关键配置对照
|
||||||
|
|
||||||
|
| 配置项 | 值 |
|
||||||
|
|---|---|
|
||||||
|
| RDS Host | `rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com` |
|
||||||
|
| DB / User | `byhlc112` / `yangtangyoupin` |
|
||||||
|
| imagePath 宿主机目录 | `/www/wwwroot/lehoo6.com/crmebimage` |
|
||||||
|
| SYNC_SOURCE_ID | `shop_16` |
|
||||||
|
| SYNC_TARGET_MER_ID | `16` |
|
||||||
|
| Spring profile | `docker`(通过 `application-docker.yml` 注入) |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 待确认项
|
||||||
|
|
||||||
|
- 如果积分管理后台域名不是 `jfadmin.lehoo6.com`,需要同步替换 `.env.example`、README 和宝塔 Nginx 配置
|
||||||
|
- Redis 仍按 Docker 内置实例方案生成;若你想接外部 Redis,可以再帮你补一版外部 Redis 配置
|
||||||
161
deploy/docker/step2-single-shop-byhlc112/docker-compose.yml
Normal file
161
deploy/docker/step2-single-shop-byhlc112/docker-compose.yml
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
# =============================================================
|
||||||
|
# 步骤二:积分商城(single-shop-22)独立部署
|
||||||
|
# 客户:宝应宏煜春商贸 byhlc112
|
||||||
|
# 包含服务:redis · single-admin-api · single-front-api
|
||||||
|
# single-admin-web(Vue) · single-h5(uni-app)
|
||||||
|
# =============================================================
|
||||||
|
|
||||||
|
name: jifenmall-byhlc112
|
||||||
|
|
||||||
|
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}
|
||||||
|
SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_16}
|
||||||
|
SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-16}
|
||||||
|
|
||||||
|
networks:
|
||||||
|
single-net:
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
single-redis-data:
|
||||||
|
|
||||||
|
services:
|
||||||
|
redis:
|
||||||
|
<<: *common
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: redis.Dockerfile
|
||||||
|
image: jifenmall-byhlc112/redis:local
|
||||||
|
container_name: single-redis-byhlc112
|
||||||
|
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-byhlc112/front-api:local
|
||||||
|
container_name: single-front-api-byhlc112
|
||||||
|
networks: [single-net]
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:30033:30033"
|
||||||
|
volumes:
|
||||||
|
- ${SINGLE_FRONT_JAR}:/app/app.jar:ro
|
||||||
|
- ${CRMEB_IMAGE_DIR}:/usr/local/crmeb/crmebimage
|
||||||
|
- ${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}
|
||||||
|
SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_16}
|
||||||
|
SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-16}
|
||||||
|
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-byhlc112/admin-api:local
|
||||||
|
container_name: single-admin-api-byhlc112
|
||||||
|
networks: [single-net]
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:30032:30032"
|
||||||
|
volumes:
|
||||||
|
- ${SINGLE_ADMIN_JAR}:/app/app.jar:ro
|
||||||
|
- ${CRMEB_IMAGE_DIR}:/usr/local/crmeb/crmebimage
|
||||||
|
- ${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}
|
||||||
|
SYNC_SOURCE_ID: ${SYNC_SOURCE_ID:-shop_16}
|
||||||
|
SYNC_TARGET_MER_ID: ${SYNC_TARGET_MER_ID:-16}
|
||||||
|
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-byhlc112/admin-web:local
|
||||||
|
container_name: single-admin-web-byhlc112
|
||||||
|
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-byhlc112/h5:local
|
||||||
|
container_name: single-h5-byhlc112
|
||||||
|
networks: [single-net]
|
||||||
|
ports:
|
||||||
|
- "${SINGLE_H5_PORT:-18082}:80"
|
||||||
|
volumes:
|
||||||
|
- ${SINGLE_H5_DIR}:/usr/share/nginx/html
|
||||||
|
depends_on:
|
||||||
|
- single-front-api
|
||||||
18
deploy/docker/step2-single-shop-byhlc112/redis.Dockerfile
Normal file
18
deploy/docker/step2-single-shop-byhlc112/redis.Dockerfile
Normal file
@@ -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"]
|
||||||
59
docs/com-byhlc112.md
Normal file
59
docs/com-byhlc112.md
Normal file
@@ -0,0 +1,59 @@
|
|||||||
|
## 公司名称: 宝应宏煜春商贸, host ip: 39.97.236.112
|
||||||
|
|
||||||
|
|
||||||
|
### **修改任务**
|
||||||
|
|
||||||
|
- 新建分支byhlc112,合并byhlc112分支的最新代码到该分支,并根据上述信息修改相关需要变更项,使符合该新公司项目环境
|
||||||
|
- 在新建分支下修改
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### mysql数据库配置
|
||||||
|
|
||||||
|
- mysql数据库使用阿里云rds:rm-bp1a178eq62lxba9xbo.mysql.rds.aliyuncs.com
|
||||||
|
- rds中项目数据库名:byhlc112
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### backend/crmeb-front模块变更
|
||||||
|
|
||||||
|
- 1. profile: byhlc112
|
||||||
|
- 2. profile file: application-byhlc112.yml, mysql和redis主机ip修改
|
||||||
|
- 3. **PDF合同模板文件路径**:pdf/sign_contract_byhlc112.pdf
|
||||||
|
- 4. 用户PDF合同url地址前缀/落库域名:https://lehoo6.com/
|
||||||
|
- 5. imagePath: /www/wwwroot/lehoo6.com/
|
||||||
|
|
||||||
|
### uniapp前端配置变更
|
||||||
|
|
||||||
|
- 1. 积分商城domain:https://jf.lehoo6.com
|
||||||
|
- 2. 抢购页面跳转地址:https://lehoo6.com
|
||||||
|
- 3. **PDF合同预览文件路径**: /static/sign_contract_byhlc112.pdf
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### backend/crmeb-admin模块变更
|
||||||
|
|
||||||
|
- 1. profile: byhlc112
|
||||||
|
- 2. profile file: application-byhlc112.yml, mysql和redis主机ip修改,sync: source-id: shop_16, target-mer-id: 16
|
||||||
|
|
||||||
|
### 积分商城后台backend-adminend配置变更
|
||||||
|
|
||||||
|
- 1. backend-adminend/.env.development文件中VUE_APP_BASE_API改为https://jf.lehoo6.com
|
||||||
|
- 2. backend-adminend/.env.production文件中VUE_APP_BASE_API改为https://jf.lehoo6.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
|
||||||
|
、、、
|
||||||
@@ -6,8 +6,8 @@
|
|||||||
// let domain = 'https://jfanyue.szxingming.com'
|
// let domain = 'https://jfanyue.szxingming.com'
|
||||||
// let domain = 'https://jf.wenjinhui.com'
|
// let domain = 'https://jf.wenjinhui.com'
|
||||||
// let domain = 'https://jjy-jf.fwxgpt.com'
|
// let domain = 'https://jjy-jf.fwxgpt.com'
|
||||||
// czleilei240 项目
|
// byhlc112 项目
|
||||||
let domain = 'https://leilei-jf.czchunfang.com'
|
let domain = 'https://jf.lehoo6.com'
|
||||||
// let domain = 'https://jf.jinyawen.com'
|
// let domain = 'https://jf.jinyawen.com'
|
||||||
// let domain = 'https://jf.hapengran.com'
|
// let domain = 'https://jf.hapengran.com'
|
||||||
// let domain = 'https://jjy-jf.uj345.com'
|
// let domain = 'https://jjy-jf.uj345.com'
|
||||||
@@ -19,7 +19,7 @@ module.exports = {
|
|||||||
// HTTP_REQUEST_URL:'',
|
// HTTP_REQUEST_URL:'',
|
||||||
HTTP_REQUEST_URL: domain,
|
HTTP_REQUEST_URL: domain,
|
||||||
// H5商城地址
|
// H5商城地址
|
||||||
HTTP_H5_URL: 'https://leilei-jf.czchunfang.com',
|
HTTP_H5_URL: 'https://jf.lehoo6.com',
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
HTTP_REQUEST_URL:domain,
|
HTTP_REQUEST_URL:domain,
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
export default {
|
export default {
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
pdfUrl: '/static/sign_contract_czleilei240.pdf',
|
pdfUrl: '/static/sign_contract_byhlc112.pdf',
|
||||||
userId: '',
|
userId: '',
|
||||||
isMobile: false,
|
isMobile: false,
|
||||||
usePdfJs: false,
|
usePdfJs: false,
|
||||||
@@ -436,4 +436,3 @@ export default {
|
|||||||
box-shadow: 0 8rpx 20rpx rgba(255, 45, 45, 0.25);
|
box-shadow: 0 8rpx 20rpx rgba(255, 45, 45, 0.25);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -343,12 +343,12 @@ export default {
|
|||||||
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index'
|
// window.location.href = 'https://shop.wenjinhui.com/?#/pages/personal/index'
|
||||||
//window.location.href = 'https://anyue.szxingming.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://xiashengjun.com/?#/pages/personal/index'
|
||||||
window.location.href = 'https://leilei.czchunfang.com/?#/pages/personal/index'
|
window.location.href = 'https://lehoo6.com/?#/pages/personal/index'
|
||||||
// window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index'
|
// window.location.href = 'http://shop.bosenyuan.com/?#/pages/personal/index'
|
||||||
// #endif
|
// #endif
|
||||||
// #ifndef H5
|
// #ifndef H5
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/web-view/index?url=' + encodeURIComponent('https://leilei.czchunfang.com/?#/pages/personal/index')
|
url: '/pages/web-view/index?url=' + encodeURIComponent('https://lehoo6.com/?#/pages/personal/index')
|
||||||
})
|
})
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
@@ -921,4 +921,3 @@ export default {
|
|||||||
line-height: 48rpx;
|
line-height: 48rpx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ export default {
|
|||||||
},
|
},
|
||||||
|
|
||||||
onLoad(options) {
|
onLoad(options) {
|
||||||
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_czleilei240.pdf'
|
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_byhlc112.pdf'
|
||||||
this.pdfUrl = url
|
this.pdfUrl = url
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -70,4 +70,3 @@ export default {
|
|||||||
box-shadow: 0 8rpx 20rpx rgba(255, 45, 45, 0.25);
|
box-shadow: 0 8rpx 20rpx rgba(255, 45, 45, 0.25);
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -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://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://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://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
window.location.href = 'https://leilei.czchunfang.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
window.location.href = 'https://lehoo6.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) : '')
|
// window.location.href = 'https://shop.uj345.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||||
}, 1000)
|
}, 1000)
|
||||||
// 返回签名信息给上一页面
|
// 返回签名信息给上一页面
|
||||||
@@ -498,4 +498,3 @@ export default {
|
|||||||
.btn.primary { background: #FF2D2D; }
|
.btn.primary { background: #FF2D2D; }
|
||||||
.btn-text { color: #fff; font-size: 28rpx; }
|
.btn-text { color: #fff; font-size: 28rpx; }
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
BIN
single_uniapp22miao/static/sign_contract_byhlc112.pdf
Normal file
BIN
single_uniapp22miao/static/sign_contract_byhlc112.pdf
Normal file
Binary file not shown.
Reference in New Issue
Block a user