skybase 0.1.82 → 0.1.85

package/package.json

@@ -1,67 +1,50 @@
-{
-  "name": "skybase",
-  "version": "0.1.82",
-  "description": "sky框架",
-  "main": "index.js",
-  "directories": {
-    "test": "tests"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/kongnet/skybase.git"
-  },
-  "scripts": {
-    "cz": "conventional-changelog -p atom -i CHANGELOG.md -s -r 0 && git add . && git status && git cz",
-    "push": "npm version patch && npm publish . && git push",
-    "test": "nyc --reporter=html mocha ./tests/*.js",
-    "demo1": "nodemon demo/1-simple/index.js",
-    "demo2": "nodemon demo/2-api-register/index.js",
-    "demo3": "nodemon demo/3-full-module/index.js",
-    "demo4": "nodemon demo/4-api-to-file/index.js",
-    "demo5": "nodemon demo/5-mock-api/index.js",
-    "demo6": "nodemon demo/6-sql-test/index.js",
-    "demo7": "nodemon demo/7-token/index.js",
-    "demo8": "nodemon demo/8-test/index.js",
-    "demo9": "nodemon demo/9-mysql-chart/index.js"
-  },
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "amqplib": "^0.5.3",
-    "figlet": "^1.2.1",
-    "ioredis": "^4.10.0",
-    "j2sql": "^1.9.25",
-    "kafka-node": "^4.1.3",
-    "koa": "^2.7.0",
-    "koa-better-body": "^3.0.4",
-    "koa-convert": "^1.2.0",
-    "koa-router": "^7.4.0",
-    "koa-static": "^5.0.0",
-    "koa2-cors": "^2.0.6",
-    "meeko": "*",
-    "mockjs": "^1.0.1-beta3",
-    "request": "^2.88.0",
-    "request-promise-native": "^1.0.7"
-  },
-  "devDependencies": {
-    "amqplib": "^0.5.3",
-    "babel-eslint": "^10.0.2",
-    "cc-jt": "^0.1.21",
-    "co-mocha": "^1.2.2",
-    "conventional-changelog": "^3.1.10",
-    "cz-jt": "^0.1.11",
-    "eslint": "^6.1.0",
-    "eslint-plugin-html": "^6.0.0",
-    "eslint-plugin-vue": "^5.2.3",
-    "mocha": "^6.1.4",
-    "nodemon": "^2.0.4",
-    "nyc": "^14.1.1",
-    "socket.io": "^2.3.0",
-    "standard": "^12.0.1"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-jt"
-    }
-  }
-}
+{
+  "name": "skybase",
+  "version": "0.1.85",
+  "description": "sky框架",
+  "main": "index.js",
+  "directories": {
+    "test": "tests"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/kongnet/skybase.git"
+  },
+  "scripts": {
+    "cz": "conventional-changelog -p atom -i CHANGELOG.md -s -r 0 && git add . && git status && git cz",
+    "push": "npm version patch && npm publish . && git push",
+    "test": "nyc --reporter=html mocha ./tests/*.js",
+    "demo1": "nodemon demo/1-simple/index.js",
+    "demo2": "nodemon demo/2-api-register/index.js",
+    "demo3": "nodemon demo/3-full-module/index.js",
+    "demo4": "nodemon demo/4-api-to-file/index.js",
+    "demo5": "nodemon demo/5-mock-api/index.js",
+    "demo6": "nodemon demo/6-sql-test/index.js",
+    "demo7": "nodemon demo/7-token/index.js",
+    "demo8": "nodemon demo/8-test/index.js",
+    "demo9": "nodemon demo/9-mysql-chart/index.js"
+  },
+  "author": "9601698@qq.com",
+  "license": "MIT",
+  "dependencies": {
+    "amqplib": "*",
+    "figlet": "^1.5.2",
+    "kafka-node": "*",
+    "koa": "^2.13.4",
+    "koa-better-body": "^3.3.9",
+    "koa-convert": "^2.0.0",
+    "koa-router": "^10.1.1",
+    "koa-static": "^5.0.0",
+    "koa2-cors": "^2.0.6",
+    "meeko": "*"
+  },
+  "devDependencies": {
+    "conventional-changelog": "^3.1.10",
+    "cz-jt": "^0.1.11"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-jt"
+    }
+  }
+}

package/sky-module/create_amqplib.js

@@ -1,71 +1,71 @@
-/**
- * rabbit_mq 连接器，带断开自动重连功能
- * */
-
-const $ = require('meeko')
-const amqp = require('amqplib')
-$.option.logTime = false
-
-/**
- * 给MQ加一些必须的监听器，包括处理重新连接的逻辑
+/**
+ * rabbit_mq 连接器，带断开自动重连功能
  * */
