Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b48f820a30 | ||
|
|
a6880a09dd | ||
|
|
7bae3b74b0 | ||
|
|
5822637b07 | ||
|
|
47895cdd6f | ||
|
|
92847a2c51 | ||
|
|
6dc8a25945 |
@@ -9,10 +9,10 @@ ENV = 'production'
|
|||||||
# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
|
# VUE_APP_BASE_API = 'http://jfadmin.xiashengjun.com'
|
||||||
|
|
||||||
# shjjy153 项目
|
# shjjy153 项目
|
||||||
VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com'
|
# VUE_APP_BASE_API = 'http://jjy-jfadmin.uj345.com'
|
||||||
|
|
||||||
# shccd159 项目
|
# 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'
|
# VUE_APP_BASE_API = 'http://jfanyueadmin.szxingming.com'
|
||||||
|
|||||||
@@ -198,8 +198,8 @@ public class WaUserController {
|
|||||||
user.setId(pid);
|
user.setId(pid);
|
||||||
// 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://jjy.uj345.com/"+pdfResultVo.getUrl());
|
// user.setContract("https://jjy.uj345.com/"+pdfResultVo.getUrl());
|
||||||
waUsersDao.updateById(user);
|
waUsersDao.updateById(user);
|
||||||
}
|
}
|
||||||
return CommonResult.success(pdfResultVo);
|
return CommonResult.success(pdfResultVo);
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ server:
|
|||||||
|
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: shjjy153
|
active: shccd159
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 50MB #设置单个文件大小
|
max-file-size: 50MB #设置单个文件大小
|
||||||
|
|||||||
72
backend/shell/deploy-admin-vue-shccd159.sh
Executable file
72
backend/shell/deploy-admin-vue-shccd159.sh
Executable file
@@ -0,0 +1,72 @@
|
|||||||
|
#!/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 部署完成 ==="
|
||||||
@@ -5,17 +5,16 @@
|
|||||||
// let domain = 'https://jf.bosenyuan.com'
|
// let domain = 'https://jf.bosenyuan.com'
|
||||||
// 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.uj345.com'
|
||||||
let domain = 'https://jjy-jf.uj345.com'
|
let domain = 'https://ccd-jf.cichude.com'
|
||||||
// let domain = 'https://ccd-jf.cichude.com'
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
// 请求域名 格式: https://您的域名
|
// 请求域名 格式: https://您的域名
|
||||||
// #ifdef MP || APP-PLUS
|
// #ifdef MP || APP-PLUS
|
||||||
// HTTP_REQUEST_URL:'',
|
|
||||||
HTTP_REQUEST_URL: domain,
|
HTTP_REQUEST_URL: domain,
|
||||||
// H5商城地址
|
// H5商城地址
|
||||||
HTTP_H5_URL: 'https://jjy-jf.uj345.com',
|
HTTP_H5_URL: 'https://ccd-jf.cichude.com',
|
||||||
|
// HTTP_H5_URL: 'https://jjy-jf.uj345.com',
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
HTTP_REQUEST_URL:domain,
|
HTTP_REQUEST_URL:domain,
|
||||||
|
|||||||
@@ -338,16 +338,14 @@ export default {
|
|||||||
// 跳转到抢购页面
|
// 跳转到抢购页面
|
||||||
goToRushBuy() {
|
goToRushBuy() {
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
window.location.href = 'https://jjy.uj345.com/?#/pages/personal/index'
|
window.location.href = 'https://ccd.cichude.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://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 = '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://ccd.fwxgpt.com/?#/pages/personal/index')
|
url: '/pages/web-view/index?url=' + encodeURIComponent('https://ccd.cichude.com/?#/pages/personal/index')
|
||||||
})
|
})
|
||||||
// #endif
|
// #endif
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -360,7 +360,7 @@ export default {
|
|||||||
});
|
});
|
||||||
// 返回
|
// 返回
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
window.location.href = 'https://jjy.uj345.com/?#/pages/rushing/index' + (this.userId ? ('?user_id=' + this.userId) : '')
|
window.location.href = 'https://ccd.cichude.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://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) : '')
|
||||||
|
|||||||
Reference in New Issue
Block a user