박권수

Merge branch 'server' into web

......@@ -8,7 +8,7 @@ const PatientInfo = require('../../models/patientInfo');
const TakeMedicineHist = require('../../models/takeMedicineHistory');
const BottleMedicine = require('../../models/bottleMedicine');
const Feedback = require('../../models/feedback');
const Mqtt = require('../../lib/MqttModule');
const Mqtt = require('../../util/MqttModule');
const jwt = require('jsonwebtoken');
//약병 등록
......
//허브(Mqtt Broker)등록 및 삭제
const Hub = require('../../models/hub');
const User = require('../../models/user');
const Mqtt = require('../../lib/MqttModule');
const DataProcess = require('../../lib/DataProcess');
const Mqtt = require('../../util/MqttModule');
const DataProcess = require('../../util/DataProcess');
const jwt = require('jsonwebtoken');
exports.hubConnect = async (ctx) => {
......
const Mqtt = require('../lib/MqttModule');
const DataProcess = require('../lib/DataProcess');
const Mqtt = require('./MqttModule');
const DataProcess = require('./DataProcess');
const Hub = require('../models/hub');
const Bottle = require('../models/bottle');
......