@cicctencent/midwayjs-base 1.0.21 → 1.0.23

package/dist/lib/utils.d.ts

@@ -1,4 +1,5 @@
 import { Context } from '@midwayjs/koa';
+import { CookieSetOptions, CookieGetOptions } from '@midwayjs/cookies';
 import { loadEnv } from '../config/env';
 export declare function checkUrlHost(url: string, host: string | Array<string>): boolean;
 /**
@@ -8,8 +9,8 @@ export declare function checkUrlHost(url: string, host: string | Array<string>):
      * @returns
      */
 export declare function getDefaultTemplate(ctx: Context, file?: string, data?: any): Promise<string>;
-export declare function getAuthToken(ctx: Context): any;
-export declare function setAuthToken(ctx: Context, token: string): void;
+export declare function getAuthToken(ctx: Context, option?: CookieGetOptions): any;
+export declare function setAuthToken(ctx: Context, token: string, option?: CookieSetOptions): void;
 export declare function decodeJWT(token: string, secretKey: string): any;
 export declare function encodeJWT(data: any, secretKey: string): any;
 export { loadEnv };

package/dist/lib/utils.js

@@ -53,22 +53,24 @@ function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
     return ctx.render(file, option);
 }
 // 从当前请求中获取登陆态token
-function getAuthToken(ctx) {
+function getAuthToken(ctx, option) {
     const body = (ctx.request.body || {});
     const token = ctx.URL.searchParams.get('token') ||
         ctx.request.header['x-auth-token'] ||
         ctx.cookies.get('token', {
             signed: false,
+            ...(option || {})
         }) ||
         ctx.request.header['authorization'] ||
         body.token;
     return token;
 }
 // 种登陆态token
-function setAuthToken(ctx, token) {
+function setAuthToken(ctx, token, option) {
     ctx.cookies.set('token', token, {
         httpOnly: true,
         maxAge: 1000 * 60 * 60 * 24 * 30,
+        ...(option || {})
     });
 }
 // 验证jwt
@@ -97,4 +99,4 @@ function encodeJWT(data, secretKey) {
     const token = jwt.sign(data, secretKey, { algorithm: 'HS256' });
     return token;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU1BLG9DQVVDO0FBUUQsZ0RBcUJDO0FBR0Qsb0NBV0M7QUFHRCxvQ0FLQztBQUdELDhCQVFDO0FBYUQsOEJBR0M7QUE1RkQsb0NBQW9DO0FBQ3BDLHVDQUF3QztBQThGcEMsd0ZBOUZLLGFBQU8sT0E4Rkw7QUE1RlgsZUFBZTtBQUNmLFNBQWdCLFlBQVksQ0FBQyxHQUFXLEVBQUUsSUFBMEI7SUFDaEUsSUFBRyxjQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQztRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3pDLElBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ3JCLEtBQUksTUFBTSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7WUFDbEIsSUFBRyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFBRSxPQUFPLElBQUksQ0FBQztRQUN6QyxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUNELE1BQU0sR0FBRyxHQUFHLElBQUksTUFBTSxDQUFDLGlCQUFpQixHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ2pELE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBRUQ7Ozs7O09BS087QUFDUCxTQUFnQixrQkFBa0IsQ0FBQyxHQUFZLEVBQUUsSUFBSSxHQUFDLFlBQVksRUFBRSxPQUFZLEVBQUU7SUFDOUUsc0JBQXNCO0lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO0lBQ3pDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQU9BLG9DQVVDO0FBUUQsZ0RBcUJDO0FBR0Qsb0NBWUM7QUFHRCxvQ0FNQztBQUdELDhCQVFDO0FBYUQsOEJBR0M7QUE5RkQsb0NBQW9DO0FBQ3BDLHVDQUF3QztBQWdHcEMsd0ZBaEdLLGFBQU8sT0FnR0w7QUE5RlgsZUFBZTtBQUNmLFNBQWdCLFlBQVksQ0FBQyxHQUFXLEVBQUUsSUFBMEI7SUFDaEUsSUFBRyxjQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQztRQUFFLE9BQU8sSUFBSSxDQUFDO0lBQ3pDLElBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDO1FBQ3JCLEtBQUksTUFBTSxDQUFDLElBQUksSUFBSSxFQUFFLENBQUM7WUFDbEIsSUFBRyxZQUFZLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQztnQkFBRSxPQUFPLElBQUksQ0FBQztRQUN6QyxDQUFDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUNELE1BQU0sR0FBRyxHQUFHLElBQUksTUFBTSxDQUFDLGlCQUFpQixHQUFHLElBQUksQ0FBQyxDQUFDO0lBQ2pELE9BQU8sR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztBQUN6QixDQUFDO0FBRUQ7Ozs7O09BS087QUFDUCxTQUFnQixrQkFBa0IsQ0FBQyxHQUFZLEVBQUUsSUFBSSxHQUFDLFlBQVksRUFBRSxPQUFZLEVBQUU7SUFDOUUsc0JBQXNCO0lBQ3RCLE1BQU0sVUFBVSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDO0lBQ3pDLE1BQU0sTUFBTSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDbkMsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUM7SUFDdkMsTUFBTSxNQUFNLEdBQUc7UUFDWCxJQUFJLEVBQUU7WUFDRixNQUFNLEVBQUU7Z0JBQ0osTUFBTTthQUNUO1lBQ0QsT0FBTyxFQUFFLEdBQUcsQ0FBQyxjQUFjLElBQUUsSUFBSTtZQUNqQyxHQUFHLElBQUk7U0FDVjtRQUNELEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDdkIsV0FBVyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUU7UUFDMUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHO1FBQ2hCLE1BQU07UUFDTixVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxRQUFRLElBQUksVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7S0FDbEUsQ0FBQztJQUNGLDBCQUEwQjtJQUMxQixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQ3BDLENBQUM7QUFFRCxtQkFBbUI7QUFDbkIsU0FBZ0IsWUFBWSxDQUFDLEdBQVksRUFBRSxNQUF5QjtJQUNoRSxNQUFNLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBUSxDQUFDO0lBQ3pDLE1BQU0sS0FBSyxHQUNYLEdBQUcsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7UUFDakMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDO1FBQ2xDLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRTtZQUNyQixNQUFNLEVBQUUsS0FBSztZQUNiLEdBQUcsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDO1NBQ3BCLENBQUM7UUFDRixHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUM7UUFDL0IsSUFBSSxDQUFDLEtBQUssQ0FBRTtJQUNwQixPQUFPLEtBQUssQ0FBQztBQUNqQixDQUFDO0FBRUQsWUFBWTtBQUNaLFNBQWdCLFlBQVksQ0FBQyxHQUFZLEVBQUUsS0FBYSxFQUFFLE1BQXlCO0lBQy9FLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxLQUFLLEVBQUU7UUFDNUIsUUFBUSxFQUFFLElBQUk7UUFDZCxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUU7UUFDaEMsR0FBRyxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUM7S0FDcEIsQ0FBQyxDQUFDO0FBQ1AsQ0FBQztBQUVELFFBQVE7QUFDUixTQUFnQixTQUFTLENBQUMsS0FBYSxFQUFFLFNBQWlCO0lBQ3RELElBQUksQ0FBQztRQUNELE1BQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1FBQzdDLE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7SUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ2IsT0FBTyxDQUFDLEtBQUssQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVTtRQUNyRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDUCxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7RUFVRTtBQUNGLFNBQWdCLFNBQVMsQ0FBQyxJQUFTLEVBQUUsU0FBaUI7SUFDbEQsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsU0FBUyxFQUFFLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUM7SUFDaEUsT0FBTyxLQUFLLENBQUM7QUFDakIsQ0FBQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cicctencent/midwayjs-base",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "description": "基础框架，服务",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -40,10 +40,11 @@
     "typescript": "^5.9.2"
   },
   "dependencies": {
-    "@fefeding/common": "^1.0.57",
+    "@fefeding/common": "^1.0.58",
     "@midwayjs/axios": "^3.20.11",
     "@midwayjs/bootstrap": "^3.20.11",
     "@midwayjs/cache-manager": "^3.20.11",
+    "@midwayjs/cookies": "^1.3.0",
     "@midwayjs/core": "^3.20.11",
     "@midwayjs/decorator": "^3.20.11",
     "@midwayjs/info": "^3.20.12",

package/typings/midway.d.ts

@@ -1,54 +1,54 @@
-import { type Session } from '@fefeding/common/dist/models/account/session';
-import { type LoggerOption } from '@fefeding/common/dist/utils/logger';
-import { ILogger, MidwayAppInfo } from '@midwayjs/core';
-
-declare module '@midwayjs/core/dist/interface' {
-    interface MidwayConfig {
-        
-    }
-    interface Context {
-
-    }
-}
-
-// 扩展 MidwayAppInfo 接口，添加自定义属性
-declare module '@midwayjs/core' {
-    interface MidwayAppInfo {
-      dist: string;
-      webDist: string;
-      webPublic: string;
-      appId: number;
-    }
-  }
-
-declare module '@midwayjs/koa/dist/interface' {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
-    interface Context {
-        /**
-         * 当前登陆态
-         */
-        currentSession?: Session;
-        /**
-         * 当前登陆态token
-         */
-        auth_token?: string;
-        clientIP?: string; // 客户IP
-        // 当当请
-        detect: {
-            IS_MOBILE: boolean,
-            IS_MQQ: boolean,
-            IS_WEIXIN: boolean,
-            IS_WECHATTOOLS: boolean,
-            IS_PCWEIXIN: boolean,
-            IS_WXWORK: boolean,
-            IS_MINA: boolean,
-            REQUESTIP: string,
-            HOSTNAME: string,
-            CLIENTIP: string,
-        },
-        logger: ILogger & {
-            // 设置环境变量
-            setOptions(options: LoggerOption): void;
-        };
-    }
-}
+import { type Session } from '@fefeding/common/dist/models/account/session';
+import { type LoggerOption } from '@fefeding/common/dist/utils/logger';
+import { ILogger, MidwayAppInfo } from '@midwayjs/core';
+
+declare module '@midwayjs/core/dist/interface' {
+    interface MidwayConfig {
+        
+    }
+    interface Context {
+
+    }
+}
+
+// 扩展 MidwayAppInfo 接口，添加自定义属性
+declare module '@midwayjs/core' {
+    interface MidwayAppInfo {
+      dist: string;
+      webDist: string;
+      webPublic: string;
+      appId: number;
+    }
+  }
+
+declare module '@midwayjs/koa/dist/interface' {
+    // eslint-disable-next-line @typescript-eslint/no-empty-interface
+    interface Context {
+        /**
+         * 当前登陆态
+         */
+        currentSession?: Session;
+        /**
+         * 当前登陆态token
+         */
+        auth_token?: string;
+        clientIP?: string; // 客户IP
+        // 当当请
+        detect: {
+            IS_MOBILE: boolean,
+            IS_MQQ: boolean,
+            IS_WEIXIN: boolean,
+            IS_WECHATTOOLS: boolean,
+            IS_PCWEIXIN: boolean,
+            IS_WXWORK: boolean,
+            IS_MINA: boolean,
+            REQUESTIP: string,
+            HOSTNAME: string,
+            CLIENTIP: string,
+        },
+        logger: ILogger & {
+            // 设置环境变量
+            setOptions(options: LoggerOption): void;
+        };
+    }
+}