代码优化

f6e6d6d9 · 朱哲铨 · 0834896a · f6e6d6d9 · f6e6d6d9 · f6e6d6d9
Commit f6e6d6d9 authored Aug 10, 2024 by 朱哲铨
9 changed files
--- a/README.md
+++ b/README.md
@@ -496,8 +496,8 @@
             function.js    Slice管理
             be_sysConfig.js   系统设置
         routes   目录: 存放 exporess 路由
-             be_routes.js    路由定义
+             index.js    路由定义
-         be_nodeSrv.js    express 服务器 
+         server.js    express 服务器 
  ```
 - 增加 lowdb 支持 
@@ -575,11 +575,11 @@
 - Web Server 服务器
-  代码: src/backend/webserver/be_nodeSrv.js:  
+  代码: src/backend/webserver/server.js:  
  ```javascript
  import express from "express";
-  import router from "./routes/be_routes.js";
+  import router from "./routes/index.js";
  const PORT = 3000;
  const webApp = express();
@@ -615,7 +615,7 @@
 - Express的API 路由:
-  代码: src/backend/webserver/routes/be_routes.js
+  代码: src/backend/webserver/routes/index.js
  ```javascript
  import express from "express";
@@ -681,7 +681,7 @@
  import { app, protocol, BrowserWindow, Menu } from "electron";
  import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
-  + import webApp from "@/backend/webserver/be_nodeSrv.js";
+  + import webApp from "@/backend/webserver/server.js";
  ...
  ```

--- a/src/backend/webserver/entity/function.js
+++ b/src/backend/webserver/entity/function.js
@@ -2,7 +2,7 @@ import {
  downloadImage,
  toSend,
  writeProfileXml
-} from "@/backend/webserver/utils";
+} from "@/backend/utils";
 const compressing = require("compressing");
 var uuid = require("uuid");
@@ -10,11 +10,9 @@ const path = require("path");
 const fs = require("fs");
 const os = require("os");
 import axios from "axios";
 var multiparty = require("multiparty");
