skybase 0.1.84 → 0.1.85

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

@@ -1,30 +1,30 @@
-const sky = require('../../index')
-const config = require('./config')
-const $ = require('meeko')
-
-const createIoredis = require('../../sky-module/create_ioredis')
-
-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 () => {
-  // 连接redis
-  const redis = createIoredis(config.redis)
-  await redis.waitForConnected()
-  global.redis = redis
-
-  // 连接mysql
-  const db = require('j2sql')(config.mysql)
-  await waitNotEmpty(db, '_mysql')
-  global.db = db
-}
-
-sky.start(config, async () => {
-  console.log('项目成功启动')
-})
+const sky = require('../../index')
+const config = require('./config')
+const $ = require('meeko')
+
+const createIoredis = require('../../sky-module/create_ioredis')
+
+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 () => {
+  // 连接redis
+  const redis = createIoredis(config.redis)
+  await redis.waitForConnected()
+  global.redis = redis
+
+  // 连接mysql
+  const db = require('j2sql')(config.mysql)
+  await waitNotEmpty(db, '_mysql')
+  global.db = db
+}
+
+sky.start(config, async () => {
+  console.log('项目成功启动')
+})

package/demo/8-test/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/8-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/8-test/model/api/mock.js

@@ -1,158 +1,158 @@
-/**
- * 测试mock数据内容
- * 参考网址 ： http://mockjs.com/examples.html
+/**
+ * 测试mock数据内容
+ * 参考网址 ： http://mockjs.com/examples.html
  * */
