diff --git a/.vscode/launch.json b/.vscode/launch.json index ed013d22..e2a5c574 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -24,6 +24,36 @@ "runtimeArgs": ["dev"], "console": "integratedTerminal", "internalConsoleOptions": "neverOpen" + }, + { + "name": "server-mysql", + "type": "node", + "request": "launch", + "cwd": "${workspaceFolder}/packages/ui/certd-server", + "runtimeExecutable": "pnpm", + "runtimeArgs": ["dev-mysql"], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" + }, + { + "name": "server-pg", + "type": "node", + "request": "launch", + "cwd": "${workspaceFolder}/packages/ui/certd-server", + "runtimeExecutable": "pnpm", + "runtimeArgs": ["dev-pg"], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" + }, + { + "name": "server-common", + "type": "node", + "request": "launch", + "cwd": "${workspaceFolder}/packages/ui/certd-server", + "runtimeExecutable": "pnpm", + "runtimeArgs": ["dev-commpro"], + "console": "integratedTerminal", + "internalConsoleOptions": "neverOpen" }, { "name": "server-local-plus", 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 8aff34aa..20af1ea0 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 @@ -28,10 +28,10 @@ 未设置触发源,不会自动执行 - + - 有效期: + 有效期: 已过期 diff --git a/packages/ui/certd-client/src/views/framework/login/index.vue b/packages/ui/certd-client/src/views/framework/login/index.vue index 2f2cd007..176a8b44 100644 --- a/packages/ui/certd-client/src/views/framework/login/index.vue +++ b/packages/ui/certd-client/src/views/framework/login/index.vue @@ -95,11 +95,14 @@ import SmsCode from "/@/views/framework/login/sms-code.vue"; import { useI18n } from "/@/locales"; import { LanguageToggle } from "/@/vben/layouts"; import CaptchaInput from "/@/components/captcha/captcha-input.vue"; +import { useRoute } from "vue-router"; export default defineComponent({ name: "LoginPage", components: { LanguageToggle, SmsCode, CaptchaInput }, setup() { const { t } = useI18n(); + const route = useRoute(); + const urlLoginType = route.query.loginType as string | undefined; const verifyCodeInputRef = ref(); const loading = ref(false); const userStore = useUserStore(); @@ -110,7 +113,7 @@ export default defineComponent({ phoneCode: "86", mobile: "", password: "", - loginType: "password", //password + loginType: urlLoginType || "password", //password smsCode: "", captcha: null, smsCaptcha: null, diff --git a/packages/ui/certd-client/src/views/framework/register/index.vue b/packages/ui/certd-client/src/views/framework/register/index.vue index d7e308ce..931dd84e 100644 --- a/packages/ui/certd-client/src/views/framework/register/index.vue +++ b/packages/ui/certd-client/src/views/framework/register/index.vue @@ -1,7 +1,7 @@