@k3000/s1 0.1.1 → 0.1.6

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,4 +1,4 @@
-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'
 

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

@@ -3,7 +3,7 @@ import {cpSync, existsSync, mkdirSync} from "node:fs";
 import {resolve, dirname} from "node:path";
 
 import {pm2} from './common/pm2.mjs'
-import {proxyService, uiService} from "./common/config.mjs";
+// import {proxyService, uiService} from "./common/config.mjs";
 
 const [, , key, value] = process.argv
 
@@ -61,6 +61,9 @@ function init(override) {
     myCopyFn('proxy', 'proxy', override)
     myCopyFn('static', 'static', override)
     myCopyFn('store1', 'store1', override)
+    myCopyFn('ui-dev', 'ui-dev', override)
+    myCopyFn('谨慎打开', '谨慎打开', override)
+    myCopyFn('build.mjs', 'build.mjs', override)
     myCopyFn('index.mjs', 'index.mjs', override)
 
     // pm2.del(uiService)
@@ -70,6 +73,14 @@ function init(override) {
 
     // pm2.exec('npm i dmb3').log()
     // pm2.exec('npm i tools2').log()
+    pm2.exec('npm i @k3000/express').log()
+    pm2.exec('npm i @k3000/mysql').log()
+    pm2.exec('npm i @k3000/proxy').log()
+    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()
@@ -78,8 +89,8 @@ function init(override) {
     pm2.exec('npm i body-parser').log()
     pm2.exec('npm i express-fileupload').log()
 
-    pm2.del(proxyService)
-    pm2.add(proxyService, './proxy.mjs')
+    // pm2.del(proxyService)
+    // pm2.add(proxyService, './proxy.mjs')
 }
 
 /**
@@ -96,6 +107,10 @@ function myCopyFn(source, destination = source, force = false) {
     return cpSync( `${dirname(path)}/${source}`, destination, {recursive: true, force})
 }
 
+/**
+ * 请先建立目录并拉下项目
+ * git clone https://github.com/yangzongzhuan/RuoYi-Vue3.git
+ */
 function updateUI() {
 
     const dir = resolve('')

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/menuIndex.vue

@@ -102,9 +102,9 @@
                <el-col :span="24">
                   <el-form-item label="菜单类型" prop="menuType">
                      <el-radio-group v-model="form.menuType">
-                        <el-radio label="M">目录</el-radio>
-                        <el-radio label="C">菜单</el-radio>
-                        <el-radio label="F">按钮</el-radio>
+                        <el-radio value="M">目录</el-radio>
+                        <el-radio value="C">菜单</el-radio>
+                        <el-radio value="F">按钮</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -132,14 +132,27 @@
                      </el-popover>
                   </el-form-item>
                </el-col>
+               <el-col :span="12">
+                  <el-form-item label="显示排序" prop="orderNum">
+                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+                  </el-form-item>
+               </el-col>
                <el-col :span="12">
                   <el-form-item label="菜单名称" prop="menuName">
                      <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
                   </el-form-item>
                </el-col>
-               <el-col :span="12">
-                  <el-form-item label="显示排序" prop="orderNum">
-                     <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+               <el-col :span="12" v-if="form.menuType == 'C'">
+                  <el-form-item prop="routeName">
+                     <template #label>
+                        <span>
+                           <el-tooltip content="默认不填则和路由地址相同：如地址为：`user`，则名称为`User`（注意：因为router会删除名称相同路由，为避免名字的冲突，特殊情况下请自定义，保证唯一性）" placement="top">
+                              <el-icon><question-filled /></el-icon>
+                           </el-tooltip>
+                           路由名称
+                        </span>
+                     </template>
+                     <el-input v-model="form.routeName" placeholder="请输入路由名称" />
                   </el-form-item>
                </el-col>
                <el-col :span="12" v-if="form.menuType != 'F'">
@@ -152,8 +165,8 @@
                         </span>
                      </template>
                      <el-radio-group v-model="form.isFrame">
-                        <el-radio label="0">是</el-radio>
-                        <el-radio label="1">否</el-radio>
+                        <el-radio value="0">是</el-radio>
+                        <el-radio value="1">否</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -227,8 +240,8 @@
                         </span>
                      </template>
                      <el-radio-group v-model="form.isCache">
-                        <el-radio label="0">缓存</el-radio>
-                        <el-radio label="1">不缓存</el-radio>
+                        <el-radio value="0">缓存</el-radio>
+                        <el-radio value="1">不缓存</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
@@ -246,7 +259,7 @@
                         <el-radio
                            v-for="dict in sys_show_hide"
                            :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -265,7 +278,7 @@
                         <el-radio
                            v-for="dict in sys_normal_disable"
                            :key="dict.value"
-                           :label="dict.value"
+                           :value="dict.value"
                         >{{ dict.label }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
@@ -325,6 +338,7 @@ function getList() {
     loading.value = false;
   });
 }
+
 /** 查询菜单下拉树结构 */
 function getTreeselect() {
   menuOptions.value = [];
@@ -334,11 +348,13 @@ function getTreeselect() {
     menuOptions.value.push(menu);
   });
 }
+
 /** 取消按钮 */
 function cancel() {
   open.value = false;
   reset();
 }
+
 /** 表单重置 */
 function reset() {
   form.value = {
@@ -355,23 +371,28 @@ function reset() {
   };
   proxy.resetForm("menuRef");
 }
+
 /** 展示下拉图标 */
 function showSelectIcon() {
   iconSelectRef.value.reset();
 }
+
 /** 选择图标 */
 function selected(name) {
   form.value.icon = name;
 }
+
 /** 搜索按钮操作 */
 function handleQuery() {
   getList();
 }
+
 /** 重置按钮操作 */
 function resetQuery() {
   proxy.resetForm("queryRef");
   handleQuery();
 }
+
 /** 新增按钮操作 */
 function handleAdd(row) {
   reset();
@@ -385,6 +406,7 @@ function handleAdd(row) {
   open.value = true;
   title.value = "添加菜单";
 }
+
 /** 展开/折叠操作 */
 function toggleExpandAll() {
   refreshTable.value = false;
@@ -413,6 +435,7 @@ async function handleUpdate(row) {
     title.value = "修改菜单";
   });
 }
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["menuRef"].validate(valid => {
@@ -433,6 +456,7 @@ function submitForm() {
     }
   });
 }
+
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function() {

package/jwt/index.mjs

@@ -1,4 +1,4 @@
-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";

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "@k3000/s1",
-  "version": "0.1.1",
+  "version": "0.1.6",
   "description": "",
   "scripts": {
+    "sync": "npm link",
     "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"
   },
+  "bin": {
+    "bot": "bin.mjs"
+  },
   "dependencies": {
     "@k3000/store": "^0.1.0",
     "@types/node": "^20.16.1",

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,4 +1,4 @@
-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";

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,