midway-fatcms 0.0.1-beta.4 → 0.0.1-beta.40

package/dist/service/curd/fixCfgModel.js

@@ -0,0 +1,107 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixCfgModel = void 0;
+const bizmodels_1 = require("../../models/bizmodels");
+const keys_1 = require("../../libs/crud-pro/models/keys");
+function isSimpleQuery(sqlSimpleName) {
+    return sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_COUNT ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE;
+}
+function fixCfgModel(cfgModel) {
+    if (!cfgModel.method) {
+        cfgModel.method = 'anonymous';
+    }
+    if (!cfgModel.updateCfg) {
+        cfgModel.updateCfg = {};
+    }
+    const sqlSimpleName = cfgModel.sqlSimpleName;
+    const enableStandardUpdateCfg = cfgModel.enableStandardUpdateCfg; // 用于设置data字段
+    const enableStandardUpdateCfgCondition = cfgModel.enableStandardUpdateCfgCondition; // 用于设置condition字段
+    // 彻底关闭
+    if (enableStandardUpdateCfg === false) {
+        return;
+    }
+    const getDataCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfg)) {
+            if (enableStandardUpdateCfg.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfg;
+        }
+        // update 、insert 添加 by
+        return ['by']; // 创建/修改语句默认添加by
+    };
+    const getConditionCfgArray = () => {
+        // 明确有配置
+        if (Array.isArray(enableStandardUpdateCfgCondition)) {
+            if (enableStandardUpdateCfgCondition.includes('null')) {
+                return [];
+            }
+            return enableStandardUpdateCfgCondition;
+        }
+        return [];
+    };
+    const dataCfgArray = getDataCfgArray();
+    const conditionCfgArray = getConditionCfgArray();
+    const mapping = {
+        'condition.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'condition.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.created_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.created_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.created_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.created_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+        'data.modified_by': { contextAsString: bizmodels_1.CTX_VISITOR_ID },
+        'data.modified_avatar': { contextAsString: bizmodels_1.CTX_VISITOR_AVATAR },
+        'data.modified_nickname': { contextAsString: bizmodels_1.CTX_VISITOR_NICKNAME },
+        'data.modified_account_type': { contextAsString: bizmodels_1.CTX_VISITOR_ACCOUNT_TYPE },
+    };
+    const buildUpdateCfgBy = (cfgArray, prefix) => {
+        const obj = {};
+        if (Array.isArray(cfgArray)) {
+            for (let i = 0; i < cfgArray.length; i++) {
+                const suffix = cfgArray[i];
+                if (suffix) {
+                    const key = `${prefix}_${suffix}`;
+                    obj[key] = mapping[key];
+                }
+            }
+        }
+        return obj;
+    };
+    // 查询语句
+    if (isSimpleQuery(sqlSimpleName)) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 查询用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 删除语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_DELETE) {
+        const updateCfgObj = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 删除用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj);
+    }
+    // 插入语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+    }
+    // 更新语句
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj2 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+    }
+    // 插入或更新
+    if (sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_OR_UPDATE ||
+        sqlSimpleName === keys_1.KeysOfSimpleSQL.SIMPLE_INSERT_ON_DUPLICATE_UPDATE) {
+        const updateCfgObj1 = buildUpdateCfgBy(dataCfgArray, 'data.created');
+        const updateCfgObj2 = buildUpdateCfgBy(dataCfgArray, 'data.modified');
+        const updateCfgObj3 = buildUpdateCfgBy(conditionCfgArray, 'condition.created'); // 更新用户本人创建的
+        Object.assign(cfgModel.updateCfg, updateCfgObj1);
+        Object.assign(cfgModel.updateCfg, updateCfgObj2);
+        Object.assign(cfgModel.updateCfg, updateCfgObj3);
+    }
+}
+exports.fixCfgModel = fixCfgModel;

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -24,6 +24,7 @@ const WeightedRandom_1 = require("./WeightedRandom");
 const WeightedRoundRobin_1 = require("./WeightedRoundRobin");
 const WorkbenchService_1 = require("../WorkbenchService");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const global_config_1 = require("../../libs/global-config/global-config");
 function toUpstreamInfo(config_content) {
     const obj = (0, functions_1.parseJsonObject)(config_content);
     if (!obj) {
@@ -79,6 +80,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         return routeTrie;
     }
     async buildUpstreamMap() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //       biz_tag={'upstream'}
         const res = await this.curdProService.executeCrudByCfg({
             condition: {
@@ -86,8 +88,8 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
             },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const upstreamMap = {};
@@ -100,12 +102,13 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         return upstreamMap;
     }
     async loadProxyApiEntity(workbench_code, upstreamMap) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdProService.executeCrudByCfg({
             condition: {},
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_proxyapi,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const rows0 = res.getResRows();

package/dist/service/proxyapi/ProxyApiService.js

@@ -16,11 +16,16 @@ const RouteTrie_1 = require("./RouteTrie");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const devops_1 = require("../../models/devops");
 const CurdProService_1 = require("../curd/CurdProService");
+const SystemEntities_1 = require("../../models/SystemEntities");
 const axios_1 = require("axios");
 const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const ProxyApiLoadService_1 = require("./ProxyApiLoadService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+function toBase64(obj) {
+    const jsonString = JSON.stringify(obj);
+    return Buffer.from(jsonString, 'utf8').toString('base64');
+}
 /**
  * 接口代理
  */
@@ -68,19 +73,20 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
         try {
             const headers = {
                 ...ctx.headers,
-                host: targetUrl.host,
-                'content-length': ctx.get('content-length'),
+                host: targetUrl.host, // 设置正确的 host
             };
+            delete headers['content-length'];
             this.setRequestHeaders(headers, proxyApiEntity);
-            const response = await (0, axios_1.default)({
+            const axiosParams = {
                 method: ctx.method,
                 url: targetUrl.toString(),
                 data: ctx.request.body,
                 headers: headers,
                 responseType: response_type,
-                timeout: proxyApiEntity.timeout_ms || 5 * 60 * 1000,
+                timeout: Number(proxyApiEntity.timeout_ms) || 5 * 60 * 1000,
                 validateStatus: () => true,
-            });
+            };
+            const response = await (0, axios_1.default)(axiosParams);
             ctx.status = response.status;
             const resHeaders = this.toResHeaders(response.headers);
             ctx.set({
@@ -229,10 +235,25 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
             headers['x-real-ip'] = ctx.headers['x-real-ip'];
             headers['x-forwarded-for'] = ctx.headers['x-forwarded-for'];
         }
-        if (proxyApiEntity.user_context) {
+        // 传递整个用户上下文
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.SESSION_INFO) {
+            const isLogin = this.ctx.userSession.isLogin();
+            const sessionInfo = this.ctx.userSession.getSessionInfo();
+            headers['x-fatcms-usercontext'] = toBase64({ ...sessionInfo, isLogin });
+        }
+        // 只传递用户基本信息
+        if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.BASIC_INFO) {
             const isLogin = this.ctx.userSession.isLogin();
             const sessionInfo = this.ctx.userSession.getSessionInfo();
-            headers['x-fatcms-user'] = JSON.stringify({ ...sessionInfo, isLogin });
+            const userBasicInfo = { isLogin };
+            if (sessionInfo && isLogin) {
+                userBasicInfo.loginName = sessionInfo.loginName;
+                userBasicInfo.sessionId = sessionInfo.sessionId;
+                userBasicInfo.accountId = sessionInfo.accountId;
+                userBasicInfo.workbenchCode = sessionInfo.workbenchCode;
+                userBasicInfo.accountType = sessionInfo.accountType;
+            }
+            headers['x-fatcms-usercontext'] = toBase64(userBasicInfo);
         }
         if (proxyApiEntity.change_host && proxyApiEntity.change_host.length > 0) {
             headers.host = proxyApiEntity.change_host;

package/dist/views/404_app.html

@@ -1,31 +1,31 @@
-<html dir="ltr" lang="zh">
-<head>
-  <meta charset="utf-8">
-  <meta name="color-scheme" content="light dark">
-  <meta name="theme-color" content="#fff">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>无法访问此应用</title>
-  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
-</head>
-<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
-
-<div id="content">
-  <div id="main-frame-error" class="interstitial-wrapper ">
-    <div id="main-content">
-      <div class="icon icon-generic"></div>
-      <div id="main-message">
-        <h1><span>无法访问此应用</span></h1>
-        <p>此应用存在如下可能的状态导致无法访问：应用不存在、应用已下线、站点不支持</p>
-        <p>appCode: <%=appCode%></p>
-        <div>
-          <p>errorMsg: <%=errorMsg%></p>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-</body>
-</html>
-
-
+<html dir="ltr" lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta name="color-scheme" content="light dark">
+  <meta name="theme-color" content="#fff">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <title>无法访问此应用</title>
+  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
+</head>
+<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
+
+<div id="content">
+  <div id="main-frame-error" class="interstitial-wrapper ">
+    <div id="main-content">
+      <div class="icon icon-generic"></div>
+      <div id="main-message">
+        <h1><span>无法访问此应用</span></h1>
+        <p>此应用存在如下可能的状态导致无法访问：应用不存在、应用已下线、站点不支持</p>
+        <p>appCode: <%=appCode%></p>
+        <div>
+          <p>errorMsg: <%=errorMsg%></p>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
+
+

package/dist/views/404_workbench.html

@@ -1,34 +1,34 @@
-<html dir="ltr" lang="zh">
-<head>
-  <meta charset="utf-8">
-  <meta name="color-scheme" content="light dark">
-  <meta name="theme-color" content="#fff">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-  <title>无法访问此网站</title>
-  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
-</head>
-<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
-
-<div id="content">
-  <div id="main-frame-error" class="interstitial-wrapper ">
-    <div id="main-content">
-      <div class="icon icon-generic"></div>
-      <div id="main-message">
-        <h1>
-          <span>无法访问此网站</span>
-        </h1>
-        <p>检查 <span id="domain_span"><%-host%></span> 中是否有拼写错误。</p>
-        <div class="error-code" style="text-transform: none;"><%-errorInfo%></div>
-      </div>
-    </div>
-  </div>
-</div>
-<script>
-  setTimeout(function () {
-    document.getElementById('domain_span').innerHTML = location.host
-  }, 10)
-</script>
-</body>
-</html>
-
-
+<html dir="ltr" lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta name="color-scheme" content="light dark">
+  <meta name="theme-color" content="#fff">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <title>无法访问此网站</title>
+  <link rel="stylesheet" href="https://cdnjsx.oss-cn-shanghai.aliyuncs.com/styles/chrome-error.css">
+</head>
+<body class="neterror" style="font-family: system-ui,PingFang SC,STHeiti,sans-serif; font-size: 75%">
+
+<div id="content">
+  <div id="main-frame-error" class="interstitial-wrapper ">
+    <div id="main-content">
+      <div class="icon icon-generic"></div>
+      <div id="main-message">
+        <h1>
+          <span>无法访问此网站</span>
+        </h1>
+        <p>检查 <span id="domain_span"><%-host%></span> 中是否有拼写错误。</p>
+        <div class="error-code" style="text-transform: none;"><%-errorInfo%></div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+  setTimeout(function () {
+    document.getElementById('domain_span').innerHTML = location.host
+  }, 10)
+</script>
+</body>
+</html>
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.4",
+  "version": "0.0.1-beta.40",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -19,22 +19,13 @@
     "dist/**/*.d.ts",
     "dist/**/*.html",
     "dist/**/*.ico",
-    "src/**/*.ts",
-    "src/**/*.txt",
-    "src/**/*.html",
-    "src/**/*.ico",
-    "index.d.ts"
+    "index.d.ts",
+    "tsconfig.json",
+    ".prettierrc.js",
+    ".eslintrc.json"
   ],
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "^29.2.0",
-    "@types/node": "^16.11.22",
-    "cross-env": "^6.0.0",
-    "jest": "^29.2.2",
-    "mwts": "^1.3.0",
-    "mwtsc": "^1.4.0",
-    "ts-jest": "^29.0.3",
-    "typescript": "~4.8.0",
     "@midwayjs/bootstrap": "^3.16.0",
     "@midwayjs/cli": "^2.1.1",
     "@midwayjs/cookies": "^1.2.0",
@@ -50,26 +41,36 @@
     "@midwayjs/upload": "^3.16.1",
     "@midwayjs/validate": "^3.16.1",
     "@midwayjs/view-ejs": "^3.20.4",
+    "@types/humps": "2.0.6",
+    "@types/jest": "^29.2.0",
+    "@types/koa": "^2.13.4",
+    "@types/lodash": "^4.14.195",
+    "@types/md5": "^2.3.5",
+    "@types/mime-types": "^2.1.4",
+    "@types/mssql": "^9.1.7",
+    "@types/node": "^16.11.22",
+    "@types/nodemailer": "^6.4.17",
+    "@types/pg": "^8.15.4",
     "aes-128-cbc": "^1.0.4",
     "axios": "^1.8.2",
+    "cross-env": "^6.0.0",
     "humps": "^2.0.1",
+    "jest": "^29.2.2",
     "lodash": "^4.17.21",
     "lru-cache": "^10.2.2",
     "md5": "^2.3.0",
     "mime-types": "^2.1.35",
     "moment": "^2.30.1",
     "mssql": "^11.0.1",
+    "mwts": "^1.3.0",
+    "mwtsc": "^1.4.0",
     "mysql2": "^3.4.0",
-    "pg": "^8.16.3",
     "nodemailer": "^7.0.3",
+    "pg": "^8.16.3",
+    "ts-jest": "^29.0.3",
+    "typescript": "~4.8.0",
     "urlsafe-base64": "^1.0.0",
-    "@types/mime-types": "^2.1.4",
-    "@types/mssql": "^9.1.7",
-    "@types/nodemailer": "^6.4.17",
-    "@types/pg": "^8.15.4",
-    "@types/humps": "2.0.6",
-    "@types/koa": "^2.13.4",
-    "@types/lodash": "^4.14.195",
-    "@types/md5": "^2.3.5"
-  }
+    "fast-csv": "^5.0.2"
+  },
+  "dependencies": {}
 }

package/tsconfig.json

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

package/dist/controller/medstatistic/MedAdminController.d.ts

@@ -1,35 +0,0 @@
-import { Context } from '@midwayjs/koa';
-import { BaseApiController } from '../base/BaseApiController';
-import { AuthService } from '../../service/AuthService';
-import { CommonResult } from '../../libs/utils/common-dto';
-import { WorkbenchService } from "../../service/WorkbenchService";
-import { SysConfigService } from "../../service/SysConfigService";
-import { MedScoreService } from "./MedScoreService";
-import { MedMessageService } from "./MedMessageService";
-interface IUserRechargeRule {
-    score: number;
-    authentication_score: number;
-    recharge_package: any[];
-    vip_package: any[];
-}
-/**
- * medstatistic 管理端
- */
-export declare class MedAdminController extends BaseApiController {
-    protected ctx: Context;
-    protected authService: AuthService;
-    protected workbenchService: WorkbenchService;
-    protected sysConfigService: SysConfigService;
-    protected medScoreService: MedScoreService;
-    protected medMessageService: MedMessageService;
-    /**
-     * 审批后自动充值30个积分
-     */
-    recharge_by_authentication_success(): Promise<CommonResult>;
-    /**
-     * 将DB中的数据同步到Redis，因为PHP的程序需要。
-     */
-    sync_med_user_recharge_rule_to_redis(): Promise<CommonResult>;
-    get_med_user_recharge_rule(): Promise<IUserRechargeRule>;
-}
-export {};