midway-fatcms 0.0.1-beta.76 → 0.0.1-beta.77

package/src/service/base/cache/NoneCache.ts

@@ -1,24 +1,24 @@
-import { ICacheService } from '@/models/bizmodels';
-import { Context } from '@midwayjs/koa';
-
-export class NoneCache implements ICacheService {
-    protected ctx: Context;
-    protected cacheName: string;
-
-    constructor(ctx: Context, cacheName: string) {
-        this.ctx = ctx;
-        this.cacheName = cacheName;
-    }
-
-    async getJsonObject(key: string): Promise<any> {
-       return null;
-    }
-
-    async setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any> {
-        return true;
-    }
-
-    async removeItem(key: string): Promise<any> {
-       return true;
-    }
-}
+import { ICacheService } from '@/models/bizmodels';
+import { Context } from '@midwayjs/koa';
+
+export class NoneCache implements ICacheService {
+    protected ctx: Context;
+    protected cacheName: string;
+
+    constructor(ctx: Context, cacheName: string) {
+        this.ctx = ctx;
+        this.cacheName = cacheName;
+    }
+
+    async getJsonObject(key: string): Promise<any> {
+       return null;
+    }
+
+    async setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any> {
+        return true;
+    }
+
+    async removeItem(key: string): Promise<any> {
+       return true;
+    }
+}

package/src/service/base/cache/RedisCache.ts

@@ -1,41 +1,41 @@
-import { Context } from '@midwayjs/koa';
-import { RedisService } from '@midwayjs/redis';
-import { parseJsonObject } from '@/libs/utils/functions';
-import { ICacheService } from '@/models/bizmodels';
-
-export class RedisCache implements ICacheService {
-  protected ctx: Context;
-  protected cacheName: string;
-  protected redisService: RedisService;
-  protected cacheSecond: number;
-
-  constructor(ctx: Context, cacheName: string, redisService: RedisService, cacheSecond: number) {
-    this.ctx = ctx;
-    this.cacheName = cacheName;
-    this.redisService = redisService;
-    this.cacheSecond = cacheSecond;
-  }
-
-  private getCacheKey(key: string): string {
-    return `${this.cacheName}${key}`;
-  }
-
-  async getJsonObject(key: string): Promise<any> {
-    const cacheKey = this.getCacheKey(key);
-    const str = await this.redisService.get(cacheKey);
-    return parseJsonObject(str);
-  }
-
-
-  async setJsonObject(key: string, obj: any, cacheSecond0?: number): Promise<any> {
-    const cacheSecond = cacheSecond0 || this.cacheSecond || 60;
-    const cacheKey = this.getCacheKey(key);
-    const str = JSON.stringify(obj);
-    return this.redisService.set(cacheKey, str, 'EX', cacheSecond);
-  }
-
-  async removeItem(key: string): Promise<any> {
-    const cacheKey = this.getCacheKey(key);
-    return this.redisService.del(cacheKey);
-  }
-}
+import { Context } from '@midwayjs/koa';
+import { RedisService } from '@midwayjs/redis';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { ICacheService } from '@/models/bizmodels';
+
+export class RedisCache implements ICacheService {
+  protected ctx: Context;
+  protected cacheName: string;
+  protected redisService: RedisService;
+  protected cacheSecond: number;
+
+  constructor(ctx: Context, cacheName: string, redisService: RedisService, cacheSecond: number) {
+    this.ctx = ctx;
+    this.cacheName = cacheName;
+    this.redisService = redisService;
+    this.cacheSecond = cacheSecond;
+  }
+
+  private getCacheKey(key: string): string {
+    return `${this.cacheName}${key}`;
+  }
+
+  async getJsonObject(key: string): Promise<any> {
+    const cacheKey = this.getCacheKey(key);
+    const str = await this.redisService.get(cacheKey);
+    return parseJsonObject(str);
+  }
+
+
+  async setJsonObject(key: string, obj: any, cacheSecond0?: number): Promise<any> {
+    const cacheSecond = cacheSecond0 || this.cacheSecond || 60;
+    const cacheKey = this.getCacheKey(key);
+    const str = JSON.stringify(obj);
+    return this.redisService.set(cacheKey, str, 'EX', cacheSecond);
+  }
+
+  async removeItem(key: string): Promise<any> {
+    const cacheKey = this.getCacheKey(key);
+    return this.redisService.del(cacheKey);
+  }
+}

package/tsconfig.json

