提交 7505e4dc authored 作者: 王鹏飞's avatar 王鹏飞

chore: update

上级 3b5ef9ab
node_modules
.nuxt
.output
.git
Dockerfile
README.md
# =====================
# 1️⃣ Build stage
# =====================
FROM node:20-alpine AS builder
WORKDIR /app
# 先复制依赖清单(利用缓存)
COPY package.json package-lock.json ./
# 安装依赖
RUN npm ci --registry=https://registry.npmmirror.com
# 复制源码
COPY . .
# 构建 Nuxt 4
RUN npm run build
# =====================
# 2️⃣ Runtime stage
# =====================
FROM node:20-alpine AS runner
WORKDIR /app
ENV NODE_ENV=production
ENV NITRO_HOST=0.0.0.0
ENV NITRO_PORT=2048
# 只复制构建产物
COPY --from=builder /app/.output ./.output
EXPOSE 2048
# 启动 Nitro Server(Nuxt 4)
CMD ["node", ".output/server/index.mjs"]
...@@ -240,7 +240,7 @@ const submitEnroll = async () => { ...@@ -240,7 +240,7 @@ const submitEnroll = async () => {
const enrollQuery = async () => { const enrollQuery = async () => {
const params = { const params = {
channel: process.client ? localStorage.getItem('channel_num') || 19962 : 19962, channel: process.client ? localStorage.getItem('channel_num') || 10000 : 10000,
project_id: formInfo.projectId === '9999' ? '1016' : formInfo.projectId, project_id: formInfo.projectId === '9999' ? '1016' : formInfo.projectId,
name: formInfo.name, name: formInfo.name,
phone: formInfo.phone, phone: formInfo.phone,
......
...@@ -67,6 +67,9 @@ onMounted(async () => { ...@@ -67,6 +67,9 @@ onMounted(async () => {
font-size: 14px; font-size: 14px;
line-height: 28px; line-height: 28px;
color: #333; color: #333;
img {
max-width: 100%;
}
} }
} }
.is-h5 { .is-h5 {
...@@ -92,6 +95,9 @@ onMounted(async () => { ...@@ -92,6 +95,9 @@ onMounted(async () => {
.article-content { .article-content {
font-size: 0.12rem; font-size: 0.12rem;
line-height: 0.24rem; line-height: 0.24rem;
img {
max-width: 100%;
}
} }
} }
</style> </style>
...@@ -113,7 +113,7 @@ const form = reactive({ ...@@ -113,7 +113,7 @@ const form = reactive({
name: '', name: '',
phone: '', phone: '',
project_id: '', project_id: '',
channel: route.query.channel_num || 19962, channel: route.query.channel_num || 10000,
}) })
const rules = computed(() => ({ const rules = computed(() => ({
......
...@@ -3,13 +3,12 @@ export const useInternationalDegreeNavList = () => { ...@@ -3,13 +3,12 @@ export const useInternationalDegreeNavList = () => {
return computed(() => [ return computed(() => [
{ {
name: t('menu.internationalDegree.news'), name: '最新动态',
path: '/internationalDegree/news', path: '/internationalDegree/news',
}, },
{ {
name: t('menu.internationalDegree.qa'), name: '常见问题',
path: '/internationalDegree/qa', path: '/internationalDegree/qa',
}, },
]) ])
} }
...@@ -3,7 +3,7 @@ export const useStudyAbroadNavList = () => { ...@@ -3,7 +3,7 @@ export const useStudyAbroadNavList = () => {
return computed(() => [ return computed(() => [
{ {
name: t('menu.studyAbroad.news'), name: '最新动态',
path: '/studyAbroad/news', path: '/studyAbroad/news',
}, },
// { // {
...@@ -12,4 +12,3 @@ export const useStudyAbroadNavList = () => { ...@@ -12,4 +12,3 @@ export const useStudyAbroadNavList = () => {
// } // }
]) ])
} }
#!/bin/bash
IMAGEVERSION=1.0.0
function docker_pro () {
export APPNAME=project-www-pc
export IMAGE=registry.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
export IMAGE_VPC=registry.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
old_git_commit_id=`cat git_commit.id`
new_git_commit_id=`git log | awk '/commit(.*)$/ { print $2;exit; }'`
if [ "$new_git_commit_id" != "$old_git_commit_id" ]; then
# n 14.19.0 && npm install && npm run build
sudo docker build ./ -t $IMAGE
sudo docker push $IMAGE
sudo docker rmi $IMAGE
fi
echo $new_git_commit_id > git_commit.id
# 提前 服务器上配置 config-pro 和 config-test 文件,并kubectl指令可用
export NAMESPACE=kube-node-lease
export DOMAIN=www-inside
export DOMAIN1=pc-inside
declare -x KUBECONFIG=~/.kube/config-pro-k8s-01
# kubectl get pod `kubectl get pods --namespace=$NAMESPACE -l app=$APPNAME | awk 'NR!=1 { print $1 }'` -n $NAMESPACE -o yaml | kubectl replace --force -f -
envsubst < k8s.yml | kubectl apply -f -
}
function docker_pre () {
export APPNAME=project-www-pc-pre
export IMAGE=registry.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
export IMAGE_VPC=registry-vpc.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
old_git_commit_id=`cat git_commit.id`
new_git_commit_id=`git log | awk '/commit(.*)$/ { print $2;exit; }'`
if [ "$new_git_commit_id" != "$old_git_commit_id" ]; then
n 16.13.2 && npm install && npm run build:pre
sudo docker build ./ -t $IMAGE
sudo docker push $IMAGE
sudo docker rmi $IMAGE
fi
echo $new_git_commit_id > git_commit.id
# 提前 服务器上配置 config-pro 和 config-test 文件,并kubectl指令可用
export NAMESPACE=ezijing-web-pre
export DOMAIN=www
export DOMAIN1=pc
declare -x KUBECONFIG=~/.kube/config-test
# kubectl get pod `kubectl get pods --namespace=$NAMESPACE -l app=$APPNAME | awk 'NR!=1 { print $1 }'` -n $NAMESPACE -o yaml | kubectl replace --force -f -
envsubst < k8s.yml | kubectl apply -f -
}
function docker_test () {
export APPNAME=project-www-pc-test
export IMAGE=registry.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
export IMAGE_VPC=registry-vpc.cn-beijing.aliyuncs.com/ezijing-beijing/$APPNAME:$IMAGEVERSION
old_git_commit_id=`cat git_commit.id`
new_git_commit_id=`git log | awk '/commit(.*)$/ { print $2;exit; }'`
if [ "$new_git_commit_id" != "$old_git_commit_id" ]; then
n 16.13.2 && npm install && npm run build:test
sudo docker build ./ -t $IMAGE
sudo docker push $IMAGE
sudo docker rmi $IMAGE
fi
echo $new_git_commit_id > git_commit.id
# 提前 服务器上配置 config-pro 和 config-test 文件,并kubectl指令可用
export NAMESPACE=ezijing-web-test
export DOMAIN=www2
export DOMAIN1=pc2
declare -x KUBECONFIG=~/.kube/config-test
# kubectl get pod `kubectl get pods --namespace=$NAMESPACE -l app=$APPNAME | awk 'NR!=1 { print $1 }'` -n $NAMESPACE -o yaml | kubectl replace --force -f -
envsubst < k8s.yml | kubectl apply -f -
}
# 执行指令
if [ "$1" == "" ]; then
echo "$0 must enter param like (pro / pre / test)"
else
if [ "$2" == "" ]; then
echo "使用默认版本发布,版本号:$IMAGEVERSION"
else
IMAGEVERSION=$2
fi
export TIMESTAMP=`date +%s%3N`
case "$1" in
pro)
docker_pro
;;
pre)
docker_pre
;;
test)
docker_test
;;
*)
echo $"Usage: $0 {pro/pre/test}"
exit 1
esac
fi
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论