Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
129fa20810 | ||
|
|
945ca2d3d0 | ||
|
|
5abbf5bc18 | ||
|
|
67f44e9c35 | ||
|
|
25409f26ce |
@@ -8,8 +8,8 @@ ENV = 'development'
|
||||
# VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com'
|
||||
# VUE_APP_BASE_API = 'http://jfadmin.wenjinhui.com'
|
||||
# VUE_APP_BASE_API = 'http://jfadmin-bsy.bosenyuan.com'
|
||||
# shjjy153 项目
|
||||
VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com'
|
||||
# hapr191 项目(淮安鹏然商贸)
|
||||
VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
||||
# shccd159 项目
|
||||
# VUE_APP_BASE_API = 'http://ccd-jfadmin.cichude.com'
|
||||
|
||||
|
||||
@@ -8,11 +8,11 @@ ENV = 'production'
|
||||
# miao33 项目
|
||||
# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
|
||||
|
||||
# shjjy153 项目
|
||||
# VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com'
|
||||
# hapr191 项目(淮安鹏然商贸)
|
||||
VUE_APP_BASE_API = 'http://jfadmin.hapengran.com'
|
||||
|
||||
# shccd159 项目
|
||||
VUE_APP_BASE_API = 'http://ccd-jfadmin.cichude.com'
|
||||
# VUE_APP_BASE_API = 'http://ccd-jfadmin.cichude.com'
|
||||
|
||||
|
||||
# VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com'
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
# CRMEB 相关配置
|
||||
crmeb:
|
||||
captchaOn: false # 是否开启行为验证码
|
||||
asyncConfig: true #是否同步config表数据到redis
|
||||
|
||||
server:
|
||||
port: 30032
|
||||
|
||||
sync:
|
||||
source-id: shop_e
|
||||
target-mer-id: 7
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
name: yangtangyoupin
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://114.55.232.191:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8
|
||||
username: yangtangyoupin
|
||||
password: 5Fn8eWrbYFtAhCZw
|
||||
redis:
|
||||
host: 114.55.232.191 #地址
|
||||
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的密码
|
||||
@@ -38,7 +38,7 @@ server:
|
||||
|
||||
spring:
|
||||
profiles:
|
||||
active: shccd159
|
||||
active: hapr191
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 50MB #设置单个文件大小
|
||||
|
||||
@@ -73,7 +73,7 @@ public class WaUserController {
|
||||
FileInputStream fileInputStream = null;
|
||||
try {
|
||||
// 读取模板PDF文件
|
||||
Resource resource = new ClassPathResource("pdf/sign_contract_jjy.pdf");
|
||||
Resource resource = new ClassPathResource("pdf/sign_contract_pengran.pdf");
|
||||
InputStream pdfInputStream = resource.getInputStream();
|
||||
document = PDDocument.load(pdfInputStream);
|
||||
pdfInputStream.close();
|
||||
@@ -198,8 +198,8 @@ public class WaUserController {
|
||||
user.setId(pid);
|
||||
// user.setContract("https://anyue.szxingming.com/"+pdfResultVo.getUrl());
|
||||
// user.setContract("https://xiashengjun.com/"+pdfResultVo.getUrl());
|
||||
user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl());
|
||||
// user.setContract("https://jjy.uj345.com/"+pdfResultVo.getUrl());
|
||||
// user.setContract("https://ccd.cichude.com/"+pdfResultVo.getUrl());
|
||||
user.setContract("https://hapengran.com/"+pdfResultVo.getUrl());
|
||||
waUsersDao.updateById(user);
|
||||
}
|
||||
return CommonResult.success(pdfResultVo);
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
crmeb:
|
||||
imagePath: /www/wwwroot/hapengran.com/ # 鹏然项目服务器图片路径配置 斜杠结尾
|
||||
asyncConfig: true #是否同步config表数据到redis
|
||||
|
||||
server:
|
||||
port: 30031
|
||||
|
||||
spring:
|
||||
datasource:
|
||||
name: yangtangyoupin
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
url: jdbc:mysql://114.55.232.191:3306/${spring.datasource.name}?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8
|
||||
username: yangtangyoupin
|
||||
password: 5Fn8eWrbYFtAhCZw
|
||||
redis:
|
||||
host: 114.55.232.191 #地址
|
||||
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: 3 # 微信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:
|
||||
profiles:
|
||||
active: shccd159
|
||||
active: hapr191
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 50MB #设置单个文件大小
|
||||
|
||||
Binary file not shown.
@@ -80,3 +80,20 @@ REMOTE_DIR_ADMIN=/www/wwwroot/ccd-jfadmin.fwxgpt.com
|
||||
REMOTE_DIR_FRONT=/www/wwwroot/ccd-jf.fwxgpt.com
|
||||
|
||||
|
||||
hapr191:
|
||||
spring:
|
||||
profiles:
|
||||
active: hapr191
|
||||
|
||||
SERVER_HOST=114.55.232.191
|
||||
SERVER_USER=root
|
||||
SERVER_PORT=22
|
||||
REMOTE_DIR_JAR=/www/wwwroot/javaapi
|
||||
FRONT_LOCAL_PORT=30031
|
||||
FRONT_JAR_NAME=miao-front-2.2.jar
|
||||
ADMIN_LOCAL_PORT=30032
|
||||
ADMIN_JAR_NAME=miao-admin-2.2.jar
|
||||
REMOTE_DIR_ADMIN=/www/wwwroot/jfadmin.hapengran.com
|
||||
REMOTE_DIR_FRONT=/www/wwwroot/jf.hapengran.com
|
||||
|
||||
|
||||
|
||||
@@ -1,72 +0,0 @@
|
||||
#!/bin/bash
|
||||
# 仅打包部署 backend-adminend(后台 Vue 前端)到 shccd159 云服务器
|
||||
# 部署前在云服务器上备份原有静态文件
|
||||
# 使用: ./shell/deploy-admin-vue-shccd159.sh(在 backend 目录下)
|
||||
# 或指定密钥: SSH_IDENTITY=~/.ssh/your_key ./shell/deploy-admin-vue-shccd159.sh
|
||||
|
||||
set -e
|
||||
SSH_IDENTITY="${SSH_IDENTITY:-$HOME/.ssh/id_ed25519_crmeb_deploy}"
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
BACKEND_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||
ROOT_DIR="$(cd "$BACKEND_DIR/.." && pwd)"
|
||||
FRONTEND_DIR="${ROOT_DIR}/backend-adminend"
|
||||
[[ ! -d "$FRONTEND_DIR" ]] && FRONTEND_DIR="${ROOT_DIR}/frontend"
|
||||
DEPLOY_CONF="$BACKEND_DIR/deploy.conf"
|
||||
|
||||
get_conf() {
|
||||
sed -n '/^shccd159:/,$p' "$DEPLOY_CONF" | grep -E "^${1}=" | tail -1 | cut -d= -f2-
|
||||
}
|
||||
SERVER_HOST=$(get_conf SERVER_HOST)
|
||||
SERVER_USER=$(get_conf SERVER_USER)
|
||||
SERVER_PORT=$(get_conf SERVER_PORT)
|
||||
REMOTE_DIR_ADMIN=$(get_conf REMOTE_DIR_ADMIN)
|
||||
|
||||
[[ -z "$SERVER_HOST" ]] && SERVER_HOST=182.92.78.159
|
||||
[[ -z "$REMOTE_DIR_ADMIN" ]] && REMOTE_DIR_ADMIN=/www/wwwroot/ccd-jfadmin.fwxgpt.com
|
||||
[[ -z "$SERVER_USER" ]] && SERVER_USER=root
|
||||
[[ -z "$SERVER_PORT" ]] && SERVER_PORT=22
|
||||
|
||||
[[ -f "$SSH_IDENTITY" ]] && SSH_OPTS=(-o "IdentityFile=$SSH_IDENTITY") || SSH_OPTS=()
|
||||
SSH_CMD=(ssh "${SSH_OPTS[@]}" -o StrictHostKeyChecking=accept-new -p "$SERVER_PORT" "$SERVER_USER@$SERVER_HOST")
|
||||
|
||||
BACKUP_SUFFIX="backup_$(date +%Y%m%d_%H%M%S)"
|
||||
|
||||
[[ ! -d "$FRONTEND_DIR" ]] && { echo "错误: 未找到 admin 前端目录 (backend-adminend 或 frontend)"; exit 1; }
|
||||
|
||||
echo "=== 仅部署 backend-adminend(后台 Vue 前端)到 shccd159 ==="
|
||||
echo " 服务器: $SERVER_USER@$SERVER_HOST"
|
||||
echo " 目标: $REMOTE_DIR_ADMIN"
|
||||
echo ""
|
||||
|
||||
echo "=== 1. 编译 backend-adminend (npm run build:prod) ==="
|
||||
cd "$FRONTEND_DIR"
|
||||
# Node 17–18 需要 --openssl-legacy-provider;Node 22+ 已不支持,不设置
|
||||
NODE_MAJOR=$(node -v 2>/dev/null | sed -E 's/^v([0-9]+).*/\1/' || echo 0)
|
||||
if [[ "$NODE_MAJOR" -ge 17 && "$NODE_MAJOR" -le 21 ]]; then
|
||||
export NODE_OPTIONS="${NODE_OPTIONS:-} --openssl-legacy-provider"
|
||||
fi
|
||||
npm run build:prod
|
||||
echo "已生成: $FRONTEND_DIR/dist"
|
||||
[[ ! -d "$FRONTEND_DIR/dist" ]] && { echo "错误: dist 未生成"; exit 1; }
|
||||
|
||||
echo ""
|
||||
echo "=== 2. 云服务器备份原有静态 ==="
|
||||
"${SSH_CMD[@]}" "bash -s" << REMOTE_BACKUP
|
||||
set -e
|
||||
if [ -d "$REMOTE_DIR_ADMIN" ] && [ "\$(ls -A $REMOTE_DIR_ADMIN 2>/dev/null)" ]; then
|
||||
BACKUP_TAR="$REMOTE_DIR_ADMIN/../ccd_jfadmin_${BACKUP_SUFFIX}.tar.gz"
|
||||
tar -czf "\$BACKUP_TAR" -C "$REMOTE_DIR_ADMIN" .
|
||||
echo "已备份: \$BACKUP_TAR"
|
||||
else
|
||||
echo "远程目录为空或不存在,跳过备份"
|
||||
fi
|
||||
REMOTE_BACKUP
|
||||
|
||||
echo ""
|
||||
echo "=== 3. 上传 dist 到 $REMOTE_DIR_ADMIN ==="
|
||||
"${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && (rm -rf ${REMOTE_DIR_ADMIN}/* ${REMOTE_DIR_ADMIN}/.??* 2>/dev/null; true)"
|
||||
(cd "$FRONTEND_DIR/dist" && tar cf - .) | "${SSH_CMD[@]}" "mkdir -p $REMOTE_DIR_ADMIN && cd $REMOTE_DIR_ADMIN && tar xf -"
|
||||
echo "后台 Vue 静态上传完成."
|
||||
|
||||
echo ""
|
||||
echo "=== backend-adminend 部署完成 ==="
|
||||
35
company-data-imgration.md
Normal file
35
company-data-imgration.md
Normal file
@@ -0,0 +1,35 @@
|
||||
|
||||
# 公司名称:淮安鹏然商贸
|
||||
|
||||
## mysql数据库配置信息
|
||||
|
||||
host ip: 114.55.232.191
|
||||
datasource:
|
||||
name: yangtangyoupin
|
||||
username: yangtangyoupin
|
||||
password: 5Fn8eWrbYFtAhCZw
|
||||
|
||||
## 数据删除任务
|
||||
|
||||
- 保留的**用户数据范围**:wa_users.id in (91956,92474,92540,92824,93208,92576,92809,93182,92905,93080,93099,93113,93132,93164,93133,93142,93194,93204,93111,93139,93100,93158,93161,93163,93176,92476,93123,93108,93193,93165,93162,93159),删除其余用户数据
|
||||
|
||||
- wa_order
|
||||
只保留“created_at >= 2026-03-31”并且user_id在用户数据范围的订单,删除其余数据
|
||||
|
||||
- wa_merchandise
|
||||
只保留“created_at >= 2026-03-31”并且seller_id或buyer_id在用户数据范围的寄售商品,删除其余数据
|
||||
|
||||
|
||||
- wa_selfbonus_log
|
||||
|
||||
- wa_sharebonus_log
|
||||
|
||||
|
||||
|
||||
- wa_coupon_log
|
||||
|
||||
- 新建hapr191分支,合并shjjy153分支的最新代码到该分支,并根据上述信息修改相关需要变更项,使符合该新公司项目环境
|
||||
|
||||
## 相关文件
|
||||
|
||||
- company-info.md
|
||||
51
company-info.md
Normal file
51
company-info.md
Normal file
@@ -0,0 +1,51 @@
|
||||
|
||||
## 公司名称:淮安鹏然商贸
|
||||
|
||||
host ip: 114.55.232.191
|
||||
|
||||
### crmeb-front模块变更
|
||||
|
||||
- 1. profile: hapr191
|
||||
- 2. profile file: application-hapr191.yml
|
||||
- 3. PDF合同模板文件路径:pdf/sign_contract_pengran.pdf
|
||||
- 4. 用户合同url地址前缀/落库域名:https://hapengran.com/
|
||||
- 5. imagePath: /www/wwwroot/hapengran.com/
|
||||
|
||||
### uniapp前端配置变更
|
||||
|
||||
- 1. 积分商城domain:https://jf.hapengran.com
|
||||
- 2. 抢购页面跳转地址:https://hapengran.com
|
||||
- 2. /static/sign_contract_pengran.pdf
|
||||
|
||||
### 修改任务
|
||||
|
||||
- 新建hapr191分支,合并shjjy153分支的最新代码到该分支,并根据上述信息修改相关需要变更项,使符合该新公司项目环境
|
||||
|
||||
## 相关文件
|
||||
|
||||
- change-list-shjjy153.md
|
||||
- compare-shjjy153-shccd159.md
|
||||
|
||||
## 积分商城nginx站点配置
|
||||
|
||||
、、、
|
||||
# 伪静态
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
# 后端API
|
||||
location /api/admin {
|
||||
proxy_pass http://127.0.0.1:30032/api/admin;
|
||||
}
|
||||
|
||||
# 前端API
|
||||
location /api/front {
|
||||
proxy_pass http://127.0.0.1:30031/api/front;
|
||||
}
|
||||
、、、
|
||||
|
||||
、、、启动积分商城api服务
|
||||
cd /www/wwwroot/javaapi
|
||||
nohup java -Xms128m -Xmx256m -jar miao-front-2.2.jar > front.log & tail -f front.log
|
||||
、、、
|
||||
@@ -5,16 +5,18 @@
|
||||
// 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://jf.hapengran.com'
|
||||
// let domain = 'https://jjy-jf.uj345.com'
|
||||
let domain = 'https://ccd-jf.cichude.com'
|
||||
// let domain = 'https://ccd-jf.cichude.com'
|
||||
|
||||
module.exports = {
|
||||
// 请求域名 格式: https://您的域名
|
||||
// #ifdef MP || APP-PLUS
|
||||
// HTTP_REQUEST_URL:'',
|
||||
HTTP_REQUEST_URL: domain,
|
||||
// H5商城地址
|
||||
HTTP_H5_URL: 'https://ccd-jf.cichude.com',
|
||||
// HTTP_H5_URL: 'https://jjy-jf.uj345.com',
|
||||
HTTP_H5_URL: 'https://jf.hapengran.com',
|
||||
// #endif
|
||||
// #ifdef H5
|
||||
HTTP_REQUEST_URL:domain,
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
pdfUrl: '/static/sign_contract_ccd.pdf',
|
||||
pdfUrl: '/static/sign_contract_pengran.pdf',
|
||||
userId: '',
|
||||
isMobile: false,
|
||||
usePdfJs: false,
|
||||
|
||||
@@ -338,14 +338,16 @@ export default {
|
||||
// 跳转到抢购页面
|
||||
goToRushBuy() {
|
||||
// #ifdef H5
|
||||
window.location.href = 'https://ccd.cichude.com/?#/pages/personal/index'
|
||||
window.location.href = 'https://hapengran.com/?#/pages/personal/index'
|
||||
// window.location.href = 'https://ccd.cichude.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://xiashengjun.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://ccd.cichude.com/?#/pages/personal/index')
|
||||
url: '/pages/web-view/index?url=' + encodeURIComponent('https://hapengran.com/?#/pages/personal/index')
|
||||
})
|
||||
// #endif
|
||||
},
|
||||
|
||||
@@ -16,7 +16,7 @@ export default {
|
||||
},
|
||||
|
||||
onLoad(options) {
|
||||
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_jjy.pdf'
|
||||
const url = options && options.url ? decodeURIComponent(options.url) : '/static/sign_contract_pengran.pdf'
|
||||
this.pdfUrl = url
|
||||
},
|
||||
|
||||
|
||||
@@ -360,7 +360,7 @@ export default {
|
||||
});
|
||||
// 返回
|
||||
setTimeout(() => {
|
||||
window.location.href = 'https://ccd.cichude.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||
window.location.href = 'https://hapengran.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://xiashengjun.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
||||
|
||||
BIN
single_uniapp22miao/static/sign_contract_pengran.pdf
Normal file
BIN
single_uniapp22miao/static/sign_contract_pengran.pdf
Normal file
Binary file not shown.
Reference in New Issue
Block a user