From 85cc32e1f588952db5fdc2a6b183b73d81f850d5 Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Wed, 27 Sep 2023 16:37:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20NEZ-3214=20=E6=A8=A1=E6=9D=BF=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=89=8D=E6=9B=B4=E6=96=B0=20i18nData=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 16 +++++++++++++++- ci-scripts/replaceI18nsql.sh | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 ci-scripts/replaceI18nsql.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4f9d8cdbf..407624152 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,16 @@ # docker镜像 -image: git.mesalab.cn:7443/nezha/nz-build-env:1.3 +image: git.mesalab.cn:7443/nezha/nz-build-env:1.4 # 定义全局变量 variables: MINIO_HOST: 'http://192.168.40.48:2020/' MINIO_USER: 'admin' MINIO_PWD: "Nezha@02!" + # sys_i18n 数据源信息 + NZ_DB_HOST: "192.168.44.23" + NZ_DB_USER: "nezha" + NZ_DB_PASSWORD: "nezha02" + NZ_DB_NAME: "nz-dev-3.8" + # 依赖的docker服务 # services: # - mariadb @@ -38,6 +44,10 @@ dev_build: - npm install --registry=http://registry.npmmirror.com - echo "npm run build" + # 更新 i18n + - chmod +x ../ci-scripts/replaceI18nsql.sh + - ../ci-scripts/replaceI18nsql.sh + # 编译 上传模板 - npm run build:html - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD @@ -90,6 +100,10 @@ rel_build: - npm install --registry=http://registry.npmmirror.com - echo "npm run build" + # 更新 i18n + - chmod +x ../ci-scripts/replaceI18nsql.sh + - ../ci-scripts/replaceI18nsql.sh + - npm run build:html - mc alias set nz $MINIO_HOST $MINIO_USER $MINIO_PWD - mkdir -p /builds/nezha/nezha-fronted/nezha-fronted/snapshot_template && cp dist/index.html /builds/nezha/nezha-fronted/nezha-fronted/snapshot_template/snapshot_template.html diff --git a/ci-scripts/replaceI18nsql.sh b/ci-scripts/replaceI18nsql.sh new file mode 100644 index 000000000..5ce04e427 --- /dev/null +++ b/ci-scripts/replaceI18nsql.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -evx +CUR_PWD=`pwd` + +echo 'add i18nData begin ... ' + +# 获取国际化数据 +EN_RESULT=`mysql -h $NZ_DB_HOST -u$NZ_DB_USER -p$NZ_DB_PASSWORD -D $NZ_DB_NAME --default-character-set=utf8mb4 \ + -NBe "select CONCAT('{', REPLACE(REPLACE(GROUP_CONCAT(JSON_OBJECT( code, value)),'{',''),'}',''), '}') from sys_i18n WHERE lang = 'en';"` + +ZH_RESULT=`mysql -h $NZ_DB_HOST -u$NZ_DB_USER -p$NZ_DB_PASSWORD -D $NZ_DB_NAME --default-character-set=utf8mb4 \ + -NBe "select CONCAT('{', REPLACE(REPLACE(GROUP_CONCAT(JSON_OBJECT( code, value)),'{',''),'}',''), '}') from sys_i18n WHERE lang = 'zh';"` + + +# 组装模板国际化数据 +echo "const i18nData = { en:" > ../nezha-fronted/src/entrance/exportHtml/i18nData.js +echo -e $EN_RESULT >> ../nezha-fronted/src/entrance/exportHtml/i18nData.js +echo ", zh:" >> ../nezha-fronted/src/entrance/exportHtml/i18nData.js +echo -e $ZH_RESULT >> ../nezha-fronted/src/entrance/exportHtml/i18nData.js +echo "}" >> ../nezha-fronted/src/entrance/exportHtml/i18nData.js +echo "export default i18nData" >> ../nezha-fronted/src/entrance/exportHtml/i18nData.js + +echo 'add i18nData finished'