diff --git a/packages/libs/lib-server/src/basic/base-controller.ts b/packages/libs/lib-server/src/basic/base-controller.ts index a87d63c19..77ea8ae69 100644 --- a/packages/libs/lib-server/src/basic/base-controller.ts +++ b/packages/libs/lib-server/src/basic/base-controller.ts @@ -25,7 +25,7 @@ export abstract class BaseController { * @param msg * @param code */ - fail(msg: string, code: any) { + fail(msg: string, code?: any) { return { code: code ? code : Constants.res.error.code, msg: msg ? msg : Constants.res.error.code, diff --git a/packages/ui/certd-client/src/utils/index.ts b/packages/ui/certd-client/src/utils/index.ts index 806c417e3..d8ccefc11 100644 --- a/packages/ui/certd-client/src/utils/index.ts +++ b/packages/ui/certd-client/src/utils/index.ts @@ -5,6 +5,7 @@ import commons from "./util.common"; import * as mitt from "./util.mitt"; import { routerUtils } from "./util.router"; import { treeUtils } from "./util.tree"; +import { hashUtils } from "./util.hash"; export const util = { ...envs, ...sites, @@ -12,5 +13,6 @@ export const util = { ...commons, ...mitt, router: routerUtils, - tree: treeUtils + tree: treeUtils, + hash: hashUtils }; diff --git a/packages/ui/certd-client/src/utils/util.hash.ts b/packages/ui/certd-client/src/utils/util.hash.ts new file mode 100644 index 000000000..38a8abf38 --- /dev/null +++ b/packages/ui/certd-client/src/utils/util.hash.ts @@ -0,0 +1,5 @@ +export const hashUtils = { + md5(data: string) { + throw new Error("Not implemented"); + } +}; diff --git a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue index cd29625d0..7699c28d3 100644 --- a/packages/ui/certd-client/src/views/certd/suite/order-modal.vue +++ b/packages/ui/certd-client/src/views/certd/suite/order-modal.vue @@ -19,7 +19,9 @@
支付方式: + 易支付 支付宝 + 微信支付
@@ -27,10 +29,12 @@ diff --git a/packages/ui/certd-server/db/migration/v10018__suite.sql b/packages/ui/certd-server/db/migration/v10018__suite.sql index 8ba8543f1..eda42b833 100644 --- a/packages/ui/certd-server/db/migration/v10018__suite.sql +++ b/packages/ui/certd-server/db/migration/v10018__suite.sql @@ -34,22 +34,28 @@ CREATE TABLE "cd_payment" CREATE TABLE "cd_trade" ( "id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, + "trade_no" varchar(100), "user_id" integer, "product_id" integer, - "title" varchar(100), - "count" integer, + "title" varchar(1024), + "desc" varchar(2048), + "num" integer, + "duration" integer, "price" integer, "amount" integer, - "remark" varchar(100), + "remark" varchar(2048), "status" varchar(100), - "pay_id" integer, + "pay_type" varchar(50), "pay_time" integer, - "pay_type" varchar(100), "pay_no" varchar(100), + "end_time" integer, "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP) ); +CREATE INDEX "index_trade_user_id" ON "cd_trade" ("user_id"); +CREATE UNIQUE INDEX "index_trade_trade_no" ON "cd_trade" ("trade_no"); +CREATE INDEX "index_trade_pay_no" ON "cd_trade" ("pay_type","pay_no"); CREATE TABLE "cd_user_suite" @@ -69,5 +75,12 @@ CREATE TABLE "cd_user_suite" "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP) ); +CREATE INDEX "index_user_suite_user_id" ON "cd_user_suite" ("user_id"); +DROP TABLE IF EXISTS "cd_cert"; +DROP TABLE IF EXISTS "cd_cert_apply_history"; +DROP TABLE IF EXISTS "cd_cert_issuer"; +DROP TABLE IF EXISTS "cd_task"; +DROP TABLE IF EXISTS "cd_task_history"; + diff --git a/packages/ui/certd-server/src/plugins/plugin-namesilo/access.ts b/packages/ui/certd-server/src/plugins/plugin-namesilo/access.ts index 24574c377..7190e4172 100644 --- a/packages/ui/certd-server/src/plugins/plugin-namesilo/access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-namesilo/access.ts @@ -19,7 +19,8 @@ export class NamesiloAccess extends BaseAccess { component: { placeholder: 'api key', }, - helper: '前往 [获取API Key](https://www.namesilo.com/account/api-manager)', + helper: + '前往 [获取API Key](https://www.namesilo.com/account/api-manager)\n不要勾选第一项(Generate key for read-only access)\n勾选第二项(Submitting this form...)\n然后点击Generate按钮', required: true, encrypt: true, })