v1.1.2

CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package root
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package root

README.md

@@ -6,9 +6,10 @@ CertD 是一个帮助你全自动申请和部署SSL证书的工具。
 ## 特性
 本项目不仅支持证书申请过程自动化，还可以自动化部署证书，让你的证书永不过期。     
 
-* 全自动申请证书
+* 全自动申请证书（支持阿里云、腾讯云、华为云注册的域名）
 * 全自动部署证书（目前支持服务器上传部署、阿里云、腾讯云等）
-* 可与CI/DI工具结合使用
+* 支持通配符域名
+* 支持多个域名打到一个证书上
 
 ## 免费证书申请说明
 * 本项目ssl证书提供商为letencrypt

deploy.js

@@ -3,7 +3,8 @@ import fs from 'fs'
 
 //读取 packages/core/pipline/package.json的版本号
 import { default as packageJson } from './packages/core/pipeline/package.json' assert { type: "json" };
-console.log("certdVersion", packageJson.version)
+const certdVersion = packageJson.version
+console.log("certdVersion",certdVersion)
 
 // 同步npmmirror的包
 async function getPackages(directoryPath) {

docker/image/Dockerfile

@@ -1,6 +1,7 @@
 FROM registry.cn-shenzhen.aliyuncs.com/handsfree/node:16-alpine
 EXPOSE 7001
 ENV NODE_ENV production
+ENV MIDWAY_SERVER_ENV production
 WORKDIR /app/
 #RUN npm install cross-env -g  --registry=https://registry.npmmirror.com
 #RUN npm install pm2 -g  --registry=https://registry.npmmirror.com

lerna.json

@@ -9,5 +9,5 @@
     }
   },
   "npmClient": "pnpm",
-  "version": "1.1.1"
+  "version": "1.1.2"
 }

package.json

