no message

bin/www

@@ -4,87 +4,88 @@
  * Module dependencies.
  */
 
-var app = require('../app');
-var debug = require('debug')('data-server:server');
-var http = require('http');
-
-/**
- * Get port from environment and store in Express.
- */
-
-var port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
-
-/**
- * Create HTTP server.
- */
-
-var server = http.createServer(app);
-
-/**
- * Listen on provided port, on all network interfaces.
- */
-
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
-
-/**
- * Normalize a port into a number, string, or false.
- */
-
-function normalizePort(val) {
-  var port = parseInt(val, 10);
-
-  if (isNaN(port)) {
-    // named pipe
-    return val;
-  }
-
-  if (port >= 0) {
-    // port number
-    return port;
-  }
-
-  return false;
-}
-
-/**
- * Event listener for HTTP server "error" event.
- */
-
-function onError(error) {
-  if (error.syscall !== 'listen') {
-    throw error;
-  }
-
-  var bind = typeof port === 'string'
-    ? 'Pipe ' + port
-    : 'Port ' + port;
-
-  // handle specific listen errors with friendly messages
-  switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-      break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-      break;
-    default:
-      throw error;
-  }
-}
-
-/**
- * Event listener for HTTP server "listening" event.
- */
-
-function onListening() {
-  var addr = server.address();
-  var bind = typeof addr === 'string'
-    ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-}
+ var app = require('../app');
+ var debug = require('debug')('data-server:server');
+ var http = require('http');
+ 
+ /**
+  * Get port from environment and store in Express.
+  */
+ 
+ var port = normalizePort(process.env.PORT || '3000');
+ app.set('port', port);
+ 
+ /**
+  * Create HTTP server.
+  */
+ 
+ var server = http.createServer(app);
+ 
+ /**
+  * Listen on provided port, on all network interfaces.
+  */
+ 
+ server.listen(port);
+ server.on('error', onError);
+ server.on('listening', onListening);
+ 
+ /**
+  * Normalize a port into a number, string, or false.
+  */
+ 
+ function normalizePort(val) {
+   var port = parseInt(val, 10);
+ 
+   if (isNaN(port)) {
+     // named pipe
+     return val;
+   }
+ 
+   if (port >= 0) {
+     // port number
+     return port;
+   }
+ 
+   return false;
+ }
+ 
+ /**
+  * Event listener for HTTP server "error" event.
+  */
+ 
+ function onError(error) {
+   if (error.syscall !== 'listen') {
+     throw error;
+   }
+ 
+   var bind = typeof port === 'string'
+     ? 'Pipe ' + port
+     : 'Port ' + port;
+ 
+   // handle specific listen errors with friendly messages
+   switch (error.code) {
+     case 'EACCES':
+       console.error(bind + ' requires elevated privileges');
+       process.exit(1);
+       break;
+     case 'EADDRINUSE':
+       console.error(bind + ' is already in use');
+       process.exit(1);
+       break;
+     default:
+       throw error;
+   }
+ }
+ 
+ /**
+  * Event listener for HTTP server "listening" event.
+  */
+ 
+ function onListening() {
+   var addr = server.address();
+   var bind = typeof addr === 'string'
+     ? 'pipe ' + addr
+     : 'port ' + addr.port;
+   debug('Listening on ' + bind);
+ }
+ 
\ No newline at end of file

package.json