-
-module.exports = {
-  __swagger__: {
-    name: 'mock数据接口',
-    description: 'mock数据接口 - http://mockjs.com/examples.html'
-  },
-  '/mock/noControllerNoMock': {
-    name: 'mock controller、mock 都没有',
-    desc: 'mock controller、mock 都没有',
-    method: 'get',
-    // controller: 'mock.noController',
-    param: {},
-    err_code: {
-      200: {
-        temp: {
-          'data': {},
-          'code': 200,
-          'msg': 'ok',
-          't': 1552709427858
-        }
-      }
-    },
-    test: {},
-    'token': false,
-    'needSign': false,
-    'front': true
-  },
-  '/mock/noController': {
-    name: 'mock 没有controller',
-    desc: 'mock 没有controller',
-    method: 'all',
-    // controller: 'mock.noController',
-    param: {},
-    mock: {
-      // 属性 list 的值是一个数组，其中含有 1 到 10 个元素
-      'list|1-2': [{
-        // 属性 id 是一个自增数，起始值为 1，每次增 1
-        'id|+1': 100,
-        'id1|0-21': 100,
-        'name': '@genName',
-        str: '@genData(\'abcdefghijklmnopqrstuvwxyz\',10)',
-        datetime: '@genDatetime(\'2016-1-1\', \'2016-2-2\')',
-        card: '@genCard',
-        url: '@genUrl(5)',
-        phoneNum: '@genPhone',
-        color: '@genColor',
-        colorRGBA: '@genColor(\'rgba\')',
-        ip: '@genIp',
-        word: '@genWord(10)',
-        word0: '@genWord',
-        sentence: '@genText(20)',
-        sentence20: '@genText(20)',
-        sentence10: '@genText(10)',
-        sentence0: '@genText',
-        constellation: '@genConstellation',
-        bool: '@genBool',
-        genEnum1: '@genEnum([\'5\',6,7])', // NOTICE key不能和函数名一样
-        genEnum0: '@genEnum',
-        genEnum2: '@genEnum([\'5x\',\'6x\',\'7x\'])',
-        genEnum3: '@genEnum([[],null,\'\'])',
-        img: '@genEnum([\'https://\',\'http://\'])resource.aijiatui.com/@genData(\'0123456789\',11)/company/moments/@genData(\'abcdefghijklmnopqrstuvwxyz0123456789\',32).jpeg',
-        skuCode: null,
-        'list|5-10': [
-          /\d{5,10}/
-        ]
-      }]
-    },
-    err_code: {
-      200: {
-        temp: {
-          'data': {},
-          'code': 200,
-          'msg': 'ok',
-          't': 1552709427858
-        }
-      }
-    },
-    test: {},
-    'token': false,
-    'needSign': false,
-    'front': true
-  },
-  '/mock/haveController': {
-    name: 'mock 有controller',
-    desc: 'mock 有controller',
-    method: 'get',
-    controller: 'mock.haveController',
-    param: {},
-    err_code: {
-      200: {
-        temp: {
-          'data': { },
-          'code': 0,
-          'msg': 'ok',
-          't': 1559204889719
-        }
-      }
-    },
-    test: {},
-    'token': false,
-    'needSign': false,
-    'front': true
-  },
-  '/mock/image': {
-    name: '各种图片数据模拟',
-    desc: '各种图片数据模拟',
-    method: 'get',
-    controller: 'mock.image',
-    param: {
-      width: {
-        desc: 'width',
-        req: 0,
-        def: 200,
-        type: 'number',
-        example: '200'
-      },
-      heigth: {
-        desc: 'heigth',
-        req: 0,
-        def: 100,
-        type: 'number',
-        example: '100'
-      },
-      count: {
-        desc: 'count',
-        req: 0,
-        def: 5,
-        type: 'number',
-        example: '5'
-      },
-      type: {
-        desc: 'type [png,jpeg,jpg]',
-        req: 0,
-        def: 'png',
-        type: 'string',
-        example: 'png'
-      }
-    },
-    err_code: {
-      200: {
-        temp: {
-          'data': { },
-          'code': 0,
-          'msg': 'ok',
-          't': 1559204889719
-        }
-      }
-    },
-    test: {},
-    'token': false,
-    'needSign': false,
-    'front': true
-  }
-}
+
+module.exports = {
+  __swagger__: {
+    name: 'mock数据接口',
+    description: 'mock数据接口 - http://mockjs.com/examples.html'
+  },
+  '/mock/noControllerNoMock': {
+    name: 'mock controller、mock 都没有',
+    desc: 'mock controller、mock 都没有',
+    method: 'get',
+    // controller: 'mock.noController',
+    param: {},
+    err_code: {
+      200: {
+        temp: {
+          'data': {},
+          'code': 200,
+          'msg': 'ok',
+          't': 1552709427858
+        }
+      }
+    },
+    test: {},
+    'token': false,
+    'needSign': false,
+    'front': true
+  },
+  '/mock/noController': {
+    name: 'mock 没有controller',
+    desc: 'mock 没有controller',
+    method: 'all',
+    // controller: 'mock.noController',
+    param: {},
+    mock: {
+      // 属性 list 的值是一个数组，其中含有 1 到 10 个元素
+      'list|1-2': [{
+        // 属性 id 是一个自增数，起始值为 1，每次增 1
+        'id|+1': 100,
+        'id1|0-21': 100,
+        'name': '@genName',
+        str: '@genData(\'abcdefghijklmnopqrstuvwxyz\',10)',
+        datetime: '@genDatetime(\'2016-1-1\', \'2016-2-2\')',
+        card: '@genCard',
+        url: '@genUrl(5)',
+        phoneNum: '@genPhone',
+        color: '@genColor',
+        colorRGBA: '@genColor(\'rgba\')',
+        ip: '@genIp',
+        word: '@genWord(10)',
+        word0: '@genWord',
+        sentence: '@genText(20)',
+        sentence20: '@genText(20)',
+        sentence10: '@genText(10)',
+        sentence0: '@genText',
+        constellation: '@genConstellation',
+        bool: '@genBool',
+        genEnum1: '@genEnum([\'5\',6,7])', // NOTICE key不能和函数名一样
+        genEnum0: '@genEnum',
+        genEnum2: '@genEnum([\'5x\',\'6x\',\'7x\'])',
+        genEnum3: '@genEnum([[],null,\'\'])',
+        img: '@genEnum([\'https://\',\'http://\'])resource.aijiatui.com/@genData(\'0123456789\',11)/company/moments/@genData(\'abcdefghijklmnopqrstuvwxyz0123456789\',32).jpeg',
+        skuCode: null,
+        'list|5-10': [
+          /\d{5,10}/
+        ]
+      }]
+    },
+    err_code: {
+      200: {
+        temp: {
+          'data': {},
+          'code': 200,
+          'msg': 'ok',
+          't': 1552709427858
+        }
+      }
+    },
+    test: {},
+    'token': false,
+    'needSign': false,
+    'front': true
+  },
+  '/mock/haveController': {
+    name: 'mock 有controller',
+    desc: 'mock 有controller',
+    method: 'get',
+    controller: 'mock.haveController',
+    param: {},
+    err_code: {
+      200: {
+        temp: {
+          'data': { },
+          'code': 0,
+          'msg': 'ok',
+          't': 1559204889719
+        }
+      }
+    },
+    test: {},
+    'token': false,
+    'needSign': false,
+    'front': true
+  },
+  '/mock/image': {
+    name: '各种图片数据模拟',
+    desc: '各种图片数据模拟',
+    method: 'get',
+    controller: 'mock.image',
+    param: {
+      width: {
+        desc: 'width',
+        req: 0,
+        def: 200,
+        type: 'number',
+        example: '200'
+      },
+      heigth: {
+        desc: 'heigth',
+        req: 0,
+        def: 100,
+        type: 'number',
+        example: '100'
+      },
+      count: {
+        desc: 'count',
+        req: 0,
+        def: 5,
+        type: 'number',
+        example: '5'
+      },
+      type: {
+        desc: 'type [png,jpeg,jpg]',
+        req: 0,
+        def: 'png',
+        type: 'string',
+        example: 'png'
+      }
+    },
+    err_code: {
+      200: {
+        temp: {
+          'data': { },
+          'code': 0,
+          'msg': 'ok',
+          't': 1559204889719
+        }
+      }
+    },
+    test: {},
+    'token': false,
+    'needSign': false,
+    'front': true
+  }
+}