Merge branch 'master' into 'dev'

config/config.local.ts

@@ -25,18 +25,7 @@ export default () => {
   };
 
   config.sequelize = {
-    datasources: [{
-      // 东八时区
-      timezone: '+08:00',
-      delegate: 'model',
-      baseDir: 'model/default',
-      dialect: 'mysql',
-      host: 'rm-bp1mnwmta5778y0d3jo.mysql.rds.aliyuncs.com',
-      database: 'htadmin_dev',
-      username: 'htadmin',
-      password: 'gSI6z8qR5B9dZ464h3S1g',
-      port: 3306,
-    }, {
+    datasources: [ {
       // 东八时区
       timezone: '+08:00',
       delegate: 'wafangModel',
@@ -50,22 +39,7 @@ export default () => {
     }],
   };
 
-  config.redis = {
-    clients: {
-      zeus: {
-        port: 6379,
-        host: '116.62.55.137',
-        password: 'DEV8redis',
-        db: 0,
-      },
-      demeter: {
-        port: 6379,
-        host: '116.62.55.137',
-        password: 'DEV8redis',
-        db: 0,
-      },
-    },
-  };
+  
 
   config.SERVICE_HOST = 'https://dev-nginx.jianbing.com';
 

config/config.prod.ts

@@ -34,34 +34,19 @@ export default () => {
     datasources: [{
       // 东八时区
       timezone: '+08:00',
-      delegate: 'model',
-      baseDir: 'model/default',
+      delegate: 'wafangModel',
+      baseDir: 'model/wafang',
       // other sequelize configurations
-      username: process.env.MYSQL_USER,
+      username: process.env.MYSQL_WANFANG_USER,
       dialect: 'mysql',
-      host: process.env.MYSQL_HOST,
+      host: process.env.MYSQL_WAFANG_HOST,
       port: 3306,
-      database: process.env.MYSQL_DB_NAME,
-      password: process.env.MYSQL_PWD,
+      database: process.env.MYSQL_WANFANG_DB_NAME,
+      password: process.env.MYSQL_WANFANG_PWD,
     }],
   };
 
-  config.redis = {
-    clients: {
-      zeus: {
-        port: 6379,
-        host: process.env.REDIS_HOST,
-        password: process.env.REDIS_PWD,
-        db: 0,
-      },
-      demeter: { // 理财
-        port: 6379,
-        host: process.env.REDIS_DEM_HOST,
-        password: process.env.REDIS_DEM_PWD,
-        db: 0,
-      },
-    },
-  };
+  
 
   config.mailer = {
     client: {