midway-fatcms 0.0.1-beta.1 → 0.0.1-beta.10

package/src/service/curd/CurdMixUtils.ts

@@ -1,4 +1,4 @@
-import {ColumnRelation, CopyAttr} from '../../libs/crud-pro/interfaces';
+import { ColumnRelation, CopyAttr } from '../../libs/crud-pro/interfaces';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
 import { KeyOfCrudTypes } from '../../libs/crud-pro/models/keys';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
@@ -33,7 +33,7 @@ function getColumnsRelationAll(sqlCfg: SqlCfgModel, cfgModel: RequestCfgModel):
 
 
 
-function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ){
+function copyBySingleSourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any) {
   // const codeObject = map.get(sourceValue);
   const codeObject = getValue(sourceValue);
   if (typeof codeObject === 'undefined' || codeObject === null) {
@@ -59,7 +59,7 @@ function copyBySingleSourceValue(row: any, sourceValue:any, targetColumns: CopyA
 
 
 
-function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAttr[], getValue: any ): boolean {
+function copyByArraySourceValue(row: any, sourceValue: any, targetColumns: CopyAttr[], getValue: any): boolean {
   let isSetArray = false;
   // 支持关联JSON数组
   if (typeof sourceValue === 'string' && sourceValue.startsWith('[') && sourceValue.endsWith(']')) {
@@ -80,15 +80,12 @@ function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAt
                 _.set(row, toStr, codeObject);
 
                 isSetArray = true;
-
               } else {
-
                 const dictAttrValue = _.get(codeObject, targetColumn.from);
-                if (typeof dictAttrValue !== "undefined" && dictAttrValue !== null) {
+                if (typeof dictAttrValue !== 'undefined' && dictAttrValue !== null) {
                   const toStr = targetColumn.to.replace('$ARRAY_INDEX', `${codeIndex}`);
                   _.set(row, toStr, dictAttrValue);
                   isSetArray = true;
-
                 }
               }
             }
@@ -101,8 +98,6 @@ function copyByArraySourceValue(row: any, sourceValue:any, targetColumns: CopyAt
   return isSetArray;
 }
 
-
-
 class CrudMixUtils {
   private readonly relatedType: RelatedType;
   constructor(relatedType: RelatedType) {
@@ -134,7 +129,7 @@ class CrudMixUtils {
         }
       }
     }
-    return _.uniqBy(relationResult,(obj: ColumnRelation)=> {
+    return _.uniqBy(relationResult, (obj: ColumnRelation) => {
       return `${obj.relatedCode}_${obj.relatedType}_${obj.sourceColumn}_${JSON.stringify(obj.targetColumns)}`;
     });
   }
@@ -191,7 +186,7 @@ class CrudMixUtils {
     }
 
     const sourceValue = _.get(row, sourceColumn);
-    if (typeof sourceValue ==='undefined' || sourceValue ===null) {
+    if (typeof sourceValue === 'undefined' || sourceValue === null) {
       return;
     }
 
@@ -216,7 +211,7 @@ class CrudMixUtils {
    * @param columnRelation
    */
   public copyColumnRelationToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
-    const {sourceColumn, targetColumns} = columnRelation;
+    const { sourceColumn, targetColumns } = columnRelation;
     if (!sourceColumn || !targetColumns) {
       return;
     }
@@ -243,6 +238,41 @@ class CrudMixUtils {
 
   }
 
+
+  /**
+  * 专门COPY用户信息到row上面。无relatedCode模式
+  * @param row
+  * @param map
+  * @param columnRelation
+  */
+  public copyUserInfoToRowNoRelatedCode(row: any, map: Map<string, any>, columnRelation: ColumnRelation) {
+    const { targetColumns } = columnRelation;
+    if (!targetColumns) {
+      return;
+    }
+
+    const tmpSourceColumn = '__fatcmsUserAccountId__';
+
+    const sourceValue = _.get(row, tmpSourceColumn);
+    if (!sourceValue) {
+      return;
+    }
+
+    const getValue = (code: string) => {
+      if (!map) {
+        return null;
+      }
+      if (typeof map.get === 'function') {
+        return map.get(`${code}`);
+      }
+      return map[code];
+    };
+
+    const isSetArray = copyByArraySourceValue(row, sourceValue, targetColumns, getValue);
+    if (!isSetArray) {
+      copyBySingleSourceValue(row, sourceValue, targetColumns, getValue);
+    }
+  }
 }
 
 export { CrudMixUtils, RelatedType, FuncRowColumnRelation };

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -5,7 +5,7 @@ import { BaseService } from '../base/BaseService';
 import { getRouteTrie, RouteTrie } from './RouteTrie';
 import { RouteHandler } from './RouteHandler';
 import { CurdProService } from '../curd/CurdProService';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { IProxyApiEntity, IUpstreamInfo } from '../../models/SystemEntities';
 import { parseJsonObject } from '../../libs/utils/functions';
@@ -15,6 +15,7 @@ import { WeightedRoundRobin } from './WeightedRoundRobin';
 import { IScheduleService } from '../../interface';
 import { WorkbenchService } from '../WorkbenchService';
 import { CommonException } from '../../libs/crud-pro/exceptions';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function toUpstreamInfo(config_content: any): IUpstreamInfo {
   const obj = parseJsonObject(config_content);
@@ -85,6 +86,9 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async buildUpstreamMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     //       biz_tag={'upstream'}
     const res = await this.curdProService.executeCrudByCfg(
       {
@@ -110,6 +114,10 @@ export class ProxyApiLoadService extends BaseService implements IScheduleService
   }
 
   private async loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): Promise<IProxyApiEntity[]> {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const res = await this.curdProService.executeCrudByCfg(
       {
         condition: {},

package/src/views/404_app.html

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

package/src/views/404_workbench.html

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

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 {};

package/dist/controller/medstatistic/MedAdminController.js

@@ -1,205 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MedAdminController = void 0;
-const core_1 = require("@midwayjs/core");
-const _ = require("lodash");
-const BaseApiController_1 = require("../base/BaseApiController");
-const AuthService_1 = require("../../service/AuthService");
-const common_dto_1 = require("../../libs/utils/common-dto");
-const WorkbenchService_1 = require("../../service/WorkbenchService");
-const permission_middleware_1 = require("../../middleware/permission.middleware");
-const SysConfigService_1 = require("../../service/SysConfigService");
-const functions_1 = require("../../libs/utils/functions");
-const exceptions_1 = require("../../libs/crud-pro/exceptions");
-const keys_1 = require("../../libs/crud-pro/models/keys");
-const ordernum_utils_1 = require("../../libs/utils/ordernum-utils");
-const MedScoreService_1 = require("./MedScoreService");
-const DateTimeUtils_1 = require("../../libs/crud-pro/utils/DateTimeUtils");
-const MedMessageService_1 = require("./MedMessageService");
-const constants_1 = require("./constants");
-const MED_STATISTIC_DB = "medstatistic";
-/**
- * medstatistic 管理端
- */
-let MedAdminController = class MedAdminController extends BaseApiController_1.BaseApiController {
-    /**
-     * 审批后自动充值30个积分
-     */
-    async recharge_by_authentication_success() {
-        const body = this.ctx.request.body; // {user_id}
-        const user_id = parseInt(body.user_id); // med的C端用户user_id
-        if (!user_id) {
-            throw new exceptions_1.CommonException("user_id不存在");
-        }
-        const authRes = await this.curdMixService.executeCrudByCfg({
-            condition: {
-                user_id: user_id,
-            },
-        }, {
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlTable: "fa_user_authentication",
-            sqlDatabase: MED_STATISTIC_DB,
-        });
-        const authResOne = authRes.getOneObj();
-        if (!authResOne || `${authResOne.status}` !== '1') {
-            throw new exceptions_1.CommonException("未提交认证资料或认证审批未通过");
-        }
-        const RECHARGE_TYPE_FOR_AUTH = '3';
-        // 查询之前有没有通过积分认证获得积分
-        const fa_user_rechargeRes = await this.curdMixService.executeCrudByCfg({
-            condition: {
-                user_id: user_id,
-                type: RECHARGE_TYPE_FOR_AUTH
-            },
-        }, {
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlTable: "fa_user_recharge",
-            sqlDatabase: MED_STATISTIC_DB,
-        });
-        const fa_user_rechargeResOne = fa_user_rechargeRes.getOneObj();
-        if (fa_user_rechargeResOne) {
-            return common_dto_1.CommonResult.errorRes("用户已经获得认证积分");
-        }
-        const rechargeRule = await this.get_med_user_recharge_rule();
-        // 插入充值记录
-        await this.curdMixService.executeCrudByCfg({
-            data: {
-                user_id: user_id,
-                type: RECHARGE_TYPE_FOR_AUTH,
-                paid: 1,
-                order_no: (0, ordernum_utils_1.generateOrderNumber)('CZ'),
-                money: 0,
-                score: rechargeRule.authentication_score,
-                pay_time: DateTimeUtils_1.DateTimeUtils.getCurrentTimeStampSecond(),
-                createtime: DateTimeUtils_1.DateTimeUtils.getCurrentTimeStampSecond(),
-            },
-        }, {
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-            sqlTable: "fa_user_recharge",
-            sqlDatabase: MED_STATISTIC_DB,
-        });
-        // 查询用户信息
-        const userRes = await this.curdMixService.executeCrudByCfg({
-            condition: {
-                id: user_id,
-            },
-        }, {
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlTable: "fa_user",
-            sqlDatabase: MED_STATISTIC_DB,
-        });
-        const userOne = userRes.getOneObj();
-        if (!userOne) {
-            return common_dto_1.CommonResult.errorRes("用户信息没有查询到");
-        }
-        // 更新用户日志。
-        await this.medScoreService.updateScore(user_id, MedScoreService_1.UpdateScorePM.increase, rechargeRule.authentication_score, "用户认证通过获得积分");
-        // 更新认证状态
-        await this.curdMixService.executeCrudByCfg({
-            condition: {
-                id: user_id,
-            },
-            data: {
-                is_authentication: 1
-            }
-        }, {
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlTable: "fa_user",
-            sqlDatabase: MED_STATISTIC_DB,
-        });
-        // 发送消息
-        // title:string, content: string, received_by: string | number, msgObj: ISendUserReceivedMsg
-        const title = "您的身份认证请求，已经审批通过";
-        await this.medMessageService.insertMessage(title, title, user_id, {
-            target_object_id: authResOne.id,
-            target_object_type: constants_1.TARGET_OBJECT_TYPE_USER_AUTHENTICATION,
-            msg_type: constants_1.MsgType.user_auth_pass
-        });
-        return common_dto_1.CommonResult.successMsg('用户认证审批通过获得积分' + rechargeRule.authentication_score);
-    }
-    /**
-     * 将DB中的数据同步到Redis，因为PHP的程序需要。
-     */
-    async sync_med_user_recharge_rule_to_redis() {
-        const ruleObj = await this.get_med_user_recharge_rule();
-        await this.redisService.set("score", ruleObj.score);
-        await this.redisService.set("authentication_score", ruleObj.authentication_score);
-        await this.redisService.set("recharge_package", JSON.stringify(ruleObj.recharge_package.map((obj0) => {
-            const obj = {};
-            obj.score = "" + obj0.score;
-            obj.price = "" + obj0.price;
-            return obj;
-        })));
-        await this.redisService.set("vip_package", JSON.stringify(ruleObj.vip_package.map((obj0) => {
-            const obj = {};
-            obj.score = "" + obj0.score;
-            obj.day = "" + obj0.day;
-            return obj;
-        })));
-        return common_dto_1.CommonResult.successRes("SUCCESS");
-    }
-    async get_med_user_recharge_rule() {
-        const rowObj = await this.sysConfigService.getSysConfigOne("med_user_recharge_rule");
-        const configContentObj = (0, functions_1.parseJsonObject)(rowObj.config_content);
-        const configContentData = configContentObj.data || {};
-        const recharge_package = configContentData.recharge_package || [];
-        const vip_package = configContentData.vip_package || [];
-        const authentication_score = Number(_.get(configContentData, 'score_setting.authentication_score')) || 30;
-        const score = Number(_.get(configContentData, 'score_setting.score')) || 1;
-        return {
-            score,
-            authentication_score,
-            recharge_package,
-            vip_package
-        };
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], MedAdminController.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", AuthService_1.AuthService)
-], MedAdminController.prototype, "authService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", WorkbenchService_1.WorkbenchService)
-], MedAdminController.prototype, "workbenchService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", SysConfigService_1.SysConfigService)
-], MedAdminController.prototype, "sysConfigService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", MedScoreService_1.MedScoreService)
-], MedAdminController.prototype, "medScoreService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", MedMessageService_1.MedMessageService)
-], MedAdminController.prototype, "medMessageService", void 0);
-__decorate([
-    (0, core_1.Post)('/recharge_by_authentication_success', { middleware: [(0, permission_middleware_1.checkPermission)("BizOperationUserAdmin")] }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], MedAdminController.prototype, "recharge_by_authentication_success", null);
-__decorate([
-    (0, core_1.Post)('/sync_med_user_recharge_rule_to_redis', { middleware: [(0, permission_middleware_1.checkPermission)("BizOperationUserAdmin")] }),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], MedAdminController.prototype, "sync_med_user_recharge_rule_to_redis", null);
-MedAdminController = __decorate([
-    (0, core_1.Controller)('/ns/api/medadmin')
-], MedAdminController);
-exports.MedAdminController = MedAdminController;

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

@@ -1,28 +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 { MedMessageService } from "./MedMessageService";
-import { CurdProService } from "../../service/curd/CurdProService";
-/**
- * medstatistic 用户端
- */
-export declare class MedClientController extends BaseApiController {
-    protected ctx: Context;
-    protected authService: AuthService;
-    protected workbenchService: WorkbenchService;
-    protected curdProService: CurdProService;
-    protected medMessageService: MedMessageService;
-    /**
-     * 充值
-     */
-    recharge(): Promise<CommonResult>;
-    /**
-     * 获取用户收到的消息。只需要登录即可
-     */
-    send_user_received_message(): Promise<CommonResult>;
-    private get_fa_contact;
-    private getBBSTopic;
-    private getBBSReply;
-}