fix #133 import bug

pull/152/merge
Bosn 7 years ago
parent f871e090b5
commit 7147c49769

@ -21,7 +21,7 @@ let config: IConfigOptions = {
min: 0, min: 0,
idle: 10000, idle: 10000,
}, },
logging: true, logging: false,
}, },
} }

@ -272,6 +272,7 @@ router.get('/account/logger', async (ctx) => {
pagination, pagination,
} }
}) })
<<<<<<< HEAD
router.get('/captcha', async (ctx) => { router.get('/captcha', async (ctx) => {
const captcha = svgCaptcha.create() const captcha = svgCaptcha.create()
@ -280,3 +281,5 @@ router.get('/captcha', async (ctx) => {
ctx.set('Content-Type', 'image/svg+xml') ctx.set('Content-Type', 'image/svg+xml')
ctx.body = captcha.data ctx.body = captcha.data
}) })
=======
>>>>>>> dev

@ -5,7 +5,7 @@ import User from "../models/bo/user";
const moment = require('moment') const moment = require('moment')
const Sequelize = require('sequelize') const Sequelize = require('sequelize')
const SELECT = { type: Sequelize.QueryTypes.SELECT } const SELECT = { type: Sequelize.QueryTypes.SELECT }
const sequelize = require('../models/sequelize') import sequelize from '../models/sequelize'
const YYYY_MM_DD = 'YYYY-MM-DD' const YYYY_MM_DD = 'YYYY-MM-DD'
// 最近 30 天新建仓库数 // 最近 30 天新建仓库数

Loading…
Cancel
Save