midway-fatcms 0.0.1-beta.3 → 0.0.1-beta.4

package/dist/config/config.default.js

@@ -134,13 +134,13 @@ exports.default = (appInfo) => {
         // 使用浏览器插件配置header信息：插件名：ModHeader - Modify HTTP headers
         // 默认值：配置key：fatcmsdebug, 配置value: headerSecret的值
         fatcmsDebug: {
-            headerKey: 'euhvfvv5sDt19dNoerVFamhNYlLJ8ZDDYcRZhMJWNRxALxtrxLPqJSks9sRZEpKY',
-            headerSecret: 'IlddQO1fO8X7KSwnF3KazNaNHK05Y0kYaD+1z3yGlfZpz0+aAF5hDzf7KQk2dyx0',
+            headerKey: 'fatcmsDebug',
+            headerSecret: '111',
         },
         // 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
         fatcmsSAEnable: {
-            headerKey: 'WyuX2jf8hehgXAjV5Bf22hvbK/KTEiHCM8eiQeI0FETm/UFXkcLnn3GSTUfwVrrE',
-            headerSecret: 'lzt19Ef6HxSqg2rp6Q1M3YT+uMrTecmAm3cX1mwFZGqoXknwWdj5fTJil1Vr9AeHDIUFuOOxrU1kSSVa6h/Ppw==',
+            headerKey: 'fatcmsSAEnable',
+            headerSecret: '222',
         },
         // 是否启用内置的定时任务
         fatcmsScheduleService: true,

package/dist/controller/gateway/StaticController.d.ts

@@ -11,6 +11,9 @@ interface HttpGetRes {
  */
 export declare class StaticController extends BaseApiController {
     protected ctx: Context;
+    constructor();
+    private getLocalPaths;
+    private initNotFoundList;
     private responseLocalFile;
     proxyStaticFile(ossName: string, relativePath: string): Promise<string>;
     saveNotFoundList(): Promise<void>;

package/dist/controller/gateway/StaticController.js

@@ -20,17 +20,17 @@ const fs2 = require("fs");
 const path = require("path");
 const https = require("https");
 const functions_1 = require("../../libs/utils/functions");
-const localDir = path.join(__dirname, '../../../public/static'); // 本地文件存储目录
-const notFoundListFile = path.join(localDir, '__404__list.json'); // 404列表文件
 function getPathConfig(ossName) {
     const remoteBaseUrlMap = {
         "cdnjsx": 'https://cdnjsx.oss-cn-shanghai.aliyuncs.com',
         "i.alicdn.com": "https://i.alicdn.com",
         "img.alicdn.com": "https://img.alicdn.com",
+        "at.alicdn.com": "https://at.alicdn.com",
     };
-    const remoteBaseUrl = remoteBaseUrlMap[ossName];
+    let remoteBaseUrl = remoteBaseUrlMap[ossName];
     if (!remoteBaseUrl) {
-        throw new Error(`ossName: ${ossName} 未配置`);
+        console.error(`getPathConfig ossName: ${ossName} 未配置`);
+        remoteBaseUrl = `https://${ossName}`;
     }
     return {
         remoteBaseUrl,
@@ -38,26 +38,43 @@ function getPathConfig(ossName) {
 }
 // 404列表缓存
 let notFoundList = new Set();
-// 初始化：加载404列表
-async function init() {
-    try {
-        // 确保本地存储目录存在
-        await fs.mkdir(localDir, { recursive: true });
-        const data = await fs.readFile(notFoundListFile, 'utf8');
-        notFoundList = new Set(JSON.parse(data));
-        console.log(`已加载${notFoundList.size}个404记录`);
-    }
-    catch (error) {
-        if (error.code !== 'ENOENT') {
-            console.error('读取404列表失败:', error);
-        }
-    }
-}
-init();
+let notFoundListIsInit = false;
 /**
  * 静态文件代理功能
  */
 let StaticController = class StaticController extends BaseApiController_1.BaseApiController {
+    constructor() {
+        super();
+        this.initNotFoundList();
+    }
+    getLocalPaths() {
+        const appDir = this.app.getAppDir();
+        const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
+        const notFoundListFile = path.join(localDir, '__404__list.json'); // 404列表文件
+        return {
+            localDir,
+            notFoundListFile
+        };
+    }
+    async initNotFoundList() {
+        if (notFoundListIsInit) {
+            return;
+        }
+        notFoundListIsInit = true;
+        const { localDir, notFoundListFile } = this.getLocalPaths();
+        try {
+            // 确保本地存储目录存在
+            await fs.mkdir(localDir, { recursive: true });
+            const data = await fs.readFile(notFoundListFile, 'utf8');
+            notFoundList = new Set(JSON.parse(data));
+            console.log(`已加载${notFoundList.size}个404记录`);
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT') {
+                console.error('读取404列表失败:', error);
+            }
+        }
+    }
     async responseLocalFile(localFilePath, localHeaderPath, relativePath) {
         const headers = {
             "Cache-Control": 'public, max-age=31536000',
@@ -107,6 +124,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
         return false;
     }
     async proxyStaticFile(ossName, relativePath) {
+        const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
         // 构建本地路径和远程路径
         const localFilePath = path.join(localDir, ossName, "files", relativePath);
@@ -161,6 +179,7 @@ let StaticController = class StaticController extends BaseApiController_1.BaseAp
     }
     // 保存404列表
     async saveNotFoundList() {
+        const { notFoundListFile } = this.getLocalPaths();
         try {
             // 确保存储404列表的目录存在
             const dir = path.dirname(notFoundListFile);
@@ -260,6 +279,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], StaticController.prototype, "proxyStaticFile", null);
 StaticController = __decorate([
-    (0, core_1.Controller)('/ns/static')
+    (0, core_1.Controller)('/ns/static'),
+    __metadata("design:paramtypes", [])
 ], StaticController);
 exports.StaticController = StaticController;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.3",
+  "version": "0.0.1-beta.4",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/gateway/StaticController.ts

@@ -1,6 +1,7 @@
 import { All, Controller, Inject, Param } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { BaseApiController } from '../base/BaseApiController';
+import * as _ from 'lodash';
 import * as fs from 'fs/promises';
 import * as fs2 from 'fs';
 import * as path from 'path';
@@ -15,19 +16,18 @@ interface HttpGetRes {
 }
 
 
-const localDir = path.join(__dirname, '../../../public/static'); // 本地文件存储目录
-const notFoundListFile = path.join(localDir, '__404__list.json') // 404列表文件
-
 
 function getPathConfig(ossName: string) {
     const remoteBaseUrlMap = {
         "cdnjsx": 'https://cdnjsx.oss-cn-shanghai.aliyuncs.com',
-        "i.alicdn.com":"https://i.alicdn.com",
-        "img.alicdn.com":"https://img.alicdn.com",
+        "i.alicdn.com": "https://i.alicdn.com",
+        "img.alicdn.com": "https://img.alicdn.com",
+        "at.alicdn.com": "https://at.alicdn.com",
     };
-    const remoteBaseUrl = remoteBaseUrlMap[ossName];
+    let remoteBaseUrl = remoteBaseUrlMap[ossName];
     if (!remoteBaseUrl) {
-        throw new Error(`ossName: ${ossName} 未配置`);
+        console.error(`getPathConfig ossName: ${ossName} 未配置`);
+        remoteBaseUrl = `https://${ossName}`
     }
     return {
         remoteBaseUrl,
@@ -35,28 +35,13 @@ function getPathConfig(ossName: string) {
 }
 
 
-// 404列表缓存
-let notFoundList = new Set();
-
 
-// 初始化：加载404列表
-async function init() {
-    try {
-        // 确保本地存储目录存在
-        await fs.mkdir(localDir, { recursive: true });
-        const data = await fs.readFile(notFoundListFile, 'utf8');
 
-        notFoundList = new Set(JSON.parse(data));
-        console.log(`已加载${notFoundList.size}个404记录`);
-    } catch (error) {
-        if (error.code !== 'ENOENT') {
-            console.error('读取404列表失败:', error);
-        }
-    }
-}
+// 404列表缓存
+let notFoundList = new Set();
+let notFoundListIsInit = false;
 
 
-init();
 
 /**
  * 静态文件代理功能
@@ -66,6 +51,44 @@ export class StaticController extends BaseApiController {
     @Inject()
     protected ctx: Context;
 
+    constructor() {
+        super();
+        this.initNotFoundList();
+    }
+
+
+    private getLocalPaths(): any {
+        const appDir = this.app.getAppDir();
+        const localDir = path.join(appDir, './public/static'); // 本地文件存储目录
+        const notFoundListFile = path.join(localDir, '__404__list.json') // 404列表文件
+        return {
+            localDir,
+            notFoundListFile
+        }
+    }
+
+
+    private async initNotFoundList() {
+        if (notFoundListIsInit) {
+            return;
+        }
+        notFoundListIsInit = true;
+
+        const { localDir, notFoundListFile } = this.getLocalPaths();
+        try {
+            // 确保本地存储目录存在
+            await fs.mkdir(localDir, { recursive: true });
+            const data = await fs.readFile(notFoundListFile, 'utf8');
+
+            notFoundList = new Set(JSON.parse(data));
+            console.log(`已加载${notFoundList.size}个404记录`);
+        } catch (error) {
+            if (error.code !== 'ENOENT') {
+                console.error('读取404列表失败:', error);
+            }
+        }
+    }
+
     private async responseLocalFile(localFilePath: string, localHeaderPath: string, relativePath: string): Promise<boolean> {
 
         const headers = {
@@ -128,6 +151,7 @@ export class StaticController extends BaseApiController {
     @All('/:ossName/:relativePath+')
     async proxyStaticFile(@Param('ossName') ossName: string, @Param('relativePath') relativePath: string) {
 
+        const { localDir } = this.getLocalPaths();
         const PATH_CONFIG = getPathConfig(ossName);
 
 
@@ -195,6 +219,7 @@ export class StaticController extends BaseApiController {
 
     // 保存404列表
     async saveNotFoundList() {
+        const { notFoundListFile } = this.getLocalPaths();
         try {
             // 确保存储404列表的目录存在
             const dir = path.dirname(notFoundListFile);