diff --git a/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue b/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue index 778fb5818..4aaba2af0 100644 --- a/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue +++ b/packages/ui/certd-client/src/views/framework/oauth/oauth-callback.vue @@ -10,7 +10,7 @@
绑定已有账号 - 创建新账号 + 创建新账号
@@ -27,9 +27,11 @@ import * as api from "./api"; import { useRoute, useRouter } from "vue-router"; import { useUserStore } from "/@/store/user"; import { notification } from "ant-design-vue"; +import { useSettingStore } from "/@/store/settings"; const route = useRoute(); const router = useRouter(); +const settingStore = useSettingStore(); const oauthType = route.params.type as string; const validationCode = route.query.validationCode as string; const forType = route.query.forType as string; diff --git a/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue b/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue index 587d55a5a..1a40f3d8b 100644 --- a/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue +++ b/packages/ui/certd-client/src/views/sys/settings/tabs/register.vue @@ -54,39 +54,40 @@
{{ t("certd.saveThenTest") }}
- -
- - -
-
- -
- - - - - - - - - - - - - -
{{ t("certd.sys.setting.oauthType") }}{{ t("certd.sys.setting.oauthConfig") }}
-
- - {{ item.title }} -
-
- -
-
-
+ +
+ + +
+
+ +
+ + + + + + + + + + + + + +
{{ t("certd.sys.setting.oauthType") }}{{ t("certd.sys.setting.oauthConfig") }}
+
+ + {{ item.title }} +
+
+ +
+
+
+ {{ t("certd.saveButton") }} diff --git a/packages/ui/certd-server/db/migration-mysql/v10034__oauth_bound.sql b/packages/ui/certd-server/db/migration-mysql/v10034__oauth_bound.sql new file mode 100644 index 000000000..a0dac0937 --- /dev/null +++ b/packages/ui/certd-server/db/migration-mysql/v10034__oauth_bound.sql @@ -0,0 +1,14 @@ + +CREATE TABLE `cd_oauth_bound` +( + `id` bigint PRIMARY KEY AUTO_INCREMENT NOT NULL, + `user_id` bigint NOT NULL, + `type` varchar(512) NOT NULL, + `open_id` varchar(512) NOT NULL, + `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP +); + + +CREATE INDEX `index_oauth_bound_user_id` ON `cd_oauth_bound` (`user_id`); +CREATE INDEX `index_oauth_bound_open_id` ON `cd_oauth_bound` (`open_id`); diff --git a/packages/ui/certd-server/db/migration-pg/v10034__oauth_bound.sql b/packages/ui/certd-server/db/migration-pg/v10034__oauth_bound.sql new file mode 100644 index 000000000..b796583b5 --- /dev/null +++ b/packages/ui/certd-server/db/migration-pg/v10034__oauth_bound.sql @@ -0,0 +1,14 @@ + +CREATE TABLE "cd_oauth_bound" +( + "id" bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY NOT NULL, + "user_id" bigint NOT NULL, + "type" varchar(512) NOT NULL, + "open_id" varchar(512) NOT NULL, + "create_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP), + "update_time" timestamp NOT NULL DEFAULT (CURRENT_TIMESTAMP) +); + + +CREATE INDEX "index_oauth_bound_user_id" ON "cd_oauth_bound" ("user_id"); +CREATE INDEX "index_oauth_bound_open_id" ON "cd_oauth_bound" ("open_id");