diff --git a/game-server/app.ts b/game-server/app.ts index a18ca021d..870e925e3 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -29,8 +29,8 @@ import { updateTeamStatus } from './app/services/battle/comBattleService'; import { resResult, genCode } from './app/pubUtils/util'; import { errlogger, infologger, loadLogger } from './app/util/logger'; import { connectThinkingData, getTire } from './app/services/sdkService'; +import { loadSubDb, loadGmDb } from './app/db'; import { loadActivities } from './app/services/memoryCache/activityData'; -import { loadSubDb, loadGmDb, loadRODb } from './app/db'; import { checkAndSetApiIsClose } from './app/services/chatService'; import { initGuildActivityIndexInPinus, resetJoinWoodenHorse } from './app/services/guildActivity/guildActivityService'; import { setGVGConfig } from './app/services/gvg/gvgService'; @@ -256,8 +256,7 @@ async function connectDb(app: _pinus.Application) { initMongodb(app), initSubMongodb(app), initGmMongodb(app), - initRedis(app), - initROMongodb(app), + initRedis(app) ]) } @@ -276,13 +275,6 @@ async function initSubMongodb(app: _pinus.Application) { loadSubDb(connect); console.log('subMongo connect suc') } - -async function initROMongodb(app: _pinus.Application) { - let connect = await mongoose.createConnection(app.get('database').mongoro||app.get('database').mongo, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true, useFindAndModify: false }); - loadRODb(connect); - console.log('mongoRODb connect suc'); -} - async function initGmMongodb(app: _pinus.Application) { let gmconnect = await mongoose.createConnection(app.get('database').gmmongo, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true, useFindAndModify: false }); loadGmDb(gmconnect); diff --git a/game-server/config/database.ts b/game-server/config/database.ts index 4eadb4277..dafb556df 100644 --- a/game-server/config/database.ts +++ b/game-server/config/database.ts @@ -14,7 +14,6 @@ module.exports = { }, 'alpha': { 'mongo': 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5c74ba4263da42.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5c74ba4263da43.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-506991391', - 'mongoro': 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da43.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&readPreferenceTags=role:readonly&replicaSet=mgset-506991391', 'gmmongo': 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', 'redis': 'r-8vbl8okinxn1zhkwh2.redis.zhangbei.rds.aliyuncs.com', 'redispw': 'zyz_alpha_2021' @@ -87,7 +86,6 @@ module.exports = { }, 'zy1': { // 公测自营大区配置 'mongo': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-8vb801bc3bc34e741.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb801bc3bc34e742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb801bc3bc34e743.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb801bc3bc34e744.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-515829261', - 'mongoro': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-8vb801bc3bc34e743.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb801bc3bc34e744.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&readPreferenceTags=role:readonly&replicaSet=mgset-515829261', 'mongoSub': 'mongodb://yjzSubDbOp:yjz2023ZySubDB@dds-8vb29d30811d39d41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb29d30811d39d42.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb29d30811d39d43.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb29d30811d39d44.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&replicaSet=mgset-515829289', 'gmmongo': 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', 'redis': 'r-8vbkqfcnivt4ja3ndj.redis.zhangbei.rds.aliyuncs.com', @@ -103,7 +101,6 @@ module.exports = { }, 'ch1': { 'mongo': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-8vb6c08497bde7141.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6c08497bde7142.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6c08497bde7143.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6c08497bde7144.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516005505', - 'mongoro': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-8vb6c08497bde7143.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6c08497bde7144.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&readPreferenceTags=role:readonly&replicaSet=mgset-516005505', 'mongoSub': 'mongodb://yjzDbOp:yjz2023ZyDB@dds-8vbc6a169e1dd6941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbc6a169e1dd6942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbc6a169e1dd6943.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbc6a169e1dd6944.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516005504', 'gmmongo': 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', 'redis': 'r-8vbqgdc3h9ac77fdvi.redis.zhangbei.rds.aliyuncs.com', diff --git a/shared/db/index.ts b/shared/db/index.ts index 6e447a018..3abe319b6 100644 --- a/shared/db/index.ts +++ b/shared/db/index.ts @@ -35,8 +35,4 @@ export function loadGmDb(connect: mongoose.Connection) { export function loadSubDb(connect: mongoose.Connection) { loadUserLog(connect); -} - -// dbro -export function loadRODb(connect: mongoose.Connection) { } \ No newline at end of file