skybase 0.1.83 → 0.1.86

package/demo/6-sql-test/service/test.js

@@ -1,96 +1,96 @@
-/**
- * @author: cuiguanghao
- * @date: 2019年06月10日08:37:23
- * @name: api.js
- * @description: 生成api文档
- */
-
-/* global $ db dbMain redis redisMain MQ Kafka */
-
-const Package = require('../package.json')
-
-module.exports = {
-  one,
-  two,
-  three,
-  four
-}
-
-async function four (arg) {
-  // mq 列队
-  let mqSend = await sendQueueMsg('moneyLog', 'test mq ' + new Date().date2Str())
-  let kafkaSend = await sendKafka('test', 'test kafka ' + new Date().date2Str())
-  return { code: 0, data: { name: 'four', mqSend, kafkaSend } }
-}
-
-// 往kafka送消息
-async function sendKafka (topic, msg) {
-  if (!Kafka) {
-    $.err(`sendKafka Not Conn topic=${topic} msg=${msg}`)
-    return false
-  }
-  return new Promise(function (resolve) {
-    Kafka.send([{ topic, msg }], function (err, result) {
-      if (err) {
-        $.err(err.stack)
-        resolve(false)
-      }
-      // $.log(result, msg)
-      resolve(true)
-    })
-  })
-}
-
-// 发送一个mq队里
-async function sendQueueMsg (queueName, msg) {
-  if (!MQ) {
-    $.err(`SendQueueMsg Not Conn queueName=${queueName} msg=${msg}`)
-    return
-  }
-  // https://github.com/squaremo/amqp.node/blob/master/examples/send_generators.js
-  const ch = await MQ.createConfirmChannel()
-  await ch.assertQueue(queueName)
-  let r = ch.sendToQueue(queueName, Buffer.from(msg))
-  await ch.waitForConfirms()
-  ch.close()
-  return r
-}
-
-async function three (arg) {
-  let r = await redis.get(`${Package.name}:${arg.name}`)
-  let rM = await redisMain.get(`${Package.name}:${arg.name}`)
-  $.log(r, rM)
-  return {
-    code: 0,
-    data: {
-      redis: r,
-      redisMain: rM
-    }
-  }
-}
-
-async function two (arg) {
-  let r = await redis.set(`${Package.name}:${arg.name}`, 'redis ' + new Date().date2Str())
-  let rM = await redisMain.set(`${Package.name}:${arg.name}`, 'redisMain ' + new Date().date2Str())
-  $.log(r, rM)
-  return {
-    code: 0,
-    data: {
-      redis: r,
-      redisMain: rM
-    }
-  }
-}
-
-async function one (arg) {
-  let r = await db.admin_user.R({ d_flag: 0 }, {}, {}, 1).run()
-  let rM = await dbMain.admin_user.R({ d_flag: 0 }, {}, {}, 1).run()
-  $.log(r, rM)
-  return {
-    code: 0,
-    data: {
-      db: r,
-      dbMain: rM
-    }
-  }
-}
+/**
+ * @author: cuiguanghao
+ * @date: 2019年06月10日08:37:23
+ * @name: api.js
+ * @description: 生成api文档
+ */
+
+/* global $ db dbMain redis redisMain MQ Kafka */
+
+const Package = require('../package.json')
+
+module.exports = {
+  one,
+  two,
+  three,
+  four
+}
+
+async function four (arg) {
+  // mq 列队
+  let mqSend = await sendQueueMsg('moneyLog', 'test mq ' + new Date().date2Str())
+  let kafkaSend = await sendKafka('test', 'test kafka ' + new Date().date2Str())
+  return { code: 0, data: { name: 'four', mqSend, kafkaSend } }
+}
+
+// 往kafka送消息
+async function sendKafka (topic, msg) {
+  if (!Kafka) {
+    $.err(`sendKafka Not Conn topic=${topic} msg=${msg}`)
+    return false
+  }
+  return new Promise(function (resolve) {
+    Kafka.send([{ topic, msg }], function (err, result) {
+      if (err) {
+        $.err(err.stack)
+        resolve(false)
+      }
+      // $.log(result, msg)
+      resolve(true)
+    })
+  })
+}
+
+// 发送一个mq队里
+async function sendQueueMsg (queueName, msg) {
+  if (!MQ) {
+    $.err(`SendQueueMsg Not Conn queueName=${queueName} msg=${msg}`)
+    return
+  }
+  // https://github.com/squaremo/amqp.node/blob/master/examples/send_generators.js
+  const ch = await MQ.createConfirmChannel()
+  await ch.assertQueue(queueName)
+  let r = ch.sendToQueue(queueName, Buffer.from(msg))
+  await ch.waitForConfirms()
+  ch.close()
+  return r
+}
+
+async function three (arg) {
+  let r = await redis.get(`${Package.name}:${arg.name}`)
+  let rM = await redisMain.get(`${Package.name}:${arg.name}`)
+  $.log(r, rM)
+  return {
+    code: 0,
+    data: {
+      redis: r,
+      redisMain: rM
+    }
+  }
+}
+
+async function two (arg) {
+  let r = await redis.set(`${Package.name}:${arg.name}`, 'redis ' + new Date().date2Str())
+  let rM = await redisMain.set(`${Package.name}:${arg.name}`, 'redisMain ' + new Date().date2Str())
+  $.log(r, rM)
+  return {
+    code: 0,
+    data: {
+      redis: r,
+      redisMain: rM
+    }
+  }
+}
+
+async function one (arg) {
+  let r = await db.admin_user.R({ d_flag: 0 }, {}, {}, 1).run()
+  let rM = await dbMain.admin_user.R({ d_flag: 0 }, {}, {}, 1).run()
+  $.log(r, rM)
+  return {
+    code: 0,
+    data: {
+      db: r,
+      dbMain: rM
+    }
+  }
+}

