适配general中entities变化

es/entities/System.js

@@ -16,6 +16,7 @@ export const entityDesc = {
                 entityId: '关联对象id',
                 accounts: '关联账户',
                 withdrawAccounts: '关联提现账户',
+                oldestVersion: '支持app最低版本',
             },
         },
     }

es/oak-app-domain/Application/Storage.js

@@ -28,6 +28,21 @@ export const desc = {
         style: {
             type: "object"
         },
+        dangerousVersions: {
+            notNull: true,
+            type: "object"
+        },
+        warningVersions: {
+            notNull: true,
+            type: "object"
+        },
+        soaVersion: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 12
+            }
+        },
         domainId: {
             type: "ref",
             ref: "domain"

es/oak-app-domain/Application/_baseSchema.d.ts

@@ -75,6 +75,7 @@ export type NativeConfig = {
         port: string;
     };
 };
+type Versions = string[];
 export type OpSchema = EntityShape & {
     name: String<32>;
     description?: Text | null;
@@ -82,6 +83,9 @@ export type OpSchema = EntityShape & {
     systemId: ForeignKey<"system">;
     config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig;
     style?: Style | null;
+    dangerousVersions: Versions;
+    warningVersions: Versions;
+    soaVersion: String<12>;
     domainId?: ForeignKey<"domain"> | null;
 } & {
     [A in ExpressionKey]?: any;
@@ -98,6 +102,9 @@ export type OpFilter = {
     systemId: Q_StringValue;
     config: JsonFilter<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
     style: JsonFilter<Style>;
+    dangerousVersions: JsonFilter<Versions>;
+    warningVersions: JsonFilter<Versions>;
+    soaVersion: Q_StringValue;
     domainId: Q_StringValue;
 } & ExprOp<OpAttr | string>;
 export type OpProjection = {
@@ -113,6 +120,9 @@ export type OpProjection = {
     systemId?: number;
     config?: number | JsonProjection<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
     style?: number | JsonProjection<Style>;
+    dangerousVersions?: number | JsonProjection<Versions>;
+    warningVersions?: number | JsonProjection<Versions>;
+    soaVersion?: number;
     domainId?: number;
 } & Partial<ExprOp<OpAttr | string>>;
 export type OpSortAttr = Partial<{
@@ -124,7 +134,11 @@ export type OpSortAttr = Partial<{
     description: number;
     type: number;
     style: number;
+    dangerousVersions: number;
+    warningVersions: number;
+    soaVersion: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;
 export type OpAction = OakMakeAction<GenericAction | string>;
 export type OpUpdateAction = "update" | string;
+export {};

es/oak-app-domain/Application/_baseSchema.js

@@ -0,0 +1 @@
+export {};

es/oak-app-domain/Application/locales/zh_CN.json

@@ -8,7 +8,10 @@
         "config": "设置",
         "style": "样式",
         "sessions": "会话",
-        "domain": "域名"
+        "domain": "域名",
+        "dangerousVersions": "强制升级版本",
+        "warningVersions": "建议升级版本",
+        "soaVersion": "最新发布版本"
     },
     "v": {
         "type": {

es/oak-app-domain/Platform/Storage.js

@@ -15,6 +15,12 @@ export const desc = {
             notNull: true,
             type: "object"
         },
+        oldestVersion: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
         style: {
             type: "object"
         },

es/oak-app-domain/Platform/_baseSchema.d.ts

@@ -9,6 +9,7 @@ export type OpSchema = EntityShape & {
     name: String<32>;
     description?: Text | null;
     config: Config;
+    oldestVersion?: String<32> | null;
     style?: Style | null;
     entity?: String<32> | null;
     entityId?: String<64> | null;
@@ -24,6 +25,7 @@ export type OpFilter = {
     name: Q_StringValue;
     description: Q_StringValue;
     config: JsonFilter<Config>;
+    oldestVersion: Q_StringValue;
     style: JsonFilter<Style>;
     entity: Q_StringValue;
     entityId: Q_StringValue;
@@ -38,6 +40,7 @@ export type OpProjection = {
     name?: number;
     description?: number;
     config?: number | JsonProjection<Config>;
+    oldestVersion?: number;
     style?: number | JsonProjection<Style>;
     entity?: number;
     entityId?: number;
@@ -50,6 +53,7 @@ export type OpSortAttr = Partial<{
     name: number;
     description: number;
     config: number;
+    oldestVersion: number;
     style: number;
     entity: number;
     entityId: number;

es/oak-app-domain/Platform/_baseSchema.js

@@ -0,0 +1 @@
+export {};

es/oak-app-domain/Platform/locales/zh_CN.json

@@ -6,7 +6,8 @@
         "config": "设置",
         "style": "样式",
         "entity": "关联对象",
-        "entityId": "关联对象id"
+        "entityId": "关联对象id",
+        "oldestVersion": "支持app最低版本"
     },
     "r": {
         "owner": "拥有者",

es/oak-app-domain/System/Storage.js

@@ -19,21 +19,26 @@ export const desc = {
             type: "ref",
             ref: "platform"
         },
-        folder // 提现的loss在用户提现时计算
+        folder: {
-        : {
             type: "varchar",
             params: {
                 length: 16
             }
         },
-        super: {
+        oldestVersion: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
+        super // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
+        : {
             type: "boolean"
         },
         style: {
             type: "object"
         },
-        entity // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
+        entity: {
-        : {
             type: "varchar",
             params: {
                 length: 32

es/oak-app-domain/System/_baseSchema.d.ts

@@ -25,6 +25,7 @@ export type OpSchema = EntityShape & {
     config: Config;
     platformId?: ForeignKey<"platform"> | null;
     folder?: String<16> | null;
+    oldestVersion?: String<32> | null;
     super?: Boolean | null;
     style?: Style | null;
     entity?: String<32> | null;
@@ -44,6 +45,7 @@ export type OpFilter = {
     config: JsonFilter<Config>;
     platformId: Q_StringValue;
     folder: Q_StringValue;
+    oldestVersion: Q_StringValue;
     super: Q_BooleanValue;
     style: JsonFilter<Style>;
     entity: Q_StringValue;
@@ -62,6 +64,7 @@ export type OpProjection = {
     config?: number | JsonProjection<Config>;
     platformId?: number;
     folder?: number;
+    oldestVersion?: number;
     super?: number;
     style?: number | JsonProjection<Style>;
     entity?: number;
@@ -77,6 +80,7 @@ export type OpSortAttr = Partial<{
     description: number;
     config: number;
     folder: number;
+    oldestVersion: number;
     super: number;
     style: number;
     entity: number;

es/oak-app-domain/System/_baseSchema.js

@@ -0,0 +1 @@
+export {};

es/oak-app-domain/System/locales/zh_CN.json

@@ -12,6 +12,7 @@
         "entity": "关联对象",
         "entityId": "关联对象id",
         "accounts": "关联账户",
-        "withdrawAccounts": "关联提现账户"
+        "withdrawAccounts": "关联提现账户",
+        "oldestVersion": "支持app最低版本"
     }
 }

es/utils/payClazz/WechatPay/index.d.ts

@@ -1,4 +1,4 @@
 import WechatPay from './WechatPay';
 import WechatPayDebug from './WechatPay.debug';
-declare const _default: typeof WechatPayDebug | typeof WechatPay;
+declare const _default: typeof WechatPay | typeof WechatPayDebug;
 export default _default;

lib/entities/System.js

@@ -19,6 +19,7 @@ exports.entityDesc = {
                 entityId: '关联对象id',
                 accounts: '关联账户',
                 withdrawAccounts: '关联提现账户',
+                oldestVersion: '支持app最低版本',
             },
         },
     }

lib/oak-app-domain/Application/Storage.js

@@ -31,6 +31,21 @@ exports.desc = {
         style: {
             type: "object"
         },
+        dangerousVersions: {
+            notNull: true,
+            type: "object"
+        },
+        warningVersions: {
+            notNull: true,
+            type: "object"
+        },
+        soaVersion: {
+            notNull: true,
+            type: "varchar",
+            params: {
+                length: 12
+            }
+        },
         domainId: {
             type: "ref",
             ref: "domain"

lib/oak-app-domain/Application/_baseSchema.d.ts

@@ -75,6 +75,7 @@ export type NativeConfig = {
         port: string;
     };
 };
+type Versions = string[];
 export type OpSchema = EntityShape & {
     name: String<32>;
     description?: Text | null;
@@ -82,6 +83,9 @@ export type OpSchema = EntityShape & {
     systemId: ForeignKey<"system">;
     config: WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig;
     style?: Style | null;
+    dangerousVersions: Versions;
+    warningVersions: Versions;
+    soaVersion: String<12>;
     domainId?: ForeignKey<"domain"> | null;
 } & {
     [A in ExpressionKey]?: any;
@@ -98,6 +102,9 @@ export type OpFilter = {
     systemId: Q_StringValue;
     config: JsonFilter<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
     style: JsonFilter<Style>;
+    dangerousVersions: JsonFilter<Versions>;
+    warningVersions: JsonFilter<Versions>;
+    soaVersion: Q_StringValue;
     domainId: Q_StringValue;
 } & ExprOp<OpAttr | string>;
 export type OpProjection = {
@@ -113,6 +120,9 @@ export type OpProjection = {
     systemId?: number;
     config?: number | JsonProjection<WebConfig | WechatMpConfig | WechatPublicConfig | NativeConfig>;
     style?: number | JsonProjection<Style>;
+    dangerousVersions?: number | JsonProjection<Versions>;
+    warningVersions?: number | JsonProjection<Versions>;
+    soaVersion?: number;
     domainId?: number;
 } & Partial<ExprOp<OpAttr | string>>;
 export type OpSortAttr = Partial<{
@@ -124,7 +134,11 @@ export type OpSortAttr = Partial<{
     description: number;
     type: number;
     style: number;
+    dangerousVersions: number;
+    warningVersions: number;
+    soaVersion: number;
     [k: string]: any;
 } | ExprOp<OpAttr | string>>;
 export type OpAction = OakMakeAction<GenericAction | string>;
 export type OpUpdateAction = "update" | string;
+export {};

lib/oak-app-domain/Application/_baseSchema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

lib/oak-app-domain/Application/locales/zh_CN.json

@@ -8,7 +8,10 @@
         "config": "设置",
         "style": "样式",
         "sessions": "会话",
-        "domain": "域名"
+        "domain": "域名",
+        "dangerousVersions": "强制升级版本",
+        "warningVersions": "建议升级版本",
+        "soaVersion": "最新发布版本"
     },
     "v": {
         "type": {

lib/oak-app-domain/Platform/Storage.js

@@ -18,6 +18,12 @@ exports.desc = {
             notNull: true,
             type: "object"
         },
+        oldestVersion: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
         style: {
             type: "object"
         },

lib/oak-app-domain/Platform/_baseSchema.d.ts

@@ -9,6 +9,7 @@ export type OpSchema = EntityShape & {
     name: String<32>;
     description?: Text | null;
     config: Config;
+    oldestVersion?: String<32> | null;
     style?: Style | null;
     entity?: String<32> | null;
     entityId?: String<64> | null;
@@ -24,6 +25,7 @@ export type OpFilter = {
     name: Q_StringValue;
     description: Q_StringValue;
     config: JsonFilter<Config>;
+    oldestVersion: Q_StringValue;
     style: JsonFilter<Style>;
     entity: Q_StringValue;
     entityId: Q_StringValue;
@@ -38,6 +40,7 @@ export type OpProjection = {
     name?: number;
     description?: number;
     config?: number | JsonProjection<Config>;
+    oldestVersion?: number;
     style?: number | JsonProjection<Style>;
     entity?: number;
     entityId?: number;
@@ -50,6 +53,7 @@ export type OpSortAttr = Partial<{
     name: number;
     description: number;
     config: number;
+    oldestVersion: number;
     style: number;
     entity: number;
     entityId: number;

lib/oak-app-domain/Platform/_baseSchema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

lib/oak-app-domain/Platform/locales/zh_CN.json

@@ -6,7 +6,8 @@
         "config": "设置",
         "style": "样式",
         "entity": "关联对象",
-        "entityId": "关联对象id"
+        "entityId": "关联对象id",
+        "oldestVersion": "支持app最低版本"
     },
     "r": {
         "owner": "拥有者",

lib/oak-app-domain/System/Storage.js

@@ -22,21 +22,26 @@ exports.desc = {
             type: "ref",
             ref: "platform"
         },
-        folder // 提现的loss在用户提现时计算
+        folder: {
-        : {
             type: "varchar",
             params: {
                 length: 16
             }
         },
-        super: {
+        oldestVersion: {
+            type: "varchar",
+            params: {
+                length: 32
+            }
+        },
+        super // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
+        : {
             type: "boolean"
         },
         style: {
             type: "object"
         },
-        entity // 如果为true，则按照渠道taxLossRatio和refundCompensateRatio进行扣取(如果因为depositLossRatio已经大于taxLossRatio，则全额退款)
+        entity: {
-        : {
             type: "varchar",
             params: {
                 length: 32

lib/oak-app-domain/System/_baseSchema.d.ts

@@ -25,6 +25,7 @@ export type OpSchema = EntityShape & {
     config: Config;
     platformId?: ForeignKey<"platform"> | null;
     folder?: String<16> | null;
+    oldestVersion?: String<32> | null;
     super?: Boolean | null;
     style?: Style | null;
     entity?: String<32> | null;
@@ -44,6 +45,7 @@ export type OpFilter = {
     config: JsonFilter<Config>;
     platformId: Q_StringValue;
     folder: Q_StringValue;
+    oldestVersion: Q_StringValue;
     super: Q_BooleanValue;
     style: JsonFilter<Style>;
     entity: Q_StringValue;
@@ -62,6 +64,7 @@ export type OpProjection = {
     config?: number | JsonProjection<Config>;
     platformId?: number;
     folder?: number;
+    oldestVersion?: number;
     super?: number;
     style?: number | JsonProjection<Style>;
     entity?: number;
@@ -77,6 +80,7 @@ export type OpSortAttr = Partial<{
     description: number;
     config: number;
     folder: number;
+    oldestVersion: number;
     super: number;
     style: number;
     entity: number;

lib/oak-app-domain/System/_baseSchema.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

lib/oak-app-domain/System/locales/zh_CN.json

@@ -12,6 +12,7 @@
         "entity": "关联对象",
         "entityId": "关联对象id",
         "accounts": "关联账户",
-        "withdrawAccounts": "关联提现账户"
+        "withdrawAccounts": "关联提现账户",
+        "oldestVersion": "支持app最低版本"
     }
 }

lib/utils/payClazz/WechatPay/index.d.ts

@@ -1,4 +1,4 @@
 import WechatPay from './WechatPay';
 import WechatPayDebug from './WechatPay.debug';
-declare const _default: typeof WechatPayDebug | typeof WechatPay;
+declare const _default: typeof WechatPay | typeof WechatPayDebug;
 export default _default;

src/entities/System.ts

@@ -44,6 +44,7 @@ export const entityDesc: EntityDesc<Schema> = {
                 entityId: '关联对象id',
                 accounts: '关联账户',
                 withdrawAccounts: '关联提现账户',
+                oldestVersion: '支持app最低版本',
             },
         },
     }