diff --git a/README.md b/README.md index 527374bee..9f3a882e7 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,9 @@ ## 运行 web-server `cd web-server && node app` +cd 到 web-server下面 +`npm run stop && npm run tsc && npm run start` + ## 扩容事项 1.master.ts对应环境的主机host填写内网ip地址,新服务器host填写主机host地址 2.config/database.ts填写对应环境下的配置 @@ -24,4 +27,4 @@ 7.手输命令示例如下: `pm2 start ./dist/app.js --name="activity-server-2" -x -- env=dev id=activity-server-2 host=172.26.145.171 port=9061 serverType=activity` `pm2 start ./dist/app.js --name="connector-server-4" -x -- env=alpha id=connector-server-4 host=172.26.145.171 port=9062 clientHost=121.89.211.172 clientPort=3050 serverType=connector frontend=true` -8.主机部分的server.ts内的server如果需要做rpc remote,host需要从127.0.0.1改为私网地址 \ No newline at end of file +8.主机部分的server.ts内的server如果需要做rpc remote,host需要从127.0.0.1改为私网地址 diff --git a/web-server/app/controller/update.ts b/web-server/app/controller/update.ts new file mode 100644 index 000000000..d50cdcc5b --- /dev/null +++ b/web-server/app/controller/update.ts @@ -0,0 +1,10 @@ +import { Controller } from 'egg'; + +export default class UpdateController extends Controller { + public async getversion() { + const { ctx } = this; + const { version } = ctx.request.body; + ctx.body = await ctx.service.update.getVersion(version); + } + +} diff --git a/web-server/app/router.ts b/web-server/app/router.ts index 8f30d64e4..c68893b2f 100644 --- a/web-server/app/router.ts +++ b/web-server/app/router.ts @@ -19,5 +19,6 @@ export default (app: Application) => { router.post('/user/checkversion', tokenParser, controller.game.checkVersion); router.post('/game/getserverlist', tokenParser, controller.game.getServerList); router.post('/game/getnotice', tokenParser, controller.game.getnotice); + router.post('/update/getversion', controller.update.getversion); router.post('/web/reloadresource', app.middleware.gmTokenParser(), controller.game.reloadResource); }; diff --git a/web-server/app/service/Update.ts b/web-server/app/service/Update.ts new file mode 100644 index 000000000..26f75e18a --- /dev/null +++ b/web-server/app/service/Update.ts @@ -0,0 +1,26 @@ +import { STATUS, } from '@consts'; +import { Service } from 'egg'; +// let fs = require("fs"); + +// const HOT_URL = 'http://zyz-hot-update.trgame.cn/version.manifest' +/** + * UpdateRes Service + */ +export default class Update extends Service { + + /** + * 获取版本号 + * @param version - 客户端版本号 + */ + + public async getVersion(version: string) { + const ctx = this.ctx; + console.log('client version: ', version); + return ctx.service.utils.resResult(STATUS.SUCCESS, { + packageUrl: 'http://zyz-hot-update.trgame.cn/', + remoteManifestUrl: 'http://zyz-hot-update.trgame.cn/project.manifest', + remoteVersionUrl: 'http://zyz-hot-update.trgame.cn/version.manifest' + }); + } +} + diff --git a/web-server/typings/app/controller/index.d.ts b/web-server/typings/app/controller/index.d.ts index 89982eb9d..03dd5c3e2 100644 --- a/web-server/typings/app/controller/index.d.ts +++ b/web-server/typings/app/controller/index.d.ts @@ -5,11 +5,13 @@ import 'egg'; import ExportAccount from '../../../app/controller/account'; import ExportGame from '../../../app/controller/game'; import ExportHome from '../../../app/controller/home'; +import ExportUpdate from '../../../app/controller/update'; declare module 'egg' { interface IController { account: ExportAccount; game: ExportGame; home: ExportHome; + update: ExportUpdate; } } diff --git a/web-server/typings/app/service/index.d.ts b/web-server/typings/app/service/index.d.ts index 348680ab7..9c24e07a2 100644 --- a/web-server/typings/app/service/index.d.ts +++ b/web-server/typings/app/service/index.d.ts @@ -11,6 +11,7 @@ import ExportGame from '../../../app/service/Game'; import ExportTest from '../../../app/service/Test'; import ExportTurboCore from '../../../app/service/TurboCore'; import ExportUtils from '../../../app/service/Utils'; +import ExportUpdate from '../../../app/service/Update'; declare module 'egg' { interface IService { @@ -19,5 +20,6 @@ declare module 'egg' { test: AutoInstanceType; turboCore: AutoInstanceType; utils: AutoInstanceType; + update: AutoInstanceType; } }