Merge commit '7cfbc45e80094334c9da8fe00c4f5833d67082a7' into feature/backend

shared/domain/sdk.ts

@@ -228,7 +228,7 @@ export class RoleNameCallBackParam {
     time: number;        // 时间戳
     sign: string;
 
-    constructor(param: RoleNameCallBackParam) {
+    constructor(param: any) {
         this.username = param.username;
         this.game_key = param.game_key;
         this.sid = param.sid;
@@ -256,7 +256,7 @@ export class GuildNameCallBackParam {
     time: number;        // 时间戳
     sign: string;
 
-    constructor(param: GuildNameCallBackParam) {
+    constructor(param: any) {
         this.game_key = param.game_key;
         this.sid = param.sid;
         this.type = param.type;
@@ -282,7 +282,7 @@ export class GetGuildInfoByUserParam {
     sid: number;         // 区服id
     sign: string;
 
-    constructor(param: GetGuildInfoByUserParam) {
+    constructor(param: any) {
         this.game_key = param.game_key;
         this.uid = param.uid;
         this.time = param.time;

shared/resource/jsons/dic_zyz_gk_branch.json

@@ -55,7 +55,7 @@
         "loseInfoInUI": "1.我方全部阵亡\r\n2.20回合内未能胜利",
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在20回合内获得胜利",
         "cost": 10,
-        "iconInMap": "spine&yinbingdao",
+        "iconInMap": "spine&yinbingdao&1",
         "iconName": "迷雾洞窟",
         "heroInUI": "3&1013",
         "detailUIBg": "1000_2",
@@ -68,8 +68,8 @@
         "HeroNum": "6&6",
         "gkInfo": "    赵云一行人刚将村中的百姓带入山洞避难，一位急急忙忙寻找妻子的青年便找上门来。\r\n    洞内仍有不少以往百姓为了躲避战乱设下的陷阱，可务必要当心！\r\n    也许在这昏暗的洞穴里，点燃火炬一路小心前行，才是上策。",
         "HeroNum_1": "1&6",
-        "progress": "1&0|2&0",
+        "progress": "1&0|6&0",
-        "progressDesc": "待解救的百姓数量&已解救的百姓数量"
+        "progressDesc": "已解救的百姓数量&待解救的百姓数量"
     },
     {
         "war_id": 2513,

shared/resource/jsons/dic_zyz_gk_main.json

@@ -137,7 +137,7 @@
         "bg_img": 605,
         "mapid": 605,
         "chapter": 1,
-        "script_id": "RE_105",
+        "script_id": "S_105&RE_105",
         "fixReward": "11001&1|31001&300|17003&1",
         "conditionReward": "&",
         "RandomReward": "&",
@@ -177,7 +177,7 @@
         "warType": 1,
         "gk_name": "第一章&拦路黄巾",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 2,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -210,7 +210,7 @@
         "warType": 1,
         "gk_name": "第一章&真定之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 3,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -243,7 +243,7 @@
         "warType": 1,
         "gk_name": "第一章&黄巾大将",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 3,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -276,7 +276,7 @@
         "warType": 1,
         "gk_name": "第一章&拦路黄巾",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 3,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -309,7 +309,7 @@
         "warType": 1,
         "gk_name": "第一章&恶狼出现",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 4,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -342,7 +342,7 @@
         "warType": 1,
         "gk_name": "第一章&巨鹿之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 5,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -401,7 +401,7 @@
         "bg_img": 602,
         "mapid": 114,
         "chapter": 1,
-        "script_id": "&",
+        "script_id": "S_114",
         "fixReward": "11001&1|31001&300|17006&1",
         "conditionReward": "&",
         "RandomReward": "&",
@@ -412,7 +412,7 @@
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "消灭所有敌军",
+        "victoryInfoInUI": "消灭血刃凶狼",
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "无",
         "cost": 10,
@@ -474,7 +474,7 @@
         "warType": 1,
         "gk_name": "第一章&河间之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 8,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -606,7 +606,7 @@
         "warType": 1,
         "gk_name": "第一章&渤海之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 10,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -644,7 +644,7 @@
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "我方全部阵亡",
+        "loseInfoInUI": "我方全部阵亡或公孙瓒阵亡",
         "starInfoInUI": "无",
         "cost": 10,
         "iconInMap": "spine&SL_daobing",
@@ -738,7 +738,7 @@
         "warType": 1,
         "gk_name": "第一章&界桥之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 15,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -870,7 +870,7 @@
         "warType": 1,
         "gk_name": "第一章&邺城之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 18,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -940,7 +940,7 @@
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "消灭所有敌军",
+        "victoryInfoInUI": "消灭所有敌军或到达撤离点",
         "loseInfoInUI": "我方全部阵亡",
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
         "cost": 10,
@@ -1002,7 +1002,7 @@
         "warType": 1,
         "gk_name": "第二章&河内之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 20,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1134,13 +1134,13 @@
         "warType": 1,
         "gk_name": "第二章&洛阳之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 22,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
         "victoryInfoInUI": "消灭所有敌军",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n2.在12回合内获得胜利",
         "cost": 10,
         "iconInMap": "city&8",
         "iconName": "洛阳",
@@ -1266,7 +1266,7 @@
         "warType": 1,
         "gk_name": "第二章&弘农之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 25,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1398,7 +1398,7 @@
         "warType": 1,
         "gk_name": "第二章&郿坞之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 28,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1530,13 +1530,13 @@
         "warType": 1,
         "gk_name": "第二章&长安之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 30,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
-        "victoryInfoInUI": "消灭所有敌军",
+        "victoryInfoInUI": "消灭董卓",
         "loseInfoInUI": "我方全部阵亡",
-        "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
+        "starInfoInUI": "1.我方无人阵亡；\r\n2.在10回合内获得胜利",
         "cost": 10,
         "iconInMap": "city&7",
         "iconName": "长安",
@@ -1662,7 +1662,7 @@
         "warType": 1,
         "gk_name": "第二章&受禅台之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 32,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1794,7 +1794,7 @@
         "warType": 1,
         "gk_name": "第三章&平原之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 35,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1926,7 +1926,7 @@
         "warType": 1,
         "gk_name": "第三章&齐郡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 38,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -1962,9 +1962,9 @@
         "lvLimted": 1,
         "turnLimted": 20,
         "forcedCharactor": "&",
-        "fobiddenCharactor": "&",
+        "fobiddenCharactor": "1&20",
         "victoryInfoInUI": "消灭所有敌军",
-        "loseInfoInUI": "我方全部阵亡",
+        "loseInfoInUI": "我方全部阵亡&或刘备阵亡&太史慈阵亡",
         "starInfoInUI": "1.我方无人阵亡；\r\n2.在5回合内获得胜利",
         "cost": 10,
         "iconInMap": "spine&SL_daobing",
@@ -2058,7 +2058,7 @@
         "warType": 1,
         "gk_name": "第三章&北海之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 40,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2190,7 +2190,7 @@
         "warType": 1,
         "gk_name": "第三章&琅琊之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 42,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2322,7 +2322,7 @@
         "warType": 1,
         "gk_name": "第三章&郯城之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 44,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2454,7 +2454,7 @@
         "warType": 1,
         "gk_name": "第三章&徐州之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 46,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2586,7 +2586,7 @@
         "warType": 1,
         "gk_name": "第四章&易京之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 47,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2718,7 +2718,7 @@
         "warType": 1,
         "gk_name": "第四章&涿郡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 48,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2850,7 +2850,7 @@
         "warType": 1,
         "gk_name": "第四章&长城之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 49,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -2982,7 +2982,7 @@
         "warType": 1,
         "gk_name": "第四章&蓟县之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 50,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3114,7 +3114,7 @@
         "warType": 1,
         "gk_name": "第四章&右北平之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 51,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3246,7 +3246,7 @@
         "warType": 1,
         "gk_name": "第四章&乌桓部落之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 52,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3378,7 +3378,7 @@
         "warType": 1,
         "gk_name": "第五章&官渡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 53,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3510,7 +3510,7 @@
         "warType": 1,
         "gk_name": "第五章&谯郡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 54,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3642,7 +3642,7 @@
         "warType": 1,
         "gk_name": "第五章&淮南之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 55,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3774,7 +3774,7 @@
         "warType": 1,
         "gk_name": "第五章&卧牛山之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 56,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -3906,7 +3906,7 @@
         "warType": 1,
         "gk_name": "第五章&古城之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 57,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4038,7 +4038,7 @@
         "warType": 1,
         "gk_name": "第五章&许田之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 58,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4170,7 +4170,7 @@
         "warType": 1,
         "gk_name": "第五章&汝南之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 59,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4302,7 +4302,7 @@
         "warType": 1,
         "gk_name": "第六章&襄阳之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 60,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4434,7 +4434,7 @@
         "warType": 1,
         "gk_name": "第六章&樊城之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 61,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4566,7 +4566,7 @@
         "warType": 1,
         "gk_name": "第六章&博望坡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 62,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4698,7 +4698,7 @@
         "warType": 1,
         "gk_name": "第六章&新野之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 63,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4830,7 +4830,7 @@
         "warType": 1,
         "gk_name": "第六章&当阳之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 64,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -4962,7 +4962,7 @@
         "warType": 1,
         "gk_name": "第六章&长坂坡之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 65,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",
@@ -5094,7 +5094,7 @@
         "warType": 1,
         "gk_name": "第六章&曹营之战",
         "kingExp": 5,
-        "lvLimted": 1,
+        "lvLimted": 66,
         "turnLimted": 20,
         "forcedCharactor": "&",
         "fobiddenCharactor": "&",

shared/resource/jsons/dic_zyz_hero.json

@@ -8361,7 +8361,7 @@
     },
     {
         "heroId": 1115,
-        "spineName": "qiezei",
+        "spineName": "toushiche",
         "rSpineName": "&",
         "name": "投石车",
         "actorId": 1115,
@@ -8401,20 +8401,20 @@
     },
     {
         "heroId": 1116,
-        "spineName": 0,
+        "spineName": "yinzhu",
         "rSpineName": "&",
         "name": "阴珠",
         "actorId": 1116,
-        "face_id": "yingzhu",
+        "face_id": "zhaoyun",
-        "quality": 0,
+        "quality": 3,
-        "initialStars": 0,
+        "initialStars": 3,
         "pieceCount": 0,
         "camp": 0,
-        "area": 0,
+        "area": "1010&1010",
         "cost": 0,
-        "jobid": 0,
+        "jobid": 4,
-        "jobClass": 0,
+        "jobClass": 10,
-        "skill": 0,
+        "skill": 1047,
         "pieceId": 0,
         "hp": 1000,
         "atk": 20,
@@ -8426,8 +8426,8 @@
         "mdef_up": 1,
         "sound_click": 1,
         "sound_fight": 0,
-        "info": 0,
+        "info": "阴阳本天生，无极分两仪。张角行邪法，生死乱序兵。",
-        "actorinfo": 0,
+        "actorinfo": "远程职业的法师，菜的一笔。",
         "skillScroll": "&",
         "position": "&",
         "initialSkin": 0,
@@ -8466,7 +8466,7 @@
         "mdef_up": 1,
         "sound_click": 1,
         "sound_fight": 0,
-        "info": 0,
+        "info": "凛凛白毫王，凶威统群狼。铁爪裂金石，长嚎慑北邙。",
         "actorinfo": 0,
         "skillScroll": "&",
         "position": "&",

shared/resource/jsons/dic_zyz_imgPos.json

@@ -1964,7 +1964,7 @@
         "heroId": 1013,
         "skinID": 0,
         "name": "阴兵",
-        "imgPosofInfoUI": "598&-164",
+        "imgPosofInfoUI": "-388&-90",
         "imgPosofotherhero": "598&-164",
         "imgPosofDialog": "598&-164",
         "imgPosofInfoMVP": "-471&-161",

shared/resource/jsons/dic_zyz_job_walk.json

@@ -898,5 +898,95 @@
         "85": 1,
         "86": 1,
         "87": 1
+    },
+    {
+        "id": 15,
+        "1": 1,
+        "2": 1,
+        "3": 1,
+        "4": 1,
+        "5": 2,
+        "6": 255,
+        "7": 1,
+        "8": 1,
+        "9": 1,
+        "10": 2,
+        "11": 2,
+        "12": 2,
+        "13": 255,
+        "14": 2,
+        "15": 255,
+        "16": 255,
+        "17": 1,
+        "18": 255,
+        "19": 1,
+        "20": 1,
+        "21": 1,
+        "22": 255,
+        "23": 1,
+        "24": 2,
+        "25": 1,
+        "26": 1,
+        "27": 255,
+        "28": 255,
+        "29": 255,
+        "30": 255,
+        "31": 1,
+        "32": 255,
+        "33": 2,
+        "34": 1,
+        "35": 255,
+        "36": 1,
+        "37": 1,
+        "38": 1,
+        "39": 255,
+        "40": 255,
+        "41": 1,
+        "42": 1,
+        "43": 1,
+        "44": 255,
+        "45": 1,
+        "46": 1,
+        "47": 1,
+        "48": 1,
+        "49": 1,
+        "50": 1,
+        "51": 1,
+        "52": 1,
+        "53": 255,
+        "54": 1,
+        "55": 1,
+        "56": 1,
+        "57": 255,
+        "58": 255,
+        "59": 1,
+        "60": 1,
+        "61": 1,
+        "62": 1,
+        "63": 1,
+        "64": 1,
+        "65": 1,
+        "66": 1,
+        "67": 1,
+        "68": 1,
+        "69": 1,
+        "70": 1,
+        "71": 1,
+        "72": 1,
+        "73": 1,
+        "74": 1,
+        "75": 1,
+        "76": 1,
+        "77": 1,
+        "78": 1,
+        "79": 255,
+        "80": 1,
+        "81": 255,
+        "82": 255,
+        "83": 1,
+        "84": 1,
+        "85": 1,
+        "86": 1,
+        "87": 1
     }
 ]

shared/resource/jsons/dic_zyz_map_terrain.json

@@ -566,6 +566,13 @@
         "description": "关闭的城门",
         "spine": "chengmen_close"
     },
+    {
+        "mapid": 82,
+        "name": "血池",
+        "seid": "&",
+        "description": "被污染的地脉净水，由张角多年收集的鲜血污染而成，邪恶而诡异。",
+        "spine": "&"
+    },
     {
         "mapid": 83,
         "name": "机关",
@@ -592,7 +599,7 @@
         "name": "火炬",
         "seid": "&",
         "description": "山洞里常见的照明物",
-        "spine": "&"
+        "spine": "huoba"
     },
     {
         "mapid": 87,

shared/resource/jsons/dic_zyz_terrain_eff.json

@@ -898,5 +898,95 @@
         "86": 100,
         "87": 100,
         "id": 10
+    },
+    {
+        "1": 100,
+        "2": 100,
+        "3": 100,
+        "4": 100,
+        "5": 100,
+        "6": 100,
+        "7": 100,
+        "8": 100,
+        "9": 100,
+        "10": 100,
+        "11": 100,
+        "12": 100,
+        "13": 100,
+        "14": 100,
+        "15": 100,
+        "16": 100,
+        "17": 100,
+        "18": 100,
+        "19": 100,
+        "20": 100,
+        "21": 100,
+        "22": 100,
+        "23": 100,
+        "24": 100,
+        "25": 100,
+        "26": 100,
+        "27": 100,
+        "28": 100,
+        "29": 100,
+        "30": 100,
+        "31": 100,
+        "32": 100,
+        "33": 100,
+        "34": 100,
+        "35": 100,
+        "36": 100,
+        "37": 100,
+        "38": 100,
+        "39": 100,
+        "40": 100,
+        "41": 100,
+        "42": 100,
+        "43": 100,
+        "44": 100,
+        "45": 100,
+        "46": 100,
+        "47": 100,
+        "48": 100,
+        "49": 100,
+        "50": 100,
+        "51": 100,
+        "52": 100,
+        "53": 100,
+        "54": 100,
+        "55": 100,
+        "56": 100,
+        "57": 100,
+        "58": 100,
+        "59": 100,
+        "60": 100,
+        "61": 100,
+        "62": 100,
+        "63": 100,
+        "64": 100,
+        "65": 100,
+        "66": 100,
+        "67": 100,
+        "68": 100,
+        "69": 100,
+        "70": 100,
+        "71": 100,
+        "72": 100,
+        "73": 100,
+        "74": 100,
+        "75": 100,
+        "76": 100,
+        "77": 100,
+        "78": 100,
+        "79": 100,
+        "80": 100,
+        "81": 100,
+        "82": 100,
+        "83": 100,
+        "84": 100,
+        "85": 100,
+        "86": 100,
+        "87": 100,
+        "id": 15
     }
 ]

web-server/app/service/Auth.ts

@@ -11,7 +11,7 @@ import { isString } from 'underscore';
 import { getAge } from '../pubUtils/timeUtil';
 import { resResult } from '../pubUtils/util';
 import { checkTeeanAgerTime } from '../pubUtils/authenticateUtil';
-import { authenticate } from '../pubUtils/httpUtil';
+// import { authenticate } from '../pubUtils/httpUtil';
 import { checkTask } from 'app/pubUtils/taskUtil';
 import { getChannelId, loginValidata } from '../pubUtils/sdkUtil';
 import { LoginValidateData37 } from 'app/domain/sdk';
@@ -371,8 +371,8 @@ export default class Auth extends Service {
         const ctx = this.ctx;
         // TODO 接SDK
         console.log(name, idNum);
-        let result = await authenticate(name, idNum, ctx.userCode, ctx.pkgName);
+        // let result = await authenticate(name, idNum, ctx.userCode, ctx.pkgName);
-        if (!result) return ctx.service.utils.resResult(STATUS.AUTHEN_FAIL);
+        // if (!result) return ctx.service.utils.resResult(STATUS.AUTHEN_FAIL);
 
         let birthday = this.getBirthdayByIdCard(idNum);
         let user = await UserModel.authentication(ctx.uid, birthday, '');

web-server/app/service/Sdk.ts

@@ -29,7 +29,7 @@ export default class Sdk extends Service {
     public async pay37Callback(params: PayCallback37Data) {
         const { ctx } = this;
         const { app } = ctx;
-        let ip = ctx.header['x-real-ip'];
+        let ip = typeof ctx.header['x-real-ip'] == 'string'? ctx.header['x-real-ip']: ctx.header['x-real-ip'][0];
         console.log('*****pay37Callback', ip)
 
         let checkResult = this.check37Sign(params);