midway-fatcms 0.0.1-beta.7 → 0.0.1-beta.71

package/src/libs/utils/fatcms-request.ts

@@ -1,115 +1,103 @@
-import { Context } from '@midwayjs/koa';
-import * as _ from 'lodash';
-import {privateAES} from "./crypto-utils";
-import {CommonException} from "../crud-pro/exceptions";
-
-function isEnableByHeaderKey(ctx: Context, configName: string){
-  const fatcmsDebug = ctx.app.getConfig(configName);
-  const headerKey = _.get(fatcmsDebug, 'headerKey');
-  const headerSecret = _.get(fatcmsDebug, 'headerSecret');
-  if (!headerSecret || !headerKey) {
-    return false;
-  }
-  const headers = _.get(ctx, 'request.headers') || {};
-  return headers[headerKey] === headerSecret;
-}
-
-
-/**
- * 是否开启调试能力
- * @param ctx
- */
-export function isEnableDebug(ctx: Context): boolean {
-  return isEnableByHeaderKey(ctx, 'fatcmsDebug');
-}
-
-
-/**
- * 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
- * @param ctx
- */
-export function isEnableSuperAdmin(ctx: Context): boolean {
-  return isEnableByHeaderKey(ctx, 'fatcmsSAEnable');
-}
-
-
-export function isLocalEnv(ctx: Context): boolean {
-  // 系统内部调用。如定时任务，没有request对象。
-  if (!ctx.request) {
-    return true;
-  }
-  const host = ctx.request.host;
-  return host.startsWith('127.0.0.1') || host.startsWith('localhost:');
-}
-
-
-
-/**
- * 获取调试时专用的站点code
- * @param ctx
- */
-export function getDebugWorkbenchCode(ctx: Context) {
-  const headers = _.get(ctx, 'request.headers') || {};
-  return headers['fatcmsworkbench'];
-}
-
-/**
- * 代理转发服务专用
- * @param ctx
- */
-export function getDebugProxyTarget(ctx: Context): string {
-  const headers = _.get(ctx, 'request.headers') || {};
-  return headers['fatcmsdebugproxytarget'];
-}
-
-
-export function getCsrfToken(ctx: Context): string{
-  const headers = _.get(ctx, 'request.headers') || {};
-  return headers['fatcmscsrftoken'];
-}
-
-
-/**
- * 扩展的源码应用：本地开发调试时加载本地的js脚本
- * @param ctx
- */
-export function getExtLocalLoaderPort(ctx: Context) : string {
-  const headers = _.get(ctx, 'request.headers') || {};
-  return headers['fatcmsextlocalloaderport'];
-}
-
-
-
-export async function isCsrfTokenValid(ctx: Context): Promise<boolean> {
-
-  // 本地开发，不需要校验
-  if (isLocalEnv(ctx) || isEnableDebug(ctx)) {
-    return true;
-  }
-
-
-  const fatcmscsrftoken = getCsrfToken(ctx);
-  if (!fatcmscsrftoken) {
-    return false;
-  }
-  try {
-    const depryptToken = await privateAES.time_decrypt_base64_utf8(fatcmscsrftoken);
-    if (depryptToken) {
-      const num = Number(depryptToken);
-      if (num && ((num + 6 * 3600 * 1000) > Date.now())) {
-        return true;
-      }
-    }
-  } catch (e) {
-    console.info('isCsrfTokenValid验证失败')
-  }
-  return false;
-}
-
-
-export async function assertCsrfToken(ctx: Context) {
-  const isOK =  await isCsrfTokenValid(ctx);
-  if (!isOK) {
-    throw new CommonException("ASSERT_CSRF_TOKEN_ERROR", "CSRF_TOKEN 验证失败")
-  }
-}
+import { Context } from '@midwayjs/koa';
+import * as _ from 'lodash';
+import { privateAES } from './crypto-utils';
+import { CommonException } from '../crud-pro/exceptions';
+
+function isEnableByHeaderKey(ctx: Context, configName: string) {
+  const fatcmsDebug = ctx.app.getConfig(configName);
+  const headerKey = _.get(fatcmsDebug, 'headerKey');
+  const headerSecret = _.get(fatcmsDebug, 'headerSecret');
+  if (!headerSecret || !headerKey) {
+    return false;
+  }
+  const headers = _.get(ctx, 'request.headers') || {};
+  return headers[headerKey] === headerSecret;
+}
+
+/**
+ * 是否开启调试能力
+ * @param ctx
+ */
+export function isEnableDebug(ctx: Context): boolean {
+  return isEnableByHeaderKey(ctx, 'fatcmsDebug');
+}
+
+/**
+ * 是否开启SA账号。只有账号密码没有用，必须通过ModHeader插件设置如下字段
+ * @param ctx
+ */
+export function isEnableSuperAdmin(ctx: Context): boolean {
+  return isEnableByHeaderKey(ctx, 'fatcmsSAEnable');
+}
+
+export function isLocalEnv(ctx: Context): boolean {
+  // 系统内部调用。如定时任务，没有request对象。
+  if (!ctx.request) {
+    return true;
+  }
+  const host = ctx.request.host;
+  return host.startsWith('127.0.0.1') || host.startsWith('localhost:');
+}
+
+/**
+ * 获取调试时专用的站点code
+ * @param ctx
+ */
+export function getDebugWorkbenchCode(ctx: Context) {
+  const headers = _.get(ctx, 'request.headers') || {};
+  return headers['fatcmsworkbench'];
+}
+
+/**
+ * 代理转发服务专用
+ * @param ctx
+ */
+export function getDebugProxyTarget(ctx: Context): string {
+  const headers = _.get(ctx, 'request.headers') || {};
+  return headers['fatcmsdebugproxytarget'];
+}
+
+export function getCsrfToken(ctx: Context): string {
+  const headers = _.get(ctx, 'request.headers') || {};
+  return headers['fatcmscsrftoken'];
+}
+
+/**
+ * 扩展的源码应用：本地开发调试时加载本地的js脚本
+ * @param ctx
+ */
+export function getExtLocalLoaderPort(ctx: Context): string {
+  const headers = _.get(ctx, 'request.headers') || {};
+  return headers['fatcmsextlocalloaderport'];
+}
+
+export async function isCsrfTokenValid(ctx: Context): Promise<boolean> {
+  // 本地开发，不需要校验
+  if (isLocalEnv(ctx) || isEnableDebug(ctx)) {
+    return true;
+  }
+
+  const fatcmscsrftoken = getCsrfToken(ctx);
+  if (!fatcmscsrftoken) {
+    return false;
+  }
+  try {
+    const depryptToken = await privateAES.time_decrypt_base64_utf8(fatcmscsrftoken);
+    if (depryptToken) {
+      const num = Number(depryptToken);
+      if (num && num + 6 * 3600 * 1000 > Date.now()) {
+        return true;
+      }
+    }
+  } catch (e) {
+    console.info('isCsrfTokenValid验证失败');
+  }
+  return false;
+}
+
+export async function assertCsrfToken(ctx: Context) {
+  const isOK = await isCsrfTokenValid(ctx);
+  if (!isOK) {
+    throw new CommonException('ASSERT_CSRF_TOKEN_ERROR', 'CSRF_TOKEN 验证失败');
+  }
+}

