nsgm-cli 1.0.21 → 1.0.25

package/generation/server/modules/template/resolver.js

@@ -1,232 +1,232 @@
-const { serverDB } = require('nsgm-cli')
-const _ = require('lodash')
-
-const { getConnection } = serverDB
-
-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)
-                }
-
-                if(sql.indexOf('?') === -1){
-                    sql += ' id=? '
-                    values.push(id)
-                }
-
-                sql += ' WHERE 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 { serverDB } = require('nsgm-cli')
+const _ = require('lodash')
+
+const { getConnection } = serverDB
+
+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)
+                }
+
+                if(sql.indexOf('?') === -1){
+                    sql += ' id=? '
+                    values.push(id)
+                }
+
+                sql += ' WHERE 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()
+            })
+        })
+    }
 }

package/generation/server/modules/template/schema.js

@@ -1,34 +1,34 @@
-module.exports = {
-    query: `
-        template(page: Int, pageSize: Int): Templates
-        templateGet(id: Int): Template
-        templateSearch(page: Int, pageSize: Int, data: TemplateSearchInput): Templates
-    `,
-    mutation: `
-        templateAdd(data: TemplateAddInput): Int
-        templateBatchAdd(datas: [TemplateAddInput]): Int
-        templateUpdate(id: Int, data: TemplateAddInput): Boolean
-        templateDelete(id: Int): Boolean
-        templateBatchDelete(ids: [Int]): Boolean
-    `,
-    subscription: ``,
-    type: `
-        type Template {
-            id: Int
-            name: String
-        }
-
-        type Templates {
-            totalCounts: Int
-            items: [Template]
-        }
-
-        input TemplateAddInput {
-            name: String
-        }
-
-        input TemplateSearchInput {
-            name: String
-        }
-    `
+module.exports = {
+    query: `
+        template(page: Int, pageSize: Int): Templates
+        templateGet(id: Int): Template
+        templateSearch(page: Int, pageSize: Int, data: TemplateSearchInput): Templates
+    `,
+    mutation: `
+        templateAdd(data: TemplateAddInput): Int
+        templateBatchAdd(datas: [TemplateAddInput]): Int
+        templateUpdate(id: Int, data: TemplateAddInput): Boolean
+        templateDelete(id: Int): Boolean
+        templateBatchDelete(ids: [Int]): Boolean
+    `,
+    subscription: ``,
+    type: `
+        type Template {
+            id: Int
+            name: String
+        }
+
+        type Templates {
+            totalCounts: Int
+            items: [Template]
+        }
+
+        input TemplateAddInput {
+            name: String
+        }
+
+        input TemplateSearchInput {
+            name: String
+        }
+    `
 } 

package/generation/server/rest.js

@@ -1,20 +1,20 @@
-const express = require('express')
-const moment = require('moment')
-//const template = require('./apis/template')
-
-const router = express.Router()
-
-router.use((req, res, next) => {
-    const fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl
-    // console.log(moment().format('YYYY-MM-DD HH:mm:ss') + ' ' + fullUrl)
-    next()
-})
-
-//router.use('/template', template)
-
-router.get('/*', (req, res) => {
-    res.statusCode = 200
-    res.json({ name: 'REST' })
-})
-
-module.exports = router
+const express = require('express')
+const moment = require('moment')
+//const template = require('./apis/template')
+
+const router = express.Router()
+
+router.use((req, res, next) => {
+    const fullUrl = req.protocol + '://' + req.get('host') + req.originalUrl
+    // console.log(moment().format('YYYY-MM-DD HH:mm:ss') + ' ' + fullUrl)
+    next()
+})
+
+//router.use('/template', template)
+
+router.get('/*', (req, res) => {
+    res.statusCode = 200
+    res.json({ name: 'REST' })
+})
+
+module.exports = router

package/generation/server/sql/template.sql

@@ -1,9 +1,9 @@
-use crm_demo;
-
-CREATE TABLE `template` (
-  `id` integer NOT NULL AUTO_INCREMENT COMMENT '主键',
-  `name` varchar(100) DEFAULT '' COMMENT '名称',
-  `create_date` TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
-  `update_date` TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
-  PRIMARY KEY (`id`)
+use crm_demo;
+
+CREATE TABLE `template` (
+  `id` integer NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `name` varchar(100) DEFAULT '' COMMENT '名称',
+  `create_date` TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) COMMENT '创建时间',
+  `update_date` TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '更新时间',
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;

package/generation/tsconfig.json

@@ -26,4 +26,4 @@
   "exclude": [
     "node_modules"
   ]
-}
+}

package/index.js

@@ -1,11 +1,11 @@
-const nextConfig = require('./next.config')
-const mysqlConfig = require('./mysql.config')
-const projectConfig = require('./project.config')
-const serverDB = require('./lib/server/db').default
-
-module.exports = {
-    nextConfig,
-    mysqlConfig,
-    projectConfig,
-    serverDB
+const nextConfig = require('./next.config')
+const mysqlConfig = require('./mysql.config')
+const projectConfig = require('./project.config')
+const serverDB = require('./lib/server/db').default
+
+module.exports = {
+    nextConfig,
+    mysqlConfig,
+    projectConfig,
+    serverDB
 }

package/lib/args.d.ts

@@ -1,6 +1,6 @@
-export declare const getProcessArgvs: (removeItems?: number) => {
-    command: string;
-    dictionary: string;
-    controller: string;
-    action: string;
-};
+export declare const getProcessArgvs: (removeItems?: number) => {
+    command: string;
+    dictionary: string;
+    controller: string;
+    action: string;
+};