diff --git a/gm-server/app/service/Game.ts b/gm-server/app/service/Game.ts index 397796438..510c52a4b 100644 --- a/gm-server/app/service/Game.ts +++ b/gm-server/app/service/Game.ts @@ -199,7 +199,7 @@ export default class Game extends Service { const total = await MarqueeModel.countByCondition( form ) return ctx.service.utils.resResult(STATUS.SUCCESS, { list: list.map(cur => { - return { ...cur, startTime: cur.startTime.getTime(), endTime: cur.endTime.getTime() } + return { ...cur, startTime: cur.startTime?.getTime()||0, endTime: cur.endTime?.getTime()||0 } }), total }); } diff --git a/gm-server/config/config.dev.ts b/gm-server/config/config.dev.ts index 5ef4bc327..794877360 100644 --- a/gm-server/config/config.dev.ts +++ b/gm-server/config/config.dev.ts @@ -21,7 +21,7 @@ export default (appInfo: EggAppInfo) => { }; config.mongoose = { - url: 'mongodb://root:zyzDev2021@dds-8vb5c74ba4263da41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5c74ba4263da42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-506991391', // 内网 + url: 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5c74ba4263da42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-506991391', // 内网 options: { useNewUrlParser: true, useUnifiedTopology: true }, }; diff --git a/web-server/app/public/js/client.js b/web-server/app/public/js/client.js index 61c3834e4..40d7392a1 100644 --- a/web-server/app/public/js/client.js +++ b/web-server/app/public/js/client.js @@ -142,7 +142,7 @@ function showError(content) { function queryEntry(param, callback) { var route = 'gate.gateHandler.queryEntry'; pomelo.init({ - host: '127.0.0.1', + host: location.hostname, port: 3014, log: true }, function () {