package/src/libs/utils/format-url.ts

@@ -0,0 +1,16 @@
+function formatHost(host: string) {
+ 
+    if (host.endsWith(':80')) {
+      host = host.slice(0, -3);
+    }
+
+    if (host.endsWith(':443')) {
+      host = host.slice(0, -4);
+    }
+
+    return host;
+}
+
+export {
+    formatHost,
+}

package/src/libs/utils/functions.ts

@@ -1,67 +1,78 @@
-import * as md5 from 'md5';
-
-let createUniqueIdIndex = 0;
-function createUniqueId(): string {
-  createUniqueIdIndex++;
-  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex);
-  const p2 = Date.now().toString(32);
-  return p1 + p2;
-}
-
-function parseJsonObject(str: any): any {
-  if (typeof str === 'object') {
-    return str;
-  }
-
-  if (typeof str === 'string') {
-    str = str.trim();
-    if (str.startsWith('{') || str.startsWith('[')) {
-      try {
-        return JSON.parse(str);
-      } catch (e) {
-        return null;
-      }
-    }
-  }
-  return null;
-}
-
-function trimStringArray(obj: any[]): string[] {
-  return obj
-    .map(s => {
-      if (typeof s === 'string') {
-        return s.trim();
-      }
-      return null;
-    })
-    .filter(Boolean);
-}
-
-function parseStringTrimArray(obj: any, separator = ','): string[] {
-  if (Array.isArray(obj)) {
-    return trimStringArray(obj);
-  }
-
-  if (typeof obj === 'string') {
-    const str = obj.trim();
-    if (str.length > 0) {
-      // 可能是一个JSON数组
-      if (str.startsWith('[') && str.endsWith(']')) {
-        const arr = parseJsonObject(str);
-        return trimStringArray(arr);
-      }
-
-      // 使用分隔符分隔
-      if (str.includes(separator)) {
-        const arr = str.split(separator);
-        return trimStringArray(arr);
-      }
-
-      return [str];
-    }
-  }
-
-  return null;
-}
-
-export { createUniqueId, parseJsonObject, parseStringTrimArray };
+import * as md5 from 'md5';
+import * as moment from 'moment';
+
+let createUniqueIdIndex = 0;
+function createUniqueId(): string {
+  createUniqueIdIndex++;
+  const p1 = md5(Date.now() + '' + Math.random() + '_' + createUniqueIdIndex);
+  const p2 = Date.now().toString(32);
+  return p1 + p2;
+}
+
+function parseJsonObject(str: any): any {
+  const typeofStr = typeof str;
+
+  if (str === null || typeofStr === 'undefined') {
+    return null;
+  }
+
+  if (typeofStr === 'object') {
+    return str;
+  }
+
+  if (typeofStr === 'string') {
+    str = str.trim();
+    if (str.startsWith('{') || str.startsWith('[')) {
+      try {
+        return JSON.parse(str);
+      } catch (e) {
+        return null;
+      }
+    }
+  }
+  return null;
+}
+
+function trimStringArray(obj: any[]): string[] {
+  return obj
+    .map(s => {
+      if (typeof s === 'string') {
+        return s.trim();
+      }
+      return null;
+    })
+    .filter(Boolean);
+}
+
+function parseStringTrimArray(obj: any, separator = ','): string[] {
+  if (Array.isArray(obj)) {
+    return trimStringArray(obj);
+  }
+
+  if (typeof obj === 'string') {
+    const str = obj.trim();
+    if (str.length > 0) {
+      // 可能是一个JSON数组
+      if (str.startsWith('[') && str.endsWith(']')) {
+        const arr = parseJsonObject(str);
+        return trimStringArray(arr);
+      }
+
+      // 使用分隔符分隔
+      if (str.includes(separator)) {
+        const arr = str.split(separator);
+        return trimStringArray(arr);
+      }
+
+      return [str];
+    }
+  }
+
+  return null;
+}
+
+function getCurrentFullMoment(): string {
+  return moment(Date.now()).format('YYYY-MM-DD HH:mm:ss.SSS');
+}
+
+export { createUniqueId, parseJsonObject, parseStringTrimArray, getCurrentFullMoment };

