skybase 0.1.82 → 0.1.85

package/demo/3-full-module/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/3-full-module/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/3-full-module/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/3-full-module/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/3-full-module/index.js

@@ -1,36 +1,36 @@
-const sky = require('../../index')
-const config = require('./config')
-const $ = require('meeko')
-
-const createIoredis = require('../../sky-module/create_ioredis')
-const createRbmq = require('../../sky-module/create_amqplib')
-
-async function waitNotEmpty (o, prop, fn) {
-  fn = fn || function () {}
-  if (!o[prop]) {
-    fn(o, prop)
-    await $.wait(100)
-    await waitNotEmpty(o, prop, fn)
-  }
-}
-
-config.beforeMount = async () => {
-  // 连接mysql
-  const db = require('j2sql')(config.mysql)
-  await waitNotEmpty(db, '_mysql')
-  global.db = db
-
-  // 连接redis
-  const redis = createIoredis(config.redis)
-  await redis.waitForConnected()
-  global.redis = redis
-
-  // 连接mq
-  global.MQ = await createRbmq(config.rabbitMQ, (mq) => {
-    global.MQ = mq
-  })
-}
-
-sky.start(config, async () => {
-  console.log('项目成功启动')
-})
+const sky = require('../../index')
+const config = require('./config')
+const $ = require('meeko')
+
+const createIoredis = require('../../sky-module/create_ioredis')
+const createRbmq = require('../../sky-module/create_amqplib')
+
+async function waitNotEmpty (o, prop, fn) {
+  fn = fn || function () {}
+  if (!o[prop]) {
+    fn(o, prop)
+    await $.wait(100)
+    await waitNotEmpty(o, prop, fn)
+  }
+}
+
+config.beforeMount = async () => {
+  // 连接mysql
+  const db = require('j2sql')(config.mysql)
+  await waitNotEmpty(db, '_mysql')
+  global.db = db
+
+  // 连接redis
+  const redis = createIoredis(config.redis)
+  await redis.waitForConnected()
+  global.redis = redis
+
+  // 连接mq
+  global.MQ = await createRbmq(config.rabbitMQ, (mq) => {
+    global.MQ = mq
+  })
+}
+
+sky.start(config, async () => {
+  console.log('项目成功启动')
+})

package/demo/3-full-module/model/api/demo.js

