diff --git a/.gitignore b/.gitignore index 3fda4751..79bbd345 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ gen /packages/test /test/own /pnpm-lock.yaml + +docker/image/workspace diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile new file mode 100644 index 00000000..6a7e5c69 --- /dev/null +++ b/docker/image/Dockerfile @@ -0,0 +1,11 @@ +FROM node:18.16.0-slim +RUN npm install -g pnpm +ADD ./workspace/certd-server/package.json /app/ +WORKDIR /app/ +pnpm install -P + +ADD ./workspace/certd-server/ /app/ +CMD ["npm","run","start"] + + + diff --git a/docker/image/build.sh b/docker/image/build.sh new file mode 100644 index 00000000..2da731e9 --- /dev/null +++ b/docker/image/build.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +echo "请先输入一个版本号：" +read version + +echo "您输入的版本号是： $version" +echo "登录aliyun镜像仓库" +docker login --username=252959493@qq.com registry.cn-shenzhen.aliyuncs.com + +$build=$(pwd) +cd ../../ +$root=$(pwd) +echo "安装依赖" +pnpm install + +echo "client build" +cd $root/packages/certd-client +pnpm run build +echo "client build success" + +echo "server build" +cd $root/packages/certd-server +pnpm run build +echo "server build success" + +echo "rm node_modules" +rm ./node_modules -rf + +echo "copy to workspace" +\cp ./* $build/workspace/certd-server -rf +\cp ../certd-client/dist/* $build/workspace/certd-server/public/ -rf + + diff --git a/docker/image/docker-compose.yaml b/docker/image/docker-compose.yaml new file mode 100644 index 00000000..a354ccf7 --- /dev/null +++ b/docker/image/docker-compose.yaml @@ -0,0 +1,14 @@ +version: '3.3' # 指定docker-compose 版本 +services: # 要拉起的服务们 + certd: + build: + context: ./ + dockerfile: Dockerfile + image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:${TAG} + container_name: certd # 容器名 + restart: unless-stopped # 重启 + ports: # 端口映射 + - "7001:7001" + environment: + - TZ=Asia/Shanghai + diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 541d2064..cdfe7f19 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -45,7 +45,7 @@ "deepdash-es": "5.3.5", "highlight.js": "^11.7.0", "humanize-duration": "^3.27.3", - "lodash": "^4.17.15", + "lodash-es": "^4.17.21", "mitt": "^3.0.0", "nanoid": "^4.0.0", "nprogress": "^0.2.0", diff --git a/packages/ui/certd-client/public/images/logo-certd/logo.svg b/packages/ui/certd-client/public/images/logo-certd/logo.svg deleted file mode 100644 index edcdefbe..00000000 --- a/packages/ui/certd-client/public/images/logo-certd/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/packages/ui/certd-client/public/images/logo-certd/rect-black.svg b/packages/ui/certd-client/public/images/logo-certd/rect-black.svg deleted file mode 100644 index 19bf439f..00000000 --- a/packages/ui/certd-client/public/images/logo-certd/rect-black.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 让你的证书永不过期 - - - diff --git a/packages/ui/certd-client/public/images/logo-certd/rect.svg b/packages/ui/certd-client/public/images/logo-certd/rect.svg deleted file mode 100644 index acc2f41c..00000000 --- a/packages/ui/certd-client/public/images/logo-certd/rect.svg +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 让你的证书永不过期 - - - diff --git a/packages/ui/certd-client/public/images/logo-certd/square.svg b/packages/ui/certd-client/public/images/logo-certd/square.svg deleted file mode 100644 index 026dd978..00000000 --- a/packages/ui/certd-client/public/images/logo-certd/square.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - diff --git a/packages/ui/certd-client/public/images/logo/rect-black.svg b/packages/ui/certd-client/public/images/logo/rect-black.svg index a57352ec..19bf439f 100644 --- a/packages/ui/certd-client/public/images/logo/rect-black.svg +++ b/packages/ui/certd-client/public/images/logo/rect-black.svg @@ -1,108 +1,44 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + - - + + + + + + + + + + + + + + + + + 让你的证书永不过期 + + + diff --git a/packages/ui/certd-client/public/images/logo/square.svg b/packages/ui/certd-client/public/images/logo/square.svg index 1b1395a1..026dd978 100644 --- a/packages/ui/certd-client/public/images/logo/square.svg +++ b/packages/ui/certd-client/public/images/logo/square.svg @@ -1,106 +1,17 @@ - - - - - - - - - - - - - - - - - - + + + + + diff --git a/packages/ui/certd-client/src/layout/layout-framework.vue b/packages/ui/certd-client/src/layout/layout-framework.vue index f719a0a8..24421cff 100644 --- a/packages/ui/certd-client/src/layout/layout-framework.vue +++ b/packages/ui/certd-client/src/layout/layout-framework.vue @@ -2,8 +2,8 @@
diff --git a/packages/ui/certd-client/src/layout/layout-outside.vue b/packages/ui/certd-client/src/layout/layout-outside.vue index a35b8c5e..862a68d0 100644 --- a/packages/ui/certd-client/src/layout/layout-outside.vue +++ b/packages/ui/certd-client/src/layout/layout-outside.vue @@ -6,9 +6,9 @@
- FsAdmin +
-
fast-crud，开发crud快如闪电
+
@@ -91,7 +91,7 @@ export default { } .logo { - height: 44px; + height: 80px; vertical-align: top; margin-right: 16px; border-style: none; diff --git a/packages/ui/certd-client/src/router/source/header.ts b/packages/ui/certd-client/src/router/source/header.ts index 8c30304a..058e2739 100644 --- a/packages/ui/certd-client/src/router/source/header.ts +++ b/packages/ui/certd-client/src/router/source/header.ts @@ -1,27 +1,8 @@ export const headerResource = [ { title: "文档", - path: "http://fast-crud.docmirror.cn/" + path: "http://github.com/certd/certd" }, - { - title: "其他Demo", - name: "demo", - children: [ - { - title: "Element版", - path: "http://fast-crud.docmirror.cn/element/" - }, - { - title: "VbenAdmin", - path: "http://fast-crud.docmirror.cn/vben/" - }, - { - title: "cool-admin-vue", - path: "http://fast-crud.docmirror.cn/cool/" - } - ] - }, - { title: "源码", name: "source", @@ -31,42 +12,18 @@ export const headerResource = [ }, children: [ { - title: "fast-crud", - children: [ - { - title: "github", - path: "http://github.com/fast-crud/fast-crud", - meta: { - icon: "ion:logo-github" - } - }, - { - title: "gitee", - path: "http://gitee.com/fast-crud/fast-crud", - meta: { - icon: "ion:logo-octocat" - } - } - ] + title: "github", + path: "http://github.com/certd/certd", + meta: { + icon: "ion:logo-github" + } }, { - title: "fs-admin", - children: [ - { - title: "github", - path: "http://github.com/fast-crud/fs-admin-antdv", - meta: { - icon: "ion:logo-github" - } - }, - { - title: "gitee", - path: "http://gitee.com/fast-crud/fs-admin-antdv", - meta: { - icon: "ion:logo-octocat" - } - } - ] + title: "gitee", + path: "http://gitee.com/certd/certd", + meta: { + icon: "ion:logo-octocat" + } } ] } diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index 24025c0a..309abbbb 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -1,11 +1,12 @@ import * as api from "./api"; import { useI18n } from "vue-i18n"; -import { ref, shallowRef } from "vue"; +import { ref } from "vue"; import { useRouter } from "vue-router"; -import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, DialogOpenOption, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; +import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud"; import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status"; import { nanoid } from "nanoid"; import { message } from "ant-design-vue"; + export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOptionsProps): CreateCrudOptionsRet { const router = useRouter(); const { t } = useI18n(); @@ -142,7 +143,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp }, title: { title: "流水线名称", - type: "text", + type: "link", search: { show: true, component: { @@ -150,7 +151,15 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp } }, column: { - width: 300 + width: 300, + component: { + on: { + // 注意：必须要on前缀 + onClick({ row }) { + router.push({ path: "/certd/pipeline/detail", query: { id: row.id, editMode: "false" } }); + } + } + } } }, lastHistoryTime: { diff --git a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue index 034d77cd..832ff8a7 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue +++ b/packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue @@ -2,6 +2,7 @@