diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index b0e6994b..9df4313f 100644 --- a/JisolGameCocos/assets/script/App.ts +++ b/JisolGameCocos/assets/script/App.ts @@ -22,10 +22,7 @@ import { TB, Tables } from "../resources/config/data/schema"; import { JsonAsset } from "cc"; import { GAction } from "./consts/GActionEnum"; import { StorageData, StorageEnum } from "./consts/GData"; -import { Axios, Env, JNGame } from "../../extensions/ngame/assets/ngame/JNGame"; - -//设置微信环境 -JNGame.setEnv(Env.WX); +import { JAPI, JAPIConfig } from "../../extensions/ngame/assets/ngame/util/JAPI"; let IP = "localhost"; @@ -234,9 +231,9 @@ export const app = { sync : new JNGSyncFrame(), //同步 event : EventDispatcher.getIns(), //通知 proto : NGameMessage.getIns(), //消息 - // api : Axios.create({ - // baseURL: `http://${IP}:8080`, - // }), //请求 + api : JAPI.create({ + baseURL: `http://${IP}:8080`, + }), //请求 // api : {}, //请求 battle : GBattleModeManager.getIns(), //战斗 config : new JNGConfig(), //配置文件 @@ -248,8 +245,8 @@ export const app = { }), } -// app.api.interceptors.request.use(function(config){ -// //设置Token -// config.headers.set("Token",StorageData.get(StorageEnum.Token)); -// return config; -// }) \ No newline at end of file +app.api.addInterceptor((config:JAPIConfig) => { + //设置Token + config.headers["Token"] = StorageData.get(StorageEnum.Token); + return true; +}) \ No newline at end of file diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index eed71d58..892bdd16 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit eed71d5820b3a313f6daf848e4d91abdcb55b367 +Subproject commit 892bdd16170c411e8dc0910a52b33bd42cb29dce