github
/
certd
mirror of https://github.com/certd/certd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 修复下载证书时提示token已过期的问题

pull/409/head
xiaojunnuo 2025-04-19 14:25:56 +08:00
parent 02b6351e13
commit 0e07ae6ce8
9 changed files with 103 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
packages/ui/certd-client/src/api/service.ts
View File

@ -49,33 +49,32 @@ function createService() {
} }
// 这个状态码是和后端约定的 // 这个状态码是和后端约定的
const { code } = dataAxios; if (dataAxios?.code === undefined) {
// 根据 code 进行判断
if (code === undefined) {
// 如果没有 code 代表这不是项目后端开发的接口 // 如果没有 code 代表这不是项目后端开发的接口
errorCreate(`非标准返回：${dataAxios}， ${response.config.url}`); errorCreate(`非标准返回：${dataAxios}， ${response.config.url}`);
return dataAxios; return dataAxios;
} else { }
// 有 code 代表这是一个后端接口 可以进行进一步的判断 const { code } = dataAxios;
switch (code) { // 有 code 代表这是一个后端接口 可以进行进一步的判断
case 0: switch (code) {
// [ 示例 ] code === 0 代表没有错误 case 0:
// [ 示例 ] code === 0 代表没有错误
// @ts-ignore
return dataAxios?.data;
default:
// 不是正确的 code
const errorMessage = dataAxios.msg || dataAxios.message || "未知错误";
// @ts-ignore
if (response?.config?.onError) {
const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data);
// @ts-ignore // @ts-ignore
return dataAxios.data; response.config.onError(err);
default: return;
// 不是正确的 code }
const errorMessage = dataAxios.msg || dataAxios.message || "未知错误"; //@ts-ignore
// @ts-ignore const showErrorNotify = response?.config?.showErrorNotify;
if (response?.config?.onError) { errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
const err = new CodeError(errorMessage, dataAxios.code, dataAxios.data); return dataAxios;
response.config.onError(err);
return;
}
//@ts-ignore
const showErrorNotify = response?.config?.showErrorNotify;
errorCreate(`${errorMessage}: ${response.config.url}`, showErrorNotify, dataAxios);
return dataAxios;
}
} }
}, },
error => { error => {

10
packages/ui/certd-client/src/i18n/locale/zh_CN.ts
View File

@ -3,12 +3,12 @@ export default {
crud: { i18n: { name: "姓名", city: "城市", status: "状态" } }, crud: { i18n: { name: "姓名", city: "城市", status: "状态" } },
login: { login: {
logoutTip: "确认", logoutTip: "确认",
logoutMessage: "确定要注销登录吗？" logoutMessage: "确定要注销登录吗？",
} },
}, },
fs: { fs: {
rowHandle: { rowHandle: {
title: "操作列" title: "操作列",
} },
} },
}; };

4
packages/ui/certd-client/src/layout/components/user-info/index.vue
View File

@ -20,7 +20,7 @@ import { useI18n } from "vue-i18n";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
defineOptions({ defineOptions({
name: "FsUserInfo" name: "FsUserInfo",
}); });
const userStore = useUserStore(); const userStore = useUserStore();
const { t } = useI18n(); const { t } = useI18n();
@ -38,7 +38,7 @@ function doLogout() {
content: t("app.login.logoutMessage"), content: t("app.login.logoutMessage"),
onOk: async () => { onOk: async () => {
await userStore.logout(true); await userStore.logout(true);
} },
}); });
} }
</script> </script>

2
packages/ui/certd-client/src/layout/layout-basic.vue
View File

@ -30,7 +30,7 @@ const avatar = computed(() => {
}); });
async function handleLogout() { async function handleLogout() {
userStore.logout(true); await userStore.logout(true);
} }
const settingStore = useSettingStore(); const settingStore = useSettingStore();

6
packages/ui/certd-client/src/store/user/api.user.ts
View File