@@ -6,19 +6,22 @@
   "dependencies": {
     "@alicloud/sms-sdk": "^1.1.6",
     "@types/node": "^10.12.18",
+    "body-parser": "^1.19.0",
     "compression": "^1.7.4",
     "express": "^4.17.1",
     "express-async-handler": "^1.1.4",
+    "express-history-api-fallback": "^2.2.1",
     "formidable": "^1.2.1",
-    "log4js": "^6.3.0",
     "lru-cache": "^4.1.5",
     "md5": "^2.2.1",
     "moment": "^2.24.0",
     "mongoose": "^5.4.0",
+    "multer": "^1.4.3",
     "mysql": "^2.18.1",
-    "node-psd": "^1.0.1",
     "node-xlsx": "^0.16.1",
     "nodemailer": "^6.1.1",
+    "oracledb": "^5.3.0",
+    "pyfl": "^1.1.4",
     "request": "^2.88.0",
     "svg-captcha": "^1.3.12",
     "ws": "^5.2.2"

src/biz/pic.ts

-//关于图片的操作
+import { addOncePic, selectAllPicture, selectPicById, selectPicList, update } from "../model/picture";
+import { selectUserByLogin } from "../model/users";
+import { upImgPathConfig } from "../serverConfig";
+import { isDirExists } from "../util/filesService";
+import { psdForPng } from "../util/psd";
+const multer = require('multer');
+const bodyParser = require('body-parser');
+const express = require('express');
+const app = express();
 
-export async function up() {
-    
+// const dir = upImgPathConfig.psd;
+// let files = fs.readdirSync(dir);
+let ret:any = {};
+export async function up(req, res) {
+    let picList = [];
+    let pngName = psdForPng(req.query.pName);
+    picList.push({
+        pId: parseInt(req.query.pId),
+        uId: req.query.uId,
+        uName: req.query.uName,
+        psdName: req.query.pName,
+        pngName,
+        path: req.query.path,
+        chartType: req.query.chartType,
+        createTime: new Date()
+    });
+    ret["up"] = await addOncePic(picList);
+    res.send(ret);
+}
+
+export async function down(req, res) {
+    let pId = req.query.pId;
+    ret["down"] = await selectPicById(pId);
+    res.send(ret);
 }
 
-export async function dow() {
+export async function changePic(req, res) {
+    let pId = parseInt(req.query.pId);
+    let picList = [];
+    picList.push({
+        psdName: req.query.pName,
+        path: req.query.path,
+        chartType: req.query.chartType,
+        createTime: new Date()
+    });
     
-}
+    ret["changePic"] = await update(pId, picList);
\ No newline at end of file
+    res.send(ret);
+}
+
+
+export async function picLict(req, res) {
+    ret["picLict"] = await selectPicList();
+    res.send(ret);
+}
+
+
+export async function uploadImg(fileFilter, storage) {
+    let imageUploader = multer({
+        fileFilter,
+        storage,
+    }).single("file");
+
+    app.use(bodyParser.urlencoded({ extended: false }));
+    app.use(bodyParser.json())
+    app.post("/upload", imageUploader, (req, res) => {
+        
+        res.send("上传成功");
+    });
+}
+

src/biz/user.ts

+import { Query } from "mongoose";
+import { addOnceUser, selectUserById, selectUserByLogin, update } from "../model/users";
+
+let ret:any = {};
+export async function login(req, res) {
+    let uName = req.query.uName;
+    let uPwd = req.query.uPwd;
+    ret["login"] = await selectUserByLogin(uName, uPwd);
+    res.send(ret);
+}
+
+export async function changePwd(req, res) {
+    let uId = req.query.uId;
+    let userInfo = {
+        uName : req.query.uName,
+        uPwd : req.query.uPwd
+    }
+    ret["changePwd"] = await update(uId, userInfo);
+    res.send(ret);
+}
+
+
+export async function register(req, res) {
+    let addInfo = {
+        uName: req.query.uName,
+        uPwd: req.query.uPwd,
+        uImg: req.query.uImg
+    }
+    ret["registerUser"] = await addOnceUser(addInfo);
+    res.send(ret);
+}
+

src/db/data/down.ts

+import { getAllLog } from "../../model/log/log";
+import { addOncePic, selectAllPicture, selectPicById } from "../../model/picture";
+
+const mongoose = require('mongoose');
+const pictures = require('../../model/picture').pictures;
+
+export async function up(req, res) {
+    let pId = req.query.pId;
+    await selectPicById(pId);
+    return;
+}

src/main.ts

+import { now } from "mongoose";
+import { initDB } from "./db/mongo/db_init";
 import { httpServer } from "./net/http_server";
 import { getPort } from "./serverConfig";
-import { psdForPng } from "./util/psd";
 
 async function lanuch() {
     httpServer.createServer(getPort());
 }
 
-
 lanuch();

src/model/log/log.ts

@@ -19,13 +19,14 @@ export async function getAllLog() {
     return await logModel.find({}).exec();
 }
 
-export async function addLog() {//todo
-    
+export async function addLog(addInfo) {//todo
+    await logModel.insert(addInfo);
+    return true;
 }
 
 export async function selectLogByParamater(paramater) { //todo
-
-    
+    let query = {paramater}
+    return await logModel.find(query).exec();  
 }
 
 export function getParamater() {//todo

src/model/picture.ts

@@ -3,11 +3,14 @@ import { picDB } from "../db/mongo/db_init";
 
 
 const pictureSchema = new Schema({
-    pId: {type:Number, index:true},
-    pName: {type: String},
+    pId: {type: Number, index:true},
+    uId: {type: Number},
+    uName: {type: String},
+    psdName: {type: String},
+    pngName: {type: String},
     path: {type: String},
     chartType:{type:Number, index:true},// 按图表类型分  后续有新的标签类型，就往后加
-    createTime:{type:Date, index:true}
+    createTime:{type:Date, index:true},
 });
 
 let pictureModel;
@@ -16,29 +19,57 @@ export function initModel() {
     pictureModel = picDB.model('picture', pictureSchema)
 }
 
+export async function selectPicList() {
+    let userModel = require('../model/users');
+    return await pictureModel.find((err, doc) => {
+        let picItem = JSON.parse(JSON.stringify(doc));
+        let uId = picItem[0].uId;
+        userModel.find({"uId":uId}, (err, doc) => {
+            picItem[0].picInfo = doc[0];
+        })
+
+    })
+}
 
 export async function selectAllPicture() {
     return await pictureModel.find({}).exec();
 }
 
-export async function addManyPic(picList) {
-    await pictureModel.insertMany(picList);
-    return true;
+export async function selectPicById(pId) {
+    let query = {pId: pId};
+    return await pictureModel.find(query).exec();
 }
 
-export async function addOncePic(pId, pName, path, chartType) {
-    let addInfo = {
-        pId,
-        pName,
-        path,
-        chartType,
-        createTIme:new Date()
-    };
-    await pictureModel.insert();
-    return true;
-}
+export async function addOncePic(addInfo) {
+    // await pictureModel.inseraddInfot(addInfo);
+    // return true;
 
-export async function update() {//todo
-    
+    await pictureModel.save((err, doc) => {
+        doc = addInfo;
+        if (!err) {
+            console.log('保存成功');
+            return true;
+        } else {
+            console.log('Error:' + err);
+        }
+    })
+    return false;
 }
 
+export async function update(pId, reviseInfo) {//todo
+    // await pictureModel.update(reviseInfo);
+    // return true;
+
+    await pictureModel.findById(pId, (err, doc) => {
+        doc = reviseInfo;
+        doc.save((err) => {
+            if (!err) {
+                console.log('修改成功');
+                return true;
+            } else {
+                console.log('Error:' + err);
+            }
+        })
+    })
+    return false;
+}
\ No newline at end of file

src/model/users.ts

+import { rejects } from "assert";
+import { resolve } from "dns";
 import { Schema } from "mongoose";
 import { picDB } from "../db/mongo/db_init";
+const bcrypt = require('bcrypt');
 
 const usersSchema = new Schema({
     uId: {type:Number, index: true},    //id
     uName: {type: String},  //管理员账号
     uPwd: {type: String},   //管理员密码
-
+    uImg: {type: String},   //头像
 });
 
 let usersModel;
@@ -14,15 +17,54 @@ export function initModel() {
     usersModel = picDB.model('users', usersSchema);
 }
 
-
 export async function selectAllUser() {
     return await usersModel.find({}).exec();
 }
 
-export async function update() { //todo
-    
+export async function update(uId, userInfo) { //todo
+    // await usersModel.findById(uId, paramater);
+    // return true;
+    await usersModel.findById(uId, (err, doc) => {
+        doc = userInfo;
+        doc.save((err) => {
+            if(!err) {
+                console.log('修改成功');
+                return true;
+            } else {
+                console.log('Error:' + err);
+            }
+        })
+    })
+    return false;
+}
+
+export async function selectUserById(uId) {//todo
+    let query = {uId: uId};
+    return await usersModel.find(query).exec();
 }
 
-export async function selectUserById() {//todo
-    
-}
+export async function selectUserByLogin(uName, uPwd) {//todo
+    let query = {uName: uName, uPwd: uPwd};
+    return await usersModel.find(query).exec();
\ No newline at end of file
+}
+
+export async function addOnceUser(addInfo) {
+    // addInfo = {
+    //     uId : 1,
+    //     uName : '陈某',
+    //     uPwd : '123456'
+    // }
+    // await usersModel.insert(addInfo);
+    // return true;
+
+    await usersModel.save((err, doc) => {
+        doc = addInfo;
+        if (!err) {
+            console.log('保存成功');
+            return true;
+        } else {
+            console.log('Error:' + err);
+        }
+    })
+    return false;
+}

src/routers/router.ts

 import * as asyncHandler from 'express-async-handler'
 import * as dataListBiz from '../biz/dataList'
+import * as userBiz from '../biz/user'
+import * as picBiz from '../biz/pic'
 
 export function setRouter(httpServer) {
     httpServer.get('/datalist', asyncHandler(dataListBiz.getData));
+
+    
+    httpServer.get('/up', asyncHandler(picBiz.up));
+    httpServer.post('/up', asyncHandler(picBiz.up));
+    
+    httpServer.get('/down', asyncHandler(picBiz.down));
+    httpServer.post('/down', asyncHandler(picBiz.down));
+    
+    httpServer.get('/picLict', asyncHandler(picBiz.picLict));
+    httpServer.post('/picLict', asyncHandler(picBiz.picLict));
+
+    httpServer.get('/uploadImg', asyncHandler(picBiz.uploadImg));
+    httpServer.post('/uploadImg', asyncHandler(picBiz.uploadImg));
+
+
+
+    httpServer.get('/registerUser', asyncHandler(userBiz.register));
+    httpServer.post('/registerUser', asyncHandler(userBiz.register));
+
+    httpServer.get('/changePwd', asyncHandler(userBiz.changePwd));
+    httpServer.post('/changePwd', asyncHandler(userBiz.changePwd));
+    
+    httpServer.get('/login', asyncHandler(userBiz.login));
+    httpServer.post('/login', asyncHandler(userBiz.login));
+
 }
\ No newline at end of file

src/serverConfig.ts

@@ -37,6 +37,6 @@ export const systemLogPath = {
 }
 
 function getPicDBUrl() {
-    return '';
+    return 'mongodb://127.0.0.1:27017/picDB';
 }
 

src/util/filesService.ts

+const fs = require('fs');
+const multer = require('multer');
+const path = require('path');
+
+///过滤
+let fileFilter = function (req, file, cb) {
+    let acceptableMime = ["image/jpeg", "image/png", "image/jpg", "image/gif"];
+    //限制类型
+    if (acceptableMime.indexOf(file.mimetype) !== -1) {
+        cb(null, true); //通过上传
+    } else {
+        cb(null, false); //禁止上传
+    }
+}
+
+
+let storage = multer.diskStorage({
+    //图片上传位置
+    destination: path.resolve(__dirname, "/res/up"),
+    //上传文件保存的文件名
+    filename: function (req, file, cb) {
+        //获取后缀
+        let extName = file.originalname.slice(file.originalname.lastIndexOf("."));  //.jpg
+        //获取名称
+        let fileName = Date.now();
+
+        cb(null, fileName + extName); //15132464156.jpg
+    }
+})
+
+export async function isDirExists(dirpath, isCreateDir) {
+    return async (resolve, reject) => {
+        if (!fs.existsSync(dirpath)) {  //判断文件夹是否存在
+            if (isCreateDir) { //如果不存在就创建
+                const res = await createDir(dirpath);
+                if (res) {
+                    resolve(res);
+                } else {
+                    reject(res);
+                }
+            } else {
+                resolve(true);
+            }
+        } else {
+            resolve(true);
+        }
+    }
+    
+}
+
+export async function createDir(filepath) {
+    return async (resolve, reject) => {
+        fs.mkdir(filepath, (err) => {
+            if (err) {
+                console.log(`创建文件夹:${filepath}失败！`);
+                reject(err);
+            } else {
+                console.log(`创建文件夹:${filepath}成功！`);
+                resolve(true);
+            }
+        })
+    }
+    
+}
\ No newline at end of file