@k3000/s1 0.1.8 → 0.2.1

package/bin.mjs

@@ -65,7 +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)
+    myCopyFn('files/package.json', 'package.json', override)
 
     // pm2.del(uiService)
     // pm2.add(uiService, './backstage/index.mjs')

package/build.mjs

@@ -1,25 +1,17 @@
-/*import {build} from '@k3000/build'
+import {build} from '@k3000/build'
+import {copyDir} from "./common/tools.mjs";
+import {existsSync, mkdirSync} from 'node:fs'
 
-// build('admin', 'index', 'admin') // 打包
-// build('jwt', 'index', 'jwt') // 打包
-// build('proxy', 'index', 'proxy') // 打包
-build('test', {
-    target: 'index2.mjs',
-    except: ['test/a']
-}) // 打包*/
-
-// import './test/index.mjs'
-import './index2.mjs'
-
-/*import {build} from '@k3000/build'
-
-// build('admin', 'index', 'admin') // 打包
-// build('jwt', 'index', 'jwt') // 打包
-// build('proxy', 'index', 'proxy') // 打包
+build('admin', 'bin/admin') // 打包
+build('jwt', 'bin/jwt') // 打包
+build('proxy', 'bin/proxy') // 打包
 build('store1', {
-    target: 'store1/index2.mjs',
+    target: 'bin/store1',
     except: ['store1/store']
-}) // 打包*/
+}) // 打包
+
+if (!existsSync('bin')) mkdirSync('bin')
 
-// import './store1/index.mjs'
-// import './store1/index2.mjs'
+copyDir('common', 'bin/common')
+copyDir('static', 'bin/static')
+copyDir('package.json', 'bin')

package/common/tools.mjs

@@ -1,6 +1,7 @@
 import {Cipher} from "@k3000/tools";