@ -41,6 +41,12 @@ export async function register(user: RegisterReq): Promise<UserInfoRes> {
data: user, data: user,
}); });
} }
export async function logout() {
return await request({
url: "/logout",
method: "post",
});
}
export async function login(data: LoginReq): Promise<LoginRes> { export async function login(data: LoginReq): Promise<LoginRes> {
//如果开启了登录与权限模块，则真实登录 //如果开启了登录与权限模块，则真实登录

3
packages/ui/certd-client/src/store/user/index.ts
View File

@ -108,9 +108,10 @@ export const useUserStore = defineStore({
/** /**
* @description: logout * @description: logout
*/ */
logout(goLogin = true) { async logout(goLogin = true) {
this.resetState(); this.resetState();
resetAllStores(); resetAllStores();
await UserApi.logout(); //主要是清空cookie
goLogin && router.push("/login"); goLogin && router.push("/login");
mitter.emit("app.logout"); mitter.emit("app.logout");
}, },

9
packages/ui/certd-server/src/controller/user/login/login-controller.ts
View File

@ -28,7 +28,7 @@ export class LoginController extends BaseController {
} }
private writeTokenCookie(token: { expire: any; token: any }) { private writeTokenCookie(token: { expire: any; token: any }) {
this.ctx.cookies.set("token", token.token, { this.ctx.cookies.set("certd_token", token.token, {
maxAge: 1000 * token.expire maxAge: 1000 * token.expire
}); });
} }
@ -72,5 +72,10 @@ export class LoginController extends BaseController {
} }
@Post('/logout', { summary: Constants.per.authOnly }) @Post('/logout', { summary: Constants.per.authOnly })
public logout() {} public logout() {
this.ctx.cookies.set("certd_token", "", {
maxAge: 0
});
return this.ok();
}
} }

15
packages/ui/certd-server/src/middleware/authority.ts
View File

