Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Module/jwt.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const randToken = require('rand-token');
const jwt = require('jsonwebtoken');
const randToken = require('./node_modules/rand-token');
const jwt = require('./node_modules/jsonwebtoken');
const {secretOrPrivateKey} = require('../config/secretKey');
const options = {
algorithm:"HS256",
Expand All @@ -20,6 +20,7 @@ module.exports ={
return result;

},

verify:(token) =>{
let decoded;
try{
Expand All @@ -38,6 +39,7 @@ module.exports ={
}
return decoded;
},

refresh:(user) =>{
const payload = {
idx:user.idx,
Expand Down
2 changes: 0 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const formidable = require('express-formidable');

var indexRouter = require('./routes/index');

var usersRouter = require('./routes/users');
var postsRouter = require('./routes/post/index')
var groupRouter = require('./routes/group/index')

Expand All @@ -25,7 +24,6 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));

app.use('/', indexRouter);
app.use('/users', usersRouter);
app.use('/post',postsRouter);
app.use('/group',groupRouter);

Expand Down
5 changes: 4 additions & 1 deletion model/group.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ var groupSchema = new Schema({
department: String, // 직무 마케팅, 개발..
category:[String],
groupImage:String,
groupCode:{type:String, unique:true} // 처음엔 null값이었다가 조직 생성 완료되면 코드 삽입
groupCode:{
type:String,
unique:true
} // 처음엔 null값이었다가 조직 생성 완료되면 코드 삽입
})
module.exports = mongoose.model('group',groupSchema)
//이름 이메일 조합 jwt 토큰 생성
8 changes: 5 additions & 3 deletions model/post.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ var Schema = mongoose.Schema
var postSchema = new Schema({
image: String,
postImages : [String],
postTitle : String,
postContent : String,
title: String,
description: String,
url: String,
see: [String],
bookmark : [String],
see: {type:Number, default: 0},
bookmark : {type:Number, default: 0},
score : {type:Number, default: 0},
comments : String,
category : String,
writer : String,
groupCode : String,
postDate: {type: Date, default: Date.now()},
},{ versionKey:'_somethingElse'})

Expand Down
8 changes: 6 additions & 2 deletions model/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ var userSchema = new Schema({
rank:String,
groupCode:String, // 조직 코드를 삽입
profileImage:String, // 이미지 url // multer aws s3
bookmark:[String]
})
bookmark: [{
categoryName:String,
// thumb:[String],
post : [{type: mongoose.Schema.Types.ObjectId, ref: 'post'}],
}]
}, { minimize: false })
module.exports = mongoose.model('user',userSchema)
//이름 이메일 조합 jwt 토큰 생성
1 change: 0 additions & 1 deletion module/awsUpload.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ let s3 = new AWS.S3();
let multer = require("multer");
let multerS3 = require('multer-s3');


let upload = multer({
storage: multerS3({
s3: s3,
Expand Down
Loading