diff --git a/script/deploy/deploy-all.sh b/script/deploy/deploy-all.sh index 1e6cc86b3a..1216388f4f 100644 --- a/script/deploy/deploy-all.sh +++ b/script/deploy/deploy-all.sh @@ -5,9 +5,10 @@ set -e # ==================== 1. 核心路径配置 ==================== -PROJECT_DIR="/www/wwwroot/sionrui" # 源码目录 -BACKEND_DIR="/www/wwwroot/yudao-server" # 运行目录 -FRONTEND_DIR="/www/wwwroot/muyetools.cn" # 前端静态目录 +PROJECT_DIR="/www/wwwroot/sionrui" # 源码目录 +BACKEND_DIR="/www/wwwroot/yudao-server" # 后端运行目录 +FRONTEND_DIR="/www/wwwroot/muyetools.cn" # 用户端前端 (web-gold) +ADMIN_DIR="/www/wwwroot/8.155.172.147" # 管理后台前端 (yudao-ui-admin-vue3) BACKEND_JAR_NAME="sion-rui.jar" BUILD_LOG="/tmp/gitea_build_$(date +%Y%m%d).log" @@ -72,22 +73,40 @@ deploy_backend() { log "✅ 后端启动成功 (PID: $!)" } -# ==================== 5. 前端部署逻辑 ==================== +# ==================== 5. 用户端前端部署逻辑 ==================== deploy_frontend() { - log "🚀 [前端] 开始部署流程..." + log "🚀 [用户端前端] 开始部署流程..." cd $PROJECT_DIR/frontend - + log "2.1 安装依赖 (pnpm)..." pnpm install >> $BUILD_LOG 2>&1 - + log "2.2 构建生产文件..." pnpm build:gold >> $BUILD_LOG 2>&1 - + log "2.3 刷新 Web 目录..." rm -rf $FRONTEND_DIR/* cp -r $PROJECT_DIR/frontend/app/web-gold/dist/* $FRONTEND_DIR/ - - log "✅ 前端部署完成" + + log "✅ 用户端前端部署完成" +} + +# ==================== 5.1 管理后台前端部署逻辑 ==================== +deploy_admin() { + log "🚀 [管理后台] 开始部署流程..." + cd $PROJECT_DIR/yudao-ui-admin-vue3 + + log "3.1 安装依赖 (pnpm)..." + pnpm install >> $BUILD_LOG 2>&1 + + log "3.2 构建生产文件..." + pnpm build:prod >> $BUILD_LOG 2>&1 + + log "3.3 刷新管理后台目录..." + rm -rf $ADMIN_DIR/* + cp -r $PROJECT_DIR/yudao-ui-admin-vue3/dist/* $ADMIN_DIR/ + + log "✅ 管理后台部署完成" } # ==================== 6. 执行主流程 ==================== @@ -97,9 +116,11 @@ pkill -f "maven" || true case "$1" in backend-only) deploy_backend ;; frontend-only) deploy_frontend ;; + admin-only) deploy_admin ;; *) deploy_backend deploy_frontend + deploy_admin ;; esac diff --git a/yudao-ui-admin-vue3/src/api/muye/redeemrecord/index.ts b/yudao-ui-admin-vue3/src/api/muye/redeemrecord/index.ts index b5d4798768..8ec1e82b65 100644 --- a/yudao-ui-admin-vue3/src/api/muye/redeemrecord/index.ts +++ b/yudao-ui-admin-vue3/src/api/muye/redeemrecord/index.ts @@ -2,12 +2,12 @@ import request from '@/config/axios' // 查询兑换记录分页 export const getRedeemRecordPage = async (params) => { - return await request.get({ url: `/admin-api/muye/redeem-record/page`, params }) + return await request.get({ url: `/muye/redeem-record/page`, params }) } // 查询兑换记录详情 export const getRedeemRecord = async (id: number) => { - return await request.get({ url: `/admin-api/muye/redeem-record/get?id=` + id }) + return await request.get({ url: `/muye/redeem-record/get?id=` + id }) } // 查询我的兑换记录(用户端) @@ -22,5 +22,5 @@ export const redeemCode = async (code: string) => { // 导出兑换记录 Excel export const exportRedeemRecord = async (params) => { - return await request.download({ url: `/admin-api/muye/redeem-record/export-excel`, params }) + return await request.download({ url: `/muye/redeem-record/export-excel`, params }) }