-
-const addListener = (mq, conf, onReconnected) => {
-  mq.on('close', async (e) => {
-    // 启动后，断开了连接
-    $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}] close...`)
-    $.err(e.message)
-
-    if (onReconnected) {
-      const MQ = await createAmqp(conf, onReconnected)
-      $.log($.c.g('✔'), `rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}]`)
-      onReconnected && onReconnected(MQ)
-    }
-  })
-
-  mq.on('error', function (e) {
-    $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}] disconnect...`)
-    $.err(e.message)
-  })
-}
-
-/**
- * 创建并连接队列
- * @param conf 配置
- * @param {function(ChannelModel)} onReconnected 重连成功之后执行的方法
- * 重连之后，整个MQ实例都会换掉（amqplib就有这个坑），如果是消费者，重连之后必须重新注册，否则即使重连了，也接收不到数据了
- *
- * @return {Promise<ChannelModel>}
+
+const $ = require('meeko')
+const amqp = require('amqplib')
+$.option.logTime = false
+
+/**
+ * 给MQ加一些必须的监听器，包括处理重新连接的逻辑
  * */
-
-const createAmqp = async (conf, onReconnected) => {
-  const option = {
-    protocol: conf.protocol,
-    hostname: conf.host,
-    port: conf.port,
-    username: conf.login,
-    password: conf.password,
-    locale: 'en_US',
-    frameMax: 0,
-    heartbeat: 7,
-    vhost: conf.vhost,
-  }
-
-  let err = false
-  do {
-    try {
-      const MQ = await amqp.connect(option)
-      addListener(MQ, option, onReconnected)
-      $.log($.c.g('✔'), `rabbitMQ [${$.c.y(`${option.hostname} : ${option.port}`)}]`)
-      return MQ
-    } catch (e) {
-      $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${option.hostname} : ${option.port}`)}] connected fail...`)
-      $.err(e.stack)
-      err = true
-      await $.wait(2000)
-    }
-  } while (err)
-  return false
-}
-
-module.exports = createAmqp
+
+const addListener = (mq, conf, onReconnected) => {
+  mq.on('close', async (e) => {
+    // 启动后，断开了连接
+    $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}] close...`)
+    $.err(e.message)
+
+    if (onReconnected) {
+      const MQ = await createAmqp(conf, onReconnected)
+      $.log($.c.g('✔'), `rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}]`)
+      onReconnected && onReconnected(MQ)
+    }
+  })
+
+  mq.on('error', function (e) {
+    $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${conf.hostname} : ${conf.port}`)}] disconnect...`)
+    $.err(e.message)
+  })
+}
+
+/**
+ * 创建并连接队列
+ * @param conf 配置
+ * @param {function(ChannelModel)} onReconnected 重连成功之后执行的方法
+ * 重连之后，整个MQ实例都会换掉（amqplib就有这个坑），如果是消费者，重连之后必须重新注册，否则即使重连了，也接收不到数据了
+ *
+ * @return {Promise<ChannelModel>}
+ * */
+
+const createAmqp = async (conf, onReconnected) => {
+  const option = {
+    protocol: conf.protocol,
+    hostname: conf.host,
+    port: conf.port,
+    username: conf.login,
+    password: conf.password,
+    locale: 'en_US',
+    frameMax: 0,
+    heartbeat: 7,
+    vhost: conf.vhost,
+  }
+
+  let err = false
+  do {
+    try {
+      const MQ = await amqp.connect(option)
+      addListener(MQ, option, onReconnected)
+      $.log($.c.g('✔'), `rabbitMQ [${$.c.y(`${option.hostname} : ${option.port}`)}]`)
+      return MQ
+    } catch (e) {
+      $.err($.c.r('✘'), `-x- rabbitMQ [${$.c.y(`${option.hostname} : ${option.port}`)}] connected fail...`)
+      $.err(e.stack)
+      err = true
+      await $.wait(2000)
+    }
+  } while (err)
+  return false
+}
+
+module.exports = createAmqp

package/sky-module/create_ioredis.js

@@ -1,47 +1,47 @@
-/* global $ */
-const Redis = require('ioredis')
-$.option.logTime = false
-const connect = function (rd) {
-  let hadConnected = false
-  let connected
-
-  // ioredis 的 auth 叫 password
-  rd.password = rd.auth
-
-  const redis = new Redis(rd)
-
-  // ioredis 自动重连出错时：
-  redis.reconnectOnError = function (err) {
-    redis.connStatus = { stat: 0 }
-    $.err($.c.r('✘'), `-x- Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] disconnect...`)
-    $.err('redis连接失败原因：', err.code, err.message)
-    return false // 返回true或1才会重新启动
-  }
-  redis.on('connect', function () {
-    redis.connStatus = { stat: 1 }
-    redis.dbsize().then(function (_r) {
-      _r = _r || 0
-      $.log($.c.g('✔'), `Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] db ${$.c.y(rd.db)} [${$.c.y(_r)}] Objects`)
-
-      hadConnected = true
-      connected && connected()
-    })
-  })
-  redis.on('error', function (e) {
-    $.err($.c.r('✘'), `-x- Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] ${e.toString()}`)
-  })
-
-  redis.waitForConnected = () => new class {
-    then (fn) {
-      if (hadConnected) {
-        fn()
-      } else {
-        connected = fn
-      }
-    }
-  }()
-
-  return redis
-}
-
-module.exports = connect
+/* global $ */
+const Redis = require('ioredis')
+$.option.logTime = false
+const connect = function (rd) {
+  let hadConnected = false
+  let connected
+
+  // ioredis 的 auth 叫 password
+  rd.password = rd.auth
+
+  const redis = new Redis(rd)
+
+  // ioredis 自动重连出错时：
+  redis.reconnectOnError = function (err) {
+    redis.connStatus = { stat: 0 }
+    $.err($.c.r('✘'), `-x- Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] disconnect...`)
+    $.err('redis连接失败原因：', err.code, err.message)
+    return false // 返回true或1才会重新启动
+  }
+  redis.on('connect', function () {
+    redis.connStatus = { stat: 1 }
+    redis.dbsize().then(function (_r) {
+      _r = _r || 0
+      $.log($.c.g('✔'), `Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] db ${$.c.y(rd.db)} [${$.c.y(_r)}] Objects`)
+
+      hadConnected = true
+      connected && connected()
+    })
+  })
+  redis.on('error', function (e) {
+    $.err($.c.r('✘'), `-x- Redis [${$.c.y(`${rd.host} : ${rd.port}`)}] ${e.toString()}`)
+  })
+
+  redis.waitForConnected = () => new class {
+    then (fn) {
+      if (hadConnected) {
+        fn()
+      } else {
+        connected = fn
+      }
+    }
+  }()
+
+  return redis
+}
+
+module.exports = connect

package/sky-module/create_kafka.js

@@ -1,24 +1,24 @@
-const $ = require('meeko')
-const kafka = require('kafka-node')
-const HighLevelProducer = kafka.HighLevelProducer
-const Client = kafka.KafkaClient
-$.option.logTime = false
-module.exports = async (kafkaConfig) => {
-  try {
-    let client = new Client({ kafkaHost: kafkaConfig.host })
-    const producer = new HighLevelProducer(client)
-
-    producer.on('ready', function () {
-      $.log($.c.g('✔'), `Kafka [${$.c.y(kafkaConfig.host)}]`)
-    })
-
-    producer.on('error', function (e) {
-      $.err($.c.r('✘'), `-x- Kafka [${$.c.y(kafkaConfig.host)}] disconnect...`)
-    })
-    return producer
-  } catch (e) {
-    $.err($.c.r('✘'), `-x- Kafka [${$.c.y(kafkaConfig.host)}] disconnect...`)
-    console.error(e.stack)
-  }
-  return null
-}
+const $ = require('meeko')
+const kafka = require('kafka-node')
+const HighLevelProducer = kafka.HighLevelProducer
+const Client = kafka.KafkaClient
+$.option.logTime = false
+module.exports = async (kafkaConfig) => {
+  try {
+    let client = new Client({ kafkaHost: kafkaConfig.host })
+    const producer = new HighLevelProducer(client)
+
+    producer.on('ready', function () {
+      $.log($.c.g('✔'), `Kafka [${$.c.y(kafkaConfig.host)}]`)
+    })
+
+    producer.on('error', function (e) {
+      $.err($.c.r('✘'), `-x- Kafka [${$.c.y(kafkaConfig.host)}] disconnect...`)
+    })
+    return producer
+  } catch (e) {
+    $.err($.c.r('✘'), `-x- Kafka [${$.c.y(kafkaConfig.host)}] disconnect...`)
+    console.error(e.stack)
+  }
+  return null
+}

package/skyconfig.js

@@ -118,7 +118,8 @@ module.exports = {
 
   bodyParse: {
     multipart: !0,
-    formLimit: '100mb', // 100M 文件上传限制
+    maxFileSize: 1024 * 1024 * 1024, //  1000M 文件上传限制 和下面的formLimit需要一起改
+    formLimit: '1000mb', // 1000M 文件上传限制
     jsonLimit: '2mb', // body中json格式大小限制
     textLimit: '2mb', //
     extendTypes: {