skybase 0.1.82 → 0.1.85

package/demo/6-sql-test/config/config.default.js

@@ -1,61 +1,61 @@
-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
-  },
-
-  mysqlMain: {
-    host: 'localhost',
-    port: 3306,
-    user: 'root',
-    password: '123456',
-    database: 'new_super_ip',
-    pool: 1000,
-    timeout: 60000,
-    charset: 'utf8mb4',
-    multipleStatements: true,
-    connectionLimit: 1000,
-    showSql: true // 使用BaseModel的才有效，打印sql
-  },
-
-  redis: {
-    host: 'localhost',
-    port: 6379,
-    auth: '',
-    db: 1
-  },
-
-  redisMain: {
-    host: 'localhost',
-    port: 6379,
-    auth: '',
-    db: 2
-  },
-
-  rabbitMQ: {
-    protocol: 'amqp',
-    host: 'localhost',
-    port: '5672'
-    // login: 'admin',
-    // password: 'rabbitmq@jiatui',
-    // vhost: ''
-  },
-
-  kafka: {
-    host: '10.0.2.31:9092,172.16.64.35:9092',
-    topic: 'appRequest'
-  }
-}
+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
+  },
+
+  mysqlMain: {
+    host: 'localhost',
+    port: 3306,
+    user: 'root',
+    password: '123456',
+    database: 'new_super_ip',
+    pool: 1000,
+    timeout: 60000,
+    charset: 'utf8mb4',
+    multipleStatements: true,
+    connectionLimit: 1000,
+    showSql: true // 使用BaseModel的才有效，打印sql
+  },
+
+  redis: {
+    host: 'localhost',
+    port: 6379,
+    auth: '',
+    db: 1
+  },
+
+  redisMain: {
+    host: 'localhost',
+    port: 6379,
+    auth: '',
+    db: 2
+  },
+
+  rabbitMQ: {
+    protocol: 'amqp',
+    host: 'localhost',
+    port: '5672'
+    // login: 'admin',
+    // password: 'rabbitmq@jiatui',
+    // vhost: ''
+  },
+
+  kafka: {
+    host: '10.0.2.31:9092,172.16.64.35:9092',
+    topic: 'appRequest'
+  }
+}

package/demo/6-sql-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
+  }
+}

package/demo/6-sql-test/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/6-sql-test/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/6-sql-test/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/6-sql-test/index.js

@@ -1,48 +1,48 @@
-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')
-const createKafka = require('../../sky-module/create_kafka.js')
-
-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
-
-  // 连接mysql主
-  const dbMain = require('j2sql')(config.mysqlMain)
-  await waitNotEmpty(dbMain, '_mysql')
-  global.dbMain = dbMain
-
-  // 连接redis
-  const redis = createIoredis(config.redis)
-  await redis.waitForConnected()
-  global.redis = redis
-
-  // 连接redis主
-  const redisMain = createIoredis(config.redisMain)
-  await redis.waitForConnected()
-  global.redisMain = redisMain
-
-  // 连接mq
-  global.MQ = await createRbmq(config.rabbitMQ)
-
-  // 连接kafka
-  global.Kafka = await createKafka(config.kafka)
-}
-
-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')
+const createKafka = require('../../sky-module/create_kafka.js')
+
+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
+
+  // 连接mysql主
+  const dbMain = require('j2sql')(config.mysqlMain)
+  await waitNotEmpty(dbMain, '_mysql')
+  global.dbMain = dbMain
+
+  // 连接redis
+  const redis = createIoredis(config.redis)
+  await redis.waitForConnected()
+  global.redis = redis
+
+  // 连接redis主
+  const redisMain = createIoredis(config.redisMain)
+  await redis.waitForConnected()
+  global.redisMain = redisMain
+
+  // 连接mq
+  global.MQ = await createRbmq(config.rabbitMQ)
+
+  // 连接kafka
+  global.Kafka = await createKafka(config.kafka)
+}
+
+sky.start(config, async () => {
+  console.log('项目成功启动')
+})

package/demo/6-sql-test/model/api/dir/dir/dir/four.js

@@ -1,18 +1,18 @@
-module.exports = {
-  __swagger__: {
-    name: '测试用例接口',
-    description: '测试用例接口'
-  },
-  '/dir/dir/dir/four': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'get',
-    controller: 'test.four',
-    param: { },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '测试用例接口',
+    description: '测试用例接口'
+  },
+  '/dir/dir/dir/four': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'get',
+    controller: 'test.four',
+    param: { },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/6-sql-test/model/api/dir/dir/three.js