@@ -1,32 +1,32 @@
-{
-  "compileOnSave": true,
-  "compilerOptions": {
-    "target": "es2018",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "inlineSourceMap":false,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "stripInternal": true,
-    "skipLibCheck": true,
-    "noImplicitReturns": false,
-    "pretty": true,
-    "declaration": true,
-    "forceConsistentCasingInFileNames": true,
-    "outDir": "dist",
-    "rootDir": "src",
-    "baseUrl": ".", 
-    "paths": {
-      "@/*": ["src/*"] 
-    }
-  },
-  "exclude": [
-    "*.js",
-    "*.ts",
-    "dist",
-    "node_modules",
-    "test"
-  ]
-}
+{
+  "compileOnSave": true,
+  "compilerOptions": {
+    "target": "es2018",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "inlineSourceMap":false,
+    "noImplicitThis": true,
+    "noUnusedLocals": true,
+    "stripInternal": true,
+    "skipLibCheck": true,
+    "noImplicitReturns": false,
+    "pretty": true,
+    "declaration": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "baseUrl": ".", 
+    "paths": {
+      "@/*": ["src/*"] 
+    }
+  },
+  "exclude": [
+    "*.js",
+    "*.ts",
+    "dist",
+    "node_modules",
+    "test"
+  ]
+}

package/dist/libs/crud-pro/utils/sqlConvert/convertPgType.d.ts

@@ -1,2 +0,0 @@
-declare function pickAndConvertPgRows(result: any): any[];
-export { pickAndConvertPgRows };

package/dist/libs/crud-pro/utils/sqlConvert/convertPgType.js

@@ -1,128 +0,0 @@
-"use strict";
-//
-// // 定义 PostgreSQL 数据类型 OID 映射
-// const PG_TYPE_OIDS = {
-//   INT2: 21,    // smallint
-//   INT4: 23,    // integer
-//   INT8: 20,    // bigint
-//   FLOAT4: 700, // real
-//   FLOAT8: 701, // double precision
-//   NUMERIC: 1700, // numeric
-//   MONEY: 790,   // money
-//   BOOL: 16,     // boolean
-//   DATE: 1082,   // date
-//   TIMESTAMP: 1114, // timestamp without time zone
-//   TIMESTAMPTZ: 1184, // timestamp with time zone
-//   JSON: 114,    // json
-//   JSONB: 3802,  // jsonb
-// };
-//
-//
-//
-// /**
-//  * 将 PostgreSQL 数据类型转换为 JavaScript 类型
-//  * @param {any} value - 原始值
-//  * @param {number} oid - 数据类型 OID
-//  * @returns {any} 转换后的值
-//  */
-// function convertPgType(value: any, oid: any) {
-//   // 如果值为 null，直接返回
-//   if (value === null) {
-//     return null;
-//   }
-//
-//   const typeOfValue = typeof value;
-//   if (typeOfValue === 'undefined') {
-//     return null;
-//   }
-//   if (typeOfValue === 'number' || typeOfValue === "boolean" || typeOfValue === "object") {
-//     return value;
-//   }
-//   if (typeOfValue === 'bigint') {
-//     return value.toString()
-//   }
-//
-//   switch (oid) {
-//     // 整数类型（全部转为 Number）
-//     case PG_TYPE_OIDS.INT2: // smallint
-//     case PG_TYPE_OIDS.INT4: // integer
-//       return Number(value);
-//     case PG_TYPE_OIDS.INT8: // bigint
-//       return value;
-//
-//     // 浮点类型
-//     case PG_TYPE_OIDS.FLOAT4: // real
-//     case PG_TYPE_OIDS.FLOAT8: // double precision
-//     case PG_TYPE_OIDS.NUMERIC: // numeric
-//     case PG_TYPE_OIDS.MONEY: // money
-//       return Number(value);
-//
-//     // 布尔类型
-//     case PG_TYPE_OIDS.BOOL:
-//       if (typeof value === 'boolean') {
-//         return value;
-//       }
-//       return value === 't' || value === 'true' || value === true;
-//
-//     // 日期/时间类型
-//     case PG_TYPE_OIDS.DATE:
-//       return new Date(value).toISOString().split('T')[0];
-//
-//     case PG_TYPE_OIDS.TIMESTAMP:
-//     case PG_TYPE_OIDS.TIMESTAMPTZ:
-//       return new Date(value).toISOString();
-//
-//     // JSON 类型
-//     case PG_TYPE_OIDS.JSON:
-//     case PG_TYPE_OIDS.JSONB:
-//       // try {
-//       //   return JSON.parse(value);
-//       // } catch (e) {
-//       //   return value; // 解析失败时返回原始值
-//       // }
-//
-//     // 默认不转换
-//     default:
-//       return value;
-//   }
-// }
-//
-//
-// /**
-//  * 获取并转换PG查询结果的数据类型
-//  * @param result
-//  */
-// function pickAndConvertPgRows(result: any): any[] {
-//   if (!result || !Array.isArray(result.rows)) {
-//     return [];
-//   }
-//
-//   console.log('',convertPgType)
-//   try {
-//     // 获取字段类型 OID
-//     const fieldTypes = result.fields.map((field: any) => field.dataTypeID);
-//
-//     // 转换每一行的数据类型
-//     return result.rows.map((row:any) => {
-//       const convertedRow = {};
-//       Object.keys(row).forEach((key, index) => {
-//         const value = row[key];
-//         const oid = fieldTypes[index];
-//         convertedRow[key] = convertPgType(value, oid);
-//       });
-//       return convertedRow;
-//     });
-//   } catch (e) {
-//     console.error('pickAndConvertPgRows', e);
-//   }
-//   return [];
-// }
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickAndConvertPgRows = void 0;
-function pickAndConvertPgRows(result) {
-    if (!result || !Array.isArray(result.rows)) {
-        return [];
-    }
-    return result.rows;
-}
-exports.pickAndConvertPgRows = pickAndConvertPgRows;

