nsgm-cli 2.0.12 → 2.0.14

package/scripts/startup.sh

@@ -1,35 +1,35 @@
-#!/bin/sh
-
-cpu=1
-
-if [ -n "$CDOS_CPUS" ]; then
-	cpu=$(printf "%.0f" $CDOS_CPUS)
-else
-	cpu=$(cat /proc/cpuinfo | grep "processor" | wc -l)
-fi
-
-if [ $cpu -lt 1 ]; then
-	cpu=1
-fi
-
-if [ $cpu -gt 8 ]; then
-	cpu=8
-fi
-
-cd $(dirname $BASH_SOURCE)
-cd ..
-appid=$(basename $(pwd))
-cd current
-appname=node-app-$appid
-
-pm2 delete $appname
-pm2 web
-pm2 start app.js\
-	-i $cpu\
-	--name $appname\
-	--merge-logs\
-	--log-date-format="YYYY-MM-DD HH:mm:ss"\
-	--log /opt/logs/$appid/outerr.log\
-	--output /opt/logs/$appid/out.log\
-	--error /opt/logs/$appid/err.log
+#!/bin/sh
+
+cpu=1
+
+if [ -n "$CDOS_CPUS" ]; then
+	cpu=$(printf "%.0f" $CDOS_CPUS)
+else
+	cpu=$(cat /proc/cpuinfo | grep "processor" | wc -l)
+fi
+
+if [ $cpu -lt 1 ]; then
+	cpu=1
+fi
+
+if [ $cpu -gt 8 ]; then
+	cpu=8
+fi
+
+cd $(dirname $BASH_SOURCE)
+cd ..
+appid=$(basename $(pwd))
+cd current
+appname=node-app-$appid
+
+pm2 delete $appname
+pm2 web
+pm2 start app.js\
+	-i $cpu\
+	--name $appname\
+	--merge-logs\
+	--log-date-format="YYYY-MM-DD HH:mm:ss"\
+	--log /opt/logs/$appid/outerr.log\
+	--output /opt/logs/$appid/out.log\
+	--error /opt/logs/$appid/err.log
 pm2 dump

package/server/apis/sso.js

@@ -1,44 +1,44 @@
-const express = require('express')
-
-const router = express.Router()
-
-router.get('/sessionCheck', (req, res) => {
-  const { query } = req
-  const { cookieValue, redirectUrl, appId } = query 
-
-  res.json({ 
-    name: 'sessionCheck',
-    query,
-    returnCode: 0,
-    userAttr: {
-      displayName: "Erishen"
-    }
-  })
-})
-
-router.get('/ticketCheck', (req, res) => {
-  const { query } = req
-  const { ticket, name } = query
-  // console.log('name', name, atob(name))
-
-  if(atob(name) === "erishen,123456"){
-    res.json({ 
-      name: 'ticketCheck',
-      query,
-      returnCode: 0,
-      userAttr: {
-        displayName: "Erishen"
-      },
-      cookieValue: 'login_cookie',
-      cookieExpire: 10000
-    })
-  } else {
-    res.json({ 
-      name: 'ticketCheck',
-      query,
-      returnCode: -1
-    })
-  }
-})
-
+const express = require('express')
+
+const router = express.Router()
+
+router.get('/sessionCheck', (req, res) => {
+  const { query } = req
+  const { cookieValue, redirectUrl, appId } = query 
+
+  res.json({ 
+    name: 'sessionCheck',
+    query,
+    returnCode: 0,
+    userAttr: {
+      displayName: "Erishen"
+    }
+  })
+})
+
+router.get('/ticketCheck', (req, res) => {
+  const { query } = req
+  const { ticket, name } = query
+  // console.log('name', name, atob(name))
+
+  if(atob(name) === "erishen,123456"){
+    res.json({ 
+      name: 'ticketCheck',
+      query,
+      returnCode: 0,
+      userAttr: {
+        displayName: "Erishen"
+      },
+      cookieValue: 'login_cookie',
+      cookieExpire: 10000
+    })
+  } else {
+    res.json({ 
+      name: 'ticketCheck',
+      query,
+      returnCode: -1
+    })
+  }
+})
+
 module.exports = router

