midway-fatcms 0.0.1-beta.64 → 0.0.1-beta.66

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (108) hide show
  1. package/dist/config/config.default.js +7 -0
  2. package/dist/controller/base/BaseApiController.d.ts +5 -0
  3. package/dist/controller/base/BaseApiController.js +25 -0
  4. package/dist/controller/gateway/CrudStdGatewayController.d.ts +1 -1
  5. package/dist/controller/gateway/CrudStdGatewayController.js +36 -10
  6. package/dist/controller/gateway/FileController.js +2 -1
  7. package/dist/controller/gateway/PublicApiController.d.ts +1 -0
  8. package/dist/controller/gateway/PublicApiController.js +64 -28
  9. package/dist/index.d.ts +1 -1
  10. package/dist/index.js +1 -1
  11. package/dist/interface.d.ts +2 -0
  12. package/dist/libs/crud-pro/exceptions.d.ts +2 -0
  13. package/dist/libs/crud-pro/exceptions.js +2 -0
  14. package/dist/libs/crud-pro/models/keys.d.ts +1 -1
  15. package/dist/libs/crud-pro/models/keys.js +1 -1
  16. package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js +6 -1
  17. package/dist/libs/crud-pro/utils/sqlConvert/convertColumnName.js +14 -0
  18. package/dist/libs/utils/AsymmetricCrypto.d.ts +76 -0
  19. package/dist/libs/utils/AsymmetricCrypto.js +261 -0
  20. package/dist/libs/utils/format-url.d.ts +2 -0
  21. package/dist/libs/utils/format-url.js +13 -0
  22. package/dist/libs/utils/render-utils.d.ts +16 -7
  23. package/dist/libs/utils/render-utils.js +27 -6
  24. package/dist/middleware/global.middleware.js +7 -0
  25. package/dist/models/SystemEntities.d.ts +34 -0
  26. package/dist/models/SystemEntities.js +22 -1
  27. package/dist/models/WorkbenchInfoTools.d.ts +7 -0
  28. package/dist/models/WorkbenchInfoTools.js +20 -0
  29. package/dist/models/bizmodels.d.ts +9 -0
  30. package/dist/models/contextLogger.d.ts +2 -0
  31. package/dist/models/contextLogger.js +8 -1
  32. package/dist/models/userSession.d.ts +2 -0
  33. package/dist/models/userSession.js +2 -0
  34. package/dist/schedule/anonymousContext.js +2 -0
  35. package/dist/service/AuthService.js +7 -0
  36. package/dist/service/EnumInfoService.d.ts +1 -1
  37. package/dist/service/EnumInfoService.js +32 -26
  38. package/dist/service/UserSessionService.d.ts +6 -1
  39. package/dist/service/UserSessionService.js +26 -17
  40. package/dist/service/WorkbenchService.d.ts +1 -0
  41. package/dist/service/WorkbenchService.js +27 -1
  42. package/dist/service/base/cache/CacheServiceFactory.d.ts +20 -0
  43. package/dist/service/base/cache/CacheServiceFactory.js +67 -0
  44. package/dist/service/base/cache/FatcmsBaseCtxCache.d.ts +19 -0
  45. package/dist/service/base/cache/FatcmsBaseCtxCache.js +38 -0
  46. package/dist/service/base/cache/FatcmsBaseDiskCache.d.ts +24 -0
  47. package/dist/service/base/cache/FatcmsBaseDiskCache.js +81 -0
  48. package/dist/service/base/cache/FatcmsBaseMemoryCache.d.ts +18 -0
  49. package/dist/service/base/cache/FatcmsBaseMemoryCache.js +66 -0
  50. package/dist/service/base/cache/FatcmsBaseNoneCache.d.ts +10 -0
  51. package/dist/service/base/cache/FatcmsBaseNoneCache.js +19 -0
  52. package/dist/service/base/{RedisCacheService.d.ts → cache/FatcmsBaseRedisCache.d.ts} +6 -6
  53. package/dist/service/base/cache/FatcmsBaseRedisCache.js +39 -0
  54. package/dist/service/crudstd/CrudStdService.d.ts +6 -4
  55. package/dist/service/crudstd/CrudStdService.js +24 -10
  56. package/dist/service/curd/CurdMixByDictService.d.ts +1 -2
  57. package/dist/service/curd/CurdMixByDictService.js +12 -8
  58. package/dist/service/curd/CurdMixByLinkToCustomService.d.ts +1 -2
  59. package/dist/service/curd/CurdMixByLinkToCustomService.js +17 -13
  60. package/dist/service/curd/CurdMixBySysConfigService.d.ts +4 -0
  61. package/dist/service/curd/CurdMixBySysConfigService.js +50 -10
  62. package/dist/service/curd/CurdMixByWorkbenchService.d.ts +2 -1
  63. package/dist/service/curd/CurdMixByWorkbenchService.js +30 -22
  64. package/package.json +1 -1
  65. package/src/config/config.default.ts +8 -0
  66. package/src/controller/base/BaseApiController.ts +39 -0
  67. package/src/controller/gateway/CrudStdGatewayController.ts +42 -10
  68. package/src/controller/gateway/FileController.ts +2 -2
  69. package/src/controller/gateway/PublicApiController.ts +72 -28
  70. package/src/controller/manage/DocLibManageApi.ts +5 -5
  71. package/src/controller/manage/FileManageApi.ts +5 -5
  72. package/src/controller/manage/MenuManageApi.ts +4 -4
  73. package/src/index.ts +1 -1
  74. package/src/interface.ts +2 -0
  75. package/src/libs/crud-pro/exceptions.ts +2 -0
  76. package/src/libs/crud-pro/models/keys.ts +6 -6
  77. package/src/libs/crud-pro/services/CrudProOriginToExecuteSql.ts +7 -1
  78. package/src/libs/crud-pro/utils/sqlConvert/convertColumnName.ts +18 -0
  79. package/src/libs/utils/AsymmetricCrypto.ts +310 -0
  80. package/src/libs/utils/format-url.ts +16 -0
  81. package/src/libs/utils/render-utils.ts +56 -15
  82. package/src/middleware/global.middleware.ts +8 -0
  83. package/src/models/SystemEntities.ts +43 -0
  84. package/src/models/WorkbenchInfoTools.ts +18 -0
  85. package/src/models/bizmodels.ts +12 -0
  86. package/src/models/contextLogger.ts +10 -1
  87. package/src/models/userSession.ts +4 -0
  88. package/src/schedule/anonymousContext.ts +2 -0
  89. package/src/service/AuthService.ts +11 -0
  90. package/src/service/EnumInfoService.ts +35 -22
  91. package/src/service/UserSessionService.ts +29 -18
  92. package/src/service/WorkbenchService.ts +42 -2
  93. package/src/service/base/cache/CacheServiceFactory.ts +66 -0
  94. package/src/service/base/cache/FatcmsBaseCtxCache.ts +47 -0
  95. package/src/service/base/cache/FatcmsBaseDiskCache.ts +87 -0
  96. package/src/service/base/cache/FatcmsBaseMemoryCache.ts +74 -0
  97. package/src/service/base/cache/FatcmsBaseNoneCache.ts +24 -0
  98. package/src/service/base/cache/FatcmsBaseRedisCache.ts +48 -0
  99. package/src/service/crudstd/CrudStdService.ts +28 -12
  100. package/src/service/curd/CurdMixByAccountService.ts +1 -0
  101. package/src/service/curd/CurdMixByDictService.ts +14 -8
  102. package/src/service/curd/CurdMixByLinkToCustomService.ts +21 -12
  103. package/src/service/curd/CurdMixBySysConfigService.ts +60 -11
  104. package/src/service/curd/CurdMixByWorkbenchService.ts +31 -24
  105. package/src/service/proxyapi/WeightedRandom.ts +1 -1
  106. package/src/service/proxyapi/WeightedRoundRobin.ts +1 -1
  107. package/dist/service/base/RedisCacheService.js +0 -57
  108. package/src/service/base/RedisCacheService.ts +0 -42
