Bladeren bron

Merge branch 'master' of http://192.168.0.115:3000/bill/traffic-laser

xzw 2 jaren geleden
bovenliggende
commit
e2b49a0a84
100 gewijzigde bestanden met toevoegingen van 18 en 5 verwijderingen
  1. 1 2
      .env
  2. 2 0
      .env.development
  3. 3 0
      server/index.js
  4. 12 3
      server/mock.ts
  5. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06240/r06240.bin
  6. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06240/r06240.hrc
  7. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06242/r06242.bin
  8. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06242/r06242.hrc
  9. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06244/r06244.bin
  10. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06244/r06244.hrc
  11. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06246/r06246.bin
  12. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06246/r06246.hrc
  13. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06420/r06420.bin
  14. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06420/r06420.hrc
  15. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06421/r06421.bin
  16. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06421/r06421.hrc
  17. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r06422.bin
  18. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r06422.hrc
  19. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064220.bin
  20. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064222.bin
  21. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064224.bin
  22. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064226.bin
  23. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r06424.bin
  24. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r06424.hrc
  25. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064241.bin
  26. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064242.bin
  27. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064243.bin
  28. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064244.bin
  29. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064245.bin
  30. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064246.bin
  31. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064247.bin
  32. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06425/r06425.bin
  33. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06425/r06425.hrc
  34. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r06426.bin
  35. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r06426.hrc
  36. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064260.bin
  37. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064262.bin
  38. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064264.bin
  39. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064266.bin
  40. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06460/r06460.bin
  41. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06460/r06460.hrc
  42. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06461/r06461.bin
  43. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06461/r06461.hrc
  44. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r06462.bin
  45. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r06462.hrc
  46. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064620.bin
  47. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064622.bin
  48. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064624.bin
  49. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064626.bin
  50. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06464/r06464.bin
  51. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06464/r06464.hrc
  52. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06465/r06465.bin
  53. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06465/r06465.hrc
  54. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r06466.bin
  55. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r06466.hrc
  56. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064660.bin
  57. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064662.bin
  58. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064664.bin
  59. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064666.bin
  60. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r06600.bin
  61. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r06600.hrc
  62. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066000.bin
  63. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066002.bin
  64. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066004.bin
  65. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066006.bin
  66. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r06602.bin
  67. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r06602.hrc
  68. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066020.bin
  69. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066022.bin
  70. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066023.bin
  71. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066024.bin
  72. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066026.bin
  73. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r06604.bin
  74. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r06604.hrc
  75. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066040.bin
  76. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066042.bin
  77. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066044.bin
  78. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066046.bin
  79. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r06606.bin
  80. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r06606.hrc
  81. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066060.bin
  82. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066062.bin
  83. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066064.bin
  84. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066066.bin
  85. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06621/r06621.bin
  86. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06621/r06621.hrc
  87. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06623/r06623.bin
  88. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06623/r06623.hrc
  89. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r06624.bin
  90. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r06624.hrc
  91. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066240.bin
  92. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066241.bin
  93. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066242.bin
  94. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066244.bin
  95. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066246.bin
  96. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06625/r06625.bin
  97. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06625/r06625.hrc
  98. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r06640.bin
  99. BIN
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r06640.hrc
  100. 0 0
      server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r066400.bin

+ 1 - 2
.env

@@ -1,2 +1 @@
-VITE_API_BASE_URL=dev
-VITE_DEV_PORT = 5178
+VITE_DEV_PORT = 5178

+ 2 - 0
.env.development

@@ -0,0 +1,2 @@
+VITE_API_BASE_URL=dev
+VITE_DEV_PORT = 5178

+ 3 - 0
server/index.js

@@ -0,0 +1,3 @@
+import { createServer } from './mock.js'
+
+createServer(8080)

+ 12 - 3
server/mock.ts

@@ -2,19 +2,28 @@ import express from "express";
 import path from "path";
 import bodyParser from 'body-parser'
 import * as fs from "fs";
+import { fileURLToPath } from 'url';
 import fileUpload from 'express-fileupload'
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 const staticDir = path.resolve(__dirname, "test");
+const publicDir = path.resolve(__dirname, "../dist");
 
-console.log(staticDir);
 let startup = false;
-export async function createServer(port: number) {
+
+
+
+export async function createServer(port) {
   if (startup) {
     return;
   }
 
   const app = express();
   app.use(express.static(staticDir));
+  console.log(publicDir)
+  app.use(express.static(publicDir));
   app.use(bodyParser({ limit: '200mb' }))
   app.use(fileUpload({createParentPath: true}))
   app.listen(port);
@@ -36,7 +45,7 @@ export async function createServer(port: number) {
   })
 
   app.post("/:sceneCode/upload", (req, res) => {
-    const file = (req as any).files.file
+    const file = (req).files.file
     const relUrl = `/attach/upload/${file.name}`
     const absUrl = path.resolve(staticDir, `./${req.params.sceneCode}/${relUrl}`)
     console.log("上传图片完成路径为", relUrl)

BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06240/r06240.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06240/r06240.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06242/r06242.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06242/r06242.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06244/r06244.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06244/r06244.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06246/r06246.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06246/r06246.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06420/r06420.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06420/r06420.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06421/r06421.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06421/r06421.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r06422.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r06422.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064220.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064222.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064224.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06422/r064226.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r06424.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r06424.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064241.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064242.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064243.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064244.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064245.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064246.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06424/r064247.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06425/r06425.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06425/r06425.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r06426.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r06426.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064260.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064262.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064264.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06426/r064266.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06460/r06460.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06460/r06460.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06461/r06461.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06461/r06461.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r06462.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r06462.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064620.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064622.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064624.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06462/r064626.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06464/r06464.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06464/r06464.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06465/r06465.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06465/r06465.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r06466.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r06466.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064660.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064662.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064664.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06466/r064666.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r06600.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r06600.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066000.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066002.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066004.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06600/r066006.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r06602.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r06602.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066020.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066022.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066023.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066024.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06602/r066026.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r06604.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r06604.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066040.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066042.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066044.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06604/r066046.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r06606.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r06606.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066060.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066062.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066064.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06606/r066066.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06621/r06621.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06621/r06621.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06623/r06623.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06623/r06623.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r06624.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r06624.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066240.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066241.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066242.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066244.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06624/r066246.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06625/r06625.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06625/r06625.hrc


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r06640.bin


BIN
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r06640.hrc


+ 0 - 0
server/test/SS-t-P1d6CwREny2 2/webcloud/data/r/06640/r066400.bin


Some files were not shown because too many files changed in this diff