@@ -1,26 +1,26 @@
-module.exports = {
-  __swagger__: {
-    name: '测试用例接口',
-    description: '测试用例接口'
-  },
-  '/dir/dir/three': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'post',
-    controller: 'test.three',
-    param: {
-      name: {
-        name: '你的名字',
-        desc: '你的名字',
-        req: 0,
-        def: '',
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '测试用例接口',
+    description: '测试用例接口'
+  },
+  '/dir/dir/three': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'post',
+    controller: 'test.three',
+    param: {
+      name: {
+        name: '你的名字',
+        desc: '你的名字',
+        req: 0,
+        def: '',
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/6-sql-test/model/api/dir/two.js

@@ -1,26 +1,26 @@
-module.exports = {
-  __swagger__: {
-    name: '测试用例接口',
-    description: '测试用例接口'
-  },
-  '/dir/two': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'post',
-    controller: 'test.two',
-    param: {
-      name: {
-        name: '你的名字',
-        desc: '你的名字',
-        req: 1,
-        def: null,
-        type: 'string'
-      }
-    },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '测试用例接口',
+    description: '测试用例接口'
+  },
+  '/dir/two': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'post',
+    controller: 'test.two',
+    param: {
+      name: {
+        name: '你的名字',
+        desc: '你的名字',
+        req: 1,
+        def: null,
+        type: 'string'
+      }
+    },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/6-sql-test/model/api/one.js

@@ -1,18 +1,18 @@
-module.exports = {
-  __swagger__: {
-    name: '测试用例接口',
-    description: '测试用例接口'
-  },
-  '/one': {
-    name: 'demo接口1',
-    desc: 'demo接口1',
-    method: 'get',
-    controller: 'test.one',
-    param: { },
-    'token': false,
-    'needSign': false,
-    'err_code': {},
-    'test': {},
-    'front': true
-  }
-}
+module.exports = {
+  __swagger__: {
+    name: '测试用例接口',
+    description: '测试用例接口'
+  },
+  '/one': {
+    name: 'demo接口1',
+    desc: 'demo接口1',
+    method: 'get',
+    controller: 'test.one',
+    param: { },
+    'token': false,
+    'needSign': false,
+    'err_code': {},
+    'test': {},
+    'front': true
+  }
+}

package/demo/6-sql-test/package.json

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

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

@@ -1,38 +1,38 @@
-
-const testService = require('../service/test.js')
-
-module.exports = {
-  async one (ctx) {
-    const r = await testService.one(ctx.checkedData.data)
-    if (r && r.code === 0) {
-      ctx.throwCode(200, '成功', r.data)
-    } else {
-      ctx.throwCode(r.code, r.msg)
-    }
-  },
-  async two (ctx) {
-    const r = await testService.two(ctx.checkedData.data)
-    if (r && r.code === 0) {
-      ctx.throwCode(200, '成功', r.data)
-    } else {
-      ctx.throwCode(r.code, r.msg)
-    }
-  },
-  async three (ctx) {
-    const r = await testService.three(ctx.checkedData.data)
-    if (r && r.code === 0) {
-      ctx.throwCode(200, '成功', r.data)
-    } else {
-      ctx.throwCode(r.code, r.msg)
-    }
-  },
-  async four (ctx) {
-    const r = await testService.four(ctx.checkedData.data)
-    if (r && r.code === 0) {
-      ctx.throwCode(200, '成功', r.data)
-    } else {
-      ctx.throwCode(r.code, r.msg)
-    }
-  }
-
-}
+
+const testService = require('../service/test.js')
+
+module.exports = {
+  async one (ctx) {
+    const r = await testService.one(ctx.checkedData.data)
+    if (r && r.code === 0) {
+      ctx.throwCode(200, '成功', r.data)
+    } else {
+      ctx.throwCode(r.code, r.msg)
+    }
+  },
+  async two (ctx) {
+    const r = await testService.two(ctx.checkedData.data)
+    if (r && r.code === 0) {
+      ctx.throwCode(200, '成功', r.data)
+    } else {
+      ctx.throwCode(r.code, r.msg)
+    }
+  },
+  async three (ctx) {
+    const r = await testService.three(ctx.checkedData.data)
+    if (r && r.code === 0) {
+      ctx.throwCode(200, '成功', r.data)
+    } else {
+      ctx.throwCode(r.code, r.msg)
+    }
+  },
+  async four (ctx) {
+    const r = await testService.four(ctx.checkedData.data)
+    if (r && r.code === 0) {
+      ctx.throwCode(200, '成功', r.data)
+    } else {
+      ctx.throwCode(r.code, r.msg)
+    }
+  }
+
+}