Merge branch 'initServer' into 'master'

整合excel数据提取和数据接口

See merge request !5

package-lock.json

@@ -13,7 +13,7 @@
         "@types/node": "^10.12.18",
         "compression": "^1.7.4",
         "exceljs": "^4.4.0",
-        "express": "^4.17.1",
+        "express": "^4.19.2",
         "express-async-handler": "^1.1.4",
         "express-history-api-fallback": "^2.2.1",
         "formidable": "^1.2.1",
@@ -33,8 +33,7 @@
       },
       "bin": {
         "screen": "out/main.js"
-      },
-      "devDependencies": {}
+      }
     },
     "node_modules/@alicloud/dybaseapi": {
       "version": "1.0.0",
@@ -435,12 +434,13 @@
       "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA=="
     },
     "node_modules/body-parser": {
-      "version": "1.20.1",
-      "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz",
-      "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+      "version": "1.20.2",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+      "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
-        "content-type": "~1.0.4",
+        "content-type": "~1.0.5",
         "debug": "2.6.9",
         "depd": "2.0.0",
         "destroy": "1.2.0",
@@ -448,7 +448,7 @@
         "iconv-lite": "0.4.24",
         "on-finished": "2.4.1",
         "qs": "6.11.0",
-        "raw-body": "2.5.1",
+        "raw-body": "2.5.2",
         "type-is": "~1.6.18",
         "unpipe": "1.0.0"
       },
@@ -459,34 +459,41 @@
     },
     "node_modules/body-parser/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
     },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
       "dependencies": {
         "ms": "2.0.0"
       }
     },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
     },
     "node_modules/body-parser/node_modules/qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "side-channel": "^1.0.4"
       },
       "engines": {
         "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/brace-expansion": {
@@ -708,16 +715,18 @@
     },
     "node_modules/content-type": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
       "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -936,16 +945,17 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.2",
-      "resolved": "https://registry.npmmirror.com/express/-/express-4.18.2.tgz",
-      "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
+      "license": "MIT",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
-        "body-parser": "1.20.1",
+        "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -1378,8 +1388,9 @@
     },
     "node_modules/iconv-lite": {
       "version": "0.4.24",
-      "resolved": "https://registry.npmmirror.com/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
       "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3"
       },
@@ -1718,8 +1729,9 @@
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.6"
       }
@@ -2019,9 +2031,10 @@
       }
     },
     "node_modules/raw-body": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz",
-      "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "license": "MIT",
       "dependencies": {
         "bytes": "3.1.2",
         "http-errors": "2.0.0",
@@ -2034,8 +2047,9 @@
     },
     "node_modules/raw-body/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8"
       }
@@ -2465,8 +2479,9 @@
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "license": "MIT",
       "dependencies": {
         "media-typer": "0.3.0",
         "mime-types": "~2.1.24"

package.json

@@ -8,7 +8,7 @@
     "@types/node": "^10.12.18",
     "compression": "^1.7.4",
     "exceljs": "^4.4.0",
-    "express": "^4.17.1",
+    "express": "^4.19.2",
     "express-async-handler": "^1.1.4",
     "express-history-api-fallback": "^2.2.1",
     "formidable": "^1.2.1",
@@ -27,7 +27,10 @@
     "xml2js": "^0.4.23"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "start": "node out/main.js",
+    "dev": "npx ts-node src/server.ts"
   },
   "author": "cjj",
   "license": "ISC",

src/app.ts

+import router from './routes';
+
+
+const express = require('express')
+
+const app = express();
+
+app.use(express.json());
+app.use('/api', router);
+
+export default app;
\ No newline at end of file

src/excelDataController.ts

+import { Request, Response } from 'express';
+import { getData } from './excelDataService'
+import { DataExtractor } from './util/dataExtractor';
+
+
+export const test = async (req: Request, res: Response) => {
+    res.status(200).send("Success!");
+};
+
+export const getDataFromSheet = async (req: Request, res: Response) => {
+    const { file, sheet } = req.params;
+    try {
+        const decodedFile = decodeURIComponent(file);
+        const decodedSheet = decodeURIComponent(sheet);
+        const data = await getData(decodedFile, decodedSheet);
+        res.json(data);
+    } catch (error) {
+        res.status(500).send("error getting data");
+    }
+};
+

src/excelDataService.ts

+import { DataExtractor } from './util/dataExtractor'
+
+export const getData = async (fileName: string, sheetName: string) => {
+    console.log("Getting data from " + fileName + " " + sheetName);
+    const extractor = DataExtractor.getInstance();
+    const data = await extractor.getData(fileName, sheetName);
+    return data;
+}
\ No newline at end of file

src/main.ts

-import { httpServer } from "./net/http_server";
-import { initConfig, systemConfig } from "./config/serverConfig";
-import { test2 } from "./test";
-let fs = require('fs');
-
-async function lanuch() {
-    await initConfig();
-    httpServer.createServer( systemConfig.port );
-    console.log('This indicates that the server is started successfully.');
-    // test();
-    // test2();
-}
-
-lanuch();
-
-
-
-
-
-
-

src/routes.ts

+import { Router } from 'express';
+import { test, getDataFromSheet } from "./excelDataController";
+
+const router = Router();
+
+router.get("/data/test", test);
+router.get("/data/:file/:sheet", getDataFromSheet)
+
+export default router;
+

src/server.ts

+import app from './app';
+
+const PORT = process.env.PORT || 3000;
+
+app.listen(PORT, () => {
+    console.log(`Server is running on port ${PORT}`);
+});

src/util/dataExtractor.ts

+import { join } from 'path';
+import { readdirSync, readFileSync } from 'fs';
+import * as XLSX from 'xlsx';
+
+export class DataExtractor {
+    private static instance: DataExtractor;
+    private data: { [key: string]: { [sheet: string]: any } } = {};
+
+    private constructor() {
+        this.loadAllData();
+    }
+
+    public static getInstance(): DataExtractor {
+        if (!DataExtractor.instance) {
+            DataExtractor.instance = new DataExtractor();
+        }
+        return DataExtractor.instance;
+    }
+
+    private loadAllData(): void {
+        const dirPath = join(__dirname, '../../data');
+        const files = readdirSync(dirPath).filter(file => file.endsWith('.xlsx'));
+        console.log("Files in data directory: ", files);
+
+        files.forEach(file => {
+            const filePath = join(dirPath, file);
+            this.data[file] = this.parseExcel(filePath);
+        });
+    }
+
+    private parseExcel(filePath: string): { [sheet: string]: any } {
+        const file = readFileSync(filePath);
+        const workbook = XLSX.read(file, { type: 'buffer' });
+        const sheetNames = workbook.SheetNames;
+        const data: { [sheet: string]: any } = {};
+
+        sheetNames.forEach(sheetName => {
+            data[sheetName] = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName]);
+        });
+
+        return data;
+    }
+
+    public getData(fileName: string, sheetName: string): any {
+        const fileData = this.data[fileName + '.xlsx'];
+        if (!fileData) {
+            throw new Error(`File ${fileName} not found`);
+        }
+        const sheetData = fileData[sheetName];
+        if (!sheetData) {
+            throw new Error(`Sheet ${sheetName} not found in file ${fileName}`);
+        }
+        return sheetData;
+    }
+
+    public getAvailableFiles(): string[] {
+        return Object.keys(this.data);
+    }
+
+    public getAvailableSheets(fileName: string): string[] {
+        const fileData = this.data[fileName + '.xlsx'];
+        if (!fileData) {
+            throw new Error(`File ${fileName} not found`);
+        }
+        return Object.keys(fileData);
+    }
+}