Merge branch 'im-internet-hospital-oracle' of huangwenjie/im.doctor into im-internet-hospital-oracle

src/server/repository/oracle/db/im.db.js

@@ -6,16 +6,16 @@
let configFile = require('../../../include/commons').CONFIG_FILE;
let config =  require('../../../resources/config/' + configFile);
// let oracledb = require('oracledb')
let oracledb = require('oracledb')
let dbUtil = require('../../../util/db.util');
// oracledb.poolMax = 100;
// oracledb.poolMin = 1;
// oracledb.poolPingInterval = 20;
// oracledb.poolTimeout = 0;
oracledb.poolMax = 100;
oracledb.poolMin = 1;
oracledb.poolPingInterval = 20;
oracledb.poolTimeout = 0;
// 初始化连接池
// let pool = oracledb.createPool(config.imDbConfig);
let pool = oracledb.createPool(config.imDbConfig);
class ImDb {
    constructor() {

src/server/repository/oracle/session.repo.js

@@ -162,7 +162,7 @@ class SessionRepo {
            }
        }
        let sqlTemp = "SELECT SESSION_ID FROM " + DB_TABLES.Participants + " W WHERE W.PARTICIPANT_ID IN('"+userId+"') GROUP BY W.SESSION_ID";
        let sqlTemp = "SELECT SESSION_ID FROM " + DB_TABLES.Participants + " W WHERE W.PARTICIPANT_ID IN(:USER_ID) GROUP BY W.SESSION_ID";
        let sessionSQL = "SELECT rownum r, ID, NAME, TYPE, CREATE_DATE, LAST_SENDER_ID, LAST_SENDER_NAME, LAST_CONTENT_TYPE, LAST_CONTENT, LAST_MESSAGE_TIME FROM "
            + DB_TABLES.Sessions + " S WHERE S.ID IN(" + sqlTemp + ") AND S.TYPE IN("+type+") ";

src/server/util/oracledb.util.js

@@ -4,7 +4,7 @@ let config = require('../resources/config/' + configFile);
let oracledb = require('oracledb');
let log = require('../util/log.js');
let query = function(options,callback){
let query = function(options){
    oracledb.getConnection(
        {
            user: config.imDbConfig.user,
@@ -25,10 +25,9 @@ let query = function(options,callback){
            {
                console.error(err.message);
                return handler(err, null);
            }/*else{
                console.log("连接成功");
            }*/
            connection.execute(sql, [], function (err, result)
            }
            connection.execute(sql, args, function (err, result)
            {
                if (err) {
                    log.error(err.message)
@@ -37,8 +36,21 @@ let query = function(options,callback){
                    doRelease(connection);
                    return handler(err, result);
                }
                handler(null, result);
                // log.info(result.toString());
                // result.rows.map((v)=>
                // {
                //     return result.metaData.reduce((p, key, i)=>
                //     {
                //         p[key.name] = v[i];
                //         log.info("p[key.name]:"+p[key.name])
                //         log.info("v[i]:"+v[i])
                //         return p;
                //     }, {})
                // });
                console.log(result);
                // console.log("result.metaData:"+result.metaData.toString());
                // console.log("result.rows[0]:"+result.rows[0]);
                handler(null, result.rows);
                //
                // //console.log(result.metaData);
                // callback(result.rows.map((v)=>