From 2d45b2c66c50f6337067947cd511b3eac03539b3 Mon Sep 17 00:00:00 2001 From: luying Date: Mon, 8 May 2023 10:00:05 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9C=A8=20feat(db):=20web=E5=92=8Cg?= =?UTF-8?q?m=E6=B7=BB=E5=8A=A0=E5=8F=AA=E8=AF=BB=E5=BA=93=E6=94=AF?= =?UTF-8?q?=E6=8C=81"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5564a8363de57d8082b60a3a2255709aab957019. --- gm-server/app.ts | 17 +---------------- gm-server/config/config.alpha.ts | 5 ----- gm-server/config/config.ch1.ts | 5 ----- gm-server/config/config.zy1.ts | 5 ----- web-server/app.ts | 17 +---------------- web-server/config/config.alpha.ts | 5 ----- web-server/config/config.ch1.ts | 5 ----- web-server/config/config.zy1.ts | 5 ----- 8 files changed, 2 insertions(+), 62 deletions(-) diff --git a/gm-server/app.ts b/gm-server/app.ts index f1326a3db..c080533d5 100644 --- a/gm-server/app.ts +++ b/gm-server/app.ts @@ -1,7 +1,7 @@ import 'reflect-metadata' import * as mongoose from 'mongoose'; import { Application, IBoot } from 'egg'; -import { loadGmDb, loadSubDb, loadRODb } from '@db/index'; +import { loadGmDb, loadSubDb } from '@db/index'; import { connectRedis } from '@pubUtils/redis'; export default class FooBoot implements IBoot { @@ -18,7 +18,6 @@ export default class FooBoot implements IBoot { await this.connectDB(this.app) await this.connectGMDB(this.app); await this.connectSubDB(this.app); - await this.connectRODB(this.app); await this.connectRedis(this.app); this.app.config.realEnv = this.app.config.env; @@ -101,20 +100,6 @@ export default class FooBoot implements IBoot { } } - public async connectRODB(app: Application) { - const { url, options } = app.config.romongoose||app.config.mongoose - try { - if (url) { - const connection = await mongoose.createConnection(url, options) - app.context.connectionRO = connection; - loadRODb(connection); - console.log('******connectSubDB suc', url, options) - } - } catch(e) { - console.log(e) - } - } - public async connectRedis(app: Application) { const { url, pw } = app.config.redis if (url) { diff --git a/gm-server/config/config.alpha.ts b/gm-server/config/config.alpha.ts index c4135c240..9e4a4580d 100644 --- a/gm-server/config/config.alpha.ts +++ b/gm-server/config/config.alpha.ts @@ -11,11 +11,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da43.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&readPreferenceTags=role:readonly&replicaSet=mgset-506991391', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.redis = { url: 'r-8vbl8okinxn1zhkwh2.redis.zhangbei.rds.aliyuncs.com', // 内网 pw: 'zyz_alpha_2021' diff --git a/gm-server/config/config.ch1.ts b/gm-server/config/config.ch1.ts index 4bcb061c6..22e01eeb0 100644 --- a/gm-server/config/config.ch1.ts +++ b/gm-server/config/config.ch1.ts @@ -11,11 +11,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: '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', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.gmmongoose = { url: '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', // 内网 options: { useNewUrlParser: true, useUnifiedTopology: true }, diff --git a/gm-server/config/config.zy1.ts b/gm-server/config/config.zy1.ts index cee0a7418..ed32d3680 100644 --- a/gm-server/config/config.zy1.ts +++ b/gm-server/config/config.zy1.ts @@ -11,11 +11,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: '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', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.gmmongoose = { url: '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', // 内网 options: { useNewUrlParser: true, useUnifiedTopology: true }, diff --git a/web-server/app.ts b/web-server/app.ts index 0166149b4..d5393a644 100644 --- a/web-server/app.ts +++ b/web-server/app.ts @@ -2,7 +2,7 @@ import 'reflect-metadata' import * as mongoose from 'mongoose'; import { Application, IBoot } from 'egg'; import { connectRedis } from './app/pubUtils/redis'; -import { loadGmDb, loadRODb, loadSubDb } from '@db/index'; +import { loadGmDb, loadSubDb } from '@db/index'; import { SDK_TA_CONST, THINKING_DATA_MODE, THINKING_DATA_MODE_LIST } from '@consts'; const ThinkingAnalytics = require("thinkingdata-node"); @@ -20,7 +20,6 @@ export default class FooBoot implements IBoot { await this.connectDB(this.app); await this.connectGMDB(this.app); await this.connectSubDB(this.app); - await this.connectRODB(this.app); await this.connectRedis(this.app); this.app.config.realEnv = this.app.config.env; @@ -105,20 +104,6 @@ export default class FooBoot implements IBoot { } } - public async connectRODB(app: Application) { - const { url, options } = app.config.romongoose||app.config.mongoose - try { - if (url) { - const connection = await mongoose.createConnection(url, options) - app.context.connectionRO = connection; - loadRODb(connection); - console.log('******connectSubDB suc', url, options) - } - } catch(e) { - console.log(e) - } - } - public async connectRedis(app: Application) { const { url, pw } = app.config.redis if (url) { diff --git a/web-server/config/config.alpha.ts b/web-server/config/config.alpha.ts index a172cb170..6903a6f26 100644 --- a/web-server/config/config.alpha.ts +++ b/web-server/config/config.alpha.ts @@ -10,11 +10,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: 'mongodb://dbop:zyzDev2021@dds-8vb5c74ba4263da43.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?readPreference=secondary&readPreferenceTags=role:readonly&replicaSet=mgset-506991391', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.redis = { url: 'r-8vbl8okinxn1zhkwh2.redis.zhangbei.rds.aliyuncs.com', // 内网 pw: 'zyz_alpha_2021' diff --git a/web-server/config/config.ch1.ts b/web-server/config/config.ch1.ts index 298e80e27..a6b017ede 100644 --- a/web-server/config/config.ch1.ts +++ b/web-server/config/config.ch1.ts @@ -10,11 +10,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: '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', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.gmmongoose = { url: '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', // 内网 options: { useNewUrlParser: true, useUnifiedTopology: true }, diff --git a/web-server/config/config.zy1.ts b/web-server/config/config.zy1.ts index 08fdfe6d3..8b1cfd410 100644 --- a/web-server/config/config.zy1.ts +++ b/web-server/config/config.zy1.ts @@ -10,11 +10,6 @@ export default (appInfo: EggAppInfo) => { options: { useNewUrlParser: true, useUnifiedTopology: true }, }; - config.romongoose = { - url: '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', // 内网 - options: { useNewUrlParser: true, useUnifiedTopology: true }, - }; - config.gmmongoose = { url: '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', // 内网 options: { useNewUrlParser: true, useUnifiedTopology: true },