@@ -8,6 +8,7 @@ import { FileCenterService, PATH_PREFIX, toDownloadPaths, isImageFile } from '@/
8
8
  import { checkLogin, checkPermission } from '@/middleware/permission.middleware';
9
9
  import { CommonResult } from '@/libs/utils/common-dto';
10
10
  import { SystemFuncCode } from '@/models/SystemPerm';
11
+ import { formatHost } from '@/libs/utils/format-url';
11
12
 
12
13
  function isTrue(obj: any) {
13
14
  return obj === true || obj === 'true';
@@ -55,8 +56,7 @@ export class FileController extends BaseApiController {
55
56
 
56
57
  const { fileKey, filename, storageUrl } = await this.fileCenterService.uploadFileToOSS(files, accessType, referer);
57
58
 
58
- const origin = this.ctx.request.origin;
59
-
59
+ const origin = formatHost(this.ctx.request.origin);
60
60
  const downloadUrls = toDownloadPaths(origin, fileKey);
61
61
 
62
62
  const data = {
@@ -10,6 +10,14 @@ import { parseJsonObject } from '@/libs/utils/functions';
10
10
  import { WorkbenchService } from '@/service/WorkbenchService';
11
11
  import { SystemRoleCode } from '@/models/SystemPerm';
12
12
  import { KeysOfAuthType } from '@/libs/crud-pro/models/keys';
13
+ import { CacheServiceFactory } from '@/service/base/cache/CacheServiceFactory';
14
+ import md5 = require('md5');
15
+ import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
16
+
17
+
18
+ const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
19
+ const DEFAULT_CACHE_SECOND = 60 * 5;
20
+
13
21
 
14
22
  /**
15
23
  * 公开的API,无需鉴权,所有人可以直接访问
@@ -25,6 +33,9 @@ export class PublicApiController extends BaseApiController {
25
33
  @Inject()
26
34
  private workbenchService: WorkbenchService;
27
35
 
36
+ @Inject()
37
+ private cacheServiceFactory: CacheServiceFactory;
38
+
28
39
  /**
29
40
  * 获取所有站点列表
30
41
  */
@@ -53,39 +64,51 @@ export class PublicApiController extends BaseApiController {
53
64
  return CommonResult.errorRes('param workbenchMenuCode is null');
54
65
  }
55
66
 
56
- const workbenchMenuCodeStr = '' + workbenchMenuCode;
57
- const workbenchMenuCodeArray = workbenchMenuCodeStr.split(',');
67
+ const { publicApiMenuCacheLevel, publicApiMenuCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
68
+
69
+ const mapResult = await this.cacheServiceFactory.getJsonObjectCache({
70
+ cacheLevel: publicApiMenuCacheLevel || DEFAULT_CACHE_LEVEL,
71
+ cacheKey: "" + workbenchMenuCode,
72
+ cacheSecond: publicApiMenuCacheSecond || DEFAULT_CACHE_SECOND,
73
+ cacheName: CacheNameEnum.GetWorkbenchMenu,
74
+ getter: async () => {
75
+
76
+ const workbenchMenuCodeStr = '' + workbenchMenuCode;
77
+ const workbenchMenuCodeArray = workbenchMenuCodeStr.split(',');
78
+ const condition = {
79
+ menu_code: {
80
+ $in: workbenchMenuCodeArray,
81
+ },
82
+ };
58
83
 
59
- const condition = {
60
- menu_code: {
61
- $in: workbenchMenuCodeArray,
62
- },
63
- };
84
+ const rows = await this.sysDBUtil.getList({ condition }, SystemTables.sys_menus);
64
85
 
65
- const rows = await this.sysDBUtil.getList({ condition }, SystemTables.sys_menus);
86
+ const map = {};
87
+ for (let i = 0; i < rows.length; i++) {
88
+ const rowElement = rows[i];
89
+ const menu_code = rowElement.menu_code;
90
+ const view_auth_config = rowElement.view_auth_config;
91
+ const view_auth_type = rowElement.view_auth_type;
66
92
 
67
- const map = {};
68
- for (let i = 0; i < rows.length; i++) {
69
- const rowElement = rows[i];
70
- const menu_code = rowElement.menu_code;
71
- const view_auth_config = rowElement.view_auth_config;
72
- const view_auth_type = rowElement.view_auth_type;
93
+ const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
73
94
 
74
- const hasPermission = this.ctx.userSession.isAuthPass(view_auth_type, view_auth_config);
95
+ const menu_config_content = rowElement.menu_config_content;
96
+ delete rowElement.menu_config_content;
97
+ const menu_list = parseJsonObject(menu_config_content) || [];
98
+ map[menu_code] = { ...rowElement, menu_list, hasPermission };
99
+ }
75
100
 
76
- const menu_config_content = rowElement.menu_config_content;
77
- delete rowElement.menu_config_content;
78
- const menu_list = parseJsonObject(menu_config_content) || [];
79
- map[menu_code] = { ...rowElement, menu_list, hasPermission };
80
- }
101
+ // 特殊的devops菜单
102
+ map['devops'] = {
103
+ menu_list: [], // 这个特殊的菜单在前端写死。
104
+ hasPermission: this.ctx.userSession.isAuthPass(KeysOfAuthType.byRoleCode, [SystemRoleCode.DevOpsWriter, SystemRoleCode.DevOpsViewer, SystemRoleCode.SuperAdmin]),
105
+ };
81
106
 
82
- // 特殊的devops菜单
83
- map['devops'] = {
84
- menu_list: [], // 这个特殊的菜单在前端写死。
85
- hasPermission: this.ctx.userSession.isAuthPass(KeysOfAuthType.byRoleCode, [SystemRoleCode.DevOpsWriter, SystemRoleCode.DevOpsViewer, SystemRoleCode.SuperAdmin]),
86
- };
107
+ return map;
108
+ }
109
+ })
87
110
 
88
- return CommonResult.successRes(map);
111
+ return CommonResult.successRes(mapResult);
89
112
  }
90
113
 
91
114
  /**
@@ -96,14 +119,35 @@ export class PublicApiController extends BaseApiController {
96
119
  const body = this.ctx.request.body as any;
97
120
  const { workbenchCode, appCode, pathname } = body;
98
121
  const resultData: any = {};
99
- const getOne = async (condition: any, tablenName: string, key: string) => {
122
+
123
+ const getOneImpl = async (condition: any, tableName: string) => {
100
124
  const values = Object.values(condition).filter(Boolean);
101
125
  // 查询条件不能为空
102
126
  if (values.length > 0) {
103
- const oneData = await this.sysDBUtil.getOne({ condition }, tablenName);
127
+ const oneData = await this.sysDBUtil.getOne({ condition }, tableName);
104
128
  if (oneData && oneData['app_schema']) {
105
129
  oneData['app_schema'] = parseJsonObject(oneData['app_schema']);
106
130
  }
131
+ return oneData;
132
+ }
133
+ return null;
134
+ };
135
+
136
+
137
+ const { publicApiNavPageInfoCacheLevel, publicApiNavPageInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
138
+
139
+ const getOne = async (condition: any, tableName: string, key: string) => {
140
+ const cacheKey = md5(tableName + ':' + JSON.stringify(condition) + ":" + key);
141
+ const oneData = await this.cacheServiceFactory.getJsonObjectCache({
142
+ cacheLevel: publicApiNavPageInfoCacheLevel || DEFAULT_CACHE_LEVEL,
143
+ cacheSecond: publicApiNavPageInfoCacheSecond || DEFAULT_CACHE_SECOND,
144
+ cacheKey,
145
+ cacheName: CacheNameEnum.GetNavPageInfo,
146
+ getter: async () => {
147
+ return await getOneImpl(condition, tableName);
148
+ },
149
+ });
150
+ if (oneData) {
107
151
  resultData[key] = oneData;
108
152
  }
109
153
  };
@@ -1,11 +1,11 @@
1
1
  import { Controller, Inject, Post } from '@midwayjs/core';
2
2
  import { Context } from '@midwayjs/koa';
3
- import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
3
+ import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
4
4
  import { BaseApiController } from '../base/BaseApiController';
5
- import { checkPermission } from '../../middleware/permission.middleware';
6
- import { SystemFuncCode } from '../../models/SystemPerm';
7
- import { SystemTables } from '../../models/SystemTables';
8
- import { CTX_WORKBENCH_CODE } from '../../models/bizmodels';
5
+ import { checkPermission } from '@/middleware/permission.middleware';
6
+ import { SystemFuncCode } from '@/models/SystemPerm';
7
+ import { SystemTables } from '@/models/SystemTables';
8
+ import { CTX_WORKBENCH_CODE } from '@/models/bizmodels';
9
9
 
10
10
  @Controller('/ns/api/manage/docLib', { middleware: [checkPermission(SystemFuncCode.DocMangeRead)] })
11
11
  export class DocLibManageApi extends BaseApiController {
@@ -1,11 +1,11 @@
1
1
  import { Controller, Inject, Post } from '@midwayjs/core';
2
2
  import { Context } from '@midwayjs/koa';
3
- import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
3
+ import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
4
4
  import { BaseApiController } from '../base/BaseApiController';
5
- import { FileCenterService } from '../../service/FileCenterService';
6
- import { checkPermission } from '../../middleware/permission.middleware';
7
- import { SystemFuncCode } from '../../models/SystemPerm';
8
- import { SystemTables } from '../../models/SystemTables';
5
+ import { FileCenterService } from '@/service/FileCenterService';
6
+ import { checkPermission } from '@/middleware/permission.middleware';
7
+ import { SystemFuncCode } from '@/models/SystemPerm';
8
+ import { SystemTables } from '@/models/SystemTables';
9
9
 
10
10
  @Controller('/ns/api/manage/file', { middleware: [checkPermission(SystemFuncCode.FileMangeRead)] })
11
11
  export class FileMangeApi extends BaseApiController {
@@ -1,10 +1,10 @@
1
1
  import { Controller, Inject, Post } from '@midwayjs/core';
2
2
  import { Context } from '@midwayjs/koa';
3
- import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
3
+ import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
4
4
  import { BaseApiController } from '../base/BaseApiController';
5
- import { checkPermission } from '../../middleware/permission.middleware';
6
- import { SystemFuncCode } from '../../models/SystemPerm';
7
- import { SystemTables } from '../../models/SystemTables';
5
+ import { checkPermission } from '@/middleware/permission.middleware';
6
+ import { SystemFuncCode } from '@/models/SystemPerm';
7
+ import { SystemTables } from '@/models/SystemTables';
8
8
 
9
9
  @Controller('/ns/api/manage/menu', { middleware: [checkPermission(SystemFuncCode.MenuMangeRead)] })
10
10
  export class MenuManageApi extends BaseApiController {
package/src/index.ts CHANGED
@@ -54,7 +54,7 @@ export * from './service/anyapi/AnyApiSandboxService';
54
54
  export * from './service/anyapi/AnyApiService';
55
55
  export * from './service/base/ApiBaseService';
56
56
  export * from './service/base/BaseService';
57
- export * from './service/base/RedisCacheService';
57
+ export * from './service/base/cache/FatcmsBaseRedisCache';
58
58
  export * from './service/crudstd/CrudStdActionService';
59
59
  export * from './service/crudstd/CrudStdRelationService';
60
60
  export * from './service/crudstd/CrudStdService';
package/src/interface.ts CHANGED
@@ -3,12 +3,14 @@ import { Transaction } from './libs/crud-pro/models/Transaction';
3
3
  import { UserSessionInfo } from './models/userSession';
4
4
  import { ContextLogger } from './models/contextLogger';
5
5
  import { IWorkbenchEntity } from './models/SystemEntities';
6
+ import { WorkbenchInfoTools } from './models/WorkbenchInfoTools';
6
7
 
7
8
  declare module '@midwayjs/core' {
8
9
  interface Context {
9
10
  transaction: Transaction;
10
11
  userSession: UserSessionInfo;
11
12
  workbenchInfo: IWorkbenchEntity;
13
+ workbenchInfoTools: WorkbenchInfoTools;
12
14
  contextLogger: ContextLogger;
13
15
  }
14
16
  }
@@ -47,6 +47,8 @@ export enum Exceptions {
47
47
  CFG_PARSE_ERROR = 'CFG_PARSE_ERROR',
48
48
  CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL = 'CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL',
49
49
  CFG_UNIQUE_COLUMN_COUNT_MUST_ONE = 'CFG_UNIQUE_COLUMN_COUNT_MUST_ONE',
50
+ CFG_ORDER_BY_TYPE_ERROR = 'CFG_ORDER_BY_TYPE_ERROR',
51
+ CFG_ERROR_POSTGRES_COLUMN_NAME_INVALID = 'CFG_ERROR_POSTGRES_COLUMN_NAME_INVALID',
50
52
 
51
53
  /**
52
54
  * 数据传错
@@ -112,19 +112,19 @@ export const KeysOfConditions = {
112
112
  $NOT_NULL: '$notNull', // is not null
113
113
  $NULL: '$null', // is null
114
114
  $RANGE: '$range', // between 1 and 2
115
- $LIKE: '$like', // A% 以A开头 {age:1, name:{"$like":"张"} }
116
- $NOT_LIKE: '$notLike', // A% 以A开头 {age:1, name:{"$notLike":"张"} }
115
+ $LIKE: '$like', //前缀匹配, A% 以A开头 {age:1, name:{"$like":"张"} }
116
+ $NOT_LIKE: '$notLike', // 前缀匹配 A% 以A开头 {age:1, name:{"$notLike":"张"} }
117
117
 
118
118
  $LIKE_INCLUDE: '$likeInclude', // %A% 包含A {age:1, name:{"$like":"张"} }
119
119
  $NOT_LIKE_INCLUDE: '$notLikeInclude', // %A% 包含A {age:1, name:{"$notLike":"张"} }
120
120
 
121
- $MATCH: '$match', // 全文索引 {age:1, name:{"$match":"张"} }
122
- $MATCH_BOOL: '$matchBool', // 全文索引 {age:1, name:{"$matchBool":"张"} }
121
+ $MATCH: '$match', // MYSQL 全文索引 {age:1, name:{"$match":"张"} }
122
+ $MATCH_BOOL: '$matchBool', // MYSQL 全文索引 {age:1, name:{"$matchBool":"张"} }
123
123
 
124
124
  /**
125
- * SELECT * FROM tms_biz.表 WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('2512274'), '$');
125
+ * SELECT * FROM table WHERE JSON_CONTAINS(`related_user1`, JSON_ARRAY('aaaaa'), '$');
126
126
  */
127
- $JSON_ARRAY_CONTAINS: '$jsonArrayContains', // 全文索引 { related_user1:{"$jsonArrayContains":"2512274"} }
127
+ $JSON_ARRAY_CONTAINS: '$jsonArrayContains', // 全文索引 { related_user1:{"$jsonArrayContains":"aaaaa"} }
128
128
 
129
129
  COMPARE_KEYS: new Set<string>([]),
130
130
  ALL_KEYS: new Set<string>([]),
@@ -238,8 +238,14 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
238
238
  if (MixinUtils.isEmpty(orderBys)) {
239
239
  return null;
240
240
  }
241
+ const ORDER_BY_TYPE_ARR = ['asc', 'desc'];
242
+
241
243
  const orderByArr = orderBys.map(orderBy => {
242
- return toSqlColumnName(orderBy.fieldName, sqlCfgModel) + ' ' + orderBy.orderType;
244
+ const orderType = (orderBy.orderType || 'asc').toLowerCase();
245
+ if (!ORDER_BY_TYPE_ARR.includes(orderType)) {
246
+ throw new CommonException(Exceptions.CFG_ORDER_BY_TYPE_ERROR, 'orderType must be asc or desc : ' + orderType);
247
+ }
248
+ return toSqlColumnName(orderBy.fieldName, sqlCfgModel) + ' ' + orderType;
243
249
  });
244
250
  const sql = 'order by ' + orderByArr.join(',');
245
251
  return new SqlSegArg(sql);
@@ -1,7 +1,25 @@
1
+ import { CommonException, Exceptions } from '../../exceptions';
1
2
  import { SqlCfgModel } from '../../models/SqlCfgModel';
2
3
  import { SqlDbType } from '../../models/keys';
3
4
 
5
+ const COLUMN_NAME_REGEX = /^[a-zA-Z0-9_]+$/;
6
+ function isColumnNameValid(str: string): boolean {
7
+ if (typeof str !== 'string') {
8
+ return false;
9
+ }
10
+ if (str === '') {
11
+ return false;
12
+ }
13
+ return COLUMN_NAME_REGEX.test(str);
14
+ }
15
+
16
+
4
17
  function toSqlColumnName(columnName: string, sqlCfgModel: SqlCfgModel): string {
18
+
19
+ if (!isColumnNameValid(columnName)) {
20
+ throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_COLUMN_NAME_INVALID, 'column name is invalid : ' + columnName);
21
+ }
22
+
5
23
  if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
6
24
  return '"' + columnName + '"';
7
25
  }
@@ -0,0 +1,310 @@
1
+
2
+
3
+ function getCrypto(): Crypto {
4
+ if (typeof crypto !== 'undefined' && crypto.subtle) {
5
+ // 浏览器环境或Node.js 19+的global.crypto
6
+ return crypto;
7
+ } else if (typeof global !== 'undefined') {
8
+ // Node.js环境
9
+ if (global.crypto && global.crypto.subtle) {
10
+ // Node.js 19+
11
+ return global.crypto;
12
+ }
13
+ // @ts-ignore
14
+ else if (global.crypto && global.crypto.webcrypto && global.crypto.webcrypto.subtle) {
15
+ // Node.js 16+
16
+ // @ts-ignore
17
+ return global.crypto.webcrypto;
18
+ } else {
19
+ // Node.js 16-18,使用crypto.webcrypto
20
+ const nodeCrypto = require('crypto');
21
+ if (nodeCrypto.webcrypto && nodeCrypto.webcrypto.subtle) {
22
+ return nodeCrypto.webcrypto;
23
+ }
24
+ throw new Error('Node.js版本低于16或缺少webcrypto支持');
25
+ }
26
+ }
27
+ throw new Error('当前环境不支持Web Crypto API');
28
+ }
29
+
30
+
31
+
32
+ class AsymmetricCrypto {
33
+ /**
34
+ * 生成RSA密钥对并返回字符串格式的公钥和私钥
35
+ * @param {number} modulusLength - 密钥长度,默认2048
36
+ * @returns {Promise<{publicKey: string, privateKey: string}>} PEM格式的密钥字符串
37
+ */
38
+ static async generateKeyPair(modulusLength: number = 2048): Promise<{ publicKey: string, privateKey: string }> {
39
+ const crypto = getCrypto();
40
+ try {
41
+ // 生成密钥对
42
+ const keyPair = await crypto.subtle.generateKey(
43
+ {
44
+ name: "RSA-OAEP",
45
+ modulusLength,
46
+ publicExponent: new Uint8Array([0x01, 0x00, 0x01]), // 65537
47
+ hash: "SHA-256",
48
+ },
49
+ true, // 是否可导出
50
+ ["encrypt", "decrypt"]
51
+ );
52
+
53
+ // 导出公钥为PEM格式字符串
54
+ const publicKeyDer = await crypto.subtle.exportKey("spki", keyPair.publicKey);
55
+ const publicKeyPem = this.derToPem(publicKeyDer, 'PUBLIC');
56
+
57
+ // 导出私钥为PEM格式字符串
58
+ const privateKeyDer = await crypto.subtle.exportKey("pkcs8", keyPair.privateKey);
59
+ const privateKeyPem = this.derToPem(privateKeyDer, 'PRIVATE');
60
+
61
+ return {
62
+ publicKey: publicKeyPem,
63
+ privateKey: privateKeyPem
64
+ };
65
+ } catch (error) {
66
+ throw new Error(`生成密钥对失败: ${error.message}`);
67
+ }
68
+ }
69
+
70
+ /**
71
+ * 使用公钥加密字符串
72
+ * @param {string} publicKeyPem - PEM格式的公钥字符串
73
+ * @param {string} data - 要加密的字符串数据
74
+ * @returns {Promise<string>} Base64编码的加密字符串
75
+ */
76
+ static async encrypt(publicKeyPem: string, data: string): Promise<string> {
77
+ const crypto = getCrypto();
78
+ try {
79
+ // 导入公钥
80
+ const publicKey = await this.importPublicKey(publicKeyPem);
81
+
82
+ // 转换数据为Uint8Array
83
+ const encoder = new TextEncoder();
84
+ const dataBuffer = encoder.encode(data);
85
+
86
+ // 检查数据长度(RSA-OAEP有最大长度限制)
87
+ const maxLength = this.getMaxEncryptLength(publicKeyPem);
88
+ if (dataBuffer.length > maxLength) {
89
+ throw new Error(`数据过长,最大支持${maxLength}字节,当前${dataBuffer.length}字节`);
90
+ }
91
+
92
+ // 加密数据
93
+ const encrypted = await crypto.subtle.encrypt(
94
+ {
95
+ name: "RSA-OAEP"
96
+ },
97
+ publicKey,
98
+ dataBuffer
99
+ );
100
+
101
+ // 转换为Base64字符串
102
+ return this.arrayBufferToBase64(encrypted);
103
+ } catch (error) {
104
+ throw new Error(`加密失败: ${error.message}`);
105
+ }
106
+ }
107
+
108
+ /**
109
+ * 使用私钥解密字符串
110
+ * @param {string} privateKeyPem - PEM格式的私钥字符串
111
+ * @param {string} encryptedData - Base64编码的加密字符串
112
+ * @returns {Promise<string>} 解密后的原始字符串
113
+ */
114
+ static async decrypt(privateKeyPem: string, encryptedData: string): Promise<string> {
115
+ const crypto = getCrypto();
116
+ try {
117
+ // 导入私钥
118
+ const privateKey = await this.importPrivateKey(privateKeyPem);
119
+
120
+ // 转换Base64字符串为ArrayBuffer
121
+ const encryptedBuffer = this.base64ToArrayBuffer(encryptedData);
122
+
123
+ // 解密数据
124
+ const decrypted = await crypto.subtle.decrypt(
125
+ {
126
+ name: "RSA-OAEP"
127
+ },
128
+ privateKey,
129
+ encryptedBuffer
130
+ );
131
+
132
+ // 转换回字符串
133
+ const decoder = new TextDecoder();
134
+ return decoder.decode(decrypted);
135
+ } catch (error) {
136
+ throw new Error(`解密失败: ${error.message}`);
137
+ }
138
+ }
139
+
140
+ /**
141
+ * 导入PEM格式的公钥字符串为CryptoKey对象
142
+ * @param {string} publicKeyPem - PEM格式的公钥字符串
143
+ * @returns {Promise<CryptoKey>}
144
+ */
145
+ static async importPublicKey(publicKeyPem: string): Promise<CryptoKey> {
146
+ const crypto = getCrypto();
147
+ try {
148
+ // PEM转DER
149
+ const der = this.pemToDer(publicKeyPem);
150
+
151
+ // 导入密钥
152
+ return await crypto.subtle.importKey(
153
+ "spki",
154
+ der,
155
+ {
156
+ name: "RSA-OAEP",
157
+ hash: "SHA-256"
158
+ },
159
+ true,
160
+ ["encrypt"]
161
+ );
162
+ } catch (error) {
163
+ throw new Error(`导入公钥失败: ${error.message}`);
164
+ }
165
+ }
166
+
167
+ /**
168
+ * 导入PEM格式的私钥字符串为CryptoKey对象
169
+ * @param {string} privateKeyPem - PEM格式的私钥字符串
170
+ * @returns {Promise<CryptoKey>}
171
+ */
172
+ static async importPrivateKey(privateKeyPem: string): Promise<CryptoKey> {
173
+ const crypto = getCrypto();
174
+ try {
175
+ // PEM转DER
176
+ const der = this.pemToDer(privateKeyPem);
177
+
178
+ // 导入密钥
179
+ return await crypto.subtle.importKey(
180
+ "pkcs8",
181
+ der,
182
+ {
183
+ name: "RSA-OAEP",
184
+ hash: "SHA-256"
185
+ },
186
+ true,
187
+ ["decrypt"]
188
+ );
189
+ } catch (error) {
190
+ throw new Error(`导入私钥失败: ${error.message}`);
191
+ }
192
+ }
193
+
194
+ /**
195
+ * 获取公钥支持的最大加密长度(字节数)
196
+ * @param {string} publicKeyPem - PEM格式的公钥字符串
197
+ * @returns {number} 最大加密字节数
198
+ */
199
+ static getMaxEncryptLength(publicKeyPem: string): number {
200
+
201
+ // 简单估算最大加密长度
202
+ // RSA-OAEP最大加密长度 = modulusLength/8 - 2*hashLength/8 - 2
203
+ // 这里通过PEM字符串长度来估算密钥长度
204
+
205
+ // 提取Base64内容
206
+ const base64Data = publicKeyPem
207
+ .replace(/-----BEGIN PUBLIC KEY-----/, '')
208
+ .replace(/-----END PUBLIC KEY-----/, '')
209
+ .replace(/\s+/g, '');
210
+
211
+ // Base64解码获取DER长度
212
+ const derLength = atob(base64Data).length;
213
+
214
+ // 典型长度对应关系:
215
+ if (derLength <= 294) { // 2048位密钥DER长度约294字节
216
+ return 190; // 2048位:190字节
217
+ } else if (derLength <= 422) { // 3072位密钥DER长度约422字节
218
+ return 318; // 3072位:318字节
219
+ } else { // 4096位
220
+ return 446; // 4096位:446字节
221
+ }
222
+ }
223
+
224
+ /**
225
+ * 将DER格式转换为PEM格式字符串
226
+ * @param {ArrayBuffer} der - DER格式的密钥数据
227
+ * @param {string} type - 密钥类型 ('PUBLIC' 或 'PRIVATE')
228
+ * @returns {string} PEM格式的密钥字符串
229
+ */
230
+ static derToPem(der: ArrayBuffer, type: 'PUBLIC' | 'PRIVATE'): string {
231
+
232
+ const base64 = this.arrayBufferToBase64(der);
233
+
234
+ // 将Base64字符串分割为64字符一行
235
+ const wrapped = base64.match(/.{1,64}/g).join('\n');
236
+
237
+ if (type === 'PUBLIC') {
238
+ return `-----BEGIN PUBLIC KEY-----\n${wrapped}\n-----END PUBLIC KEY-----`;
239
+ } else {
240
+ return `-----BEGIN PRIVATE KEY-----\n${wrapped}\n-----END PRIVATE KEY-----`;
241
+ }
242
+ }
243
+
244
+ /**
245
+ * 将PEM格式字符串转换为DER格式
246
+ * @param {string} pem - PEM格式的密钥字符串
247
+ * @returns {ArrayBuffer} DER格式的密钥数据
248
+ */
249
+ static pemToDer(pem: string): ArrayBuffer {
250
+ // 移除PEM头部、尾部和所有空白字符
251
+ const base64 = pem
252
+ .replace(/-----BEGIN (?:PUBLIC|PRIVATE) KEY-----/, '')
253
+ .replace(/-----END (?:PUBLIC|PRIVATE) KEY-----/, '')
254
+ .replace(/\s+/g, '');
255
+
256
+ return this.base64ToArrayBuffer(base64);
257
+ }
258
+
259
+ /**
260
+ * ArrayBuffer转Base64字符串
261
+ * @param {ArrayBuffer} buffer
262
+ * @returns {string}
263
+ */
264
+ static arrayBufferToBase64(buffer: ArrayBuffer): string {
265
+ const bytes = new Uint8Array(buffer);
266
+ let binary = '';
267
+ for (let i = 0; i < bytes.byteLength; i++) {
268
+ binary += String.fromCharCode(bytes[i]);
269
+ }
270
+ return btoa(binary);
271
+ }
272
+
273
+ /**
274
+ * Base64字符串转ArrayBuffer
275
+ * @param {string} base64
276
+ * @returns {ArrayBuffer}
277
+ */
278
+ static base64ToArrayBuffer(base64: string): ArrayBuffer {
279
+ const binaryString = atob(base64);
280
+ const bytes = new Uint8Array(binaryString.length);
281
+ for (let i = 0; i < binaryString.length; i++) {
282
+ bytes[i] = binaryString.charCodeAt(i);
283
+ }
284
+ return bytes.buffer;
285
+ }
286
+
287
+ /**
288
+ * 验证PEM格式的密钥字符串
289
+ * @param {string} pem - PEM格式的密钥字符串
290
+ * @param {'PUBLIC'|'PRIVATE'} expectedType - 期望的密钥类型
291
+ * @returns {boolean} 是否为有效的PEM格式
292
+ */
293
+ static validatePemFormat(pem: string, expectedType: 'PUBLIC' | 'PRIVATE'): boolean {
294
+ if (typeof pem !== 'string') return false;
295
+
296
+ const publicKeyPattern = /^-----BEGIN PUBLIC KEY-----\n([A-Za-z0-9+/=\n]+)\n-----END PUBLIC KEY-----$/;
297
+ const privateKeyPattern = /^-----BEGIN PRIVATE KEY-----\n([A-Za-z0-9+/=\n]+)\n-----END PRIVATE KEY-----$/;
298
+
299
+ if (expectedType === 'PUBLIC') {
300
+ return publicKeyPattern.test(pem);
301
+ } else {
302
+ return privateKeyPattern.test(pem);
303
+ }
304
+ }
305
+ }
306
+
307
+
308
+ export {
309
+ AsymmetricCrypto
310
+ }
@@ -0,0 +1,16 @@
1
+ function formatHost(host: string) {
2
+
3
+ if (host.endsWith(':80')) {
4
+ host = host.slice(0, -3);
5
+ }
6
+
7
+ if (host.endsWith(':443')) {
8
+ host = host.slice(0, -4);
9
+ }
10
+
11
+ return host;
12
+ }
13
+
14
+ export {
15
+ formatHost,
16
+ }