package/server/apis/template.js

@@ -1,18 +1,38 @@
-const express = require('express')
-const XLSX = require('xlsx')
-const { templateBatchAdd } = require('../modules/template/resolver')
-const router = express.Router()
-
-router.post('/import', (req, res) => {
-    //console.log('files', req.files)
-    const workbook = XLSX.read(req.files.file.data, { type: "buffer" })
-    //console.log('Sheets', workbook.Sheets)
-
-    const datas = XLSX.utils.sheet_to_json(workbook.Sheets["Template"])
-    //console.log('datas', datas)
-
-    templateBatchAdd({ datas })
-    res.json({ name: 'Template' })
-})
-
+const express = require('express')
+const ExcelJS = require('exceljs')
+const { templateBatchAdd } = require('../modules/template/resolver')
+const router = express.Router()
+
+router.post('/import', async (req, res) => {
+    // console.log('files', req.files)
+    // 从上传的文件读取数据
+    const workbook = new ExcelJS.Workbook();
+    await workbook.xlsx.load(req.files.file.data);
+
+    // 假设你想读取第一个工作表
+    const worksheet = workbook.worksheets[0];
+
+    // 获取表头
+    const headers = [];
+    worksheet.getRow(1).eachCell((cell, colNumber) => {
+        headers[colNumber] = cell.value.toLowerCase();
+    });
+
+    // 获取数据
+    const jsonData = [];
+    worksheet.eachRow({ includeEmpty: false }, (row, rowNumber) => {
+        if (rowNumber === 1) return; // 跳过表头行
+
+        const rowData = {};
+        row.eachCell({ includeEmpty: true }, (cell, colNumber) => {
+            rowData[headers[colNumber]] = cell.value;
+        });
+        jsonData.push(rowData);
+    });
+
+    // console.log('jsonData', jsonData)
+    templateBatchAdd({ datas: jsonData })
+    res.json({ name: 'Template' })
+})
+
 module.exports = router

package/server/modules/template/resolver.js

