修复包引用问题

src/server/app.js

@@ -4,7 +4,6 @@
"use strict";
let express = require('express');
let swagger = require("swagger-node-express");
let path = require('path');
let favicon = require('serve-favicon');
let logger = require('morgan');
@@ -127,5 +126,7 @@ socketHandler.start();
log.info('Starting IM server, version ' + config.version + ', running on port ' + server.address().port + ', ' + new Date().toLocaleString());
log.info('Configuration profile: ' + configFile.split('.')[1]);
// load the notify messages that have not pushed
//PushJobLoader.load();
var Users =  require('./models/user/users');
let abc = new Users();
abc.isPatientId('not-patient_id');

src/server/endpoints/chats.endpoint.js

@@ -13,8 +13,8 @@ let log = require('../util/log.js');
let objectUtil = require("../util/objectUtil.js");
let controllerUtil = require('../util/controllerUtil');
let Patient = require("../models/patient");
let Doctor = require('../models/doctor');
let Patient = require("../models/user/patient");
let Doctor = require('../models/user/doctor');
let Group = require('../models/group');
let Search = require('../models/search');

src/server/handlers/socket.handler.js

@@ -9,7 +9,7 @@ let log = require("../util/log.js");
let clientCache = require('../models/socket.io/client.cache').clientCache();
let PatientClient = require('./../models/socket.io/patient.client');
let Doctor = require('../models/doctor');
let Doctor = require('../models/user/doctor');
let doctor = new Doctor();
let Group = require('../models/group');

src/server/models/group.js

@@ -8,12 +8,12 @@ let log = require("../util/log.js");
let modelUtil = require('../util/modelUtil');
let getui = require('getui');
let Patient = new require("../models/patient");
let Doctor = new require('../models/doctor');
let Patient = new require("../models/user/patient");
let Doctor = new require('../models/user/doctor');
let groupRepo = require('../repository/group.repo');
let gmRepo = require('../repository/group.msg.repo');
let statsRepo = require("../repository/stats.msg.repo");
let groupRepo = require('../repository/mysql/group.repo');
let gmRepo = require('../repository/mysql/group.msg.repo');
let statsRepo = require("../repository/mysql/stats.msg.repo");
let objectUtil = require("../util/objectUtil.js");
const GROUP_TYPE = require('../include/commons').GROUP_TYPE;

src/server/models/schedule/push.job.loader.js

