@k3000/s1 0.1.5 → 0.1.7

package/admin/base.mjs

@@ -1,4 +1,4 @@
-import {Base} from 'tools2/router.mjs'
+import {Base} from '@k3000/express'
 import {fromJWT} from "../common/tools.mjs";
 import {store1} from './service.mjs'
 import {adminLifetime} from "../common/config.mjs";

package/admin/index.mjs

@@ -1,4 +1,4 @@
-import {Express} from "tools2/router.mjs";
+import {Express} from "@k3000/express";
 import bodyParser from "body-parser";
 import fileUpload from "express-fileupload";
 import {adminServicePort} from "../common/config.mjs";

package/admin/monitor/server.mjs

@@ -1,4 +1,4 @@
-import {cpu, disk, mem, node, sys} from "tools2/info.mjs"
+import {cpu, disk, mem, node, sys} from "@k3000/info"
 import {AdminAuth} from "../base.mjs";
 
 export class Server extends AdminAuth {

package/admin/service.mjs

@@ -1,8 +1,8 @@
-import createServer from 'tools2/server.mjs'
+import createServer from '@k3000/server'
 import {adminUdpPort as port} from "../common/config.mjs";
 import {service as pools} from '../common/service.mjs'
 
-/*const service = */createServer({pools, port})
+/*const service = */createServer({port, type: "udp"}, pools)
 
 console.log('running on ' + port)
 

package/admin/tool/gen.mjs

@@ -1,4 +1,4 @@
-import Query from "tools2/mysql2ssh2.mjs";
+import Query from "@k3000/mysql";
 import {mysql} from "../../common/config.mjs";
 import {AdminAuth, AdminAuthPerm, NoActionHandle, NoActionParams} from "../base.mjs";
 import {store1} from "../service.mjs";

package/app/index.mjs

@@ -1,4 +1,4 @@
-import {Express} from "tools2/router.mjs";
+import {Express} from "@k3000/express";
 import bodyParser from "body-parser";
 import {appServicePort} from "../common/config.mjs";
 
@@ -6,4 +6,4 @@ const app = new Express({
     port: appServicePort,
     callback: () => console.log('running on ' + appServicePort),
 })
-app.use(bodyParser.urlencoded({extended: true}));
+app.use(bodyParser.urlencoded({extended: true}));

package/bin.mjs

@@ -65,6 +65,7 @@ function init(override) {
     myCopyFn('谨慎打开', '谨慎打开', override)
     myCopyFn('build.mjs', 'build.mjs', override)
     myCopyFn('index.mjs', 'index.mjs', override)
+    myCopyFn('package.json', 'package.json', override)
 
     // pm2.del(uiService)
     // pm2.add(uiService, './backstage/index.mjs')
@@ -79,6 +80,8 @@ function init(override) {
     pm2.exec('npm i @k3000/server').log()
     pm2.exec('npm i @k3000/store').log()
     pm2.exec('npm i @k3000/tools').log()
+    pm2.exec('npm i @k3000/info').log()
+    pm2.exec('npm i @k3000/build').log()
     pm2.exec('npm i svg-captcha').log()
     pm2.exec('npm i mysql2').log()
     pm2.exec('npm i ssh2').log()

package/build.mjs

@@ -1,4 +1,4 @@
-/*import {build} from 'tools2/module.mjs'
+/*import {build} from '@k3000/build'
 
 // build('admin', 'index', 'admin') // 打包
 // build('jwt', 'index', 'jwt') // 打包
@@ -11,7 +11,7 @@ build('test', {
 // import './test/index.mjs'
 import './index2.mjs'
 
-/*import {build} from 'tools2/module.mjs'
+/*import {build} from '@k3000/build'
 
 // build('admin', 'index', 'admin') // 打包
 // build('jwt', 'index', 'jwt') // 打包

package/common/tools.mjs

@@ -1,4 +1,4 @@
-import {Cipher} from "tools2";
+import {Cipher} from "@k3000/tools";
 import {jwtLifetime, jwtSalt} from "./config.mjs";
 import {readdirSync, statSync} from "node:fs";
 

package/files/package.json

@@ -0,0 +1,26 @@
+{
+  "scripts": {
+    "admin": "node admin/index.mjs",
+    "store1": "node store1/index.mjs",
+    "proxy": "node proxy/index.mjs",
+    "jwt": "node jwt/index.mjs",
+    "app": "node app/index.mjs"
+  },
+  "dependencies": {
+    "@k3000/build": "^0.1.1",
+    "@k3000/express": "^0.1.1",
+    "@k3000/info": "^0.1.0",
+    "@k3000/mysql": "^0.1.0",
+    "@k3000/proxy": "^0.2.0",
+    "@k3000/server": "^1.0.5",
+    "@k3000/store": "^0.1.0",
+    "@k3000/tools": "^0.1.1",
+    "archiver": "^7.0.1",
+    "body-parser": "^1.20.3",
+    "exceljs": "^4.4.0",
+    "express-fileupload": "^1.5.1",
+    "mysql2": "^3.11.4",
+    "ssh2": "^1.16.0",
+    "svg-captcha": "^1.4.0"
+  }
+}

package/jwt/index.mjs

@@ -1,11 +1,11 @@
-import createServer from 'tools2/server.mjs'
+import createServer from '@k3000/server'
 import {jwtPort as port} from "../common/config.mjs";
 import {service as pools} from "../common/service.mjs";
 import {fromJWT, toJWT} from "../common/tools.mjs";
 
 const map = new Map
 
-const service = createServer({pools, port, map})
+const service = createServer({port, map, type: "udp"}, pools)
 
 console.log('running on ' + port)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@k3000/s1",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "",
   "scripts": {
     "sync": "npm link",

package/proxy/index.mjs

@@ -1,4 +1,4 @@
-import {createProxy} from "tools2/proxy.mjs";
+import {createProxy} from "@k3000/proxy";
 import {proxyMap, proxyPort} from "../common/config.mjs";
 
 try {

package/store1/index.mjs

@@ -1,11 +1,11 @@
-import createServer from 'tools2/server.mjs'
+import createServer from '@k3000/server'
 import {store1Port as port} from "../common/config.mjs";
 import store from "./store/index.mjs";
 import {Pools} from "../common/tools.mjs";
 
 const map = new Pools()
 
-createServer({port, map})
+createServer({port, map, type: "udp"})
 
 map.set('/getSetList', data => Object.keys(store).join(','))
 

package/store1/tool.mjs

@@ -1,6 +1,6 @@
 import {colIncludes, page, Pools, rowSlice, update} from "../common/tools.mjs";
 import store, {getStruct, remark} from "./store/index.mjs";
-import Query from "tools2/mysql2ssh2.mjs";
+import Query from "@k3000/mysql";
 import {mysql, serverDir} from "../common/config.mjs";
 import {
     columnNameNotEdit,