midway-fatcms 0.0.2 → 0.0.3

package/src/service/curd/fixSoftDelete.ts

@@ -1,58 +1,58 @@
-import { KeysOfSimpleSQL } from "@/libs/crud-pro/models/keys";
-import { IRequestModel } from "@/libs/crud-pro/interfaces";
-import { IRequestCfgModel2 } from "@/models/bizmodels";
-import { Context } from "@midwayjs/koa";
-
-
-function fixSoftDelete(oldSqlSimpleName: KeysOfSimpleSQL, cfgModel: IRequestCfgModel2, params: IRequestModel, ctx?: Context) {
-
-  // 没有开启软删除。不做处理，直接物理删除
-  if (cfgModel.enableSoftDelete !== true) {
-    return;
-  }
-
-  // 刚插入的话，肯定是未删除的
-  if (KeysOfSimpleSQL.SIMPLE_INSERT === oldSqlSimpleName) {
-    if (!params.data) {
-      params.data = {};
-    }
-    params.data.deleted_at = 0; // 默认值为 0； 0代表未删除
-  }
-
-  // 删除操作，如果是软删除修改为update语句。
-  // 标准软删除：deleted_at 字段为0代表未删除，有任意时间字段代表已删除。
-  if (KeysOfSimpleSQL.SIMPLE_DELETE === oldSqlSimpleName) {
-
-    if (!params.condition || Object.keys(params.condition).length === 0) {
-      throw new Error('执行删除操作，必须指定删除条件')
-    }
-
-    if (!params.data) {
-      params.data = {};
-    }
-    const sessionInfo = ctx?.userSession?.getSessionInfo();
-    params.data.deleted_at = Date.now(); // 默认值为 0； 0代表未删除
-    params.data.deleted_by = sessionInfo?.accountId || "";
-
-    // 执行update操作
-    cfgModel.sqlSimpleName = KeysOfSimpleSQL.SIMPLE_UPDATE;
-  }
-
-  // 查询操作。强制查询未删除的。
-  if (KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
-    || KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
-    || KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
-
-    if (!params.condition) {
-      params.condition = {};
-    }
-    params.condition.deleted_at = 0; // 未删除
-
-  }
-
-}
-
-
-export {
-  fixSoftDelete,
-}
+import { KeysOfSimpleSQL } from "@/libs/crud-pro/models/keys";
+import { IRequestModel } from "@/libs/crud-pro/interfaces";
+import { IRequestCfgModel2 } from "@/models/bizmodels";
+import { Context } from "@midwayjs/koa";
+
+
+function fixSoftDelete(oldSqlSimpleName: KeysOfSimpleSQL, cfgModel: IRequestCfgModel2, params: IRequestModel, ctx?: Context) {
+
+  // 没有开启软删除。不做处理，直接物理删除
+  if (cfgModel.enableSoftDelete !== true) {
+    return;
+  }
+
+  // 刚插入的话，肯定是未删除的
+  if (KeysOfSimpleSQL.SIMPLE_INSERT === oldSqlSimpleName) {
+    if (!params.data) {
+      params.data = {};
+    }
+    params.data.deleted_at = 0; // 默认值为 0； 0代表未删除
+  }
+
+  // 删除操作，如果是软删除修改为update语句。
+  // 标准软删除：deleted_at 字段为0代表未删除，有任意时间字段代表已删除。
+  if (KeysOfSimpleSQL.SIMPLE_DELETE === oldSqlSimpleName) {
+
+    if (!params.condition || Object.keys(params.condition).length === 0) {
+      throw new Error('执行删除操作，必须指定删除条件')
+    }
+
+    if (!params.data) {
+      params.data = {};
+    }
+    const sessionInfo = ctx?.userSession?.getSessionInfo();
+    params.data.deleted_at = Date.now(); // 默认值为 0； 0代表未删除
+    params.data.deleted_by = sessionInfo?.accountId || "";
+
+    // 执行update操作
+    cfgModel.sqlSimpleName = KeysOfSimpleSQL.SIMPLE_UPDATE;
+  }
+
+  // 查询操作。强制查询未删除的。
+  if (KeysOfSimpleSQL.SIMPLE_QUERY_ONE === oldSqlSimpleName
+    || KeysOfSimpleSQL.SIMPLE_QUERY === oldSqlSimpleName
+    || KeysOfSimpleSQL.SIMPLE_QUERY_PAGE === oldSqlSimpleName) {
+
+    if (!params.condition) {
+      params.condition = {};
+    }
+    params.condition.deleted_at = 0; // 未删除
+
+  }
+
+}
+
+
+export {
+  fixSoftDelete,
+}

