Merge remote-tracking branch 'origin/feature-refactor' into feature-refactor

src/server/resources/config/config.dev.js

@@ -14,7 +14,7 @@ let imDbConfig = {
let redisConfig = {
    host: '192.168.1.220',
    port: 6379,
    db: 10
    db: 15
};
// 三师后台