lrf 2 years ago
parent
commit
3ba9f90aea
2 changed files with 33 additions and 35 deletions
  1. 22 24
      config/config.default.js
  2. 11 11
      config/config.prod.js

+ 22 - 24
config/config.default.js

@@ -1,5 +1,3 @@
-/* eslint valid-jsdoc: "off" */
-
 'use strict';
 
 /**
@@ -29,13 +27,13 @@ module.exports = appInfo => {
   // 进程设置
   config.cluster = {
     listen: {
-      port: 12211,
+      port: 12111,
     },
   };
   // 数据库设置
-  config.dbName = 'point_shopping-dev';
+  config.dbName = 'point_shopping';
   config.mongoose = {
-    url: `mongodb://120.48.146.1:27017/${config.dbName}`, // 120.48.146.1 127.0.0.1
+    url: `mongodb://127.0.0.1:27017/${config.dbName}`, // 120.48.146.1 127.0.0.1
     options: {
       user: 'admin',
       pass: 'admin',
@@ -57,52 +55,52 @@ module.exports = appInfo => {
   config.redis = {
     client: {
       port: 6379, // Redis port
-      host: '120.48.146.1', // Redis host
+      host: '127.0.0.1', // Redis host
       password: '123456',
-      db: 2,
+      db: 1,
     },
   };
   // mq设置
   config.amqp = {
     client: {
-      hostname: '120.48.146.1',
-      username: 'tehqDev',
-      password: 'tehqDev',
-      vhost: 'tehqDev',
+      hostname: '127.0.0.1',
+      username: 'tehq',
+      password: 'tehq',
+      vhost: 'tehq',
     },
     app: true,
     agent: true,
   };
   // 定时任务机制设置
   config.taskMqConfig = {
-    ex: 'taskDevLocal',
-    queue: 'taskDevLocal',
-    routingKey: 'trDevLocal',
-    deadEx: 'deadTaskDevLocal',
-    deadQueue: 'deadTaskQueueDevLocal',
-    deadLetterRoutingKey: 'deadTrDevLocal',
+    ex: 'task',
+    queue: 'task',
+    routingKey: 'tr',
+    deadEx: 'deadTask',
+    deadQueue: 'deadTaskQueue',
+    deadLetterRoutingKey: 'deadTr',
   };
 
   // 路由设置
-  config.routePrefix = '/dev/point/v1/api';
+  config.routePrefix = '/point/v1/api';
   // 支付路由回调设置
   config.payReturn = {
-    order: '/dev/point/v1/api/pay/order',
+    order: '/point/v1/api/pay/order',
   };
 
   // http请求前缀
   config.httpPrefix = {
-    wechat: 'http://127.0.0.1:14001/wechat/api',
-    // wechat: 'https://broadcast.waityou24.cn/wechat/api',
+    // wechat: 'http://127.0.0.1:14001/wechat/api',
+    wechat: 'https://broadcast.waityou24.cn/wechat/api',
     // email: 'http://broadcast.waityou24.cn/semail/api',
     email: 'http://127.0.0.1:14002/semail/api',
     sms: 'http://127.0.0.1:14003/sms/api',
   };
   config.emailConfig = {
-    config: 'free',
+    config: 'tehq',
   };
   config.smsConfig = {
-    config: 'free',
+    config: 'tehq',
   };
   // 中间件
   config.requestLog = {
@@ -116,7 +114,7 @@ module.exports = appInfo => {
   config.errcode = {
     groupJoinRefund: -111,
   };
-  config.wxPayConfig = 'pointApp';
+  config.wxPayConfig = 'tehqApp';
   return {
     ...config,
     ...userConfig,

+ 11 - 11
config/config.prod.js

@@ -2,7 +2,7 @@
 module.exports = appInfo => {
   const config = (exports = {});
   // 数据库设置
-  config.dbName = 'point_shopping-dev';
+  config.dbName = 'point_shopping';
   config.mongoose = {
     url: `mongodb://127.0.0.1:27017/${config.dbName}`, // 120.48.146.1 127.0.0.1
     options: {
@@ -20,28 +20,28 @@ module.exports = appInfo => {
       port: 6379, // Redis port
       host: '127.0.0.1', // Redis host
       password: '123456',
-      db: 2,
+      db: 1,
     },
   };
   // mq设置
   config.amqp = {
     client: {
       hostname: '127.0.0.1',
-      username: 'tehqDev',
-      password: 'tehqDev',
-      vhost: 'tehqDev',
+      username: 'tehq',
+      password: 'tehq',
+      vhost: 'tehq',
     },
     app: true,
     agent: true,
   };
   // 定时任务机制设置
   config.taskMqConfig = {
-    ex: 'taskDev',
-    queue: 'taskDev',
-    routingKey: 'trDev',
-    deadEx: 'deadTaskDev',
-    deadQueue: 'deadTaskQueueDev',
-    deadLetterRoutingKey: 'deadTrDev',
+    ex: 'task',
+    queue: 'task',
+    routingKey: 'tr',
+    deadEx: 'deadTask',
+    deadQueue: 'deadTaskQueue',
+    deadLetterRoutingKey: 'deadTr',
   };
   config.logger = {
     level: 'NONE',