瀏覽代碼

配置修改

yeshijie 7 年之前
父節點
當前提交
9967888b7c

+ 1 - 0
src/server/include/commons.js

@ -110,6 +110,7 @@ exports.SOCKET_TYPES={
    PATIENT:"patient",
    DOCTOR:"doctor",
    PC_DOCTOR:"pc_doctor",
    PCIM_DOCTOR:"pcim_doctor",
    DEMO:"demo"
}

+ 3 - 3
src/server/models/redis/redisPubClient.js

@ -19,7 +19,7 @@ let redisPubClient = null;
class RedisPubClient {
    constructor() {
        var redisConfig = config.redisConfig;
        var redisConfig = config.innerRedisConfig;
            redisConfig.retry_strategy = function(options){
                log.info("pub Redis重新连接次数:"+options.times_connected);
                if (options.error.code === 'ECONNREFUSED') {
@ -31,9 +31,9 @@ class RedisPubClient {
                return Math.max(options.attempt * 100, 3000);
            }
        this._connection = redis.createClient(
            config.redisConfig
            config.innerRedisConfig
        );
        this._connection.auth(config.redisConfig.password||"",function(){
        this._connection.auth(config.innerRedisConfig.password||"",function(){
            console.log('pub Redis通过认证');
        });

+ 3 - 3
src/server/models/redis/redisSubClient.js

@ -19,7 +19,7 @@ let redisSubClient = null;
class RedisSubClient {
    constructor() {
        var redisConfig = config.redisConfig;
        var redisConfig = config.innerRedisConfig;
            redisConfig.retry_strategy = function(options){
                log.info("sub Redis重新连接次数:"+options.times_connected);
                if (options.error.code === 'ECONNREFUSED') {
@ -31,9 +31,9 @@ class RedisSubClient {
                return Math.max(options.attempt * 100, 3000);
            }
        this._connection = redis.createClient(
            config.redisConfig
            config.innerRedisConfig
        );
        this._connection.auth(config.redisConfig.password||"",function(){
        this._connection.auth(config.innerRedisConfig.password||"",function(){
            console.log('sub Redis通过认证');
        });

+ 25 - 10
src/server/resources/config/config.dev.js

@ -24,6 +24,12 @@ let redisConfig = {
    port: 6379,
    db: 1
};
// 内网Redis
let innerRedisConfig = {
    host: '192.168.1.220',
    port: 6379,
    db: 1
};
// 三师后台
// let wlyyServerConfig = {
@ -37,6 +43,13 @@ let wlyyServerConfig = {
    model:"/"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '192.168.131.113',
    port: 8080,
    model:"/"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
@ -45,13 +58,13 @@ let getTuiConfig = {
    MASTERSECRET: 'veXiajQrId6iojy7Qv8kZ2'
};
/*let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
    APPID: 'DKgbGvbacm74nJJzen5ilA',
    APPSECRET: '4kGcL7e7kU6mbSqfEGZFW7',
    APPKEY: 'ArZfS2qvoA7N3hawOAGVC5',
    MASTERSECRET: '9lpy5vEss46tVzP1RCJiC4'
};*/
// let getTuiConfig = {
//     HOST: 'https://api.getui.com/apiex.htm',
//     APPID: 'DKgbGvbacm74nJJzen5ilA',
//     APPSECRET: '4kGcL7e7kU6mbSqfEGZFW7',
//     APPKEY: 'ArZfS2qvoA7N3hawOAGVC5',
//     MASTERSECRET: '9lpy5vEss46tVzP1RCJiC4'
// };
// 微信配置
// let wechatConfig = {
@ -76,7 +89,7 @@ let wechatConfig = {
// 会话配置
let sessionConfig = {
    maxMessageCount: 1000,                  // 会话缓存的消息数量
    maxMessageCount: 2000,                  // 会话缓存的消息数量
    maxMessageTimespan: 7 * 24 * 3600,      // 会话缓存的最大时间跨度
    expireTime: 3 * 60 * 60 * 1000,         // 会话过期时间,以毫秒计
@ -86,13 +99,13 @@ let sessionConfig = {
// 议题配置
let topicConfig = {
    TTL: 24,                                 // 议题的存活时间,TTL = Time To Live
    TERMINATING_CRON: "* 30 * * * *"     // 议题自动关闭的任务执行时间间隔
    TERMINATING_CRON: "* 44 * * * *"     // 议题自动关闭的任务执行时间间隔
};
exports.environment = 'dev';
exports.pubChannel = 'dev';
exports.subChannel = 'dev';
exports.pubSubSwitch = false;
exports.pubSubSwitch = true;
exports.app = 'IM.Server';
exports.version = '2.0.0';
@ -103,9 +116,11 @@ exports.sessionExpire = 1800;
exports.showSQL = true;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;
exports.wlyyDAServerConfig = wlyyDAServerConfig;
exports.wechatConfig = wechatConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;

+ 10 - 3
src/server/resources/config/config.local.js

@ -1,9 +1,9 @@
"use strict";
let imDbConfig = {
    host: '59.61.92.90',
    host: '10.95.22.143',
    user: 'im',
    port:8079,
    port:3306,
    password: 'im!)123',
    database: 'im',
    connectionLimit: '100',
@ -17,7 +17,13 @@ let redisConfig = {
    db: 1,
    password:'jkzlehr'
};
// 内网Redis
let innerRedisConfig = {
    host: '10.95.22.142',
    port: 6380,
    db: 1,
    password:'jkzlehr'
};
// 三师后台
let wlyyServerConfig = {
    host: '10.95.22.137',
@ -80,6 +86,7 @@ exports.sessionExpire = 1800;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;

+ 8 - 0
src/server/resources/config/config.prod.js

@ -17,6 +17,13 @@ let redisConfig = {
    db: 1,
    password:'jkzl_ehr'
};
// 内网Redis
let innerRedisConfig = {
    host: '10.95.22.142',
    port: 6380,
    db: 1,
    password:'jkzlehr'
};
// 三师后台
let wlyyServerConfig = {
@ -80,6 +87,7 @@ exports.sessionExpire = 1800;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;

+ 12 - 6
src/server/resources/config/config.test.js

@ -1,11 +1,11 @@
"use strict";
let imDbConfig = {
    host: '172.17.110.160',
    user: 'ssgg',
    password: 'ssgg',
    host: '172.19.103.85',
    user: 'linzhou',
    password: 'linzhou',
    database: 'im_new',
    connectionLimit: '100',
    connectionLimit: '50',
    charset: 'utf8mb4'
};
@ -15,7 +15,12 @@ let redisConfig = {
    port: 6379,
    db: 1
};
// 内网Redis
let innerRedisConfig = {
    host: '192.168.1.220',
    port: 6379,
    db: 1
};
// 三师后台
let wlyyServerConfig = {
    host: '172.19.103.88',
@ -65,7 +70,7 @@ let topicConfig = {
exports.environment = 'test';
exports.pubChannel = 'test';
exports.subChannel = 'test';
exports.subChannel = 'dev';
exports.pubSubSwitch = false;
exports.app = 'im.server';
@ -77,6 +82,7 @@ exports.sessionExpire = 1800;
exports.showSQL = true;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;