From 7147c49769cd276165fae90b309f2c309fe4184f Mon Sep 17 00:00:00 2001
From: Bosn <bosn@outlook.com>
Date: Thu, 19 Apr 2018 11:10:34 +0800
Subject: [PATCH] fix #133 import bug

---
 src/config/config.dev.ts | 2 +-
 src/routes/account.ts    | 3 +++
 src/routes/analytics.ts  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/config/config.dev.ts b/src/config/config.dev.ts
index ae1f0cf..9a88c0d 100644
--- a/src/config/config.dev.ts
+++ b/src/config/config.dev.ts
@@ -21,7 +21,7 @@ let config: IConfigOptions = {
       min: 0,
       idle: 10000,
     },
-    logging: true,
+    logging: false,
   },
 }
 
diff --git a/src/routes/account.ts b/src/routes/account.ts
index e028e8b..c2bcc24 100644
--- a/src/routes/account.ts
+++ b/src/routes/account.ts
@@ -272,6 +272,7 @@ router.get('/account/logger', async (ctx) => {
     pagination,
   }
 })
+<<<<<<< HEAD
 
 router.get('/captcha', async (ctx) => {
   const captcha = svgCaptcha.create()
@@ -280,3 +281,5 @@ router.get('/captcha', async (ctx) => {
   ctx.set('Content-Type', 'image/svg+xml')
   ctx.body = captcha.data
 })
+=======
+>>>>>>> dev
diff --git a/src/routes/analytics.ts b/src/routes/analytics.ts
index 29e6ecd..64413cb 100644
--- a/src/routes/analytics.ts
+++ b/src/routes/analytics.ts
@@ -5,7 +5,7 @@ import User from "../models/bo/user";
 const moment = require('moment')
 const Sequelize = require('sequelize')
 const SELECT = { type: Sequelize.QueryTypes.SELECT }
-const sequelize = require('../models/sequelize')
+import sequelize from '../models/sequelize'
 const YYYY_MM_DD = 'YYYY-MM-DD'
 
 // 最近 30 天新建仓库数