nsgm-cli 1.0.26 → 2.0.0

package/{generation/server → server}/apis/template.js

@@ -1,19 +1,18 @@
-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 entry = 'Template'
-    const datas = XLSX.utils.sheet_to_json(workbook.Sheets[entry])
-    //console.log('datas', datas)
-
-    templateBatchAdd({ datas })
-    res.json({ name: 'Template' })
-})
-
+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' })
+})
+
 module.exports = router

package/{generation/server → server}/modules/template/resolver.js

@@ -1,8 +1,6 @@
-const { serverDB } = require('nsgm-cli')
+const { getConnection } = require('../../utils/common')
 const _ = require('lodash')
 
-const { getConnection } = serverDB
-
 module.exports = {
     template: ({ page = 0, pageSize = 10 }) => {
         return new Promise((resolve, reject)=>{
@@ -11,16 +9,16 @@ module.exports = {
                 const countSql = 'SELECT count(*) as counts from template'
                 const values = [pageSize, page * pageSize]
 
-                // console.log('sql', sql, values, countSql)
+                console.log('sql', sql, values, countSql)
 
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
                     
                     connection.query(countSql, (countError, countResults, countFields) => {
                         if (countError) throw countError
                         const totalCounts = countResults[0].counts
-                        // console.log('totalCounts', totalCounts)
+                        console.log('totalCounts', totalCounts)
 
                         resolve({
                             totalCounts,
@@ -33,7 +31,7 @@ module.exports = {
         })
     }, 
     templateGet: ({ id }) => {
-        // console.log('templateGet', id)
+        console.log('templateGet', id)
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
                 let sql = 'SELECT id, name from template WHERE 1=1'
@@ -44,10 +42,10 @@ module.exports = {
                     values.push(id)
                 } 
 
-                // console.log('sql', sql, values)
+                console.log('sql', sql, values)
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
 
                     if(results.length > 0)
                         resolve(results[0])
@@ -59,7 +57,7 @@ module.exports = {
         })
     },
     templateSearch: ({ page = 0, pageSize = 10, data }) => {
-        // console.log('templateSearch', page, pageSize, data)
+        console.log('templateSearch', page, pageSize, data)
         const { name } = data
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
@@ -79,16 +77,16 @@ module.exports = {
                 values.push(pageSize)
                 values.push(page * pageSize)
                 
-                // console.log('sql', sql, values, countSql)
+                console.log('sql', sql, values, countSql)
 
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
                     
                     connection.query(countSql, countsValues, (countError, countResults, countFields) => {
                         if (countError) throw countError
                         const totalCounts = countResults[0].counts
-                        // console.log('totalCounts', totalCounts)
+                        console.log('totalCounts', totalCounts)
 
                         resolve({
                             totalCounts,
@@ -101,7 +99,7 @@ module.exports = {
         })
     }, 
     templateAdd: ({ data }) => {
-        // console.log('templateAdd', data)
+        console.log('templateAdd', data)
         const { name } = data
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
@@ -109,10 +107,10 @@ module.exports = {
                 let sql = 'INSERT INTO template (name) values (?)'
                 let values = [name]
                 
-                // console.log('sql', sql, values)
+                console.log('sql', sql, values)
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
 
                     resolve(results.insertId)
                     connection.end()
@@ -121,7 +119,7 @@ module.exports = {
         })
     },
     templateBatchAdd: ({ datas }) => {
-        // console.log('templateBatchAdd', datas)
+        console.log('templateBatchAdd', datas)
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
 
@@ -136,10 +134,10 @@ module.exports = {
 
                 sql = sql.substring(0, sql.length - 1)
                 
-                // console.log('sql', sql, values)
+                console.log('sql', sql, values)
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
 
                     resolve(results.insertId)
                     connection.end()
@@ -148,7 +146,7 @@ module.exports = {
         })
     },
     templateUpdate: ({ id, data }) => {
-        // console.log('templateUpdate', id, data)
+        console.log('templateUpdate', id, data)
         const { name } = data
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
@@ -156,22 +154,18 @@ module.exports = {
                 let values = []
 
                 if(name !== undefined){
-                    sql += ' name=? '
+                    sql += ' name=?, '
                     values.push(name)
                 }
 
-                if(sql.indexOf('?') === -1){
-                    sql += ' id=? '
-                    values.push(id)
-                }
-
-                sql += ' WHERE id=? '
+                sql += ' id=? WHERE id=? '
+                values.push(id)
                 values.push(id)
 
-                // console.log('sql', sql, values)
+                console.log('sql', sql, values)
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
 
                     resolve(true)
                     connection.end()
@@ -180,16 +174,16 @@ module.exports = {
         })
     },
     templateDelete: ({ id }) => {
-        // console.log('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)
+                console.log('sql', sql, values)
 
                 connection.query(sql, values, (error, results, fields) => {
                     if (error) throw error
-                    // console.log('results', results)
+                    console.log('results', results)
 
                     resolve(true)
                     connection.end()
@@ -198,7 +192,7 @@ module.exports = {
         })
     },
     templateBatchDelete: ({ ids }) => {
-        // console.log('templateBatchDelete', ids)
+        console.log('templateBatchDelete', ids)
         return new Promise((resolve, reject)=>{
             getConnection().then((connection)=>{
                 let sql = 'DELETE FROM template WHERE id in ('
@@ -214,11 +208,11 @@ module.exports = {
                     sql += ')'
     
                     const values = ids
-                    // console.log('sql', sql, values)
+                    console.log('sql', sql, values)
     
                     connection.query(sql, values, (error, results, fields) => {
                         if (error) throw error
-                        // console.log('results', results)
+                        console.log('results', results)
     
                         resolve(true)
                         connection.end()

package/{generation/server → 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/server/rest.js

@@ -0,0 +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

package/{generation/server → 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/server/utils/common.js

@@ -0,0 +1,7 @@
+const { serverDB } = require('../../index')
+
+const { getConnection } = serverDB
+
+module.exports = {
+  getConnection
+}

package/generation/client/layout/index.tsx

@@ -1,223 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { Layout, Menu, Breadcrumb, Image } from 'antd'
-import { Container } from '../styled/layout'
-import { useRouter } from 'next/router'
-import _ from 'lodash'
-import menuConfig from '../utils/menu'
-
-const { SubMenu } = Menu
-const { Header, Content, Sider } = Layout
-
-const getLocationKey = () => {
-  const result = {
-    topMenu: '1',
-    slideMenu: '0'
-  }
-
-  if (typeof window !== 'undefined') {
-    const locationHref = window.location.href
-
-    let locationHrefArr = locationHref.split('?')
-    if (locationHrefArr.length > 0) {
-      locationHrefArr = locationHrefArr[0].split('//')
-
-      if (locationHrefArr.length > 1) {
-        let locationStr = locationHrefArr[1]
-        const locationIndex = locationStr.indexOf('/')
-        locationStr = locationStr.substring(locationIndex)
-
-        console.log('locationStr', locationStr)
-
-        _.each(menuConfig, (item:any, index:any) => {
-          const { key, url, subMenus } = item
-
-          if (subMenus) {
-            _.each(subMenus, (subItem:any, subIndex:any) => {
-              const { key: subKey, url: subUrl } = subItem
-
-              if (locationStr === subUrl.split('?')[0]) {
-                const subKeyArr = subKey.split('_')
-                const subKeyArrLen = subKeyArr.length
-
-                if (subKeyArrLen > 0) result.topMenu = subKeyArr[0]
-                if (subKeyArrLen > 1) result.slideMenu = subKeyArr[1]
-
-                return false
-              }
-            })
-          } else {
-            if (locationStr === url.split('?')[0]) {
-              result.topMenu = key
-              return false
-            }
-          }
-        })
-      }
-    }
-  }
-  console.log('result', result)
-  return result
-}
-
-const routerPush = (router: any, url: string) => { 
-  console.log('routerPush', url)
-
-  if (router && url) { 
-    router.push(url)
-  }
-}
-
-const LayoutComponent = ({ children }) => {
-  const router = useRouter()
-  const [topMenuKey, setTopMenuKey] = useState('1')
-  const [sliderMenuKey, setSliderMenuKey] = useState('1')
-
-  console.log('topMenuKey: ' + topMenuKey, ', sliderMenuKey: ' + sliderMenuKey)
-
-  useEffect(() => {
-    const { topMenu, slideMenu } = getLocationKey()
-    setTopMenuKey(topMenu)
-    setSliderMenuKey(slideMenu)
-  }, [])
-
-  return (
-    <Layout>
-      <Container>
-        <Header className="header">
-          <div className="logo">
-            <Image width={100} src="../images/zhizuotu_1.png" preview={false} />
-          </div>
-          <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']} selectedKeys={[topMenuKey]}>
-            {_.map(menuConfig, (item:any, index:any) => {
-              const { key, text, url, subMenus } = item
-              if (key) {
-                return (
-                  <Menu.Item
-                    key={key}
-                    onClick={() => {
-                      routerPush(router, url)
-                      setTopMenuKey(key)
-
-                      if (subMenus) {
-                        setSliderMenuKey('1')
-                      } else {
-                        setSliderMenuKey('0')
-                      }
-                    }}
-                  >
-                    {text}
-                  </Menu.Item>
-                )
-              }
-            })}
-          </Menu>
-        </Header>
-        <Layout>
-          <Sider width={200} className="site-layout-background">
-            <Menu
-              mode="inline"
-              defaultSelectedKeys={['slider_1_0']}
-              defaultOpenKeys={['slider_1']}
-              selectedKeys={['slider_' + topMenuKey + '_' + sliderMenuKey]}
-              openKeys={['slider_' + topMenuKey]}
-              style={{ height: '100%', borderRight: 0 }}
-            >
-              {_.map(menuConfig, (item:any, index:any) => {
-                const { key, text, url, icon, subMenus } = item
-
-                if (subMenus) {
-                  return (
-                    <SubMenu
-                      key={'slider_' + key}
-                      icon={icon}
-                      title={text}
-                      onTitleClick={() => {
-                        setTopMenuKey(key)
-                        setSliderMenuKey('1')
-                      }}
-                    >
-                      {_.map(subMenus, (subItem:any, subIndex:any) => {
-                        const { key: subKey, text: subText, url: subUrl } = subItem
-                        return (
-                          <Menu.Item
-                            key={'slider_' + subKey}
-                            onClick={() => {
-                              routerPush(router, subUrl)
-
-                              const subKeyArr = subKey.split('_')
-                              const subKeyArrLen = subKeyArr.length
-
-                              console.log(subKeyArr, subKeyArrLen)
-
-                              if (subKeyArrLen >= 1) setTopMenuKey(subKeyArr[0])
-
-                              if (subKeyArrLen >= 2) setSliderMenuKey(subKeyArr[1])
-                            }}
-                          >
-                            {subText}
-                          </Menu.Item>
-                        )
-                      })}
-                    </SubMenu>
-                  )
-                } else {
-                  if (key) {
-                    return (
-                      <Menu.Item
-                        key={'slider_' + key + '_0'}
-                        icon={icon}
-                        onClick={() => {
-                          routerPush(router, url)
-                          setTopMenuKey(key)
-                          setSliderMenuKey('0')
-                        }}
-                      >
-                        {text}
-                      </Menu.Item>
-                    )
-                  }
-                }
-              })}
-            </Menu>
-          </Sider>
-          <Layout style={{ padding: '0 24px 24px' }}>
-            <Breadcrumb style={{ margin: '16px 0' }}>
-              {_.map(menuConfig, (item:any, index:any) => {
-                const { key, text, subMenus } = item
-
-                if (key && key === topMenuKey) {
-                  if (subMenus) {
-                    const subContent = []
-                    _.each(subMenus, (subItem:any, subIndex:any) => {
-                      const { key: subKey, text: subText } = subItem
-                      if (subKey === key + '_' + sliderMenuKey) {
-                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{text}</Breadcrumb.Item>)
-                        subContent.push(<Breadcrumb.Item key={'breadcrumb' + subIndex}>{subText}</Breadcrumb.Item>)
-                        return false
-                      }
-                    })
-                    return subContent
-                  } else {
-                    return <Breadcrumb.Item key={'breadcrumb' + index}>{text}</Breadcrumb.Item>
-                  }
-                }
-              })}
-            </Breadcrumb>
-            <Content
-              className="site-layout-background"
-              style={{
-                padding: 24,
-                margin: 0,
-                minHeight: 280
-              }}
-            >
-              {children}
-            </Content>
-          </Layout>
-        </Layout>
-      </Container>
-    </Layout>
-  )
-}
-
-export default LayoutComponent

package/generation/client/service/template/manage.ts

@@ -1,74 +0,0 @@
-import { getLocalGraphql } from '../../utils/fetch'
-import _ from 'lodash'
-
-export const getTemplateService = (page=0, pageSize=10) => {
-  const getTemplateQuery = `query { template(page:` + page + `, pageSize:` + pageSize + `) { 
-      totalCounts items { 
-        id name
-      } 
-    } 
-  }`
-  return getLocalGraphql(getTemplateQuery)
-}
-
-export const searchTemplateByIdService = (id: number) => {
-  const searchTemplateByIdQuery = `query { templateGet(id:` + id + `) { 
-      id name
-    } 
-  }`
-  return getLocalGraphql(searchTemplateByIdQuery)
-}
-
-export const searchTemplateService = (page = 0, pageSize = 10, data: any) => {
-  const { name } = data
-  const searchTemplateQuery = `query { templateSearch(page:` + page + `, pageSize:` + pageSize + `, data: { name: "` + name + `" }) { 
-      totalCounts items { 
-        id name
-      } 
-    } 
-  }`
-  return getLocalGraphql(searchTemplateQuery)
-}
-
-export const addTemplateService = (data: any) => { 
-  const { name } = data
-
-  const addTemplateQuery = `mutation { templateAdd(data: { name: "` + name + `"}) }`
-
-  return getLocalGraphql(addTemplateQuery)
-}
-
-export const updateTemplateService = (id: number, data: any) => { 
-  const { name } = data
-
-  const updateTemplateQuery = `mutation { templateUpdate(id: ` + id + `, data: { name: "` + name + `"}) }`
-
-  return getLocalGraphql(updateTemplateQuery)
-}
-
-export const deleteTemplateService = (id: number) => { 
-  const deleteTemplateQuery = `mutation { templateDelete(id: ` + id + `) }`
-
-  return getLocalGraphql(deleteTemplateQuery)
-}
-
-export const batchAddTemplateService = (datas: any) => { 
-  let batchStr = ''
-  _.each(datas, (item, index) => { 
-    const { name } = item
-    batchStr += `{ name: "` + name + `" },`
-  })
-  batchStr = batchStr.substring(0, batchStr.length - 1)
-
-  const batchAddTemplateQuery = `mutation { templateBatchAdd(datas: [` + batchStr + `]) }`
-
-  return getLocalGraphql(batchAddTemplateQuery)
-}
-
-export const batchDeleteTemplateService = (ids: any) => { 
-  const batchStr = ids.join(',')
-
-  const batchDeleteTemplateQuery = `mutation { templateBatchDelete(ids: [` + batchStr + `]) }`
-
-  return getLocalGraphql(batchDeleteTemplateQuery)
-}

package/generation/client/styled/layout/index.ts

@@ -1,14 +0,0 @@
-import styled from 'styled-components'
-
-export const Container = styled.div`
-  .logo {
-    float: left;
-    width: 120px;
-    height: 31px;
-    margin: 16px 24px 16px 0;
-  }
-
-  .site-layout-background {
-    background: #fff;
-  }
-`