diff --git a/gm-server/config/config.default.ts b/gm-server/config/config.default.ts index 5218dfc53..ff9acf677 100644 --- a/gm-server/config/config.default.ts +++ b/gm-server/config/config.default.ts @@ -77,8 +77,8 @@ export default (appInfo: EggAppInfo) => { }; let regions = [ // 大区数据 - { id: 1, env: 'stable', name: "常山少年", domain: 'http://pinus_gm_test.trgame.cn' }, - { id: 2, env: 'alpha', name: "测试服", domain: 'http://zyz_gm.trgame.cn' }, + { id: 1, env: 'stable', name: "常山少年", domain: 'http://zyz_gm.trgame.cn' }, + { id: 2, env: 'alpha', name: "测试服", domain: 'http://pinus_gm_test.trgame.cn' }, { id: 3, env: 'dev', name: "开发服", domain: 'http://zyzdev_gm.trgame.cn' } ]; config.regions = regions; @@ -94,6 +94,15 @@ export default (appInfo: EggAppInfo) => { return path.replace(`/api/${env}`, '/api') } } + httpProxy[`/web/${env}`] = { + target: domain, + changeOrigin: true, + secure: true, + pathRewrite: function(path) { + console.log('proxy', path, path.replace(`/web/${env}`, '/web')) + return path.replace(`/web/${env}`, '/web') + } + } } config.proxy = httpProxy; diff --git a/shared/db/User.ts b/shared/db/User.ts index ba31e99cb..0c00b6505 100644 --- a/shared/db/User.ts +++ b/shared/db/User.ts @@ -44,7 +44,7 @@ export default class User extends BaseModel { @prop({ required: true, _id: false }) channelInfo: LoginValidateData37|{}; // 渠道数据 - @prop({ required: true, set: (val: string) => aesEncryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV), get: (val: string) => aesDecryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV) }) + @prop({ required: true, set: (val: string) => aesEncryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV), get: (val: string) => val?aesDecryptcfb(val, ENCRYPT_KEY, ENCRYPT_IV):'' }) tel: string; // 账号 @prop({ required: true, default: '' })