@@ -1,226 +1,226 @@
-const { getConnection } = require('../../utils/common')
-const _ = require('lodash')
-
-module.exports = {
-    template: ({ page = 0, pageSize = 10 }) => {
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                const sql = 'SELECT id, name from template LIMIT ? OFFSET ?'
-                const countSql = 'SELECT count(*) as counts from template'
-                const values = [pageSize, page * pageSize]
-
-                console.log('sql', sql, values, countSql)
-
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-                    
-                    connection.query(countSql, (countError, countResults, countFields) => {
-                        if (countError) throw countError
-                        const totalCounts = countResults[0].counts
-                        console.log('totalCounts', totalCounts)
-
-                        resolve({
-                            totalCounts,
-                            items: results
-                        })
-                        connection.end()
-                    })
-                })
-            })
-        })
-    }, 
-    templateGet: ({ id }) => {
-        console.log('templateGet', id)
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                let sql = 'SELECT id, name from template WHERE 1=1'
-                let values = []
-
-                if(id !== undefined){
-                    sql += ' AND id=? '
-                    values.push(id)
-                } 
-
-                console.log('sql', sql, values)
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-
-                    if(results.length > 0)
-                        resolve(results[0])
-                    else
-                        reject()
-                    connection.end()
-                })
-            })
-        })
-    },
-    templateSearch: ({ page = 0, pageSize = 10, data }) => {
-        console.log('templateSearch', page, pageSize, data)
-        const { name } = data
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                const values = []
-                const countsValues = []
-
-                let whereSql = ''
-                if(name !== undefined && name !== ''){
-                    whereSql += ' AND name like ? '
-                    values.push('%' + name + '%')
-                    countsValues.push('%' + name + '%')
-                }
-
-                const sql = 'SELECT id, name from template WHERE 1=1 ' + whereSql + ' LIMIT ? OFFSET ?'
-                const countSql = 'SELECT count(*) as counts from template WHERE 1=1 ' + whereSql
-
-                values.push(pageSize)
-                values.push(page * pageSize)
-                
-                console.log('sql', sql, values, countSql)
-
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-                    
-                    connection.query(countSql, countsValues, (countError, countResults, countFields) => {
-                        if (countError) throw countError
-                        const totalCounts = countResults[0].counts
-                        console.log('totalCounts', totalCounts)
-
-                        resolve({
-                            totalCounts,
-                            items: results
-                        })
-                        connection.end()
-                    })
-                })
-            })
-        })
-    }, 
-    templateAdd: ({ data }) => {
-        console.log('templateAdd', data)
-        const { name } = data
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-
-                let sql = 'INSERT INTO template (name) values (?)'
-                let values = [name]
-                
-                console.log('sql', sql, values)
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-
-                    resolve(results.insertId)
-                    connection.end()
-                })
-            })
-        })
-    },
-    templateBatchAdd: ({ datas }) => {
-        console.log('templateBatchAdd', datas)
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-
-                let sql = 'INSERT INTO template (name) values '
-                let values = []
-
-                _.each(datas, (item, index)=>{
-                    sql += '(?),'
-                    const { name } = item
-                    values.push(name)
-                })
-
-                sql = sql.substring(0, sql.length - 1)
-                
-                console.log('sql', sql, values)
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-
-                    resolve(results.insertId)
-                    connection.end()
-                })
-            })
-        })
-    },
-    templateUpdate: ({ id, data }) => {
-        console.log('templateUpdate', id, data)
-        const { name } = data
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                let sql = 'UPDATE template SET'
-                let values = []
-
-                if(name !== undefined){
-                    sql += ' name=?, '
-                    values.push(name)
-                }
-
-                sql += ' id=? WHERE id=? '
-                values.push(id)
-                values.push(id)
-
-                console.log('sql', sql, values)
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-
-                    resolve(true)
-                    connection.end()
-                })
-            })
-        })
-    },
-    templateDelete: ({ id }) => {
-        console.log('templateDelete', id)
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                const sql = 'DELETE FROM template WHERE id=?'
-                const values = [id]
-                console.log('sql', sql, values)
-
-                connection.query(sql, values, (error, results, fields) => {
-                    if (error) throw error
-                    console.log('results', results)
-
-                    resolve(true)
-                    connection.end()
-                })
-            })
-        })
-    },
-    templateBatchDelete: ({ ids }) => {
-        console.log('templateBatchDelete', ids)
-        return new Promise((resolve, reject)=>{
-            getConnection().then((connection)=>{
-                let sql = 'DELETE FROM template WHERE id in ('
-
-                const idsLen = ids.length
-
-                if(idsLen > 0){
-                    for(let i = 0; i < idsLen; i++){
-                        sql += '?,'
-                    }
-    
-                    sql = sql.substring(0, sql.length - 1)
-                    sql += ')'
-    
-                    const values = ids
-                    console.log('sql', sql, values)
-    
-                    connection.query(sql, values, (error, results, fields) => {
-                        if (error) throw error
-                        console.log('results', results)
-    
-                        resolve(true)
-                        connection.end()
-                    })
-                }
-                else 
-                    reject()
-            })
-        })
-    }
+const { getConnection } = require('../../utils/common')
+const _ = require('lodash')
+
+module.exports = {
+    template: ({ page = 0, pageSize = 10 }) => {
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                const sql = 'SELECT id, name from template LIMIT ? OFFSET ?'
+                const countSql = 'SELECT count(*) as counts from template'
+                const values = [pageSize, page * pageSize]
+
+                console.log('sql', sql, values, countSql)
+
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+                    
+                    connection.query(countSql, (countError, countResults, countFields) => {
+                        if (countError) throw countError
+                        const totalCounts = countResults[0].counts
+                        console.log('totalCounts', totalCounts)
+
+                        resolve({
+                            totalCounts,
+                            items: results
+                        })
+                        connection.end()
+                    })
+                })
+            })
+        })
+    }, 
+    templateGet: ({ id }) => {
+        console.log('templateGet', id)
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                let sql = 'SELECT id, name from template WHERE 1=1'
+                let values = []
+
+                if(id !== undefined){
+                    sql += ' AND id=? '
+                    values.push(id)
+                } 
+
+                console.log('sql', sql, values)
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+
+                    if(results.length > 0)
+                        resolve(results[0])
+                    else
+                        reject()
+                    connection.end()
+                })
+            })
+        })
+    },
+    templateSearch: ({ page = 0, pageSize = 10, data }) => {
+        console.log('templateSearch', page, pageSize, data)
+        const { name } = data
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                const values = []
+                const countsValues = []
+
+                let whereSql = ''
+                if(name !== undefined && name !== ''){
+                    whereSql += ' AND name like ? '
+                    values.push('%' + name + '%')
+                    countsValues.push('%' + name + '%')
+                }
+
+                const sql = 'SELECT id, name from template WHERE 1=1 ' + whereSql + ' LIMIT ? OFFSET ?'
+                const countSql = 'SELECT count(*) as counts from template WHERE 1=1 ' + whereSql
+
+                values.push(pageSize)
+                values.push(page * pageSize)
+                
+                console.log('sql', sql, values, countSql)
+
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+                    
+                    connection.query(countSql, countsValues, (countError, countResults, countFields) => {
+                        if (countError) throw countError
+                        const totalCounts = countResults[0].counts
+                        console.log('totalCounts', totalCounts)
+
+                        resolve({
+                            totalCounts,
+                            items: results
+                        })
+                        connection.end()
+                    })
+                })
+            })
+        })
+    }, 
+    templateAdd: ({ data }) => {
+        console.log('templateAdd', data)
+        const { name } = data
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+
+                let sql = 'INSERT INTO template (name) values (?)'
+                let values = [name]
+                
+                console.log('sql', sql, values)
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+
+                    resolve(results.insertId)
+                    connection.end()
+                })
+            })
+        })
+    },
+    templateBatchAdd: ({ datas }) => {
+        console.log('templateBatchAdd', datas)
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+
+                let sql = 'INSERT INTO template (name) values '
+                let values = []
+
+                _.each(datas, (item, index)=>{
+                    sql += '(?),'
+                    const { name } = item
+                    values.push(name)
+                })
+
+                sql = sql.substring(0, sql.length - 1)
+                
+                console.log('sql', sql, values)
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+
+                    resolve(results.insertId)
+                    connection.end()
+                })
+            })
+        })
+    },
+    templateUpdate: ({ id, data }) => {
+        console.log('templateUpdate', id, data)
+        const { name } = data
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                let sql = 'UPDATE template SET'
+                let values = []
+
+                if(name !== undefined){
+                    sql += ' name=?, '
+                    values.push(name)
+                }
+
+                sql += ' id=? WHERE id=? '
+                values.push(id)
+                values.push(id)
+
+                console.log('sql', sql, values)
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+
+                    resolve(true)
+                    connection.end()
+                })
+            })
+        })
+    },
+    templateDelete: ({ id }) => {
+        console.log('templateDelete', id)
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                const sql = 'DELETE FROM template WHERE id=?'
+                const values = [id]
+                console.log('sql', sql, values)
+
+                connection.query(sql, values, (error, results, fields) => {
+                    if (error) throw error
+                    console.log('results', results)
+
+                    resolve(true)
+                    connection.end()
+                })
+            })
+        })
+    },
+    templateBatchDelete: ({ ids }) => {
+        console.log('templateBatchDelete', ids)
+        return new Promise((resolve, reject)=>{
+            getConnection().then((connection)=>{
+                let sql = 'DELETE FROM template WHERE id in ('
+
+                const idsLen = ids.length
+
+                if(idsLen > 0){
+                    for(let i = 0; i < idsLen; i++){
+                        sql += '?,'
+                    }
+    
+                    sql = sql.substring(0, sql.length - 1)
+                    sql += ')'
+    
+                    const values = ids
+                    console.log('sql', sql, values)
+    
+                    connection.query(sql, values, (error, results, fields) => {
+                        if (error) throw error
+                        console.log('results', results)
+    
+                        resolve(true)
+                        connection.end()
+                    })
+                }
+                else 
+                    reject()
+            })
+        })
+    }
 }