diff --git a/src/components/admin/dialogs/editVendor.vue b/src/components/admin/dialogs/editVendor.vue index 30e76f6..f68f313 100644 --- a/src/components/admin/dialogs/editVendor.vue +++ b/src/components/admin/dialogs/editVendor.vue @@ -18,7 +18,7 @@ const defaultData: Backend = { comment: "", tls: false, jwtSecret: "", - customCA: "", + customCa: "", timeOut: "", consul: { serviceName: "", diff --git a/src/components/user/dialogs/email.vue b/src/components/user/dialogs/email.vue index 12a325b..37fca2c 100644 --- a/src/components/user/dialogs/email.vue +++ b/src/components/user/dialogs/email.vue @@ -12,7 +12,7 @@ const emit = defineEmits(["updateUInfo"]); interface FormData { email: string; captcha: string; - captchaID: string; + captchaId: string; answer: string; } @@ -27,7 +27,7 @@ const formDataRef = ref(); const formData = reactive({ email: "", captcha: "", - captchaID: "", + captchaId: "", answer: "" }); const rules = reactive>({ @@ -67,7 +67,7 @@ const toSendEmailCode = async () => { }, data: { email, - captchaID: formData.captchaID, + captchaId: formData.captchaId, answer: formData.answer } }); @@ -118,7 +118,7 @@ const refreshCaptcha = async () => { Authorization: token.value } }); - if (captcha.value) formData.captchaID = captcha.value.captchaID; + if (captcha.value) formData.captchaId = captcha.value.captchaId; }; diff --git a/src/services/apis/auth.ts b/src/services/apis/auth.ts index 10ace10..764f73d 100644 --- a/src/services/apis/auth.ts +++ b/src/services/apis/auth.ts @@ -104,7 +104,7 @@ export const getPublicSettings = useDefineApi({ export const getRegCaptchaApi = useDefineApi< any, { - captchaID: string; + captchaId: string; captchaBase64: string; } >({ @@ -117,7 +117,7 @@ export const sendRegCodeApi = useDefineApi< { data: { email: string; - captchaID: string; + captchaId: string; answer: string; }; }, @@ -131,7 +131,7 @@ export const sendRegCodeApi = useDefineApi< export const getResetCaptchaApi = useDefineApi< any, { - captchaID: string; + captchaId: string; captchaBase64: string; } >({ @@ -144,7 +144,7 @@ export const sendResetCodeApi = useDefineApi< { data: { email: string; - captchaID: string; + captchaId: string; answer: string; }; }, diff --git a/src/services/apis/user.ts b/src/services/apis/user.ts index 883a660..9030fc9 100644 --- a/src/services/apis/user.ts +++ b/src/services/apis/user.ts @@ -97,7 +97,7 @@ export const oAuth2Platforms = useDefineApi< }, { [platform: string]: { - providerUserID: string; + providerUserId: string; createdAt: number; }; } @@ -142,7 +142,7 @@ export const getBindEmailCaptchaApi = useDefineApi< }; }, { - captchaID: string; + captchaId: string; captchaBase64: string; } >({ @@ -158,7 +158,7 @@ export const sendBindEmailCodeApi = useDefineApi< }; data: { email: string; - captchaID: string; + captchaId: string; answer: string; }; }, diff --git a/src/services/apis/vendor.ts b/src/services/apis/vendor.ts index 9af694e..6cecf58 100644 --- a/src/services/apis/vendor.ts +++ b/src/services/apis/vendor.ts @@ -138,7 +138,7 @@ export const getAListBinds = useDefineApi< }; }, { - serverID: string; + serverId: string; host: string; }[] >({ @@ -167,7 +167,7 @@ export const getAListAccountInfo = useDefineApi< { headers: { Authorization: string }; params: { - serverID: string; + serverId: string; }; }, { @@ -224,7 +224,7 @@ export const getEmbyBinds = useDefineApi< }; }, { - serverID: string; + serverId: string; host: string; }[] >({ diff --git a/src/types/Vendor.ts b/src/types/Vendor.ts index b4bd25a..45b138b 100644 --- a/src/types/Vendor.ts +++ b/src/types/Vendor.ts @@ -4,7 +4,7 @@ export interface Backend { comment?: string; tls?: boolean; jwtSecret?: string; - customCA?: string; + customCa?: string; timeOut?: string; consul?: Consul; etcd?: Etcd; diff --git a/src/views/auth/Register.vue b/src/views/auth/Register.vue index ac2eb07..d3372a0 100644 --- a/src/views/auth/Register.vue +++ b/src/views/auth/Register.vue @@ -34,11 +34,11 @@ const { execute: passwordRegisterApi } = usePasswordRegisterApi(); const { state: oauth2SignupEnabled, execute: getOAuth2SignupEnabled } = OAuth2SignupEnabled(); const { execute: loginOAuth2 } = loginWithOAuth2(); -const formData = ref({ +const formData = ref({ email: "", password: "", captcha: "", - captchaID: "", + captchaId: "", answer: "" }); @@ -73,7 +73,7 @@ const toSendRegCode = async () => { await sendRegCode({ data: { email, - captchaID: formData.value.captchaID, + captchaId: formData.value.captchaId, answer: formData.value.answer } }); @@ -251,7 +251,7 @@ const toRegister = async () => { const refreshRegCaptcha = async () => { await getRegCaptcha(); - if (captcha.value) formData.value.captchaID = captcha.value.captchaID; + if (captcha.value) formData.value.captchaId = captcha.value.captchaId; }; const resetForm = () => { @@ -259,7 +259,7 @@ const resetForm = () => { email: "", password: "", captcha: "", - captchaID: "", + captchaId: "", answer: "" }; passwordFormData.value = { diff --git a/src/views/auth/Reset.vue b/src/views/auth/Reset.vue index ec6e1c2..a0c8da1 100644 --- a/src/views/auth/Reset.vue +++ b/src/views/auth/Reset.vue @@ -20,11 +20,11 @@ const { execute: sendResetCode, isLoading: sendResetCodeLoading } = sendResetCod const _captcha = useRouteQuery("captcha"); const _email = useRouteQuery("email"); const step = ref(1); -const formData = ref({ +const formData = ref({ email: "", password: "", captcha: "", - captchaID: "", + captchaId: "", answer: "" }); const emailProvider = ref(settings?.emailWhitelistEnabled && settings?.emailWhitelist[0]); @@ -50,7 +50,7 @@ const toSendResetCode = async () => { await sendResetCode({ data: { email, - captchaID: formData.value.captchaID, + captchaId: formData.value.captchaId, answer: formData.value.answer } }); @@ -131,7 +131,7 @@ const toReset = async () => { const refreshRegCaptcha = async () => { await getRegCaptcha(); - if (captcha.value) formData.value.captchaID = captcha.value.captchaID; + if (captcha.value) formData.value.captchaId = captcha.value.captchaId; }; const resetForm = () => @@ -139,7 +139,7 @@ const resetForm = () => email: "", password: "", captcha: "", - captchaID: "", + captchaId: "", answer: "" }); diff --git a/src/views/user/account/index.vue b/src/views/user/account/index.vue index 096893e..c9cda6c 100644 --- a/src/views/user/account/index.vue +++ b/src/views/user/account/index.vue @@ -18,7 +18,7 @@ const { token, info, getUserInfo } = userStore(); const bindEmailDialog = ref>(); interface ProviderType { name: string; - providerUserID: string; + providerUserId: string; createdAt: number; } @@ -42,13 +42,13 @@ const getProviders = async () => { if (state.value[key].createdAt === 0) { unbind.value.push({ name: key, - providerUserID: state.value[key].providerUserID, + providerUserId: state.value[key].providerUserId, createdAt: state.value[key].createdAt }); } else { bind.value.push({ name: key, - providerUserID: state.value[key].providerUserID, + providerUserId: state.value[key].providerUserId, createdAt: state.value[key].createdAt }); } @@ -182,7 +182,7 @@ onMounted(async () => { - + diff --git a/src/views/user/platforms/emby.vue b/src/views/user/platforms/emby.vue index 0c29872..a2e5879 100644 --- a/src/views/user/platforms/emby.vue +++ b/src/views/user/platforms/emby.vue @@ -38,7 +38,7 @@ const { execute: reqAccountInfo, isLoading: getEmbyAccountInfoLoading } = getEmbyAccountInfo(); -const getAccountInfo = async (serverID: string) => { +const getAccountInfo = async (serverId: string) => { try { infoDialog.value = true; await reqAccountInfo({ @@ -46,7 +46,7 @@ const getAccountInfo = async (serverID: string) => { Authorization: userToken.value }, params: { - serverID + serverId } }); } catch (err: any) { @@ -132,11 +132,11 @@ const closeLoginDialog = () => { >
- + @@ -155,14 +155,14 @@ const closeLoginDialog = () => { confirm-button-text="是" cancel-button-text="否" title="你确定要解除绑定吗?" - @confirm="embyLogout(scope.row.serverID)" + @confirm="embyLogout(scope.row.serverId)" > - + 详情