Merge branch 'feature/190419-dynamic' into 'master'

feat(change the api component params to dynamic) See merge request !3

Merge branch 'feature/190419-dynamic' into 'master'
feat(change the api component params to dynamic) See merge request !3
fd97a6a7 · 劳工 · 9b7bd77a · 61292177 · fd97a6a7 · fd97a6a7
Commit fd97a6a7 authored Apr 22, 2019 by 劳工
21 changed files
--- a/src/net/SampleApi.ts
+++ b/src/net/SampleApi.ts
@@ -4,7 +4,7 @@
 * 简单的api组件
 */

-import {utils} from 'scilla'
+import {utils, dynamic} from 'scilla'
 import ApiComponent from "./ApiComponent";
 import {callApi} from "./webService";

@@ -13,7 +13,7 @@ export default class SampleApi extends ApiComponent {
 	name: string;
 	uri: string;
 	method: string = 'POST';
-	params: any = {};
+	params: dynamic;

 	async callApi(name, paramsInput, ...args){
 		if(this.name == name){

--- a/src/net/SamplePollingApi.ts
+++ b/src/net/SamplePollingApi.ts
@@ -4,7 +4,7 @@
 * 简单的api组件
 */

-import {utils} from 'scilla'
+import {utils, dynamic} from 'scilla'
 import ApiComponent from "./ApiComponent";
 import {callApi, polling} from "./webService";

@@ -14,7 +14,7 @@ export default class SamplePollingApi extends ApiComponent {
 	successValues: any[];
 	uri: string;
 	method: string = 'GET';
-	params: any = {};
+	params: dynamic;
 	maxTimes: number = 5;
 	delay: number = 500;


--- a/src/net/api/hdtool/base/AjaxElementComponent.ts
+++ b/src/net/api/hdtool/base/AjaxElementComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取渲染数据
@@ -11,9 +11,9 @@ export default class AjaxElementComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//duiba活动ID
-	duibaId: string;
+	duibaId: dynamic;
 	//入库活动ID
-	activityId: string;
+	activityId: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { duibaId: this.duibaId, activityId: this.activityId });

--- a/src/net/api/hdtool/base/DoJoinComponent.ts
+++ b/src/net/api/hdtool/base/DoJoinComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取渲染数据
@@ -11,19 +11,19 @@ export default class DoJoinComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//入库活动ID
-	activityId: string;
+	activityId: dynamic;
 	//token
-	token: string;
+	token: dynamic;
 	//再来一次订单ID
-	againOrderId: string;
+	againOrderId: dynamic;
 	//活动类型
-	activityType: string;
+	activityType: dynamic;
 	//用户ID
-	consumerId: string;
+	consumerId: dynamic;
 	//积分
-	credits: number;
+	credits: dynamic;
 	//分数 分段发奖
-	score: number;
+	score: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, {

--- a/src/net/api/hdtool/base/GetOrderStatusComponent.ts
+++ b/src/net/api/hdtool/base/GetOrderStatusComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 查询订单状态
@@ -11,7 +11,7 @@ export default class GetOrderStatusComponent extends SampleApi {
 	//请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    
    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/api/hdtool/base/PrizeDetailComponent.ts
+++ b/src/net/api/hdtool/base/PrizeDetailComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 查询奖品信息
@@ -11,11 +11,11 @@ export default class PrizeDetailComponent extends SampleApi {
    //请求方式
    method: string = 'GET';
    //
-    appItemId: string;
+    appItemId: dynamic;
    //
-    itemId: string;
+    itemId: dynamic;
    //
-    appId: string;
+    appId: dynamic;

    protected async execute() {
        utils.injectProp(this.params, { appItemId: this.appItemId, itemId: this.itemId, appId: this.appId });

--- a/src/net/api/hdtool/base/SubCreditsStatusComponent.ts
+++ b/src/net/api/hdtool/base/SubCreditsStatusComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SamplePollingApi from "../../../SamplePollingApi";

 export default class SubCreditsStatusComponent extends SamplePollingApi {
@@ -9,7 +9,7 @@ export default class SubCreditsStatusComponent extends SamplePollingApi {
 	//请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    
    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/api/hdtool/game/DatapashComponent.ts
+++ b/src/net/api/hdtool/game/DatapashComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";

 export default class DatapashComponent extends SampleApi {
@@ -9,11 +9,11 @@ export default class DatapashComponent extends SampleApi {
    //请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    //防作弊数据
-    dynamicData: any;
+    dynamicData: dynamic;
    //duiba活动ID
-    duibaId: any;
+    duibaId: dynamic;

    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId, duibaId: this.duibaId, dynamicData: this.dynamicData });

--- a/src/net/api/hdtool/game/GetNgameStartStatusComponent.ts
+++ b/src/net/api/hdtool/game/GetNgameStartStatusComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SamplePollingApi from "../../../SamplePollingApi";
 /**
 * 查询游戏开始订单状态
@@ -11,7 +11,7 @@ export default class GetNgameStartStatusComponent extends SamplePollingApi {
 	//请求方式
 	method: string = 'POST';
 	//订单ID
-    orderId: string;
+    orderId: dynamic;
    
    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/api/hdtool/game/NgameManySubmitComponent.ts
+++ b/src/net/api/hdtool/game/NgameManySubmitComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 游戏提交成绩接口
@@ -11,15 +11,15 @@ export default class NgameManySubmitComponent extends SampleApi {
    //请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    //分数
-    score: string;
+    score: dynamic;
    //无用
-    gameData: any;
+    gameData: dynamic;
    //签名
-    sgin: string;
+    sgin: dynamic;
    //防作弊数据
-    dynamicData: any;
+    dynamicData: dynamic;

    protected async execute() {
        utils.injectProp(this.params, {

--- a/src/net/api/hdtool/game/NgameSubmitComponent.ts
+++ b/src/net/api/hdtool/game/NgameSubmitComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 游戏提交成绩接口
@@ -11,15 +11,15 @@ export default class NgameSubmitComponent extends SampleApi {
    //请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    //分数
-    score: string;
+    score: dynamic;
    //无用
-    gameData: any;
+    gameData: dynamic;
    //签名
-    sgin: string;
+    sgin: dynamic;
    //防作弊数据
-    dynamicData: any;
+    dynamicData: dynamic;

    protected async execute() {
        utils.injectProp(this.params, {

--- a/src/net/api/hdtool/game/ResurrectionComponent.ts
+++ b/src/net/api/hdtool/game/ResurrectionComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 游戏复活接口
@@ -11,7 +11,7 @@ export default class ResurrectionComponent extends SampleApi {
    //请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;

    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/api/hdtool/game/ResurrectionStatusComponent.ts
+++ b/src/net/api/hdtool/game/ResurrectionStatusComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SamplePollingApi from "../../../SamplePollingApi";
 /**
 * 查询复活状态
@@ -11,9 +11,9 @@ export default class ResurrectionStatusComponent extends SamplePollingApi {
 	//请求方式
 	method: string = 'POST';
 	//doJoin订单ID
-	orderId: string;
+	orderId: dynamic;
 	//resurrec订单ID
-	resurrecOrderId: string;
+	resurrecOrderId: dynamic;
    
    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId, resurrecOrderId: this.resurrecOrderId });

--- a/src/net/api/hdtool/preLottery/GetGameOrderInfoComponent.ts
+++ b/src/net/api/hdtool/preLottery/GetGameOrderInfoComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SamplePollingApi from "../../../SamplePollingApi";
 /**
 * 查询前置开奖结果
@@ -11,7 +11,7 @@ export default class GetGameOrderInfoComponent extends SamplePollingApi {
 	//请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    
    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/api/hdtool/preLottery/GetGameSubmitComponent.ts
+++ b/src/net/api/hdtool/preLottery/GetGameSubmitComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 前置开奖提交成绩接口
@@ -11,9 +11,9 @@ export default class GetGameSubmitComponent extends SampleApi {
    //请求方式
    method: string = 'POST';
    //订单ID
-    orderId: string;
+    orderId: dynamic;
    //价值
-    facePrice: number;
+    facePrice: dynamic;

    protected async execute() {
        utils.injectProp(this.params, { orderId: this.orderId, facePrice: this.facePrice });

--- a/src/net/api/hdtool/question/CheckOutAnswerComponent.ts
+++ b/src/net/api/hdtool/question/CheckOutAnswerComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 检查题目答案是否正确
@@ -11,9 +11,9 @@ export default class CheckOutAnswerComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//订单ID
-	orderId: string;
+	orderId: dynamic;
 	//答案
-	answerData: string;
+	answerData: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { orderId: this.orderId, answerData: this.answerData });

--- a/src/net/api/hdtool/question/GetQuestionComponent.ts
+++ b/src/net/api/hdtool/question/GetQuestionComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取题目数据
@@ -11,7 +11,7 @@ export default class GetQuestionComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//入库活动ID
-	activityId: string;
+	activityId: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { activityId: this.activityId });

--- a/src/net/api/hdtool/question/QuestionSubmitComponent.ts
+++ b/src/net/api/hdtool/question/QuestionSubmitComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取题目数据
@@ -11,9 +11,9 @@ export default class QuestionSubmitComponent extends SampleApi {
 	//请求方式
 	method: string = 'POST';
 	//doJoin订单ID
-	orderId: string;
+	orderId: dynamic;
 	//答案
-	answerData: string;
+	answerData: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { orderId: this.orderId, answerData: this.answerData });

--- a/src/net/api/hdtool/throughGame/AjaxThroughInfoComponent.ts
+++ b/src/net/api/hdtool/throughGame/AjaxThroughInfoComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取渲染数据
@@ -11,9 +11,9 @@ export default class AjaxThroughInfoComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//duiba活动ID
-	duibaId: string;
+	duibaId: dynamic;
 	//关卡ID
-	throughId: string;
+	throughId: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { duibaId: this.duibaId, throughId: this.throughId });

--- a/src/net/api/hdtool/throughGame/ThroughSubmitComponent.ts
+++ b/src/net/api/hdtool/throughGame/ThroughSubmitComponent.ts
-import { utils } from "scilla";
+import { utils, dynamic } from "scilla";
 import SampleApi from "../../../SampleApi";
 /**
 * 获取渲染数据
@@ -11,7 +11,7 @@ export default class ThroughSubmitComponent extends SampleApi {
 	//请求方式
 	method: string = 'GET';
 	//duiba活动ID
-	orderId: string;
+	orderId: dynamic;

 	protected async execute() {
 		utils.injectProp(this.params, { orderId: this.orderId });

--- a/src/net/index.ts
+++ b/src/net/index.ts