@ -56,7 +56,20 @@ export class AuthorityMiddleware implements IWebMiddleware {
token = token.replace('Bearer ', '').trim(); token = token.replace('Bearer ', '').trim();
if (!token) { if (!token) {
//尝试从cookie中获取token //尝试从cookie中获取token
token = ctx.cookies.get('token') || ''; const cookie = ctx.headers.cookie;
if (cookie) {
const items = cookie.split(';');
for (const item of items) {
if (!item || !item.trim()) {
continue;
}
const [key, value] = item.split('=');
if (key.trim() === 'certd_token') {
token = value.trim();
break;
}
}
}
} }
if (!token) { if (!token) {
//尝试从query中获取token //尝试从query中获取token

88
pnpm-lock.yaml
View File

@ -46,7 +46,7 @@ importers:
packages/core/acme-client: packages/core/acme-client:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../basic version: link:../basic
'@peculiar/x509': '@peculiar/x509':
specifier: ^1.11.0 specifier: ^1.11.0
@ -204,10 +204,10 @@ importers:
packages/core/pipeline: packages/core/pipeline:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../basic version: link:../basic
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
dayjs: dayjs:
specifier: ^1.11.7 specifier: ^1.11.7
@ -412,7 +412,7 @@ importers:
packages/libs/lib-k8s: packages/libs/lib-k8s:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@kubernetes/client-node': '@kubernetes/client-node':
specifier: 0.21.0 specifier: 0.21.0
@ -452,16 +452,16 @@ importers:
packages/libs/lib-server: packages/libs/lib-server:
dependencies: dependencies:
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
'@midwayjs/cache': '@midwayjs/cache':
specifier: ~3.14.0 specifier: ~3.14.0
@ -604,16 +604,16 @@ importers:
packages/plugins/plugin-cert: packages/plugins/plugin-cert:
dependencies: dependencies:
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../plugin-lib version: link:../plugin-lib
'@google-cloud/publicca': '@google-cloud/publicca':
specifier: ^1.3.0 specifier: ^1.3.0
@ -680,10 +680,10 @@ importers:
specifier: ^1.7.10 specifier: ^1.7.10
version: 1.8.0 version: 1.8.0
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@kubernetes/client-node': '@kubernetes/client-node':
specifier: 0.21.0 specifier: 0.21.0
@ -771,19 +771,19 @@ importers:
packages/pro/commercial-core: packages/pro/commercial-core:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/lib-server': '@certd/lib-server':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-server version: link:../../libs/lib-server
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-plus': '@certd/plugin-plus':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../plugin-plus version: link:../plugin-plus
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../plus-core version: link:../plus-core
'@midwayjs/core': '@midwayjs/core':
specifier: ~3.20.3 specifier: ~3.20.3
@ -868,22 +868,22 @@ importers:
specifier: ^1.0.2 specifier: ^1.0.2
version: 1.0.2 version: 1.0.2
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/lib-k8s': '@certd/lib-k8s':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-k8s version: link:../../libs/lib-k8s
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-cert': '@certd/plugin-cert':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../plugins/plugin-cert version: link:../../plugins/plugin-cert
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../plugins/plugin-lib version: link:../../plugins/plugin-lib
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../plus-core version: link:../plus-core
ali-oss: ali-oss:
specifier: ^6.21.0 specifier: ^6.21.0
@ -980,7 +980,7 @@ importers:
packages/pro/plus-core: packages/pro/plus-core:
dependencies: dependencies:
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
dayjs: dayjs:
specifier: ^1.11.7 specifier: ^1.11.7
@ -1270,10 +1270,10 @@ importers:
version: 0.1.3(zod@3.24.2) version: 0.1.3(zod@3.24.2)
devDependencies: devDependencies:
'@certd/lib-iframe': '@certd/lib-iframe':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-iframe version: link:../../libs/lib-iframe
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@rollup/plugin-commonjs': '@rollup/plugin-commonjs':
specifier: ^25.0.7 specifier: ^25.0.7
@ -1453,43 +1453,43 @@ importers:
specifier: ^3.705.0 specifier: ^3.705.0
version: 3.758.0(aws-crt@1.25.3) version: 3.758.0(aws-crt@1.25.3)
'@certd/acme-client': '@certd/acme-client':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/acme-client version: link:../../core/acme-client
'@certd/basic': '@certd/basic':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/basic version: link:../../core/basic
'@certd/commercial-core': '@certd/commercial-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../pro/commercial-core version: link:../../pro/commercial-core
'@certd/jdcloud': '@certd/jdcloud':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-jdcloud version: link:../../libs/lib-jdcloud
'@certd/lib-huawei': '@certd/lib-huawei':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-huawei version: link:../../libs/lib-huawei
'@certd/lib-k8s': '@certd/lib-k8s':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-k8s version: link:../../libs/lib-k8s
'@certd/lib-server': '@certd/lib-server':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/lib-server version: link:../../libs/lib-server
'@certd/midway-flyway-js': '@certd/midway-flyway-js':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../libs/midway-flyway-js version: link:../../libs/midway-flyway-js
'@certd/pipeline': '@certd/pipeline':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../core/pipeline version: link:../../core/pipeline
'@certd/plugin-cert': '@certd/plugin-cert':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../plugins/plugin-cert version: link:../../plugins/plugin-cert
'@certd/plugin-lib': '@certd/plugin-lib':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../plugins/plugin-lib version: link:../../plugins/plugin-lib
'@certd/plugin-plus': '@certd/plugin-plus':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../pro/plugin-plus version: link:../../pro/plugin-plus
'@certd/plus-core': '@certd/plus-core':
specifier: ^1.33.4 specifier: ^1.33.5
version: link:../../pro/plus-core version: link:../../pro/plus-core
'@corsinvest/cv4pve-api-javascript': '@corsinvest/cv4pve-api-javascript':
specifier: ^8.3.0 specifier: ^8.3.0
@ -20673,13 +20673,13 @@ snapshots:
resolve: 1.22.10 resolve: 1.22.10
semver: 6.3.1 semver: 6.3.1
eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8): eslint-plugin-prettier@3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8):
dependencies: dependencies:
eslint: 7.32.0 eslint: 7.32.0
prettier: 2.8.8 prettier: 2.8.8
prettier-linter-helpers: 1.0.0 prettier-linter-helpers: 1.0.0
optionalDependencies: optionalDependencies:
eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-config-prettier: 8.10.0(eslint@8.57.0)
eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8): eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8):
dependencies: dependencies:
@ -23393,7 +23393,7 @@ snapshots:
eslint: 7.32.0 eslint: 7.32.0
eslint-config-prettier: 8.10.0(eslint@7.32.0) eslint-config-prettier: 8.10.0(eslint@7.32.0)
eslint-plugin-node: 11.1.0(eslint@7.32.0) eslint-plugin-node: 11.1.0(eslint@7.32.0)
eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@7.32.0))(eslint@7.32.0)(prettier@2.8.8) eslint-plugin-prettier: 3.4.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@7.32.0)(prettier@2.8.8)
execa: 5.1.1 execa: 5.1.1
inquirer: 7.3.3 inquirer: 7.3.3
json5: 2.2.3 json5: 2.2.3