-let fn = new Object();
+export default {
+  getPodProductionInfo: async (req, res) => {
-fn.getPodProductionInfo = async (req, res) => {
    const token = req.headers["jwt-token"];
    const company = req.headers["company"];
    const productionNo = req.body.productionNo;
@@ -54,8 +52,8 @@ fn.getPodProductionInfo = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.findByPodProductionNo = async (req, res) => {
+  findByPodProductionNo: async (req, res) => {
    const token = req.headers["jwt-token"];
    const company = req.headers["company"];
    const q = req.body;
@@ -71,8 +69,8 @@ fn.findByPodProductionNo = async (req, res) => {
    } catch (err) {
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.getCompanyList = async (req, res) => {
+  getCompanyList: async (req, res) => {
    try {
      let { data } = await axios.get(
        "https://platform.jomalls.com/api/tools/getCompanyList"
@@ -82,8 +80,8 @@ fn.getCompanyList = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.commitApply = async (req, res) => {
+  commitApply: async (req, res) => {
    const company = req.headers["company"];
    const q = req.body;
    try {
@@ -96,8 +94,8 @@ fn.commitApply = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.completeDelivery = async (req, res) => {
+  completeDelivery: async (req, res) => {
    const token = req.headers["jwt-token"];
    const company = req.headers["company"];
    const q = req.body;
@@ -113,8 +111,8 @@ fn.completeDelivery = async (req, res) => {
    } catch (err) {
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.downloadByDesignId = async (req, res) => {
+  downloadByDesignId: async (req, res) => {
    let q = req.body;
    try {
      let dir = path.join(os.homedir(), "/Desktop/" + q.productionNo + ".zip");
@@ -156,8 +154,8 @@ fn.downloadByDesignId = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.uploadImage = async (req, res) => {
+  uploadImage: async (req, res) => {
    try {
      const p = path.join(process.cwd(), "./print/Input/");
      let fileName = uuid.v4() + ".png";
@@ -183,8 +181,8 @@ fn.uploadImage = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
-fn.getPngImg = async (req, res) => {
+  getPngImg: async (req, res) => {
    try {
      const filePath = path.join(
        process.cwd(),
@@ -209,9 +207,8 @@ fn.getPngImg = async (req, res) => {
    } catch (err) {
      res.send({ code: 500, msg: err });
    }
-};
+  },
+  login: async (req, res) => {
-fn.login = async (req, res) => {
    const { loginName, company, password, deviceId } = req.body;
    try {
      let { data } = await axios.post(`https://${company}/api/sysLogin/login`, {
@@ -225,9 +222,8 @@ fn.login = async (req, res) => {
      console.log(err);
      res.json({ code: 500, msg: err });
    }
-};
+  },
+  toPrint: (req, res) => {
-fn.toPrint = (req, res) => {
    let body = req.body;
    writeProfileXml(body); // 写入xml文件
    // GTXproCMD.exe print -X "Profile\\CO12.xml" -I "Input\\sample.png" -A "Output\\pO12.arxp" -S 03000400 -L 02540254
@@ -238,6 +234,6 @@ fn.toPrint = (req, res) => {
      .catch(err => {
        res.send({ code: 500, msg: err });
      });
+  }
 };
-export { fn as default };
--- a/src/backend/webserver/routes/be_routes.js
+++ b/src/backend/webserver/routes/be_routes.js
@@ -5,16 +5,26 @@ import fn from "../entity/function.js";
 let router = express.Router();
+// 执行打印命令
 router.post("/toPrint", fn.toPrint);
+// 登录接口
 router.post("/login", fn.login);
+// 获取本地文件返回
 router.post("/getPngImg", fn.getPngImg);
+// 上传文件到本地
 router.post("/uploadImage", fn.uploadImage);
+// 获取公司列表
 router.get("/getCompanyList", fn.getCompanyList);
+// 提交授权申请
 router.post("/commitApply", fn.commitApply);
+// 下载素材到本地
 router.post("/downloadByDesignId", fn.downloadByDesignId);
+// 获取 生产单号返回素材地址
 router.post("/getPodProductionInfo", fn.getPodProductionInfo);
+// 提交生产完成
 router.post("/completeDelivery", fn.completeDelivery);
+// 根据生产单号查询详情
 router.post("/findByPodProductionNo", fn.findByPodProductionNo);
-export {router as default};
+export { router as default };
--- a/src/backend/webserver/be_nodeSrv.js
+++ b/src/backend/webserver/be_nodeSrv.js
 import express from "express";
-import router from "./routes/be_routes.js";
+import router from "./routes/index.js";
 const PORT = 3000;
 const webApp = express();
@@ -9,12 +9,12 @@ webApp.use(express.urlencoded({ extended: false }));
 webApp.use("/", router);
 // catch 404
-webApp.use((req, res, next) => {
+webApp.use((req, res) => {
  res.status(404).send("Sorry! 404 Error.");
 });
 // error handler, 4个参数
-webApp.use((err, req, res, next) => {
+webApp.use((err, req, res) => {
  // set locals, only providing error in development
  res.locals.message = err.message;
  res.locals.error = req.app.get("env") === "development" ? err : {};

--- a/src/backend/webserver/utils/index.js
+++ b/src/backend/webserver/utils/index.js
--- a/src/background.js
+++ b/src/background.js
 "use strict";
-import { contextBridge, ipcMain, ipcRenderer } from "electron";
+import {  ipcMain } from "electron";
-import { app, protocol, BrowserWindow, Menu, screen } from "electron";
+import { app, protocol, BrowserWindow, screen } from "electron";
 import { createProtocol } from "vue-cli-plugin-electron-builder/lib";
-import webApp from "@/backend/webserver/be_nodeSrv.js";
+import webApp from "@/backend/server.js";
-let isCreateWin = false;
 const isDevelopment = process.env.NODE_ENV !== "production";
 let win;

--- a/src/main.js
+++ b/src/main.js
@@ -2,14 +2,14 @@ import Vue from "vue";
 import App from "./App.vue";
 import router from "./router";
 import store from "./store";
-import VueI18n from 'vue-i18n';
+import VueI18n from "vue-i18n";
 import VueCompositionApi from "@vue/composition-api";
 import { Message } from "element-ui";
 // 挂载到$message上
-import api from '@/utils/axios'
+import api from "@/utils/axios";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
-import dataStore from 'electron-store';
+import dataStore from "electron-store";
 const DataStore = new dataStore();
@@ -18,20 +18,19 @@ Vue.use(ElementUI);
 Vue.use(VueCompositionApi);
 Vue.use(VueI18n);
-Vue.prototype.$message = Message
+Vue.prototype.$message = Message;
-Vue.prototype.$dataStore = DataStore
+Vue.prototype.$dataStore = DataStore;
-Vue.prototype.$store = store
+Vue.prototype.$store = store;
-Vue.prototype.$api = api
+Vue.prototype.$api = api;
-Vue.prototype.$message = Message
+Vue.prototype.$message = Message;
 const i18n = new VueI18n({
-  locale: 'zh',
+  locale: "zh",
  messages: {
-    'zh': require('./i18n/zh.js'),
+    zh: require("./i18n/zh.js"),
-    'en': require('./i18n/en.js')
+    en: require("./i18n/en.js")
  }
 });
 new Vue({
  router,
  store,

--- a/src/preload.js
+++ b/src/preload.js
--- a/src/preloadOther.js
+++ b/src/preloadOther.js