Skip to content

Commit 811f082

Browse files
committed
1
1 parent 9d26869 commit 811f082

File tree

6 files changed

+31
-86
lines changed

6 files changed

+31
-86
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
77
.vscode
8+
static

api/pics.js

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let PicsModel = dbPics.model('fs.files',PicsSchema)
2525

2626
/* GET pictures list by type. */
2727
router.get('/pics', (req, res, next) => {
28-
PicsModel.find({"metadata.type":"photo"},(err,docs) => {
28+
PhotosModel.find({"originType":"photo"},(err,docs) => {
2929
res.json(docs)
3030
})
3131
})
@@ -52,24 +52,23 @@ router.post('/pics', multipartyMiddleware, (req, res, next) => {
5252
// 多图上传
5353
for(let file of req.files.uploadFile){
5454
let path = file.path
55-
let writeStream = gfs.createWriteStream({
56-
filename: file.name,
57-
content_type: file.type,
58-
metadata: {
59-
type:"photo"
60-
}
61-
})
55+
// let writeStream = gfs.createWriteStream({
56+
// filename: file.name,
57+
// content_type: file.type,
58+
// metadata: {
59+
// type:"photo"
60+
// }
61+
// })
62+
let writeStream = fs.createWriteStream('./static/images/' + file.name)
6263
gm(path).resize(500).stream().pipe(writeStream)
63-
writeStream.on('close',(file) => {
64+
writeStream.on('close',() => {
6465
// 记录图片业务关联信息
6566
let photo = {}
66-
photo.id = file._id.toString()
67-
photo.name = file.filename
68-
photo.contentType = file.contentType
67+
photo.name = file.name
68+
photo.contentType = file.type
69+
photo.originType = "photo"
6970
let photosEntity = new PhotosModel(photo)
70-
photosEntity.save((err,photos) => {
71-
72-
})
71+
photosEntity.save((err,photo) => {})
7372
//删除临时文件
7473
fs.unlink(path,(err) => {})
7574
})
@@ -78,24 +77,23 @@ router.post('/pics', multipartyMiddleware, (req, res, next) => {
7877
// 单图上传
7978
let file = req.files.uploadFile
8079
let path = file.path
81-
let writeStream = gfs.createWriteStream({
82-
filename: file.name,
83-
content_type: file.type,
84-
metadata: {
85-
type:"photo"
86-
}
87-
})
80+
// let writeStream = gfs.createWriteStream({
81+
// filename: file.name,
82+
// content_type: file.type,
83+
// metadata: {
84+
// type:"photo"
85+
// }
86+
// })
87+
let writeStream = fs.createWriteStream('./static/images/' + file.name)
8888
gm(path).resize(500).stream().pipe(writeStream)
89-
writeStream.on('close',(file) => {
89+
writeStream.on('close',() => {
9090
// 记录图片业务关联信息
9191
let photo = {}
92-
photo.id = file._id.toString()
93-
photo.name = file.filename
94-
photo.contentType = file.contentType
92+
photo.name = file.name
93+
photo.contentType = file.type
94+
photo.originType = "photo"
9595
let photosEntity = new PhotosModel(photo)
96-
photosEntity.save((err,photos) => {
97-
98-
})
96+
photosEntity.save((err,photo) => {})
9997
//删除临时文件
10098
fs.unlink(path,(err) => {})
10199
})

api/schema/photosSchema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const mongoose = require('mongoose')
22

33
let PhotosSchema = new mongoose.Schema({
4-
id:{type:String,default:''},
54
name:{type:String,default:''},
65
contentType:{type:String,default:''},
6+
originType:{type:String,default:''},
77
createDate:{type:Date,default:new Date()}
88
})
99

apiServer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const app = require('express')()
22
const host = process.env.HOST || '127.0.0.1'
33
const port = process.env.PORT || 3090
4-
const router = require('express').Router()
54

65
app.set('port', port)
76

src/pages/Photo.vue

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="content">
55
<div class="photoList">
66
<div class="item" v-for="photo in photos">
7-
<img v-lazy.container="picsUrl + photo.filename" />
7+
<img v-lazy.container="picsUrl + photo.name" />
88
</div>
99
</div>
1010
<mt-button type="primary" v-on:click="onTap">添加图片</mt-button>
@@ -23,15 +23,14 @@
2323
</template>
2424

2525
<script>
26-
2726
import vHeader from '../components/Header'
2827
import vFooter from '../components/Footer'
2928
export default {
3029
data() {
3130
return {
3231
formdata : undefined,
3332
popupVisible:false,
34-
picsUrl : 'http://116.62.143.122/pics/',
33+
picsUrl : './static/images/',
3534
photos : []
3635
}
3736
},

src/pages/test.vue

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)