feat: ts

Author: GuoYuFu123

crowller-code-express/data/course.json

@@ -1 +1 @@
-{"1590472484271":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590472490515":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590473203446":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}]}
+{"1590472484271":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590472490515":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590473203446":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590544400232":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}],"1590545229685":[{"index":0,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":1,"title":"React 16.4 开发简书项目 从零基础入门到实战"},{"index":2,"title":"Vue2.5开发去哪儿网App 从零基础入门到实战项目"},{"index":3,"title":"从基础到实战\t手把手带你掌握新版Webpack4.0"},{"index":4,"title":"Dell Lee 的微课堂，职业规划答疑解惑，精彩文章与你分享"}]}

crowller-code-express/src/router.ts

@@ -1,18 +1,28 @@
-import { Router, Request, Response } from 'express';
-import Crowller from './crowller';
-import DellAnalyzer from './dellAnalyzer';
+import { Router, Request, Response, NextFunction } from 'express';
+import Crowller from './utils/crowller';
+import DellAnalyzer from './utils/dellAnalyzer';
 import fs from 'fs';
 import path from 'path';
+import { getResponseData } from './utils/utils'
 
-const router = Router();
-
-interface RequestWithBody extends Request {
+interface BodyRequest extends Request {
   body: {
     [key: string]: string | undefined;
   }
 }
 
-router.get('/', (req: Request, res: Response) => {
+const router = Router();
+
+const checkLogin = (req: Request, res: Response, next: NextFunction) => {
+  const isLogin = req.session ? req.session.login : false;
+  if (isLogin) {
+    next();
+  } else {
+    res.json(getResponseData(null, '请先登录'));
+  }
+};
+
+router.get('/', (req: BodyRequest, res: Response) => {
   const isLogin = req.session ? req.session.login : undefined;
   if (isLogin) {
     res.send(`
@@ -39,11 +49,11 @@ router.get('/', (req: Request, res: Response) => {
 
 })
 
-router.post('/login', (req: RequestWithBody, res: Response) => {
+router.post('/login', (req: BodyRequest, res: Response) => {
   const { password } = req.body;
   const isLogin = req.session ? req.session.login : undefined;
   if (isLogin) {
-    res.send('已经登录过')
+    res.json(getResponseData(true));
   } else {
     if (password === '123') {
       if (req.session) {
@@ -53,45 +63,44 @@ router.post('/login', (req: RequestWithBody, res: Response) => {
         }, 2000)
       }
     } else {
-      res.send('登录失败')
+      res.json(getResponseData(false, '登录失败'));
     }
   }
 })
 
-router.get('/logout', (req: RequestWithBody, res: Response) => {
+router.get('/logout', (req: BodyRequest, res: Response) => {
   if (req.session) {
     req.session.login = undefined;
   }
-  res.redirect('/');
-  // res.send("已经退出了")
+  res.json(getResponseData(true));
 })
 
-router.get('/getData', (req: RequestWithBody, res: Response) => {
+router.get('/getData', checkLogin, (req: BodyRequest, res: Response) => {
   const isLogin = req.session ? req.session.login : false;
   if (isLogin) {
     // 爬虫url：http://www.dell-lee.com/typescript/demo.html?secret=secret
     const secret = 'secretKey';
     const url = `http://www.dell-lee.com/typescript/demo.html?secret=${secret}`;
     const anlayzer = DellAnalyzer.getInstance();
     new Crowller(url, anlayzer);
-    res.send('getData success')
+    res.json(getResponseData("爬取成功"));
   } else {
-    res.send('请登录后进行爬取')
+    res.json(getResponseData(false, "用户尚未登录，请登录之后进行数据爬取"));
   }
 })
 
-router.get('/showData', (req: RequestWithBody, res: Response) => {
+router.get('/showData', checkLogin, (req: BodyRequest, res: Response) => {
   const isLogin = req.session ? req.session.login : false;
   if (isLogin) {
     try {
       const position = path.resolve(__dirname, '../data/course.json');
       const result = fs.readFileSync(position, 'utf-8');
-      res.json(JSON.parse(result));
+      res.json(getResponseData(JSON.parse(result)));
     } catch (e) {
-      res.send("尚未爬取到数据")
+      res.json(getResponseData(false, "暂无数据"));
     }
   } else {
-    res.send("用户尚未登录，请登录之后进行数据展示")
+    res.json(getResponseData(false, "用户尚未登录，请登录之后进行数据展示"));
   }
 })
 

crowller-code-express/src/crowller.ts crowller-code-express/src/utils/crowller.ts

@@ -0,0 +1,20 @@
+interface  Result {
+  success: boolean;
+  errMsg?: string;
+  data: any
+}
+
+const getResponseData = (data: any, errMsg?: string): Result => {
+  if (errMsg) {
+    return {
+      success: false,
+      errMsg,
+      data
+    }
+  }
+  return {
+    success: true,
+    data
+  }
+}
+export { getResponseData }