-import {jwtLifetime, jwtSalt} from "./config.mjs";
-import {readdirSync, statSync} from "node:fs";
+import {jwtLifetime, jwtSalt, staticDir} from "./config.mjs";
+import {existsSync, mkdirSync, readdirSync, statSync, readFileSync, appendFileSync} from "node:fs";
+import {basename} from "node:path";
 
 /**
  * 生成固定格式数据
@@ -312,3 +313,39 @@ export const rowSlice = (rows, index, size) => {
     return rows.slice((index - 1) * size, index * size)
 }
 
+export const copyDir = (source, target) => {
+
+    if (!existsSync(source)) return
+
+    const stat = statSync(source)
+
+    if (stat.isDirectory()) {
+
+        if (!existsSync(target)) {
+
+            mkdirSync(target)
+        }
+
+        for (const name of readdirSync(source)) {
+
+            copyDir(`${source}/${name}`, `${target}/${name}`)
+        }
+
+    } else if (stat.isFile()) {
+
+        if (existsSync(target) && statSync(target).isDirectory()) {
+
+            if (!existsSync(target)) {
+
+                mkdirSync(target)
+            }
+
+            target = `${target}/${basename(source)}`
+        }
+
+        if (!existsSync(target)) {
+
+            appendFileSync(target, readFileSync(source))
+        }
+    }
+}

package/files/package.json

@@ -4,10 +4,11 @@
     "store1": "node store1/index.mjs",
     "proxy": "node proxy/index.mjs",
     "jwt": "node jwt/index.mjs",
-    "app": "node app/index.mjs"
+    "app": "node app/index.mjs",
+    "build": "node build.mjs"
   },
   "dependencies": {
-    "@k3000/build": "^0.1.1",
+    "@k3000/build": "^0.1.2",
     "@k3000/express": "^0.1.1",
     "@k3000/info": "^0.1.0",
     "@k3000/mysql": "^0.1.0",

package/package.json

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

package/common/service0.mjs

@@ -1,468 +0,0 @@
-import {jwtPort, store1Port} from "./config.mjs";
-
-export const service = {
-    store1: {
-        /**
-         * @type {Function}
-         * @return {Promise<Array<String>>}
-         */
-        getSetList: `localhost:${store1Port}/getSetList`,
-        /**
-         * 登录
-         * @type {Function}
-         * @param {{
-         *     userName: String,
-         *     password: String,
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        login: `localhost:${store1Port}/login`,
-        /**
-         * 更新JWT
-         * @type {Function}
-         * @param {{
-         *     uid: Number,
-         *     jti: Number,
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        checkJWT: `localhost:${store1Port}/checkJWT`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise<Array<String>>}
-         */
-        getDeptNameById: `localhost:${store1Port}/getDeptNameById`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise<Array<String>>}
-         */
-        getRouters: `localhost:${store1Port}/getRouters`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise<Array<String>>}
-         */
-        log: `localhost:${store1Port}/log`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise<Array<String>>}
-         */
-        log2: `localhost:${store1Port}/log2`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise<Array<String>>}
-         */
-        getInfo: `localhost:${store1Port}/getInfo`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     key: String,
-         *     value: *
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericFilter: `localhost:${store1Port}/genericFilter`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     key: String,
-         *     value: *
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericChangeStatus: `localhost:${store1Port}/genericChangeStatus`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     key: String,
-         *     value: *
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericFind: `localhost:${store1Port}/genericFind`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     key: String,
-         *     values: Array
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericRemove: `localhost:${store1Port}/genericRemove`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     key: String,
-         *     values: Array
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericRemove2: `localhost:${store1Port}/genericRemove2`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     body: Object
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericPush: `localhost:${store1Port}/genericPush`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     body: Object
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericUpdate: `localhost:${store1Port}/genericUpdate`,
-        /**
-         * @type {Function}
-         * @param {Number} userId
-         * @return {Promise<Array<String>>}
-         */
-        getPerms: `localhost:${store1Port}/getPerms`,
-        /**
-         * @type {Function}
-         * @param {String} name
-         * @return {Promise<Array<String>>}
-         */
-        genericClean: `localhost:${store1Port}/genericClean`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     query: Object,
-         *     timeKey: String,
-         *     all: Boolean,
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        genericPage: `localhost:${store1Port}/genericPage`,
-        /**
-         * @type {Function}
-         * @param {{
-         *     name: String,
-         *     keys: Array<String>,
-         * }} data
-         * @return {Promise}
-         */
-        genericTable: `localhost:${store1Port}/genericTable`,
-        /**
-         * @type {Function}
-         * @return {Promise<Array<String>>}
-         */
-        buildDeptTree: `localhost:${store1Port}/buildDeptTree`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise<Array<Number>>}
-         */
-        getDept: `localhost:${store1Port}/getDept`,
-        /**
-         * @type {Function}
-         * @return {Promise<Array<Number>>}
-         */
-        getPostUserList: `localhost:${store1Port}/getPostUserList`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise<Array<Number>>}
-         */
-        getUserInfoById: `localhost:${store1Port}/getUserInfoById`,
-        /**
-         * @type {Function}
-         * @param {Array<Number>} ids
-         * @return {Promise}
-         */
-        deleteUserByIds: `localhost:${store1Port}/deleteUserByIds`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        addUser: `localhost:${store1Port}/addUser`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        updateUser: `localhost:${store1Port}/updateUser`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        changeUserStatus: `localhost:${store1Port}/changeUserStatus`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        resetUserPwd: `localhost:${store1Port}/resetUserPwd`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        authUserRole: `localhost:${store1Port}/authUserRole`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        getDeptList: `localhost:${store1Port}/getDeptList`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise}
-         */
-        getDeptListExcludeById: `localhost:${store1Port}/getDeptListExcludeById`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        getMenuList: `localhost:${store1Port}/getMenuList`,
-        /**
-         * @type {Function}
-         * @return {Promise}
-         */
-        getTreeSelect: `localhost:${store1Port}/getTreeSelect`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise}
-         */
-        getRoleMenuTreeSelect: `localhost:${store1Port}/getRoleMenuTreeSelect`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise}
-         */
-        getUserAuthRole: `localhost:${store1Port}/getUserAuthRole`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        addRole: `localhost:${store1Port}/addRole`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        updateRole: `localhost:${store1Port}/updateRole`,
-        /**
-         * @type {Function}
-         * @param {Array} list
-         * @return {Promise}
-         */
-        deleteRole: `localhost:${store1Port}/deleteRole`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        changeRoleStatus: `localhost:${store1Port}/changeRoleStatus`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        getRoleDataScope: `localhost:${store1Port}/getRoleDataScope`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        roleAuthUserAllocatedList: `localhost:${store1Port}/roleAuthUserAllocatedList`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        roleAuthUserUnallocatedList: `localhost:${store1Port}/roleAuthUserUnallocatedList`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        roleAuthUserSelectAll: `localhost:${store1Port}/roleAuthUserSelectAll`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        roleAuthUserCancel: `localhost:${store1Port}/roleAuthUserCancel`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise}
-         */
-        getRoleDeptTree: `localhost:${store1Port}/getRoleDeptTree`,
-        /**
-         * @type {Function}
-         * @param {String} usn
-         * @return {Promise}
-         */
-        LogininforUnlock: `localhost:${store1Port}/LogininforUnlock`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        updateGenTable: `localhost:${store1Port}/updateGenTable`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        genTableImportTable: `localhost:${store1Port}/genTableImportTable`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        genTableImportTable2: `localhost:${store1Port}/genTableImportTable2`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        batchGenCode: `localhost:${store1Port}/batchGenCode`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolGenDbList: `localhost:${store1Port}/toolGenDbList`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolGenDbList2: `localhost:${store1Port}/toolGenDbList2`,
-        /**
-         * @type {Function}
-         * @param {Number} id
-         * @return {Promise}
-         */
-        genPreview: `localhost:${store1Port}/genPreview`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2List: `localhost:${store1Port}/toolPm2List`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2AddService: `localhost:${store1Port}/toolPm2AddService`,
-        /**
-         * @type {Function}
-         * @param {String} name
-         * @return {Promise}
-         */
-        toolPm2RemoveService: `localhost:${store1Port}/toolPm2RemoveService`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2ChangeStatus: `localhost:${store1Port}/toolPm2ChangeStatus`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2Data: `localhost:${store1Port}/toolPm2Data`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2DataList: `localhost:${store1Port}/toolPm2DataList`,
-        /**
-         * @type {Function}
-         * @param {String} ids
-         * @return {Promise}
-         */
-        toolPm2RemoveData: `localhost:${store1Port}/toolPm2RemoveData`,
-        /**
-         * @type {Function}
-         * @return {Promise}
-         */
-        toolPm2Export: `localhost:${store1Port}/toolPm2Export`,
-        /**
-         * @type {Function}
-         * @return {Promise}
-         */
-        getStruct: `localhost:${store1Port}/getStruct`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2StoreList: `localhost:${store1Port}/toolPm2StoreList`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2StoreDataUpdate: `localhost:${store1Port}/toolPm2StoreDataUpdate`,
-        /**
-         * @type {Function}
-         * @param {Object} data
-         * @return {Promise}
-         */
-        toolPm2RemoveStoreData: `localhost:${store1Port}/toolPm2RemoveStoreData`,
-    },
-    jwt: {
-        /**
-         * 登录
-         * @type {Function}
-         * @param {{
-         *     uid: String,
-         *     pwd: String,
-         * }} data
-         * @return {Promise<Array<String>>}
-         */
-        login: `localhost:${jwtPort}/login`,
-        /**
-         * 安全退出
-         * @type {Function}
-         * @param {String} token
-         * @return {Promise<Array<String>>}
-         */
-        logout: `localhost:${jwtPort}/logout`,
-        /**
-         * 校验并获取登录信息
-         * @type {Function}
-         * @param {String} token
-         * @return {Promise<Array<String>>}
-         */
-        check: `localhost:${jwtPort}/check`,
-        /**
-         * 刷新token
-         * @type {Function}
-         * @param {String} token
-         * @return {Promise<Array<String>>}
-         */
-        /**
-         * @type {import('./type').Service}
-         */
-        update: `localhost:${jwtPort}/update`,
-    }
-}