Toggle navigation
Toggle navigation
This project
Loading...
Sign in
2021-1-capstone-design1
/
RIT_Project1
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
1
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
박권수
2021-09-15 20:13:37 +0900
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
b0f485c0dd9a2cebb0e7c01f6182730b1b74bf79
b0f485c0
2 parents
ebee4530
3e4b1496
Merge branch 'server' into web
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
server/src/api/bottle/bottle.ctrl.js
server/src/api/hub/hub.ctrl.js
server/src/lib/DataProcess.js → server/src/util/DataProcess.js
server/src/lib/MqttModule.js → server/src/util/MqttModule.js
server/src/util/MqttServer.js
server/src/api/bottle/bottle.ctrl.js
View file @
b0f485c
...
...
@@ -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'
);
//약병 등록
...
...
server/src/api/hub/hub.ctrl.js
View file @
b0f485c
//허브(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
)
=>
{
...
...
server/src/
lib
/DataProcess.js
→
server/src/
util
/DataProcess.js
View file @
b0f485c
File moved
server/src/
lib
/MqttModule.js
→
server/src/
util
/MqttModule.js
View file @
b0f485c
File moved
server/src/util/MqttServer.js
View file @
b0f485c
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'
);
...
...
Please
register
or
login
to post a comment