nsgm-cli 2.0.6 → 2.0.8

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

@@ -0,0 +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
+    })
+  }
+})
+
+module.exports = router

package/server/apis/template.js

@@ -1,18 +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 datas = XLSX.utils.sheet_to_json(workbook.Sheets["Template"])
-    //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/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

@@ -1,20 +1,24 @@
-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 sso = require('./apis/sso')
+
+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.use('/sso', sso)
+
+router.get('/*', (req, res) => {
+    res.statusCode = 200
+    res.json({ name: 'REST' })
+})
+
+module.exports = router

package/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;