@@ -11,12 +11,12 @@
   "scripts": {
     "start": "lerna bootstrap --hoist",
     "i-all": "lerna link && lerna exec npm install  ",
-    "publish": "npm run proxy && npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && npm run deploy",
+    "publish": "npm run proxy && npm run prepublishOnly1  && lerna publish --conventional-commits && npm run afterpublishOnly && node deploy.js",
     "afterpublishOnly": "",
     "proxy": "npm config set proxy=http://127.0.0.1:10809",
     "prepublishOnly1": "npm run before-build && lerna run build ",
     "before-build": "cd ./packages/core/acme-client && time /t >build.md && git add ./build.md && git commit -m \"build: prepare to build\"",
-    "deploy": "node deploy.js"
+    "deploy1": "node deploy.js"
   },
   "license": "MIT",
   "dependencies": {

packages/core/acme-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/publishlab/node-acme-client/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/acme-client
+
 ## [1.1.1](https://github.com/publishlab/node-acme-client/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/acme-client

packages/core/acme-client/build.md

@@ -1 +1 @@
-15:46
+09:16

packages/core/acme-client/package.json

@@ -3,7 +3,7 @@
     "description": "Simple and unopinionated ACME client",
     "private": false,
     "author": "nmorsman",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "main": "src/index.js",
     "types": "types",
     "license": "MIT",

packages/core/pipeline/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/pipeline
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/pipeline

packages/core/pipeline/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/pipeline",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -20,11 +20,10 @@
     "axios": "^1.4.0",
     "node-forge": "^1.3.1",
     "nodemailer": "^6.9.3",
-    "qs": "^6.11.2",
+    "qs": "^6.11.2"
-    "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/core/pipeline/src/plugin/api.ts

@@ -6,7 +6,7 @@ import { IAccessService } from "../access";
 import { IEmailService } from "../service";
 import { IContext } from "../core";
 import { AxiosInstance } from "axios";
-import { v4 as uuidv4 } from "uuid";
+
 export enum ContextScope {
   global,
   pipeline,
@@ -78,16 +78,19 @@ export abstract class AbstractTaskPlugin implements ITaskPlugin {
     this.ctx = ctx;
   }
 
+  randomFileId() {
+    return Math.random().toString(36).substring(2, 9);
+  }
   linkFile(file: FileItem) {
     this._result.files!.push({
       ...file,
-      id: uuidv4(),
+      id: this.randomFileId(),
     });
   }
   saveFile(filename: string, file: Buffer) {
     const filePath = this.ctx.fileStore.writeFile(filename, file);
     this._result.files!.push({
-      id: uuidv4(),
+      id: this.randomFileId(),
       filename,
       path: filePath,
     });

packages/core/pipeline/src/plugin/decorator.ts

@@ -8,7 +8,6 @@ import "reflect-metadata";
 export const PLUGIN_CLASS_KEY = "pipeline:plugin";
 
 export function IsTaskPlugin(define: PluginDefine): ClassDecorator {
-  console.log("IsTaskPlugin");
   return (target: any) => {
     target = Decorator.target(target);
 

packages/plugins/plugin-aliyun/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-aliyun
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-aliyun

packages/plugins/plugin-aliyun/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-aliyun",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -23,10 +23,10 @@
     "node-forge": "^0.10.0"
   },
   "devDependencies": {
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
-    "@certd/plugin-util": "^1.1.1",
+    "@certd/plugin-util": "^1.1.2",
     "@midwayjs/core": "^3.0.0",
     "@midwayjs/decorator": "^3.0.0",
     "@rollup/plugin-commonjs": "^23.0.4",

packages/plugins/plugin-all/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-all
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-all

packages/plugins/plugin-all/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-all",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,12 +17,12 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-aliyun": "^1.1.1",
+    "@certd/plugin-aliyun": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
-    "@certd/plugin-host": "^1.1.1",
+    "@certd/plugin-host": "^1.1.2",
-    "@certd/plugin-huawei": "^1.1.1",
+    "@certd/plugin-huawei": "^1.1.2",
-    "@certd/plugin-tencent": "^1.1.1",
+    "@certd/plugin-tencent": "^1.1.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/plugins/plugin-cert/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-cert
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-cert

packages/plugins/plugin-cert/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-cert",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,8 +17,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
     "jszip": "^3.10.1",
     "node-forge": "^0.10.0"
   },

packages/plugins/plugin-host/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-host
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-host

packages/plugins/plugin-host/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-host",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,8 +17,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
     "ssh2": "^0.8.9"
   },
   "devDependencies": {

packages/plugins/plugin-huawei/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-huawei
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-huawei

packages/plugins/plugin-huawei/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-huawei",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,10 +17,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
-    "@certd/plugin-util": "^1.1.1",
+    "@certd/plugin-util": "^1.1.2",
     "axios": "^0.27.2",
     "dayjs": "^1.11.6",
     "lodash": "^4.17.21",

packages/plugins/plugin-tencent/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-tencent
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-tencent

packages/plugins/plugin-tencent/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-tencent",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -17,9 +17,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
-    "@certd/plugin-util": "^1.1.1",
+    "@certd/plugin-util": "^1.1.2",
     "tencentcloud-sdk-nodejs": "^4.0.44"
   },
   "devDependencies": {

packages/plugins/plugin-util/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/plugin-util
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/plugin-util

packages/plugins/plugin-util/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@certd/plugin-util",
   "private": false,
-  "version": "1.1.1",
+  "version": "1.1.2",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
   "types": "./src/index.ts",
@@ -21,7 +21,7 @@
     "shelljs": "^0.8.5"
   },
   "devDependencies": {
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",

packages/ui/certd-client/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/certd/certd/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/ui-client
+
 ## [1.1.1](https://github.com/certd/certd/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/ui-client

packages/ui/certd-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-client",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "private": true,
   "scripts": {
     "dev": "vite",
@@ -22,12 +22,11 @@
   "dependencies": {
     "@ant-design/colors": "^6.0.0",
     "@ant-design/icons-vue": "^6.0.1",
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
-    "@certd/pipeline": "^1.1.1",
+    "@fast-crud/fast-crud": "^1.14.4",
-    "@fast-crud/fast-crud": "^1.13.8",
+    "@fast-crud/fast-extends": "^1.14.4",
-    "@fast-crud/fast-extends": "^1.13.8",
+    "@fast-crud/ui-antdv": "^1.14.4",
-    "@fast-crud/ui-antdv": "^1.13.8",
+    "@fast-crud/ui-interface": "^1.14.4",
-    "@fast-crud/ui-interface": "^1.13.8",
     "@iconify/iconify": "^3.0.1",
     "@iconify/json": "^2.1.151",
     "@purge-icons/generated": "^0.9.0",
@@ -60,10 +59,11 @@
     "vuedraggable": "^4.0.1"
   },
   "devDependencies": {
+    "@certd/pipeline": "^1.1.2",
     "@rollup/plugin-commonjs": "^23.0.4",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@types/chai": "^4.3.4",
-    "@types/lodash": "^4.14.195",
+    "@types/lodash-es": "^4.17.7",
     "@types/mocha": "^10.0.1",
     "@types/node": "^18.11.15",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
@@ -107,10 +107,8 @@
     "vite-plugin-package-config": "^0.1.1",
     "vite-plugin-purge-icons": "^0.9.2",
     "vite-plugin-theme": "^0.8.1",
-    "vite-plugin-windicss": "^1.8.10",
     "vue-eslint-parser": "^9.1.0",
-    "vue-tsc": "^0.40.13",
+    "vue-tsc": "^0.40.13"
-    "windicss": "^3.5.6"
   },
   "husky": {
     "hooks": {

packages/ui/certd-client/src/api/service.ts

@@ -1,5 +1,5 @@
 import axios from "axios";
-import { get } from "lodash";
+import { get } from "lodash-es";
 import Adapter from "axios-mock-adapter";
 import { errorLog, errorCreate } from "./tools";
 import { env } from "/src/utils/util.env";

packages/ui/certd-client/src/i18n/index.ts

@@ -1,20 +1,13 @@
 import { createI18n } from "vue-i18n";
-//
-import enFsLocale from "@fast-crud/fast-crud/dist/locale/lang/en.js";
-import zhFsLocale from "@fast-crud/fast-crud/dist/locale/lang/zh-cn.js";
 import en from "./locale/en";
 import zh from "./locale/zh_CN";
 const messages = {
   en: {
     label: "English",
-    // 定义您自己的字典，但是请不要和 `fs` 重复，这样会导致 fast-crud 内部组件的翻译失效.
-    fs: enFsLocale.fs,
     ...en
   },
   "zh-cn": {
     label: "简体中文",
-    // 定义您自己的字典，但是请不要和 `fs` 重复，这样会导致 fast-crud  内部组件的翻译失效.
-    fs: zhFsLocale.fs,
     ...zh
   }
 };

packages/ui/certd-client/src/layout/components/locale/index.vue

@@ -25,7 +25,7 @@
 <script>
 import i18n from "../../../i18n";
 import { computed, inject } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 export default {
   name: "FsLocale",
   setup() {

packages/ui/certd-client/src/layout/components/menu/index.jsx

@@ -1,7 +1,7 @@
 import { useRoute, useRouter } from "vue-router";
 import { ref, watch, onMounted, onUnmounted, resolveComponent, nextTick, defineComponent } from "vue";
 import getEachDeep from "deepdash-es/getEachDeep";
-import _ from "lodash";
+import _ from "lodash-es";
 import BScroll from "better-scroll";
 import "./index.less";
 const eachDeep = getEachDeep(_);

packages/ui/certd-client/src/main.ts

@@ -3,7 +3,6 @@ import App from "./App.vue";
 import router from "./router";
 import Antd from "ant-design-vue";
 import "./style/common.less";
-import "./mock";
 import i18n from "./i18n";
 import store from "./store";
 import components from "./components";

packages/ui/certd-client/src/mock/base.js

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import _ from "lodash-es";
 function copyList(originList, newList, options, parentId) {
   for (const item of originList) {
     const newItem = { ...item, parentId };

packages/ui/certd-client/src/mock/common/pcas-data.js

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import _ from "lodash-es";
 export async function getPcasData() {
   const pcasData = () => import("china-division/dist/pcas-code.json");
   const ret = await pcasData();

packages/ui/certd-client/src/mock/index.js

@@ -1,6 +1,6 @@
 import { mock } from "../api/service";
 import * as tools from "../api/tools";
-import _ from "lodash";
+import _ from "lodash-es";
 const commonMocks = import.meta.globEager("./common/mock.*.js");
 const apiMocks = import.meta.globEager("../api/modules/*.mock.ts");
 const viewMocks = import.meta.globEager("../views/**/mock.js");

packages/ui/certd-client/src/plugin/fast-crud/index.ts

@@ -1,225 +0,0 @@
-import { request, requestForMock } from "/src/api/service";
-import "/src/mock";
-import UiAntdv from "@fast-crud/ui-antdv";
-import { FastCrud, UseCrudProps, useTypes, setLogger } from "@fast-crud/fast-crud";
-import "@fast-crud/fast-crud/dist/style.css";
-import { FsExtendsUploader, FsExtendsEditor, FsExtendsJson, FsExtendsCopyable, FsExtendsTime } from "@fast-crud/fast-extends";
-import "@fast-crud/fast-extends/dist/style.css";
-
-import { useCrudPermission } from "../permission";
-
-function install(app, options: any = {}) {
-  app.use(UiAntdv);
-  //设置日志级别
-  setLogger({ level: "debug" });
-  app.use(FastCrud, {
-    i18n: options.i18n,
-    async dictRequest({ url }) {
-      if (url && url.startsWith("/mock")) {
-        //如果是crud开头的dict请求视为mock
-        return await requestForMock({ url, method: "post" });
-      }
-      return await request({ url, method: "post" });
-    },
-    /**
-     * useCrud时会被执行
-     * @param context，useCrud的参数
-     */
-    commonOptions(context: UseCrudProps) {
-      const crudBinding = context.expose?.crudBinding;
-      const opts = {
-        table: {
-          size: "small",
-          pagination: false,
-          onResizeColumn: (w, col) => {
-            crudBinding.value.table.columnsMap[col.key].width = w;
-          }
-        },
-        rowHandle: {
-          buttons: {
-            view: { type: "link", text: null, icon: "ion:eye-outline" },
-            edit: { type: "link", text: null, icon: "ion:create-outline" },
-            remove: { type: "link", style: { color: "red" }, text: null, icon: "ion:trash-outline" }
-          },
-          dropdown: {
-            more: {
-              type: "link"
-            }
-          }
-        },
-        request: {
-          transformQuery: ({ page, form, sort }) => {
-            const limit = page.pageSize;
-            const currentPage = page.currentPage ?? 1;
-            const offset = limit * (currentPage - 1);
-
-            sort = sort == null ? {} : sort;
-
-            return {
-              page: {
-                limit,
-                offset
-              },
-              query: form,
-              sort
-            };
-          },
-          transformRes: ({ res }) => {
-            const pageSize = res.limit;
-            let currentPage = res.offset / pageSize;
-            if (res.offset % pageSize === 0) {
-              currentPage++;
-            }
-            return { currentPage, pageSize, ...res };
-          }
-        },
-        form: {
-          display: "flex",
-          labelCol: {
-            //固定label宽度
-            span: null,
-            style: {
-              width: "120px"
-            }
-          },
-          wrapperCol: {
-            span: null
-          }
-        }
-      };
-
-      // 从 useCrud({permission}) 里获取permission参数，去设置各个按钮的权限
-      const crudPermission = useCrudPermission({ permission: context.permission });
-      return crudPermission.merge(opts);
-    }
-  });
-
-  // fast-extends里面的扩展组件均为异步组件，只有在使用时才会被加载，并不会影响首页加载速度
-  //安装uploader 公共参数
-  app.use(FsExtendsUploader, {
-    defaultType: "cos",
-    cos: {
-      domain: "https://d2p-demo-1251260344.cos.ap-guangzhou.myqcloud.com",
-      bucket: "d2p-demo-1251260344",
-      region: "ap-guangzhou",
-      secretId: "", //
-      secretKey: "", // 传了secretKey 和secretId 代表使用本地签名模式（不安全，生产环境不推荐）
-      getAuthorization(custom) {
-        // 不传secretKey代表使用临时签名模式,此时此参数必传（安全，生产环境推荐）
-        return request({
-          url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization",
-          method: "get"
-        }).then((ret) => {
-          // 返回结构如下
-          // ret.data:{
-          //   TmpSecretId,
-          //   TmpSecretKey,
-          //   XCosSecurityToken,
-          //   ExpiredTime, // SDK 在 ExpiredTime 时间前，不会再次调用 getAuthorization
-          // }
-          return ret;
-        });
-      },
-      successHandle(ret) {
-        // 上传完成后可以在此处处理结果，修改url什么的
-        console.log("success handle:", ret);
-        return ret;
-      }
-    },
-    alioss: {
-      domain: "https://d2p-demo.oss-cn-shenzhen.aliyuncs.com",
-      bucket: "d2p-demo",
-      region: "oss-cn-shenzhen",
-      accessKeyId: "",
-      accessKeySecret: "",
-      async getAuthorization(custom, context) {
-        // 不传accessKeySecret代表使用临时签名模式,此时此参数必传（安全，生产环境推荐）
-        const ret = await request({
-          url: "http://www.docmirror.cn:7070/api/upload/alioss/getAuthorization",
-          method: "get"
-        });
-        console.log("ret", ret);
-        return ret;
-      },
-      sdkOpts: {
-        // sdk配置
-        secure: true // 默认为非https上传,为了安全，设置为true
-      },
-      successHandle(ret) {
-        // 上传完成后可以在此处处理结果，修改url什么的
-        console.log("success handle:", ret);
-        return ret;
-      }
-    },
-    qiniu: {
-      bucket: "d2p-demo",
-      async getToken(options) {
-        const ret = await request({
-          url: "http://www.docmirror.cn:7070/api/upload/qiniu/getToken",
-          method: "get"
-        });
-        return ret; // {token:xxx,expires:xxx}
-      },
-      successHandle(ret) {
-        // 上传完成后可以在此处处理结果，修改url什么的
-        console.log("success handle:", ret);
-        return ret;
-      },
-      domain: "http://d2p.file.handsfree.work/"
-    },
-    form: {
-      action: "http://www.docmirror.cn:7070/api/upload/form/upload",
-      name: "file",
-      withCredentials: false,
-      uploadRequest: async ({ action, file, onProgress }) => {
-        // @ts-ignore
-        const data = new FormData();
-        data.append("file", file);
-        return await request({
-          url: action,
-          method: "post",
-          headers: {
-            "Content-Type": "multipart/form-data"
-          },
-          timeout: 60000,
-          data,
-          onUploadProgress: (p) => {
-            onProgress({ percent: Math.round((p.loaded / p.total) * 100) });
-          }
-        });
-      },
-      successHandle(ret) {
-        // 上传完成后的结果处理， 此处应返回格式为{url:xxx}
-        return {
-          url: "http://www.docmirror.cn:7070" + ret,
-          key: ret.replace("/api/upload/form/download?key=", "")
-        };
-      }
-    }
-  });
-
-  //安装editor
-  app.use(FsExtendsEditor, {
-    //编辑器的公共配置
-    wangEditor: {}
-  });
-  app.use(FsExtendsJson);
-  app.use(FsExtendsTime);
-  app.use(FsExtendsCopyable);
-
-  const { addTypes } = useTypes();
-  addTypes({
-    time2: {
-      //如果与官方字段类型同名，将会覆盖官方的字段类型
-      form: { component: { name: "a-date-picker" } },
-      column: { component: { name: "fs-date-format", format: "YYYY-MM-DD" } },
-      valueBuilder(context) {
-        console.log("time2,valueBuilder", context);
-      }
-    }
-  });
-}
-
-export default {
-  install
-};

packages/ui/certd-client/src/plugin/fast-crud/index.tsx

@@ -1,17 +1,17 @@
 import { request, requestForMock } from "/src/api/service";
-import "/src/mock";
+import { ColumnCompositionProps, CrudOptions, FastCrud, setLogger, useColumns, UseCrudProps, useTypes } from "@fast-crud/fast-crud";
-import { FastCrud, UseCrudProps, useTypes, setLogger, useColumns, ColumnCompositionProps, MergeColumnPlugin, CrudOptions } from "@fast-crud/fast-crud";
 import "@fast-crud/fast-crud/dist/style.css";
-import { FsExtendsUploader, FsExtendsEditor, FsExtendsJson, FsExtendsCopyable, FsExtendsTime } from "@fast-crud/fast-extends";
+import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader } from "@fast-crud/fast-extends";
 import "@fast-crud/fast-extends/dist/style.css";
 import UiAntdv from "@fast-crud/ui-antdv";
-import _ from "lodash";
+import _ from "lodash-es";
 import { useCrudPermission } from "../permission";
+import { App } from "vue";
 
-function install(app, options: any = {}) {
+function install(app: App, options: any = {}) {
   app.use(UiAntdv);
   //设置日志级别
-  setLogger({ level: "debug" });
+  setLogger({ level: "info" });
   app.use(FastCrud, {
     i18n: options.i18n,
     async dictRequest({ url }) {
@@ -31,7 +31,7 @@ function install(app, options: any = {}) {
         table: {
           size: "small",
           pagination: false,
-          onResizeColumn: (w, col) => {
+          onResizeColumn: (w: any, col: any) => {
             crudBinding.value.table.columnsMap[col.key].width = w;
           }
         },
@@ -70,7 +70,7 @@ function install(app, options: any = {}) {
             if (res.offset % pageSize === 0) {
               currentPage++;
             }
-            return { currentPage, pageSize, ...res };
+            return { currentPage, pageSize, total: res.total, records: res.records };
           }
         },
         form: {
@@ -96,7 +96,9 @@ function install(app, options: any = {}) {
 
   // fast-extends里面的扩展组件均为异步组件，只有在使用时才会被加载，并不会影响首页加载速度
   //安装uploader 公共参数
+
   app.use(FsExtendsUploader, {
+    // @ts-ignore
     defaultType: "cos",
     cos: {
       domain: "https://d2p-demo-1251260344.cos.ap-guangzhou.myqcloud.com",
@@ -109,7 +111,7 @@ function install(app, options: any = {}) {
         return request({
           url: "http://www.docmirror.cn:7070/api/upload/cos/getAuthorization",
           method: "get"
-        }).then((ret) => {
+        }).then((ret: any) => {
           // 返回结构如下
           // ret.data:{
           //   TmpSecretId,
@@ -132,7 +134,7 @@ function install(app, options: any = {}) {
       region: "oss-cn-shenzhen",
       accessKeyId: "",
       accessKeySecret: "",
-      async getAuthorization(custom, context) {
+      async getAuthorization(custom: any, context: any) {
         // 不传accessKeySecret代表使用临时签名模式,此时此参数必传（安全，生产环境推荐）
         const ret = await request({
           url: "http://www.docmirror.cn:7070/api/upload/alioss/getAuthorization",
@@ -183,7 +185,7 @@ function install(app, options: any = {}) {
           },
           timeout: 60000,
           data,
-          onUploadProgress: (p) => {
+          onUploadProgress: (p: any) => {
             onProgress({ percent: Math.round((p.loaded / p.total) * 100) });
           }
         });
@@ -214,7 +216,7 @@ function install(app, options: any = {}) {
       //如果与官方字段类型同名，将会覆盖官方的字段类型
       form: { component: { name: "a-date-picker" } },
       column: { component: { name: "fs-date-format", format: "YYYY-MM-DD" } },
-      valueBuilder(context) {
+      valueBuilder(context: any) {
         console.log("time2,valueBuilder", context);
       }
     }

packages/ui/certd-client/src/plugin/iconfont/index.ts

@@ -1 +1 @@
-import "./iconfont.js"
+import "./iconfont.js";

packages/ui/certd-client/src/plugin/index.ts

@@ -1,8 +1,9 @@
 import "./iconify";
 import "./iconfont";
-import FastCrud from "./fast-crud";
+import FastCrud from "./fast-crud/index";
 import permission from "./permission";
-function install(app, options: any = {}) {
+import { App } from "vue";
+function install(app: App, options: any = {}) {
   app.use(FastCrud, options);
   app.use(permission);
 }

packages/ui/certd-client/src/plugin/permission/use-crud-permission.ts

@@ -1,5 +1,5 @@
 import { usePermission } from "/@/plugin/permission";
-import _ from "lodash";
+import _ from "lodash-es";
 
 /**
  * 设置按钮动作权限

packages/ui/certd-client/src/router/resolve.ts

@@ -1,5 +1,5 @@
 import LayoutPass from "/src/layout/layout-pass.vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { outsideResource } from "./source/outside";
 import { headerResource } from "./source/header";
 import { frameworkResource } from "./source/framework";

packages/ui/certd-client/src/router/source/modules/certd.ts

@@ -55,6 +55,16 @@ export const certdResources = [
               icon: "ion:mail-outline",
               auth: true
             }
+          },
+          {
+            title: "账号信息",
+            name: "userProfile",
+            path: "/certd/mine/user-profile",
+            component: "/certd/mine/user-profile.vue",
+            meta: {
+              icon: "ion:person-outline",
+              auth: true
+            }
           }
         ]
       }

packages/ui/certd-client/src/store/modules/page.ts

@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { cloneDeep, get, uniq } from "lodash";
+import { cloneDeep, get, uniq } from "lodash-es";
 import router from "/src/router";
 import { frameworkRoutes } from "/src/router/resolve";
 // @ts-ignore
@@ -21,7 +21,7 @@ interface PageState {
   inited: boolean;
 }
 // 判定是否需要缓存
-const isKeepAlive = (data) => get(data, "meta.cache", false);
+const isKeepAlive = (data: any) => get(data, "meta.cache", false);
 
 export const usePageStore = defineStore({
   id: "app.page",
@@ -48,6 +48,7 @@ export const usePageStore = defineStore({
     inited: false
   }),
   getters: {
+    // @ts-ignore
     getOpened() {
       // @ts-ignore
       return this.opened;
@@ -91,7 +92,7 @@ export const usePageStore = defineStore({
       const valid: Array<number> = [];
       // 处理数据
       this.opened = value
-        .map((opened) => {
+        .map((opened: any) => {
           // 忽略首页
           if (opened.fullPath === "/index") {
             valid.push(1);
@@ -105,7 +106,7 @@ export const usePageStore = defineStore({
           // 新的数据中一般不会携带 params 和 query, 所以旧的参数会留存
           return Object.assign({}, opened, find);
         })
-        .filter((opened, index) => valid[index] === 1);
+        .filter((opened: any, index: any) => valid[index] === 1);
       // 标记已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
       this.openedLoaded = true;
       // 根据 opened 数据生成缓存设置
@@ -132,7 +133,7 @@ export const usePageStore = defineStore({
      * @param {Object} context
      * @param {Object} payload { index, params, query, fullPath } 路由信息
      */
-    async openedUpdate({ index, params, query, fullPath }) {
+    async openedUpdate({ index, params, query, fullPath }: any) {
       // 更新页面列表某一项
       const page = this.opened[index];
       page.params = params || page.params;
@@ -148,7 +149,7 @@ export const usePageStore = defineStore({
      * @param {Object} context
      * @param {Object} payload { oldIndex, newIndex } 位置信息
      */
-    async openedSort({ oldIndex, newIndex }) {
+    async openedSort({ oldIndex, newIndex }: any) {
       // 重排页面列表某一项
       const page = this.opened[oldIndex];
       this.opened.splice(oldIndex, 1);
@@ -162,7 +163,7 @@ export const usePageStore = defineStore({
      * @param {Object} context
      * @param {Object} payload new tag info
      */
-    async add({ tag, params, query, fullPath }) {
+    async add({ tag, params, query, fullPath }: any) {
       // 设置新的 tag 在新打开一个以前没打开过的页面时使用
       const newTag = tag;
       newTag.params = params || newTag.params;
@@ -183,7 +184,7 @@ export const usePageStore = defineStore({
      * @param {Object} context
      * @param {Object} payload 从路由钩子的 to 对象上获取 { name, params, query, fullPath, meta } 路由信息
      */
-    async open({ name, params, query, fullPath, meta }) {
+    async open({ name, params, query, fullPath, meta }: any) {
       // 已经打开的页面
       const opened = this.opened;
       // 判断此页面是否已经打开 并且记录位置
@@ -227,7 +228,7 @@ export const usePageStore = defineStore({
      * @param {Object} context
      * @param {Object} payload { tagName: 要关闭的标签名字 }
      */
-    async close({ tagName }) {
+    async close({ tagName }: any) {
       // 预定下个新页面
       let newPage = {};
       const isCurrent = this.current === tagName;
@@ -267,7 +268,7 @@ export const usePageStore = defineStore({
      */
     async closeLeft(opts = {}) {
       await this.closeByCondition({
-        condition({ i, currentIndex }) {
+        condition({ i, currentIndex }: any) {
           return i >= currentIndex;
         },
         ...opts
@@ -280,7 +281,7 @@ export const usePageStore = defineStore({
      */
     async closeRight(opts = {}) {
       await this.closeByCondition({
-        condition({ i, currentIndex }) {
+        condition({ i, currentIndex }: any) {
           return currentIndex >= i;
         },
         ...opts
@@ -321,7 +322,7 @@ export const usePageStore = defineStore({
      */
     async closeOther(opts = {}) {
       await this.closeByCondition({
-        condition({ i, currentIndex }) {
+        condition({ i, currentIndex }: any) {
           return currentIndex === i;
         },
         ...opts
@@ -364,7 +365,7 @@ export const usePageStore = defineStore({
      * @param {Object} state state
      * @param {String} name name
      */
-    keepAliveRemove(name) {
+    keepAliveRemove(name: any) {
       const list = cloneDeep(this.keepAlive);
       const index = list.findIndex((item) => item === name);
       if (index !== -1) {
@@ -377,7 +378,7 @@ export const usePageStore = defineStore({
      * @param {Object} state state
      * @param {String} name name
      */
-    keepAlivePush(name) {
+    keepAlivePush(name: any) {
       const keep = cloneDeep(this.keepAlive);
       keep.push(name);
       this.keepAlive = uniq(keep);
@@ -395,7 +396,7 @@ export const usePageStore = defineStore({
      * @param {Object} state state
      * @param {String} fullPath new fullPath
      */
-    currentSet(fullPath) {
+    currentSet(fullPath: any) {
       this.current = fullPath;
     },
     /**
@@ -404,7 +405,7 @@ export const usePageStore = defineStore({
      * @param {Object} state state
      * @param {Array} routes routes
      */
-    async init(routes) {
+    async init(routes: any) {
       if (this.inited) {
         return;
       }
@@ -414,9 +415,9 @@ export const usePageStore = defineStore({
         routes = frameworkRoutes;
       }
 
-      const pool = [];
+      const pool: any = [];
-      const push = function (routes) {
+      const push = function (routes: any) {
-        routes.forEach((route) => {
+        routes.forEach((route: any) => {
           if (route.children && route.children.length > 0) {
             push(route.children);
           } else {

packages/ui/certd-client/src/store/modules/resource.ts

@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 // @ts-ignore
 import { frameworkMenus, headerMenus, filterMenus, findMenus } from "/src/router/resolve";
-import _ from "lodash";
+import _ from "lodash-es";
 import { mitter } from "/src/utils/util.mitt";
 //监听注销事件
 mitter.on("app.logout", () => {

packages/ui/certd-client/src/style/common.less

@@ -5,6 +5,8 @@
 @import './scroll.less';
 @import './transition.less';
 @import './fix-windicss.less';
+
+
 svg { vertical-align: baseline; }
 
 html, body {

packages/ui/certd-client/src/utils/util.common.ts

@@ -1,4 +1,4 @@
-import _ from "lodash";
+import _ from "lodash-es";
 export default {
   arrayToMap(array: any) {
     if (!array) {

packages/ui/certd-client/src/utils/util.env.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-import _ from "lodash";
+import _ from "lodash-es";
 export function getEnvValue(key: string) {
   // @ts-ignore
   return import.meta.env["VITE_APP_" + key];

packages/ui/certd-client/src/utils/util.storage.ts

@@ -1,5 +1,5 @@
 import { env } from "./util.env";
-function isNullOrUnDef(value) {
+function isNullOrUnDef(value: any) {
   return value == null;
 }
 const DEFAULT_CACHE_TIME = 60 * 60 * 24 * 7;

packages/ui/certd-client/src/views/certd/access/common.tsx

@@ -2,7 +2,7 @@ import { ColumnCompositionProps, dict } from "@fast-crud/fast-crud";
 // @ts-ignore
 import * as api from "./api";
 // @ts-ignore
-import _ from "lodash";
+import _ from "lodash-es";
 import { toRef } from "vue";
 
 export function getCommonColumnDefine(crudExpose: any, typeRef: any) {

packages/ui/certd-client/src/views/certd/mine/api.ts

@@ -0,0 +1,16 @@
+import { request } from "/src/api/service";
+
+export async function getMineInfo() {
+  return request({
+    url: "/mine/info",
+    method: "POST"
+  });
+}
+
+export async function changePassword(form: any) {
+  return request({
+    url: "/mine/changePassword",
+    method: "POST",
+    data: form
+  });
+}

packages/ui/certd-client/src/views/certd/mine/user-profile.vue

@@ -0,0 +1,98 @@
+<template>
+  <fs-page>
+    <div class="p-4">
+      <a-descriptions title="我的信息" bordered>
+        <a-descriptions-item label="用户名">{{ userInfo.userInfoname }}</a-descriptions-item>
+        <a-descriptions-item label="昵称">{{ userInfo.nickName }}</a-descriptions-item>
+        <a-descriptions-item label="邮箱">{{ userInfo.email }}</a-descriptions-item>
+        <a-descriptions-item label="手机号">{{ userInfo.phoneCode }}{{ userInfo.mobile }}</a-descriptions-item>
+        <a-descriptions-item label="修改密码">
+          <a-button type="primary" @click="changePassword">修改密码</a-button>
+        </a-descriptions-item>
+      </a-descriptions>
+    </div>
+  </fs-page>
+</template>
+
+<script lang="ts" setup>
+import * as api from "./api";
+import { Ref, ref } from "vue";
+import { CrudOptions, useColumns, useFormWrapper } from "@fast-crud/fast-crud";
+
+const userInfo: Ref = ref({});
+
+const getUserInfo = async () => {
+  userInfo.value = await api.getMineInfo();
+};
+getUserInfo();
+
+let passwordFormRef = ref();
+
+const validatePass1 = async (rule: any, value: any) => {
+  if (value === "") {
+    throw new Error("请输入密码");
+  }
+  if (passwordFormRef.value.getFormData().confirmNewPassword !== "") {
+    passwordFormRef.value.formRef.formRef.validateFields(["confirmNewPassword"]);
+  }
+};
+const validatePass2 = async (rule: any, value: any) => {
+  if (value === "") {
+    throw new Error("请再次输入密码");
+  } else if (value !== passwordFormRef.value.getFormData().newPassword) {
+    throw new Error("两次输入密码不一致!");
+  }
+};
+const { openDialog } = useFormWrapper();
+const { buildFormOptions } = useColumns();
+const passwordFormOptions: CrudOptions = {
+  form: {
+    col: {
+      span: 24
+    },
+    wrapper: {
+      width: "500px"
+    },
+    async doSubmit({ form }) {
+      await api.changePassword(form);
+    }
+  },
+  columns: {
+    password: {
+      title: "旧密码",
+      type: "password",
+      form: {
+        rules: [{ required: true, message: "请输入旧密码" }]
+      }
+    },
+    newPassword: {
+      title: "新密码",
+      type: "password",
+      form: {
+        rules: [
+          { required: true, message: "请输入确认密码" },
+          //@ts-ignore
+          { validator: validatePass1, trigger: "blur" }
+        ]
+      }
+    },
+    confirmNewPassword: {
+      title: "确认新密码",
+      type: "password",
+      form: {
+        rules: [
+          { required: true, message: "请输入确认密码" },
+          //@ts-ignore
+          { validator: validatePass2, trigger: "blur" }
+        ]
+      }
+    }
+  }
+};
+
+async function changePassword() {
+  const formOptions = buildFormOptions(passwordFormOptions);
+  formOptions.newInstance = true; //新实例打开
+  passwordFormRef.value = await openDialog(formOptions);
+}
+</script>

packages/ui/certd-client/src/views/certd/pipeline/api.history.ts

@@ -1,5 +1,5 @@
+import { RunHistory } from "./pipeline/type";
 import { request } from "/src/api/service";
-import { RunHistory } from "/@/views/certd/pipeline/pipeline/type";
 
 const apiPrefix = "/pi/history";
 

packages/ui/certd-client/src/views/certd/pipeline/api.plugin.ts

@@ -1,5 +1,5 @@
 import { request } from "/src/api/service";
-import _ from "lodash";
+import _ from "lodash-es";
 const apiPrefix = "/pi/plugin";
 
 const defaultInputDefine = {
@@ -9,7 +9,7 @@ const defaultInputDefine = {
   }
 };
 
-export async function GetList(query) {
+export async function GetList(query: any) {
   const plugins = await request({
     url: apiPrefix + "/list",
     method: "post",

packages/ui/certd-client/src/views/certd/pipeline/certd-form/index.vue

@@ -6,7 +6,7 @@
 import { useColumns, useExpose } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud.jsx";
 import { ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 export default {
   name: "PiCertdForm",
   setup(props, ctx) {

packages/ui/certd-client/src/views/certd/pipeline/detail.vue

@@ -11,7 +11,7 @@ import * as pluginApi from "./api.plugin";
 import * as historyApi from "./api.history";
 import * as api from "./api";
 import { useRoute } from "vue-router";
-import { PipelineDetail, PipelineOptions, RunHistory, Pipeline } from "/@/views/certd/pipeline/pipeline/type";
+import { PipelineDetail, PipelineOptions, RunHistory } from "./pipeline/type";
 
 export default defineComponent({
   name: "PipelineDetail",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/notification-form/index.vue

@@ -61,7 +61,7 @@
 <script lang="ts">
 import { Modal } from "ant-design-vue";
 import { ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { nanoid } from "nanoid";
 import PiNotificationFormEmail from "./pi-notification-form-email.vue";
 

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/status-show.vue

@@ -10,8 +10,9 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, provide, Ref, watch, computed } from "vue";
+import { computed, defineComponent } from "vue";
 import { statusUtil } from "/@/views/certd/pipeline/pipeline/utils/util.status";
+
 export default defineComponent({
   name: "PiStatusShow",
   props: {
@@ -26,7 +27,7 @@ export default defineComponent({
   },
   setup(props, ctx) {
     const statusRef = computed(() => {
-      return statusUtil.get(props.status);
+      return statusUtil.get(props.status as string);
     });
 
     return {

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/step-form/index.vue

@@ -87,7 +87,7 @@
 <script lang="tsx">
 import { message, Modal } from "ant-design-vue";
 import { computed, inject, Ref, ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { nanoid } from "nanoid";
 import { compute } from "@fast-crud/fast-crud";
 export default {

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-form/index.vue

@@ -66,7 +66,7 @@
 
 <script lang="ts">
 import { provide, Ref, ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { nanoid } from "nanoid";
 import PiStepForm from "../step-form/index.vue";
 import { message, Modal } from "ant-design-vue";

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/task-view/index.vue

@@ -1,11 +1,5 @@
 <template>
-  <a-modal
+  <a-modal v-model:visible="taskModal.visible" class="pi-task-view" title="任务日志" style="width: 80%" v-bind="taskModal">
-    v-model:visible="taskModal.visible"
-    class="pi-task-view"
-    title="任务日志"
-    style="width: 80%"
-    v-bind="taskModal"
-  >
     <a-tabs v-model:activeKey="activeKey" tab-position="left" animated>
       <a-tab-pane v-for="item of detail.nodes" :key="item.node.id">
         <template #tab>
@@ -14,9 +8,7 @@
             <pi-status-show :status="item.node.status?.result" type="icon"></pi-status-show>
           </div>
         </template>
-        <pre
+        <pre class="pi-task-view-logs"><template v-for="(text, index) of item.logs" :key="index">{{ text }}</template></pre>
-          class="pi-task-view-logs"
-        ><template v-for="(text, index) of item.logs" :key="index">{{ text }}</template></pre>
       </a-tab-pane>
     </a-tabs>
   </a-modal>
@@ -24,14 +16,14 @@
 
 <script lang="ts">
 import { inject, provide, Ref, ref } from "vue";
-import { RunHistory } from "/@/views/certd/pipeline/pipeline/type";
+import { RunHistory } from "../../type";
 import PiStatusShow from "/@/views/certd/pipeline/pipeline/component/status-show.vue";
 
 export default {
   name: "PiTaskView",
   components: { PiStatusShow },
   props: {},
-  setup(props, ctx) {
+  setup(props: any, ctx: any) {
     const taskModal = ref({
       visible: false,
       onOk() {
@@ -43,7 +35,7 @@ export default {
     const detail = ref({ nodes: [] });
     const activeKey = ref();
     const currentHistory: Ref<RunHistory> | undefined = inject("currentHistory");
-    const taskViewOpen = (task) => {
+    const taskViewOpen = (task: any) => {
       taskModal.value.visible = true;
       const nodes: any = [];
       // nodes.push({

packages/ui/certd-client/src/views/certd/pipeline/pipeline/component/trigger-form/index.vue

@@ -81,7 +81,7 @@
 <script>
 import { message, Modal } from "ant-design-vue";
 import { inject, ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { nanoid } from "nanoid";
 export default {
   name: "PiTriggerForm",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/index.vue

@@ -207,11 +207,12 @@ import PiTriggerForm from "./component/trigger-form/index.vue";
 import PiNotificationForm from "./component/notification-form/index.vue";
 import PiTaskView from "./component/task-view/index.vue";
 import PiStatusShow from "./component/status-show.vue";
-import _ from "lodash";
+import _ from "lodash-es";
 import { message, Modal, notification } from "ant-design-vue";
 import { pluginManager } from "/@/views/certd/pipeline/pipeline/plugin";
 import { nanoid } from "nanoid";
-import { PipelineDetail, PipelineOptions, RunHistory, Runnable } from "/@/views/certd/pipeline/pipeline/type";
+import { PipelineDetail, PipelineOptions, RunHistory } from "./type";
+import type { Runnable } from "@certd/pipeline";
 import PiHistoryTimelineItem from "/@/views/certd/pipeline/pipeline/component/history-timeline-item.vue";
 export default defineComponent({
   name: "PipelineEdit",

packages/ui/certd-client/src/views/certd/pipeline/pipeline/type.ts

@@ -1,5 +1,4 @@
-import { Pipeline } from "@certd/pipeline";
+import type { Pipeline } from "@certd/pipeline";
-export * from "@certd/pipeline";
 export type PipelineDetail = {
   pipeline: Pipeline;
 };

packages/ui/certd-client/src/views/certd/pipeline/pipeline/utils/util.status.ts

@@ -14,6 +14,7 @@ const StatusEnum: StatusEnumType = {
     value: "success",
     label: "成功",
     color: "green",
+    spin: true,
     icon: "ant-design:check-circle-outlined"
   },
   error: {

packages/ui/certd-client/src/views/crud/advanced/from-backend/index.vue

@@ -7,7 +7,7 @@ import { defineComponent, ref, onMounted } from "vue";
 import { useCrud, dict, useExpose } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 import { GetCrud } from "./api";
-import _ from "lodash";
+import _ from "lodash-es";
 export default defineComponent({
   name: "AdvancedFromBackend",
   setup() {

packages/ui/certd-client/src/views/crud/advanced/linkage/mock.js

@@ -1,5 +1,5 @@
 import mockUtil from "/src/mock/base";
-import _ from "lodash";
+import _ from "lodash-es";
 const options = {
   name: "FormLinkage",
   idGenerator: 0

packages/ui/certd-client/src/views/crud/advanced/local-pagination/crud.jsx

@@ -1,5 +1,5 @@
 import * as api from "./api";
-import _ from "lodash";
+import _ from "lodash-es";
 import { dict } from "@fast-crud/fast-crud";
 export default function ({ expose, localDataRef }) {
   const pageRequest = async ({ page, query }) => {

packages/ui/certd-client/src/views/crud/basis/first/index.vue

@@ -8,7 +8,7 @@
 import { defineComponent, ref, onMounted } from "vue";
 import { dict, useCrud } from "@fast-crud/fast-crud";
 import { useExpose } from "@fast-crud/fast-crud";
-import _ from "lodash";
+import _ from "lodash-es";
 
 //此处为crudOptions配置
 const createCrudOptions = function ({ expose }) {

packages/ui/certd-client/src/views/crud/component/select/crud.jsx

@@ -2,7 +2,7 @@ import * as api from "./api";
 import { requestForMock } from "/src/api/service";
 import { dict } from "@fast-crud/fast-crud";
 import { ref } from "vue";
-import _ from "lodash";
+import _ from "lodash-es";
 function useSearchRemote() {
   let lastFetchId = 0;
 

packages/ui/certd-client/src/views/crud/form/custom-form/index.vue

@@ -13,7 +13,7 @@
 import { defineComponent, ref, onMounted } from "vue";
 import { useCrud, useExpose, useColumns } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import _ from "lodash";
+import _ from "lodash-es";
 import { message } from "ant-design-vue";
 export default defineComponent({
   name: "FormCustomForm",

packages/ui/certd-client/src/views/crud/form/new-page/edit.vue

@@ -18,7 +18,7 @@ import { defineComponent, ref, onMounted } from "vue";
 import { useCrud, useExpose, useColumns } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 import * as api from "./api";
-import _ from "lodash";
+import _ from "lodash-es";
 import { message } from "ant-design-vue";
 import { usePageStore } from "/@/store/modules/page";
 export default defineComponent({

packages/ui/certd-client/src/views/crud/form/new-page/index.vue

@@ -10,7 +10,7 @@
 import { defineComponent, ref, onMounted } from "vue";
 import { useCrud, useExpose, useColumns } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import _ from "lodash";
+import _ from "lodash-es";
 import { message } from "ant-design-vue";
 export default defineComponent({
   name: "FormNewPage",

packages/ui/certd-client/src/views/sys/authority/permission/fs-permission-tree.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import _ from "lodash";
+import _ from "lodash-es";
 import getEachDeep from "deepdash-es/getEachDeep";
 const eachDeep = getEachDeep(_);
 import { defineComponent, ref, computed } from "vue";

packages/ui/certd-client/vite.config.ts

@@ -4,11 +4,6 @@ import visualizer from "rollup-plugin-visualizer";
 import viteCompression from "vite-plugin-compression";
 import PurgeIcons from "vite-plugin-purge-icons";
 import * as path from "path";
-// import { generateModifyVars } from "./build/modify-vars";
-// import { configThemePlugin } from "./build/theme-plugin";
-// import OptimizationPersist from "vite-plugin-optimize-persist";
-// import PkgConfig from "vite-plugin-package-config";
-// https://vitejs.dev/config/
 // 增加环境变量 _
 process.env.VITE_APP_VERSION = require("./package.json").version;
 process.env.VITE_APP_BUILD_TIME = require("dayjs")().format("YYYY-M-D HH:mm:ss");

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.1.2](https://github.com/fast-crud/fast-server-js/compare/v1.1.1...v1.1.2) (2023-07-03)
+
+**Note:** Version bump only for package @certd/ui-server
+
 ## [1.1.1](https://github.com/fast-crud/fast-server-js/compare/v1.1.0...v1.1.1) (2023-06-28)
 
 **Note:** Version bump only for package @certd/ui-server

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "fast-server base midway",
   "private": true,
   "scripts": {
@@ -21,15 +21,15 @@
     "mig": "typeorm migration:create -n name"
   },
   "dependencies": {
-    "@certd/acme-client": "^1.1.1",
+    "@certd/acme-client": "^1.1.2",
-    "@certd/pipeline": "^1.1.1",
+    "@certd/pipeline": "^1.1.2",
-    "@certd/plugin-aliyun": "^1.1.1",
+    "@certd/plugin-aliyun": "^1.1.2",
-    "@certd/plugin-all": "^1.1.1",
+    "@certd/plugin-all": "^1.1.2",
-    "@certd/plugin-cert": "^1.1.1",
+    "@certd/plugin-cert": "^1.1.2",
-    "@certd/plugin-host": "^1.1.1",
+    "@certd/plugin-host": "^1.1.2",
-    "@certd/plugin-huawei": "^1.1.1",
+    "@certd/plugin-huawei": "^1.1.2",
-    "@certd/plugin-tencent": "^1.1.1",
+    "@certd/plugin-tencent": "^1.1.2",
-    "@certd/plugin-util": "^1.1.1",
+    "@certd/plugin-util": "^1.1.2",
     "@koa/cors": "^3.4.3",
     "@midwayjs/bootstrap": "^3.9.1",
     "@midwayjs/cache": "^3.9.0",

packages/ui/certd-server/src/config/config.default.ts

@@ -14,6 +14,10 @@ const development = {
     port: 7001,
   },
   staticFile: {
+    usePrecompiledGzip: true,
+    buffer: true,
+    maxAge: 60 * 60 * 24 * 30 * 1000,
+    gzip: true,
     dirs: {
       default: {
         prefix: '/',
@@ -68,7 +72,7 @@ const development = {
   auth: {
     jwt: {
       secret: 'certd666',
-      expire: 7 * 24 * 60, //单位秒
+      expire: 7 * 24 * 60 * 60, //单位秒
     },
   },
   certd: {

packages/ui/certd-server/src/configuration.ts

@@ -15,6 +15,7 @@ import { PreviewMiddleware } from './middleware/preview';
 import { AuthorityMiddleware } from './middleware/authority';
 import * as staticFile from '@midwayjs/static-file';
 import * as cron from './plugins/cron';
+import { logger } from './utils/logger';
 
 @Configuration({
   imports: [koa, orm, cache, flyway, validateComp, cron, staticFile],
@@ -54,5 +55,7 @@ export class ContainerLifeCycle {
       //授权处理
       AuthorityMiddleware,
     ]);
+
+    logger.info('当前环境：', this.app.getEnv()); // prod
   }
 }

packages/ui/certd-server/src/controller/home.ts

@@ -1,10 +1,16 @@
-import { Controller, Get, Provide } from '@midwayjs/decorator';
+import { MidwayEnvironmentService } from '@midwayjs/core';
+import { Controller, Get, Inject, Provide } from '@midwayjs/decorator';
+import { logger } from '../utils/logger';
+import { Constants } from '../basic/constants';
 
 @Provide()
 @Controller('/hello')
 export class HomeController {
-  @Get('/')
+  @Inject()
+  environmentService: MidwayEnvironmentService;
+  @Get('/', { summary: Constants.per.guest })
   async home(): Promise<string> {
+    logger.info('当前环境：', this.environmentService.getCurrentEnvironment()); // prod
     return 'Hello Midwayjs!';
   }
 }

packages/ui/certd-server/src/modules/authority/service/user-service.ts

@@ -142,4 +142,17 @@ export class UserService extends BaseService<UserEntity> {
     delete newUser.password;
     return newUser;
   }
+
+  async changePassword(userId: any, form: any) {
+    const user = await this.info(userId);
+    if (!this.checkPassword(form.password, user.password)) {
+      throw new CommonException('原密码错误');
+    }
+    const param = {
+      id: userId,
+      password: form.newPassword,
+    };
+
+    await this.update(param);
+  }
 }

packages/ui/certd-server/src/modules/mine/controller/mine-controller.ts

@@ -0,0 +1,34 @@
+import {
+  ALL,
+  Body,
+  Controller,
+  Inject,
+  Post,
+  Provide,
+} from '@midwayjs/decorator';
+import { BaseController } from '../../../basic/base-controller';
+import { Constants } from '../../../basic/constants';
+import { UserService } from '../../authority/service/user-service';
+
+/**
+ */
+@Provide()
+@Controller('/api/mine')
+export class MineController extends BaseController {
+  @Inject()
+  userService: UserService;
+  @Post('/info', { summary: Constants.per.authOnly })
+  public async info() {
+    const userId = this.getUserId();
+    const user = await this.userService.info(userId);
+    delete user.password;
+    return this.ok(user);
+  }
+
+  @Post('/changePassword', { summary: Constants.per.authOnly })
+  public async changePassword(@Body(ALL) body: any) {
+    const userId = this.getUserId();
+    await this.userService.changePassword(userId, body);
+    return this.ok({});
+  }
+}