@@ -1,26 +1,26 @@
-module.exports = {
-  __swagger__: {
-    name: 'demo接口',
-    description: '用于展示如何定义一个接口'
-  },
-  '/demo/api1': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'get',
-    controller: 'demo.api1',
-    param: {
-      name: {
-        name: '你的名字',
-        desc: '该接口将原封返回',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: 'demo接口',
+    description: '用于展示如何定义一个接口'
+  },
+  '/demo/api1': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'get',
+    controller: 'demo.api1',
+    param: {
+      name: {
+        name: '你的名字',
+        desc: '该接口将原封返回',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/3-full-module/model/api/dir/demo.js

@@ -1,26 +1,26 @@
-module.exports = {
-  __swagger__: {
-    name: 'demo接口',
-    description: '用于展示如何定义一个接口'
-  },
-  'api1': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'get',
-    controller: 'dir/demo.api1',
-    param: {
-      name: {
-        name: '你的名字',
-        desc: '该接口将原封返回',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: 'demo接口',
+    description: '用于展示如何定义一个接口'
+  },
+  'api1': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'get',
+    controller: 'dir/demo.api1',
+    param: {
+      name: {
+        name: '你的名字',
+        desc: '该接口将原封返回',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/3-full-module/model/api/use-rabbitmq.js

@@ -1,26 +1,26 @@
-module.exports = {
-  __swagger__: {
-    name: '使用rabbitmq',
-    description: '用于展示如何使用rabbitmq'
-  },
-  'api1': {
-    name: '往队列里插入数据',
-    desc: '往队列里插入数据',
-    method: 'get',
-    controller: 'use-rabbitmq.api1',
-    param: {
-      msg: {
-        name: '消息内容',
-        desc: '',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '使用rabbitmq',
+    description: '用于展示如何使用rabbitmq'
+  },
+  'api1': {
+    name: '往队列里插入数据',
+    desc: '往队列里插入数据',
+    method: 'get',
+    controller: 'use-rabbitmq.api1',
+    param: {
+      msg: {
+        name: '消息内容',
+        desc: '',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/3-full-module/model/api/use-redis.js

@@ -1,33 +1,33 @@
-module.exports = {
-  __swagger__: {
-    name: '使用redis',
-    description: '用于展示如何使用redis'
-  },
-  'api1': {
-    name: '使用redis示例',
-    desc: '',
-    method: 'get',
-    controller: 'use-redis.api1',
-    param: {
-      key: {
-        name: 'key',
-        desc: '',
-        req: 1,
-        def: null,
-        type: 'string'
-      },
-      val: {
-        name: 'val',
-        desc: '',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '使用redis',
+    description: '用于展示如何使用redis'
+  },
+  'api1': {
+    name: '使用redis示例',
+    desc: '',
+    method: 'get',
+    controller: 'use-redis.api1',
+    param: {
+      key: {
+        name: 'key',
+        desc: '',
+        req: 1,
+        def: null,
+        type: 'string'
+      },
+      val: {
+        name: 'val',
+        desc: '',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/3-full-module/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "3-full-module",
-  "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": "3-full-module",
+  "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/3-full-module/rabbit-consumer.js

@@ -1,46 +1,46 @@
-/**
- * 队列消费者
- *
- * 启动方式： node ./demo/3-full-module/rabbit-consumer.js
- * */
-
-'use strict'
-
-// 在windows上设置这个环境麻烦，所以只要是没设置的，就认为是本地环境
-process.env.NODE_ENV = process.env.NODE_ENV || process.argv[2] || 'local'
-
-const $ = require('meeko')
-
-const queueName = 'test'
-
-const config = require('./config')
-const createRbmq = require('../../sky-module/create_amqplib')
-let MQ
-
-async function before () {
-  MQ = await createRbmq(config.rabbitMQ, (mq) => {
-    MQ = mq
-    start().then()
-  })
-  console.log('mq加载完成')
-}
-
-async function start () {
-  const ch = await MQ.createChannel()
-  await ch.assertQueue(queueName, {})
-  await ch.consume(queueName, async function (msg) {
-    const data = msg.content.toString()
-    console.log('data receive:', data)
-  }, {
-    // 这个设为false，则处理完之后必须使用 ch.ack(msg)
-    noAck: true
-  })
-
-  $.log(`listening queue: ${queueName}`)
-}
-
+/**
+ * 队列消费者
+ *
+ * 启动方式： node ./demo/3-full-module/rabbit-consumer.js
+ * */
+
+'use strict'
+
+// 在windows上设置这个环境麻烦，所以只要是没设置的，就认为是本地环境
+process.env.NODE_ENV = process.env.NODE_ENV || process.argv[2] || 'local'
+
+const $ = require('meeko')
+
+const queueName = 'test'
+
+const config = require('./config')
+const createRbmq = require('../../sky-module/create_amqplib')
+let MQ
+
+async function before () {
+  MQ = await createRbmq(config.rabbitMQ, (mq) => {
+    MQ = mq
+    start().then()
+  })
+  console.log('mq加载完成')
+}
+
+async function start () {
+  const ch = await MQ.createChannel()
+  await ch.assertQueue(queueName, {})
+  await ch.consume(queueName, async function (msg) {
+    const data = msg.content.toString()
+    console.log('data receive:', data)
+  }, {
+    // 这个设为false，则处理完之后必须使用 ch.ack(msg)
+    noAck: true
+  })
+
+  $.log(`listening queue: ${queueName}`)
+}
+
 before().then(start)
-  ['catch'](async (err) => {
-    console.error('致命错误', err.stack)
-    process.exit(1)
-  })
+  ['catch'](async (err) => {
+    console.error('致命错误', err.stack)
+    process.exit(1)
+  })

package/demo/3-full-module/router/demo.js

@@ -1,9 +1,9 @@
-module.exports = {
-  async api1 (ctx) {
-    const { name } = ctx.checkedData.data
-    ctx.throwCode(200, '成功', {
-      path: 'demo',
-      name: name
-    })
-  }
-}
+module.exports = {
+  async api1 (ctx) {
+    const { name } = ctx.checkedData.data
+    ctx.throwCode(200, '成功', {
+      path: 'demo',
+      name: name
+    })
+  }
+}

package/demo/3-full-module/router/dir/demo.js

@@ -1,9 +1,9 @@
-module.exports = {
-  async api1 (ctx) {
-    const { name } = ctx.checkedData.data
-    ctx.throwCode(200, '成功', {
-      path: 'dir/demo',
-      name: name
-    })
-  }
-}
+module.exports = {
+  async api1 (ctx) {
+    const { name } = ctx.checkedData.data
+    ctx.throwCode(200, '成功', {
+      path: 'dir/demo',
+      name: name
+    })
+  }
+}

package/demo/3-full-module/router/use-redis.js

@@ -1,14 +1,14 @@
-module.exports = {
-  async api1 (ctx) {
-    const {key, val} = ctx.checkedData.data
-
-    await global.redis.setex(key, 1, val)
-    const v = await global.redis.get(key)
-
-    if (v === val) {
-      ctx.ok()
-    } else {
-      ctx.throwCode(0, '失败')
-    }
-  }
-}
+module.exports = {
+  async api1 (ctx) {
+    const {key, val} = ctx.checkedData.data
+
+    await global.redis.setex(key, 1, val)
+    const v = await global.redis.get(key)
+
+    if (v === val) {
+      ctx.ok()
+    } else {
+      ctx.throwCode(0, '失败')
+    }
+  }
+}