package/src/service/proxyapi/ProxyApiService.ts

@@ -46,7 +46,8 @@ export class ProxyApiService extends ApiBaseService {
     if (!cfgInfo) {
       throw new BizException('路径配置没有匹配到', Exceptions.CFG_NOT_FOUND);
     }
-    return this._handleProxyRequestForCfg(cfgInfo, upstream_path);
+    const proxyApiEntity: IProxyApiEntity = JSON.parse(JSON.stringify(cfgInfo));
+    return this._handleProxyRequestForCfg(proxyApiEntity, upstream_path);
   }
 
   /**
@@ -286,6 +287,7 @@ export class ProxyApiService extends ApiBaseService {
       const workbenchCode = this.ctx.workbenchInfo?.workbench_code;
       const userBasicInfo: any = { isLogin };
       if (sessionInfo && isLogin) {
+        userBasicInfo.nickName = sessionInfo.nickName;
         userBasicInfo.loginName = sessionInfo.loginName;
         userBasicInfo.sessionId = sessionInfo.sessionId;
         userBasicInfo.accountId = sessionInfo.accountId;
@@ -296,6 +298,25 @@ export class ProxyApiService extends ApiBaseService {
       return toBase64(userBasicInfo);
     }
 
+    // 传递用户基本信息和BizExt
+    if (proxyApiEntity.user_context === ProxyUserContextEnum.BASIC_INFO_BIZ_EXT) {
+      const isLogin = this.ctx.userSession.isLogin();
+      const sessionInfo = this.ctx.userSession.getSessionInfo();
+      const workbenchCode = this.ctx.workbenchInfo?.workbench_code;
+      const userBasicInfo: any = { isLogin };
+      if (sessionInfo && isLogin) {
+        userBasicInfo.nickName = sessionInfo.nickName;
+        userBasicInfo.loginName = sessionInfo.loginName;
+        userBasicInfo.sessionId = sessionInfo.sessionId;
+        userBasicInfo.accountId = sessionInfo.accountId;
+        userBasicInfo.workbenchCode = sessionInfo.workbenchCode;
+        userBasicInfo.accountType = sessionInfo.accountType;
+        userBasicInfo.bizExt = sessionInfo.bizExt; // 多了一个bizExt
+      }
+      userBasicInfo.workbenchCode = workbenchCode;
+      return toBase64(userBasicInfo);
+    }
+
     return null;
   }
 }

package/src/service/proxyapi/RouteHandler.ts

@@ -1,6 +1,8 @@
+import {IProxyApiEntity} from "@/models/SystemEntities";
+
 class RouteHandler {
-  cfgInfo: any;
-  constructor(cfgInfo: any) {
+  cfgInfo: IProxyApiEntity;
+  constructor(cfgInfo: IProxyApiEntity) {
     this.cfgInfo = cfgInfo;
   }
 }

package/src/service/proxyapi/RouteTrie.ts

@@ -13,7 +13,7 @@ class RouteTrieNode {
 
 class RouteTrie {
   private root: RouteTrieNode;
-  private routeCount: 0;
+  private routeCount: number = 0;
   constructor() {
     this.root = new RouteTrieNode();
     this.routeCount = 0;

package/src/service/proxyapi/WeightedRoundRobin.ts

@@ -7,7 +7,7 @@ interface IUpstreamItemExt extends IUpstreamItem {
 
 class WeightedRoundRobin {
   private readonly totalWeight: number;
-  private servers: IUpstreamItemExt[];
+  private readonly servers: IUpstreamItemExt[];
   constructor(servers: IUpstreamItem[]) {
     this.servers = servers.map(server => ({
       ...server,
@@ -34,6 +34,7 @@ class WeightedRoundRobin {
     // 2. 被选中的服务器减去总权重（实现平滑分配）
     if (selected) {
       selected.currentWeight -= this.totalWeight;
+      selected.currentWeight = Math.max(selected.currentWeight, 0);
       return selected;
     }
 

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"
+  ]
+}