2021-1-capstone-design1 / RIT_Project1

Go to a project
Toggle navigation Toggle navigation pinning
박권수
b0f485c0 2 parents ebee4530 3e4b1496

Merge branch 'server' into web

Inline Side-by-side
Showing 5 changed files with 5 additions and 5 deletions
...@@ -8,7 +8,7 @@ const PatientInfo = require('../../models/patientInfo'); ...@@ -8,7 +8,7 @@ const PatientInfo = require('../../models/patientInfo');
8 const TakeMedicineHist = require('../../models/takeMedicineHistory'); 8 const TakeMedicineHist = require('../../models/takeMedicineHistory');
9 const BottleMedicine = require('../../models/bottleMedicine'); 9 const BottleMedicine = require('../../models/bottleMedicine');
10 const Feedback = require('../../models/feedback'); 10 const Feedback = require('../../models/feedback');
11 -const Mqtt = require('../../lib/MqttModule'); 11 +const Mqtt = require('../../util/MqttModule');
12 const jwt = require('jsonwebtoken'); 12 const jwt = require('jsonwebtoken');
13 13
14 //약병 등록 14 //약병 등록
......
1 //허브(Mqtt Broker)등록 및 삭제 1 //허브(Mqtt Broker)등록 및 삭제
2 const Hub = require('../../models/hub'); 2 const Hub = require('../../models/hub');
3 const User = require('../../models/user'); 3 const User = require('../../models/user');
4 -const Mqtt = require('../../lib/MqttModule'); 4 +const Mqtt = require('../../util/MqttModule');
5 -const DataProcess = require('../../lib/DataProcess'); 5 +const DataProcess = require('../../util/DataProcess');
6 const jwt = require('jsonwebtoken'); 6 const jwt = require('jsonwebtoken');
7 7
8 exports.hubConnect = async (ctx) => { 8 exports.hubConnect = async (ctx) => {
......
1 -const Mqtt = require('../lib/MqttModule'); 1 +const Mqtt = require('./MqttModule');
2 -const DataProcess = require('../lib/DataProcess'); 2 +const DataProcess = require('./DataProcess');
3 const Hub = require('../models/hub'); 3 const Hub = require('../models/hub');
4 const Bottle = require('../models/bottle'); 4 const Bottle = require('../models/bottle');
5 5
......