package/src/libs/crud-pro/utils/sqlConvert/convertPgType.ts

@@ -1,127 +0,0 @@
-//
-// // 定义 PostgreSQL 数据类型 OID 映射
-// const PG_TYPE_OIDS = {
-//   INT2: 21,    // smallint
-//   INT4: 23,    // integer
-//   INT8: 20,    // bigint
-//   FLOAT4: 700, // real
-//   FLOAT8: 701, // double precision
-//   NUMERIC: 1700, // numeric
-//   MONEY: 790,   // money
-//   BOOL: 16,     // boolean
-//   DATE: 1082,   // date
-//   TIMESTAMP: 1114, // timestamp without time zone
-//   TIMESTAMPTZ: 1184, // timestamp with time zone
-//   JSON: 114,    // json
-//   JSONB: 3802,  // jsonb
-// };
-//
-//
-//
-// /**
-//  * 将 PostgreSQL 数据类型转换为 JavaScript 类型
-//  * @param {any} value - 原始值
-//  * @param {number} oid - 数据类型 OID
-//  * @returns {any} 转换后的值
-//  */
-// function convertPgType(value: any, oid: any) {
-//   // 如果值为 null，直接返回
-//   if (value === null) {
-//     return null;
-//   }
-//
-//   const typeOfValue = typeof value;
-//   if (typeOfValue === 'undefined') {
-//     return null;
-//   }
-//   if (typeOfValue === 'number' || typeOfValue === "boolean" || typeOfValue === "object") {
-//     return value;
-//   }
-//   if (typeOfValue === 'bigint') {
-//     return value.toString()
-//   }
-//
-//   switch (oid) {
-//     // 整数类型（全部转为 Number）
-//     case PG_TYPE_OIDS.INT2: // smallint
-//     case PG_TYPE_OIDS.INT4: // integer
-//       return Number(value);
-//     case PG_TYPE_OIDS.INT8: // bigint
-//       return value;
-//
-//     // 浮点类型
-//     case PG_TYPE_OIDS.FLOAT4: // real
-//     case PG_TYPE_OIDS.FLOAT8: // double precision
-//     case PG_TYPE_OIDS.NUMERIC: // numeric
-//     case PG_TYPE_OIDS.MONEY: // money
-//       return Number(value);
-//
-//     // 布尔类型
-//     case PG_TYPE_OIDS.BOOL:
-//       if (typeof value === 'boolean') {
-//         return value;
-//       }
-//       return value === 't' || value === 'true' || value === true;
-//
-//     // 日期/时间类型
-//     case PG_TYPE_OIDS.DATE:
-//       return new Date(value).toISOString().split('T')[0];
-//
-//     case PG_TYPE_OIDS.TIMESTAMP:
-//     case PG_TYPE_OIDS.TIMESTAMPTZ:
-//       return new Date(value).toISOString();
-//
-//     // JSON 类型
-//     case PG_TYPE_OIDS.JSON:
-//     case PG_TYPE_OIDS.JSONB:
-//       // try {
-//       //   return JSON.parse(value);
-//       // } catch (e) {
-//       //   return value; // 解析失败时返回原始值
-//       // }
-//
-//     // 默认不转换
-//     default:
-//       return value;
-//   }
-// }
-//
-//
-// /**
-//  * 获取并转换PG查询结果的数据类型
-//  * @param result
-//  */
-// function pickAndConvertPgRows(result: any): any[] {
-//   if (!result || !Array.isArray(result.rows)) {
-//     return [];
-//   }
-//
-//   console.log('',convertPgType)
-//   try {
-//     // 获取字段类型 OID
-//     const fieldTypes = result.fields.map((field: any) => field.dataTypeID);
-//
-//     // 转换每一行的数据类型
-//     return result.rows.map((row:any) => {
-//       const convertedRow = {};
-//       Object.keys(row).forEach((key, index) => {
-//         const value = row[key];
-//         const oid = fieldTypes[index];
-//         convertedRow[key] = convertPgType(value, oid);
-//       });
-//       return convertedRow;
-//     });
-//   } catch (e) {
-//     console.error('pickAndConvertPgRows', e);
-//   }
-//   return [];
-// }
-
-function pickAndConvertPgRows(result: any): any[] {
-  if (!result || !Array.isArray(result.rows)) {
-    return [];
-  }
-  return result.rows;
-}
-
-export { pickAndConvertPgRows };