diff --git a/packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue b/packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue index c944d5bf7..9dbd49d7c 100644 --- a/packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue +++ b/packages/ui/certd-client/src/views/framework/home/dashboard/suite-card.vue @@ -37,7 +37,7 @@
监控站点数:
- +
diff --git a/packages/ui/certd-server/src/configuration-cache.ts b/packages/ui/certd-server/src/configuration-cache.ts index 7b1091800..7788bd7a8 100644 --- a/packages/ui/certd-server/src/configuration-cache.ts +++ b/packages/ui/certd-server/src/configuration-cache.ts @@ -1,6 +1,11 @@ export function shouldSetDefaultNoCache(path: string, cacheControl?: string) { + if(path === '/' || path === '/index.html' ){ + //首页不管怎样都不要缓存 + return true; + } if (cacheControl) { return false; } - return path === '/' || path === '/index.html' || path.startsWith('/api'); + // api也不要缓存,如果他本身有设置缓存除外 + return path.startsWith('/api'); } diff --git a/packages/ui/certd-server/src/configuration.test.ts b/packages/ui/certd-server/src/configuration.test.ts index 9b1266f81..cc9147e33 100644 --- a/packages/ui/certd-server/src/configuration.test.ts +++ b/packages/ui/certd-server/src/configuration.test.ts @@ -13,7 +13,9 @@ describe("shouldSetDefaultNoCache", () => { }); it("keeps explicit cache headers from file responses", () => { - assert.equal(shouldSetDefaultNoCache("/api/basic/file/download", "public,max-age=259200"), false); + assert.equal(shouldSetDefaultNoCache("/", "public,max-age=259200"), true); + assert.equal(shouldSetDefaultNoCache("/index.html", "public,max-age=259200"), true); + assert.equal(shouldSetDefaultNoCache("/api/basic/file/download", "public,max-age=259200"), false); }); it("ignores non-html and non-api paths", () => { diff --git a/packages/ui/certd-server/src/configuration.ts b/packages/ui/certd-server/src/configuration.ts index 1fe7f5b92..e91056944 100644 --- a/packages/ui/certd-server/src/configuration.ts +++ b/packages/ui/certd-server/src/configuration.ts @@ -126,7 +126,7 @@ export class MainConfiguration { await next(); const path = ctx.path; // 如果是首页则强制设置为不缓存 - if (path === '/' || path === '/index.html' || shouldSetDefaultNoCache(path, ctx.response.get('Cache-Control')) ) { + if (shouldSetDefaultNoCache(path, ctx.response.get('Cache-Control')) ) { ctx.response.set('Cache-Control', 'public,max-age=0'); } }); @@ -138,6 +138,6 @@ export class MainConfiguration { logger.info('当前环境:', this.app.getEnv()); // prod // throw new Error("address family not supported") - + } }