diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 713b2efa..2266989d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,4 @@ -name: build +name: npm run build 测试 on: push: diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml new file mode 100644 index 00000000..e5f59fa8 --- /dev/null +++ b/.github/workflows/image.yml @@ -0,0 +1,51 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Docker 镜像 + +on: + push: + branches: [ dev ] + +jobs: + task: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest] + node-version: [18.x] + npm-client: [npm] + + steps: + - uses: pnpm/action-setup@v2 + if: matrix.npm-client == 'pnpm' + name: Install pnpm + with: + version: 7 + run_install: false + + - name: Set up Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} + + - name: Check out code + uses: actions/checkout@v4 + + - name: Install dependencies + run: ${{ matrix.npm-client }} install + + - name: Build + run: ${{ matrix.npm-client }} run build:docker + + - name: Login to Docker Registry + run: docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} registry.cn-hangzhou.aliyuncs.com + + - name: Build and push Docker images + run: | + docker compose -f ./docker/docker-compose.yaml build + registry="registry.cn-hangzhou.aliyuncs.com/pigx/" + for service in $(docker-compose -f ./docker/docker-compose.yaml config --services); do + docker tag ${service}:latest ${registry}${service}:latest + docker push ${registry}${service}:latest + done diff --git a/src/layout/navBars/breadcrumb/search.vue b/src/layout/navBars/breadcrumb/search.vue index 17288756..24c67fd7 100644 --- a/src/layout/navBars/breadcrumb/search.vue +++ b/src/layout/navBars/breadcrumb/search.vue @@ -1,30 +1,30 @@ - - - - - - - - - - - - - {{ $t(item.name) }} - - - - - - + + + + + + + + + + + + + {{ $t(item.name) }} + + + + + + diff --git a/src/utils/validate.ts b/src/utils/validate.ts index 0ef6de21..2790ed3f 100644 --- a/src/utils/validate.ts +++ b/src/utils/validate.ts @@ -1,3 +1,4 @@ +// @ts-nocheck /** * 判断是否为空 * @param val 数据 diff --git a/src/views/admin/user/personal.vue b/src/views/admin/user/personal.vue index ce85de75..7f0fb40d 100644 --- a/src/views/admin/user/personal.vue +++ b/src/views/admin/user/personal.vue @@ -1,6 +1,6 @@ - +