Browse Source

commonJS语法

CzRger 1 year ago
parent
commit
2ee37880be

+ 1 - 0
.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .idea/
 yarn.lock
+*.exe

+ 4 - 2
package.json

@@ -1,11 +1,13 @@
 {
   "name": "ax-node",
   "version": "1.0.0",
-  "type": "module",
+  "type": "commonjs",
   "description": "",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "win": "pkg ./src/app.js -t win",
+    "linux": "pkg ./src/app.js -t linux"
   },
   "keywords": [],
   "author": "",

+ 5 - 5
app.js

@@ -1,7 +1,7 @@
-import express from 'express'
-import cors from 'cors'
-import bodyParser from 'body-parser'
-import multiparty from 'connect-multiparty'
+const express = require('express')
+const cors = require('cors')
+const bodyParser = require('body-parser')
+const multiparty = require('connect-multiparty')
 
 const port = 3000
 
@@ -18,7 +18,7 @@ app.use(bodyParser.urlencoded({
 app.use(bodyParser.json())
 // 处理 mutipart/form-data
 app.use(multiparty())
-import shipTestRouter from "./ship-test/routers/index.js";
+const shipTestRouter = require('./ship-test/routers/index');
 app.use('/ship-test', shipTestRouter)
 // 启动
 app.listen(port, () => {

+ 1 - 1
ship-test/config/api.js

@@ -2,7 +2,7 @@ const resultCode = {
     200: '请求成功',
     500: '请求失败'
 }
-export default class ApiResult {
+module.exports = class ApiResult {
     constructor(code, data, msg) {
         this.code = code
         this.data = data

+ 12 - 7
ship-test/config/db.js

@@ -1,9 +1,14 @@
-import * as mysql from 'mysql'
+const mysql = require('mysql')
 const db_config = {
-    host: '74.10.28.37',
-    user: 'ax_tj_seat',
-    password: 'Taiji@2023#seat',
-    port: "45371",
+    // host: '74.10.28.37',
+    // user: 'ax_tj_seat',
+    // password: 'Taiji@2023#seat',
+    // port: "45371",
+    // database: 'seat_tools'
+    host: '8.140.240.182',
+    user: 'root',
+    password: 'Taiji@2023#data',
+    port: "18080",
     database: 'seat_tools'
 }
 // 进行数据库交互
@@ -45,6 +50,6 @@ const closeMysql = (connect) => {
     })
 }
 // 导出方法
-export {
+module.exports = {
     sqlHandle
-}
+}

+ 2 - 2
ship-test/config/page.js

@@ -1,4 +1,4 @@
-import {sqlHandle} from "./db.js";
+const {sqlHandle} = require("./db")
 
 const PageResult = async (sql, pageNum, pageSize, Entity) => {
     const result = await sqlHandle(sql)
@@ -7,4 +7,4 @@ const PageResult = async (sql, pageNum, pageSize, Entity) => {
         total: result.length
     }
 }
-export default PageResult
+module.exports = PageResult

ship-test/config/seat_tools.sql → src/ship-test/config/seat_tools.sql


+ 3 - 3
ship-test/control/hover-control.js

@@ -1,5 +1,5 @@
-import HoverService from "../service/hover-service.js";
-import ApiResult from "../config/api.js";
+const HoverService = require("../service/hover-service")
+const ApiResult = require("../config/api")
 const HoverControl = {
   list: async (req, res) => {
     try {
@@ -68,4 +68,4 @@ const HoverControl = {
     }
   },
 }
-export default HoverControl
+module.exports = HoverControl

+ 3 - 3
ship-test/control/params-control.js

@@ -1,5 +1,5 @@
-import ParamsService from "../service/params-service.js";
-import ApiResult from "../config/api.js";
+const ParamsService = require("../service/params-service")
+const ApiResult = require("../config/api")
 const ParamsControl = {
   list: async (req, res) => {
     try {
@@ -68,4 +68,4 @@ const ParamsControl = {
     }
   },
 }
-export default ParamsControl
+module.exports = ParamsControl

+ 3 - 3
ship-test/control/params-dict-control.js

@@ -1,5 +1,5 @@
-import ParamsDictService from "../service/params-dict-service.js";
-import ApiResult from "../config/api.js";
+const ParamsDictService = require("../service/params-dict-service")
+const ApiResult = require("../config/api")
 const ParamsDictControl = {
   list: async (req, res) => {
     try {
@@ -90,4 +90,4 @@ const ParamsDictControl = {
     }
   },
 }
-export default ParamsDictControl
+module.exports = ParamsDictControl

+ 7 - 7
ship-test/control/ship-filter-control.js

@@ -1,9 +1,9 @@
-import SourceService from "../service/source-service.js";
-import ApiResult from "../config/api.js";
-import ParamsService from "../service/params-service.js";
-import ParamsDictService from "../service/params-dict-service.js";
-import TrackService from "../service/track-service.js";
-import HoverService from "../service/hover-service.js";
+const SourceService = require("../service/source-service")
+const ApiResult = require("../config/api")
+const ParamsService = require("../service/params-service")
+const ParamsDictService = require("../service/params-dict-service")
+const TrackService = require("../service/track-service")
+const HoverService = require("../service/hover-service")
 const ShipFilterControl = {
   getConfig: async (req, res) => {
     try {
@@ -26,4 +26,4 @@ const ShipFilterControl = {
     }
   },
 }
-export default ShipFilterControl
+module.exports = ShipFilterControl

+ 3 - 3
ship-test/control/source-control.js

@@ -1,5 +1,5 @@
-import SourceService from "../service/source-service.js";
-import ApiResult from "../config/api.js";
+const SourceService = require("../service/source-service")
+const ApiResult = require("../config/api")
 const SourceControl = {
   list: async (req, res) => {
     try {
@@ -68,4 +68,4 @@ const SourceControl = {
     }
   },
 }
-export default SourceControl
+module.exports = SourceControl

+ 3 - 3
ship-test/control/track-control.js

@@ -1,5 +1,5 @@
-import TrackService from "../service/track-service.js";
-import ApiResult from "../config/api.js";
+const TrackService = require("../service/track-service")
+const ApiResult = require("../config/api")
 const TrackControl = {
   list: async (req, res) => {
     try {
@@ -79,4 +79,4 @@ const TrackControl = {
     }
   },
 }
-export default TrackControl
+module.exports = TrackControl

+ 2 - 2
ship-test/entity/hover-entity.js

@@ -1,6 +1,6 @@
-import {objToCamel, isValue, YMDHms} from "../../util/index.js";
+const {objToCamel, isValue, YMDHms} = require("../../util/index")
 
-export default class ParamsEntity {
+module.exports = class ParamsEntity {
   constructor(obj) {
     objToCamel(obj)
     this.sourceId = isValue(obj?.sourceId) ? obj.sourceId : null

+ 2 - 2
ship-test/entity/params-dict-entity.js

@@ -1,6 +1,6 @@
-import {objToCamel, isValue, YMDHms} from "../../util/index.js";
+const {objToCamel, isValue, YMDHms} = require("../../util/index")
 
-export default class ParamsEntity {
+module.exports = class ParamsEntity {
   constructor(obj) {
     objToCamel(obj)
     this.paramsId = isValue(obj?.paramsId) ? obj.paramsId : null

+ 2 - 2
ship-test/entity/params-entity.js

@@ -1,6 +1,6 @@
-import {objToCamel, isValue, YMDHms} from "../../util/index.js";
+const {objToCamel, isValue, YMDHms} = require("../../util/index")
 
-export default class ParamsEntity {
+module.exports = class ParamsEntity {
   constructor(obj) {
     objToCamel(obj)
     this.sourceId = isValue(obj?.sourceId) ? obj.sourceId : null

+ 2 - 2
ship-test/entity/source-entity.js

@@ -1,6 +1,6 @@
-import {objToCamel, isValue, YMDHms} from "../../util/index.js";
+const {objToCamel, isValue, YMDHms} = require("../../util/index")
 
-export default class SourceEntity {
+module.exports = class SourceEntity {
   constructor(obj) {
     objToCamel(obj)
     this.id = isValue(obj?.id) ? obj.id : null

+ 2 - 2
ship-test/entity/track-entity.js

@@ -1,6 +1,6 @@
-import {objToCamel, isValue, YMDHms} from "../../util/index.js";
+const {objToCamel, isValue, YMDHms} = require("../../util/index")
 
-export default class ParamsEntity {
+module.exports = class ParamsEntity {
   constructor(obj) {
     objToCamel(obj)
     this.sourceId = isValue(obj?.sourceId) ? obj.sourceId : null

+ 9 - 8
ship-test/routers/index.js

@@ -1,10 +1,11 @@
-import express from 'express'
-import SourceControl from "../control/source-control.js";
-import ParamsControl from "../control/params-control.js";
-import ParamsDictControl from "../control/params-dict-control.js";
-import TrackControl from "../control/track-control.js";
-import HoverControl from "../control/hover-control.js";
-import ShipFilterControl from "../control/ship-filter-control.js";
+const express = require("express")
+const SourceControl = require("../control/source-control")
+const ParamsControl = require("../control/params-control")
+const ParamsDictControl = require("../control/params-dict-control")
+const TrackControl = require("../control/track-control")
+const HoverControl = require("../control/hover-control")
+const ShipFilterControl = require("../control/ship-filter-control")
+
 const shipTestRouter = express.Router()
 // 数据源
 shipTestRouter.post('/source/list', SourceControl.list)
@@ -46,4 +47,4 @@ shipTestRouter.put('/hover/edit', HoverControl.edit)
 shipTestRouter.delete('/hover/del/:ids', HoverControl.del)
 // 船筛
 shipTestRouter.get('/ship-filter/get-config', ShipFilterControl.getConfig)
-export default shipTestRouter
+module.exports = shipTestRouter

+ 5 - 5
ship-test/service/hover-service.js

@@ -1,7 +1,7 @@
-import {sqlHandle} from "../config/db.js";
-import {isValue, paramToUnder} from "../../util/index.js";
-import PageResult from "../config/page.js";
-import HoverEntity from "../entity/hover-entity.js";
+const {sqlHandle} = require("../config/db")
+const {isValue, paramToUnder} = require("../../util/index")
+const PageResult = require("../config/page")
+const HoverEntity = require("../entity/hover-entity")
 const HoverService = {
   list: ({sourceId, name, orderByColumn, isAsc}) => {
     return new Promise(async (resolve, reject) => {
@@ -190,4 +190,4 @@ const HoverService = {
     })
   }
 }
-export default HoverService
+module.exports = HoverService

+ 5 - 5
ship-test/service/params-dict-service.js

@@ -1,7 +1,7 @@
-import {sqlHandle} from "../config/db.js";
-import {isValue, paramToUnder} from "../../util/index.js";
-import PageResult from "../config/page.js";
-import ParamsDictEntity from "../entity/params-dict-entity.js";
+const {sqlHandle} = require("../config/db")
+const {isValue, paramToUnder} = require("../../util/index")
+const PageResult = require("../config/page")
+const ParamsDictEntity = require("../entity/params-dict-entity")
 const ParamsDictService = {
   list: ({paramsId, name, orderByColumn, isAsc}) => {
     return new Promise(async (resolve, reject) => {
@@ -206,4 +206,4 @@ const ParamsDictService = {
     })
   }
 }
-export default ParamsDictService
+module.exports = ParamsDictService

+ 5 - 5
ship-test/service/params-service.js

@@ -1,7 +1,7 @@
-import {sqlHandle} from "../config/db.js";
-import {isValue, paramToUnder} from "../../util/index.js";
-import PageResult from "../config/page.js";
-import ParamsEntity from "../entity/params-entity.js";
+const {sqlHandle} = require("../config/db")
+const {isValue, paramToUnder} = require("../../util/index")
+const PageResult = require("../config/page")
+const ParamsEntity = require("../entity/params-entity")
 const ParamsService = {
   list: ({sourceId, name, orderByColumn, isAsc}) => {
     return new Promise(async (resolve, reject) => {
@@ -167,4 +167,4 @@ const ParamsService = {
     })
   }
 }
-export default ParamsService
+module.exports = ParamsService

+ 5 - 5
ship-test/service/source-service.js

@@ -1,7 +1,7 @@
-import {sqlHandle} from "../config/db.js";
-import {isValue, paramToUnder} from "../../util/index.js";
-import PageResult from "../config/page.js";
-import SourceEntity from "../entity/source-entity.js";
+const {sqlHandle} = require("../config/db")
+const {isValue, paramToUnder} = require("../../util/index")
+const PageResult = require("../config/page")
+const SourceEntity = require("../entity/source-entity")
 const SourceService = {
   list: ({name, orderByColumn, isAsc}) => {
     return new Promise(async (resolve, reject) => {
@@ -167,4 +167,4 @@ const SourceService = {
     })
   }
 }
-export default SourceService
+module.exports = SourceService

+ 5 - 5
ship-test/service/track-service.js

@@ -1,7 +1,7 @@
-import {sqlHandle} from "../config/db.js";
-import {isValue, paramToUnder} from "../../util/index.js";
-import PageResult from "../config/page.js";
-import TrackEntity from "../entity/track-entity.js";
+const {sqlHandle} = require("../config/db")
+const {isValue, paramToUnder} = require("../../util/index")
+const PageResult = require("../config/page")
+const TrackEntity = require("../entity/track-entity")
 const TrackService = {
   list: ({sourceId, name, orderByColumn, isAsc}) => {
     return new Promise(async (resolve, reject) => {
@@ -182,4 +182,4 @@ const TrackService = {
     })
   }
 }
-export default TrackService
+module.exports = TrackService

+ 8 - 8
util/index.js

@@ -1,4 +1,4 @@
-export const isValue = (val) => {
+module.exports.isValue = (val) => {
   if (val === null || val === undefined || (typeof val === 'string' && val.trim() === '') || (typeof val === 'object' && val?.length === 0)) {
     return false
   }
@@ -6,7 +6,7 @@ export const isValue = (val) => {
 }
 
 // 对象转驼峰命名
-export const objToCamel = (obj) => {
+module.exports.objToCamel = (obj) => {
   for (let key in obj) {
     let newKey = key.replace(/_([a-z])/g, function($0, $1){ return $1.toUpperCase(); });
     if (newKey !== key) {
@@ -16,7 +16,7 @@ export const objToCamel = (obj) => {
   }
 }
 // 对象转下划线命名
-export const objToUnder = (obj) => {
+module.exports.objToUnder = (obj) => {
   for (let key in obj) {
     let newKey = key.replace(/([A-Z])/g, '_$1').toLowerCase();
     if (newKey !== key) {
@@ -26,15 +26,15 @@ export const objToUnder = (obj) => {
   }
 }
 // 参数转驼峰命名
-export const paramToCamel = (param) => {
+module.exports.paramToCamel = (param) => {
   return  param.replace(/_([a-z])/g, function($0, $1){ return $1.toUpperCase(); });
 }
 // 参数转下划线命名
-export const paramToUnder = (param) => {
+module.exports.paramToUnder = (param) => {
   return param.replace(/([A-Z])/g, '_$1').toLowerCase();
 }
 
-export const YMDHms = (date) => {
+module.exports.YMDHms = (date) => {
   const _date = new Date(date)
   const Y = `${_date.getFullYear()}`;
   const M = `${_date.getMonth() + 1 < 10 ? `0${_date.getMonth() + 1}` : _date.getMonth() + 1}`;
@@ -45,7 +45,7 @@ export const YMDHms = (date) => {
   return `${Y}-${M}-${D} ${H}:${m}:${s}`;
 }
 
-export const YMD = (date, format = false) => {
+module.exports.YMD = (date, format = false) => {
   const _date = new Date(date)
   const Y = `${_date.getFullYear()}`;
   const M = `${_date.getMonth() + 1 < 10 ? `0${_date.getMonth() + 1}` : _date.getMonth() + 1}`;
@@ -53,7 +53,7 @@ export const YMD = (date, format = false) => {
   return format ? `${Y}年${M}月${D}日` : `${Y}-${M}-${D}`;
 }
 
-export const Hms = (date, format = false) => {
+module.exports.Hms = (date, format = false) => {
   const _date = new Date(date)
   const H = `${_date.getHours() < 10 ? `0${_date.getHours()}` : _date.getHours()}`;
   const m = `${_date.getMinutes() < 10 ? `0${_date.getMinutes()}` : _date.getMinutes()}`;