@@ -7,10 +7,10 @@
"use strict";
let Schedule = require('./schedule');
let Doctor = require("../doctor.js");
let Doctor = require("../user/doctor.js");
const nmRepo = require('../../repository/notify.msg.repo');
const doctorRepo = require('../../repository/doctor.repo');
const nmRepo = require('../../repository/mysql/notify.msg.repo');
const doctorRepo = require('../../repository/mysql/doctor.repo');
const log = require("../../util/log.js");
class PushJobLoader{

src/server/models/search.js

@@ -11,7 +11,7 @@
"use strict";
let BaseModel = require('./base.model');
let searchRepo = require('../repository/search.repo');
let searchRepo = require('../repository/mysql/search.repo');
let modelUtil = require("../util/modelUtil");
let objectUtil = require('../util/objectUtil');

src/server/models/server/management.js

@@ -9,8 +9,8 @@
let configFile = require('../../include/commons').CONFIG_FILE;
let config = require('../../resources/config/' + configFile);
let wlyyRepo = require('../../repository/database/wlyy.db.js');
let imRepo = require('../../repository/database/im.db.js');
let wlyyRepo = require('../../repository/mysql/db/im.db');
let imRepo = require('../../repository/mysql/db/im.db');
let BaseModel = require('../base.model');
let modeUtil = require("../../util/modelUtil");

src/server/models/stats.js

@@ -4,7 +4,7 @@
"use strict";
let BaseModel = require('./base.model');
let statsRepo = require("../repository/stats.msg.repo.js");
let statsRepo = require("../repository/mysql/stats.msg.repo.js");
let log = require("../util/log.js");
let modelUtil = require('../util/modelUtil');

src/server/models/user.status.js

@@ -11,7 +11,7 @@
let BaseModel = require('./base.model');
let doctorRepo = require('../repository/doctor.repo');
let doctorRepo = require('../repository/mysql/doctor.repo');
let modelUtil = require("../util/modelUtil.js");
let Token = require('./auth/token');

src/server/models/user/doctor.js

@@ -8,12 +8,12 @@ let getui = require('getui');
let BaseModel = require('./../base.model');
let Schedule = require("./../schedule/schedule.js");
let doctorRepo = require('../../repository/doctor.repo.js');
let gmRepo = require('../../repository/group.msg.repo');
let pmRepo = require('../../repository/private.msg.repo');
let nmRepo = require("../../repository/notify.msg.repo");
let smRepo = require("../../repository/system.msg.repo.js");
let statsRepo = require("../../repository/stats.msg.repo");
let doctorRepo = require('../../repository/mysql/doctor.repo.js');
let gmRepo = require('../../repository/mysql/group.msg.repo');
let pmRepo = require('../../repository/mysql/private.msg.repo');
let nmRepo = require("../../repository/mysql/notify.msg.repo");
let smRepo = require("../../repository/mysql/system.msg.repo.js");
let statsRepo = require("../../repository/mysql/stats.msg.repo");
let objectUtil = require("../../util/objectUtil.js");
let modelUtil = require('../../util/modelUtil');

src/server/models/user/patient.js

@@ -3,29 +3,29 @@
 */
"use strict";
let configFile = require('../include/commons').CONFIG_FILE;
let config = require('../resources/config/' + configFile);
let log = require("../util/log.js");
let configFile = require('../../include/commons').CONFIG_FILE;
let config = require('../../resources/config/' + configFile);
let log = require("../../util/log.js");
let BaseModel = require('./base.model');
let BaseModel = require('../base.model');
let patientRepo = require('../repository/patient.repo');
let statsRepo = require("../repository/stats.msg.repo.js");
let pmRepo = require('../repository/private.msg.repo');
let patientRepo = require('../../repository/mysql/patient.repo');
let statsRepo = require("../../repository/mysql/stats.msg.repo.js");
let pmRepo = require('../../repository/mysql/private.msg.repo');
let objectUtil = require("../util/objectUtil.js");
let modelUtil = require('../util/modelUtil');
let objectUtil = require("../../util/objectUtil.js");
let modelUtil = require('../../util/modelUtil');
let Doctor = require('../models/doctor');
let Doctor = require('../../models/user/doctor');
const CONTENT_TYPES = require('../include/commons').CONTENT_TYPE;
const CONTENT_TYPES = require('../../include/commons').CONTENT_TYPE;
let clientCache = require('./socket.io/client.cache').clientCache();
let clientCache = require('../socket.io/client.cache').clientCache();
let DoctorRepo = require('../repository/doctor.repo');
let groupRepo = require('../repository/group.repo');
let wechatUtil = require('../util/wechatUtil');
let DoctorRepo = require('../../repository/mysql/doctor.repo');
let groupRepo = require('../../repository/mysql/group.repo');
let wechatUtil = require('../../util/wechatUtil');
class Patient extends BaseModel {
    constructor() {

src/server/models/user/users.js

@@ -33,23 +33,22 @@ class Users extends BaseModel {
    isPatientId(userId) {
        return async.waterfall([
                function (callback) {
                    var sql = "select case count(*) > 0 then true else false is_patient end c from patients where code = ?";
                    var sql = "select case when count(*) > 0 then true else false end 'is_patient' from patients where id = ?";
                    imDb.execQuery({
                        "sql": sql,
                        "args": [userId],
                        "handler": function (err, res) {
                            callback(err, res);
                            if(err) callback(err, res);
                            callback(null, res);
                        }
                    });
                    return false;
                },
                function (res, callback) {
                    callback(null, res.is_patient);
                }
            ],
            function (err, res) {
                if (err) {
                    log.error("User id probe failed: ", err);

src/server/node_modules/getui/index.js

@@ -21,7 +21,7 @@ var ListMessage = require('./getui/message/ListMessage');
var configFile = require('../../include/commons').CONFIG_FILE;
var config = require('../../resources/config/' + configFile);
var msgStat = require('../../repository/stats.msg.repo');
var msgStat = require('../../repository/mysql/stats.msg.repo');
var gt = new GeTui(config.geTuiConfig.HOST, config.geTuiConfig.APPKEY, config.geTuiConfig.MASTERSECRET);
var gt_appstore = new GeTui(config.geTuiAppStoreCfg.HOST, config.geTuiAppStoreCfg.APPKEY, config.geTuiAppStoreCfg.MASTERSECRET);

src/server/repository/mysql/group.msg.repo.js

@@ -1,6 +1,6 @@
"use strict";
var imRepo = require("./mysql/im.db.js");
var imRepo = require("../mysql/db/im.db.js");
exports.save = function (from, groupId, at, contentType, content, handler) {
    imRepo.execQuery({

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

@@ -6,8 +6,8 @@
 */
"use strict";
var wlyyRepo = require("./mysql/wlyy.db.js");
var GROUP_TYPE = require('../include/commons').GROUP_TYPE;
var wlyyRepo = require("../mysql/db/im.db.js");
var GROUP_TYPE = require('../../include/commons').GROUP_TYPE;
exports.getOnGroupMsg=function(msgid,handler){
    wlyyRepo.execQuery({

src/server/repository/mysql/notify.msg.repo.js

@@ -4,8 +4,8 @@
 */
"use strict";
let log = require('../util/log');
let imRepo = require("./mysql/im.db.js");
let log = require('../../util/log');
let imRepo = require("../mysql/db/im.db.js");
/**
 * 保存推送消息。

src/server/repository/mysql/private.msg.repo.js

@@ -1,6 +1,6 @@
"use strict";
var imRepo = require("./mysql/im.db.js");
var imRepo = require("../mysql/db/im.db.js");
/**
 * 保存消息。

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

@@ -3,7 +3,7 @@
 */
"use strict";
let imRepo = require('./mysql/im.db.js');
let imRepo = require('../mysql/db/im.db');
/**
 * 搜索与医生签约过的患者，条件：患者姓名。

src/server/repository/mysql/stats.msg.repo.js

@@ -6,14 +6,13 @@
var http = require('http');
var async = require('async');
var configFile = require('../include/commons').CONFIG_FILE;
var config = require('../resources/config/' + configFile);
var configFile = require('../../include/commons').CONFIG_FILE;
var config = require('../../resources/config/' + configFile);
var log = require('../util/log');
var wlyyRepo = require("./mysql/wlyy.db.js");
var imRepo = require("./mysql/im.db.js");
var log = require('../../util/log');
var imRepo = require("../mysql/db/im.db.js");
var WLYY_ENPOINTS = require('../include/wlyy.endpoints').WLYY_ENPOINTS;
var WLYY_ENPOINTS = require('../../include/wlyy.endpoints').WLYY_ENPOINTS;
//--------------------About all chats--------------------
/**

src/server/repository/mysql/system.msg.repo.js

@@ -1,7 +1,7 @@
"use strict";
var log = require('../util/log');
var imRepo = require("./mysql/im.db.js");
var log = require('../../util/log');
var imRepo = require("../mysql/db/im.db.js");
exports.save = function(to, contentType, title, summary, content, handler) {
    imRepo.execQuery({

src/server/repository/mysql/wechat.token.repo.js

@@ -4,8 +4,8 @@
 * Created by lyr-pc on 2016/11/25.
 */
"use strict";
var log = require('../util/log');
var wlyyDb = require('./mysql/wlyy.db');
var log = require('../../util/log');
var wlyyDb = require('../mysql/db/im.db');
/**
 * 获取微信AccessToken

src/server/resources/schema/ichat_schema.1.2.8.sql

@@ -131,9 +131,9 @@ SET FOREIGN_KEY_CHECKS=1;
/* 用户视图：医生与患者 */
create or replace view doctors as 
select code, name, sex, birthday birthdate, photo avatar, level
select code id, name, sex, birthday birthdate, photo avatar, level
from wlyy.wlyy_doctor;
create or replace view patients as 
select code, name, sex, birthday birthdate, photo avatar, openid
select code id, name, sex, birthday birthdate, photo avatar, openid
from wlyy.wlyy_patient;

src/server/util/wechatUtil.js

@@ -7,7 +7,7 @@
var log = require('./log');
var configFile = require('../include/commons').CONFIG_FILE;
var config = require('../resources/config/' + configFile);
var wxTokenRepo = require('../repository/wechat.token.repo.js');
var wxTokenRepo = require('../repository/mysql/wechat.token.repo.js');
var https = require('https');
/**

test/server/models/user/user.Test.js

@@ -21,6 +21,8 @@ describe('Users class', function () {
            let users = new Users();
            assert.strictEqual(users.isPatientId('not-patient_id'), false);
            done();
        })
    });
});