package/demo/7-token/README.md

@@ -1 +1 @@
-全模块都加载的例子
+全模块都加载的例子

package/demo/7-token/config/config.default.js

@@ -1,35 +1,35 @@
-const path = require('path')
-const packageJson = require('../package')
-module.exports = {
-  name: packageJson.name,
-  rootDir: path.join(__dirname, '../'),
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  },
-
-  redis: {
-    host: 'localhost',
-    port: 6379,
-    auth: '',
-    db: 1
-  },
-
-  rabbitMQ: {
-    protocol: 'amqp',
-    host: 'localhost',
-    port: '5672'
-    // login: 'admin',
-    // password: 'rabbitmq@jiatui',
-    // vhost: ''
-  }
-}
+const path = require('path')
+const packageJson = require('../package')
+module.exports = {
+  name: packageJson.name,
+  rootDir: path.join(__dirname, '../'),
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  },
+
+  redis: {
+    host: 'localhost',
+    port: 6379,
+    auth: '',
+    db: 1
+  },
+
+  rabbitMQ: {
+    protocol: 'amqp',
+    host: 'localhost',
+    port: '5672'
+    // login: 'admin',
+    // password: 'rabbitmq@jiatui',
+    // vhost: ''
+  }
+}

package/demo/7-token/config/config.dev.js

@@ -1,15 +1,15 @@
-module.exports = {
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  }
-}
+module.exports = {
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  }
+}

package/demo/7-token/config/config.prod.js

@@ -1,15 +1,15 @@
-module.exports = {
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  }
-}
+module.exports = {
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  }
+}

package/demo/7-token/config/config.test.js

@@ -1,15 +1,15 @@
-module.exports = {
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  }
-}
+module.exports = {
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  }
+}

package/demo/7-token/config/index.js

@@ -1,32 +1,32 @@
-'use strict'
-let $ = require('meeko')
-const envMap = {
-  dev: 'dev',
-  development: 'dev',
-  test: 'test',
-  'local-test': 'local-test',
-  checkout: 'checkout', // 是另一个测试环境，当时运维没命好名
-  local: 'local',
-  production: 'prod',
-  prod: 'prod'
-}
-
-let env = process.env.NODE_ENV
-
-// 有这个之后，启动时 node .\index.js local 即可指定环境
-if (!env && process.argv[2]) {
-  env = process.argv[2]
-}
-
-env = envMap[env] || 'local'
-const defConfig = require('./config.default')
-
-let config = {}
-try {
-  config = require('./config.' + env)
-} catch (e) {
-  console.log('\x1b[2;31m' + `【普通错误】${env}配置文件缺失，将使用default配置` + '\x1b[m')
-}
-$.option.logTime = 0
-$.log(`=======================\n   NODE_ENV:${$.c.g(` ${env}  `)}  \n=======================`)
-module.exports = { ...defConfig, ...config }
+'use strict'
+let $ = require('meeko')
+const envMap = {
+  dev: 'dev',
+  development: 'dev',
+  test: 'test',
+  'local-test': 'local-test',
+  checkout: 'checkout', // 是另一个测试环境，当时运维没命好名
+  local: 'local',
+  production: 'prod',
+  prod: 'prod'
+}
+
+let env = process.env.NODE_ENV
+
+// 有这个之后，启动时 node .\index.js local 即可指定环境
+if (!env && process.argv[2]) {
+  env = process.argv[2]
+}
+
+env = envMap[env] || 'local'
+const defConfig = require('./config.default')
+
+let config = {}
+try {
+  config = require('./config.' + env)
+} catch (e) {
+  console.log('\x1b[2;31m' + `【普通错误】${env}配置文件缺失，将使用default配置` + '\x1b[m')
+}
+$.option.logTime = 0
+$.log(`=======================\n   NODE_ENV:${$.c.g(` ${env}  `)}  \n=======================`)
+module.exports = { ...defConfig, ...config }

