代码修改

src/server/endpoints/v2/user.endpoint.js

@@ -59,7 +59,7 @@ router.put(APIv2.Users.UserStatus, function (req, res) {
    let userId = req.params.user_id;
    let payload = req.body;
    if (userId === null) {
    if (userId == null||userId=="null") {
        throw {httpStatus: 406, message: 'Validation Failed. Missing field(s): user_id.'};
    }

src/server/include/commons.js

@@ -212,9 +212,9 @@ const DB_TABLES = {
    Sessions: "sessions",
    Topics: "topics",
    StickySessions: "sticky_sessions",
    WlyyConsult:"wlyy_consults",
    WlyyConsultS:"wlyy_consults",
    WlyyConsultTeam:wlyyDBName+".wlyy_consult_team",
    WlyyConsultS:wlyyDBName+".wlyy_consult",
    WlyyConsult:wlyyDBName+".wlyy_consult",
    WxAccessToken:wlyyDBName+".wx_access_token",
    WlyyWxPushLog:wlyyDBName+".wlyy_wx_push_log",
    WeixinTemplateConfig:wlyyDBName+".weixin_template_config",

src/server/repository/mysql/topics.repo.js

@@ -243,23 +243,23 @@ class TopicRepo {
        let sql = "";
        var args =[];
        if(status==10){
            args.push(adminTeamCode,userId,status);
            args.push(userId,status);
            sql =  "SELECT count(1)  as count FROM "+
                DB_TABLES.Topics+" t,"+DB_TABLES.Participants+" p,"+DB_TABLES.Doctors+" d,"+DB_TABLES.WlyyConsultTeam+" c,"+DB_TABLES.Patients+" s "+
                "WHERE d.id = p.participant_id AND c.consult = t.id AND c.patient = s.id AND p.session_id = t.session_id "+
                "AND c.admin_team_code=? AND c.type!=8 AND d.id in (?) AND t. STATUS = ? ";
                " AND c.type=1 AND d.id in (?) AND t. STATUS = ? ";
        }else if(status){
            args.push(adminTeamCode,userId,status,reply);
            args.push(userId,status,reply);
            sql =  "SELECT count(1) as count FROM "+
                DB_TABLES.Topics+" t,"+DB_TABLES.Participants+" p,"+DB_TABLES.Doctors+" d,"+DB_TABLES.WlyyConsultTeam+" c,"+DB_TABLES.Patients+" s "+
                "WHERE d.id = p.participant_id AND c.consult = t.id AND c.patient = s.id AND p.session_id = t.session_id "+
                "AND c.admin_team_code=? AND c.type!=8 AND d.id in (?) AND t. STATUS = ? and t.reply=? ";
                " AND c.type=1 AND d.id in (?) AND t. STATUS = ? and t.reply=? ";
        }else{
            args.push(adminTeamCode,userId);
            args.push(userId);
            sql =  "SELECT count(1) as count FROM "+
                DB_TABLES.Topics+" t,"+DB_TABLES.Participants+" p,"+DB_TABLES.Doctors+" d,"+DB_TABLES.WlyyConsultTeam+" c,"+DB_TABLES.Patients+" s "+
                "WHERE d.id = p.participant_id AND c.consult = t.id AND c.patient = s.id AND p.session_id = t.session_id "+
                "AND c.admin_team_code=? AND c.type!=8 AND d.id in (?)";
                " AND c.type=1 AND d.id in (?)";
        }
        ImDb.execQuery({
            sql: sql,

src/server/resources/config/config.local.js

@@ -1,10 +1,10 @@
"use strict";
let imDbConfig = {
    host: '10.95.22.143',
    user: 'im',
    host: '11.1.2.5',
    user: 'wlyy_sr',
    port:3306,
    password: 'im!)123',
    password: '123456',
    database: 'im',
    connectionLimit: '100',
    charset : 'utf8mb4'
@@ -12,41 +12,49 @@ let imDbConfig = {
// Redis
let redisConfig = {
    host: '10.95.22.142',
    port: 6380,
    host: '11.1.2.22',
    port: 6390,
    db: 1,
    password:'jkzlehr'
    password:'Kb6wKDQP1W4'
};
// let redisConfig = {
//     host: '192.168.120.14',
//     port: 6380,
//     db: 1,
//     password:'jkzl_ehr'
// };
// 内网Redis
let innerRedisConfig = {
    host: '10.95.22.142',
    port: 6380,
    host: '11.1.2.22',
    port: 6390,
    db: 1,
    password:'jkzlehr'
    password:'Kb6wKDQP1W4'
};
// 三师后台
let wlyyServerConfig = {
    host: '10.95.22.137',
    port: 9660,
    host: 'srijk.yihu.com',
    port: 80,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
    APPID: 'qWmRh2X88l7HuE36z3qBe8',
    APPKEY: 'EzERfV8c849lBkZqHWzQG1',
    MASTERSECRET: 'veXiajQrId6iojy7Qv8kZ2'
    APPID: 'NamoCLe9no9pIihdoZ930A',
    APPKEY: 'db7PZsd7TX6JAsLKmWuAT8',
    MASTERSECRET: '5IFJjgxRiI7QpuArMMT3E5'
};
// 微信配置
let wechatConfig = {
    appId: 'wxad04e9c4c5255acf',
    appSecret: 'ae77c48ccf1af5d07069f5153d1ac8d3',
    appId: 'wxe627ffaee2d05a40',
    appSecret: '7c29f6b28be7e54b742883a47ff39767',
    token: '27eb3bb24f149a7760cf1bb154b08040',
    baseUrl: 'www.xmtyw.cn/wlyy',
    accId: 'gh_733f975e0bed',
    baseUrl: 'srijk.yihu.com/wlyy',
    template: {
        consultTemplate: '0mF_vHj-ILx8EH8DwzmAi7LqzjqYiU9IrSRRmziTZyc'  // 咨询回复模板
        consultTemplate: 'a3PCZJetJ02MI0Xs5pkZKUNZo6UkdC9xdR4GqEjlsNA'  // 咨询回复模板
    }
};
@@ -65,9 +73,9 @@ let topicConfig = {
    TERMINATING_CRON: "* 59 * * * *"        // 议题自动关闭的任务执行时间间隔
};
exports.environment = 'local';
exports.pubChannel = 'pc_to_phone';
exports.subChannel = 'phone_to_pc';
exports.environment = 'prod';
exports.pubChannel = 'phone_to_pc';
exports.subChannel = 'pc_to_phone';
exports.pubSubSwitch = false;
exports.app = 'im.server';

src/server/resources/config/config.prod.js

@@ -48,13 +48,13 @@ let getTuiConfig = {
// 微信配置
let wechatConfig = {
    appId: 'wxe627ffaee2d05a40',
    appSecret: '7c29f6b28be7e54b742883a47ff39767',
    appId: 'wx0a06b75a40b28f2a',
    appSecret: 'd46ecfb0fc6fc8bc699b77f93b2a1e20',
    token: '27eb3bb24f149a7760cf1bb154b08040',
    accId: 'gh_733f975e0bed',
    accId: 'gh_9386c9ab884f',
    baseUrl: 'srijk.yihu.com/wlyy',
    template: {
        consultTemplate: '-dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18'  // 咨询回复模板
        consultTemplate: 'fadxatOcyNG3ihvJg-OZsq8EzQyLDNljogv6V-Hxshc'  // 咨询回复模板
    }
};