package/src/libs/utils/ordernum-utils.ts

@@ -1,18 +1,14 @@
-import * as moment from 'moment';
-
-
-function generateOrderNumber(prefix:string = 'NO'): string {
-  // 获取当前时间并格式化为YYYYMMDDHHmmss
-  const timestamp = moment().format('YYYYMMDDHHmmss');
-
-  // 生成6位随机数字
-  const randomDigits = Math.floor(100000 + Math.random() * 900000);
-
-  // 组合订单号
-  return prefix + timestamp + randomDigits;
-}
-
-
-export {
-  generateOrderNumber
-}
+import * as moment from 'moment';
+
+function generateOrderNumber(prefix = 'NO'): string {
+  // 获取当前时间并格式化为YYYYMMDDHHmmss
+  const timestamp = moment().format('YYYYMMDDHHmmss');
+
+  // 生成6位随机数字
+  const randomDigits = Math.floor(100000 + Math.random() * 900000);
+
+  // 组合订单号
+  return prefix + timestamp + randomDigits;
+}
+
+export { generateOrderNumber };

package/src/libs/utils/parseConfig.ts

@@ -1,62 +1,58 @@
-import * as _ from 'lodash';
-import {parseJsonObject} from "./functions";
-
-
-
-interface IEnumInfo {
-  label: string;
-  value: string | number;
-  children?: IEnumInfo[];
-}
-
-function parseTreeTableToIEnumInfo(dataSource:any[]): IEnumInfo[]{
-  if (!dataSource || !Array.isArray(dataSource)) {
-    return undefined;
-  }
-  return  dataSource.map((item: any) => {
-    const {key, nodeName, value, label } = item;
-    const children = parseTreeTableToIEnumInfo(item.children);
-    const enumInfo: IEnumInfo =  {
-      label: label || nodeName,
-      value: value || key,
-    };
-    if (children) {
-      enumInfo.children = children;
-    }
-    return enumInfo;
-  });
-}
-
-
-function parseConfigContentToEnumInfo(configEntity: any): IEnumInfo[] {
-
-  const { config_content, config_type } = configEntity;
-
-  const configObj = parseJsonObject(config_content);
-  if (!configObj) {
-    return null;
-  }
-
-  if (config_type === 'treeTable') {
-    const dataSource = _.get(configObj, 'data.dataSource');
-    if (Array.isArray(dataSource)) {
-      return parseTreeTableToIEnumInfo(dataSource);
-    }
-    return [];
-  }
-
-  if (configObj.data && Array.isArray(configObj.data)) {
-    return configObj.data;
-  }
-
-  if (Array.isArray(configObj)) {
-    return configObj;
-  }
-  return []
-}
-
-
-export {
-  parseConfigContentToEnumInfo,
-  IEnumInfo
-}
+import * as _ from 'lodash';
+import { parseJsonObject } from './functions';
+
+interface IEnumInfo {
+  label: string;
+  value: string | number;
+  style?: string;
+  children?: IEnumInfo[];
+}
+
+function parseTreeTableToIEnumInfo(dataSource: any[]): IEnumInfo[] {
+  if (!dataSource || !Array.isArray(dataSource)) {
+    return undefined;
+  }
+  return dataSource.map((item: any) => {
+    const { key, nodeName, value, label } = item;
+    const children = parseTreeTableToIEnumInfo(item.children);
+    const enumInfo: IEnumInfo = {
+      label: label || nodeName,
+      value: value || key,
+    };
+    if (item && typeof item.style === 'string' && item.style) {
+      enumInfo.style = item.style.trim();
+    }
+    if (children) {
+      enumInfo.children = children;
+    }
+    return enumInfo;
+  });
+}
+
+function parseConfigContentToEnumInfo(configEntity: any): IEnumInfo[] {
+  const { config_content, config_type } = configEntity;
+
+  const configObj = parseJsonObject(config_content);
+  if (!configObj) {
+    return null;
+  }
+
+  if (config_type === 'treeTable') {
+    const dataSource = _.get(configObj, 'data.dataSource');
+    if (Array.isArray(dataSource)) {
+      return parseTreeTableToIEnumInfo(dataSource);
+    }
+    return [];
+  }
+
+  if (configObj.data && Array.isArray(configObj.data)) {
+    return configObj.data;
+  }
+
+  if (Array.isArray(configObj)) {
+    return configObj;
+  }
+  return [];
+}
+
+export { parseConfigContentToEnumInfo, IEnumInfo };