package/demo/7-token/model/api/demo.js

@@ -1,43 +1,43 @@
-module.exports = {
-  __swagger__: {
-    name: 'demo接口',
-    description: '用于展示如何定义一个接口'
-  },
-  '/demo/login': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'get',
-    controller: 'demo.login',
-    param: {
-      account: {
-        name: '账号',
-        desc: '账号',
-        req: 1,
-        def: null,
-        type: 'string'
-      },
-      password: {
-        name: '密码',
-        desc: '密码',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  },
-  '/demo/home': {
-    name: '测试token',
-    desc: '测试token',
-    method: 'get',
-    controller: 'demo.home',
-    param: { },
-    'token': true,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: 'demo接口',
+    description: '用于展示如何定义一个接口'
+  },
+  '/demo/login': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'get',
+    controller: 'demo.login',
+    param: {
+      account: {
+        name: '账号',
+        desc: '账号',
+        req: 1,
+        def: null,
+        type: 'string'
+      },
+      password: {
+        name: '密码',
+        desc: '密码',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  },
+  '/demo/home': {
+    name: '测试token',
+    desc: '测试token',
+    method: 'get',
+    controller: 'demo.home',
+    param: { },
+    'token': true,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/7-token/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "7-token",
-  "version": "1.0.0",
-  "description": "含所有模块的应用",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "j2sql": "^1.9.21",
-    "amqplib": "^0.5.3",
-    "ioredis": "^4.9.5",
-    "meeko": "^1.7.50"
-  }
-}
+{
+  "name": "7-token",
+  "version": "1.0.0",
+  "description": "含所有模块的应用",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "j2sql": "^1.9.21",
+    "amqplib": "^0.5.3",
+    "ioredis": "^4.9.5",
+    "meeko": "^1.7.50"
+  }
+}

package/demo/8-test/README.md

@@ -1 +1 @@
-全模块都加载的例子
+全模块都加载的例子

package/demo/8-test/config/config.default.js

@@ -1,35 +1,35 @@
-const path = require('path')
-const packageJson = require('../package')
-module.exports = {
-  name: packageJson.name,
-  rootDir: path.join(__dirname, '../'),
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  },
-
-  redis: {
-    host: 'localhost',
-    port: 6379,
-    auth: '',
-    db: 1
-  },
-
-  rabbitMQ: {
-    protocol: 'amqp',
-    host: 'localhost',
-    port: '5672'
-    // login: 'admin',
-    // password: 'rabbitmq@jiatui',
-    // vhost: ''
-  }
-}
+const path = require('path')
+const packageJson = require('../package')
+module.exports = {
+  name: packageJson.name,
+  rootDir: path.join(__dirname, '../'),
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  },
+
+  redis: {
+    host: 'localhost',
+    port: 6379,
+    auth: '',
+    db: 1
+  },
+
+  rabbitMQ: {
+    protocol: 'amqp',
+    host: 'localhost',
+    port: '5672'
+    // login: 'admin',
+    // password: 'rabbitmq@jiatui',
+    // vhost: ''
+  }
+}

package/demo/8-test/config/config.dev.js

@@ -1,15 +1,15 @@
-module.exports = {
-  mysql: {
-    host: '127.0.0.1',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'test',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  }
-}
+module.exports = {
+  mysql: {
+    host: '127.0.0.1',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'test',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  }
+}