Merge branch 'master' of http://git.cc-lotus.info/service-platform/service-live

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "eggHelper.serverPort": 38722,
+    "maven.view": "flat"
+}

app.js

@@ -1,28 +0,0 @@
-'use strict';
-class AppBootHook {
-  constructor(app) {
-    this.app = app;
-  }
-
-  async didReady() {
-    // 应用已经启动完毕
-    // const ctx = await this.app.createAnonymousContext();
-    // 企业入驻申请消息接收事件
-    // await ctx.service.rabbitmq.receiveQueueMsg('public_chat');
-  }
-
-  async serverDidReady() {
-    // 应用已经启动完毕
-  }
-}
-module.exports = AppBootHook;
-
-// module.exports = app => {
-//   app.messenger.on('mq_action', data => {
-//     console.log('------------------------------->app-start');
-//     // 应用已经启动完毕
-//     const ctx = app.createAnonymousContext();
-//     // 企业入驻申请消息接收事件
-//     ctx.service.rabbitmq.receiveQueueMsg('stu_import');
-//   });
-// };

app/controller/.dock.js

@@ -9,6 +9,7 @@ module.exports = {
       "province",
       "file_path",
       "place",
+      "is_allowed",
     ],
   },
   destroy: {
@@ -17,7 +18,19 @@ module.exports = {
   },
   update: {
     params: ["!id"],
+<<<<<<< HEAD
     requestBody: ["title", "desc", "start_time", "join_end", "status","province", "place", "file_path"],
+=======
+    requestBody: [
+      "title",
+      "desc",
+      "start_time",
+      "join_end",
+      "status",
+      "province",
+      "place",
+    ],
+>>>>>>> dbbe354904214a7be67765301d770fa35b46fc9c
   },
   show: {
     parameters: {

config/config.local.js

@@ -11,21 +11,21 @@ module.exports = () => {
   config.mongoose = {
     url: 'mongodb://localhost:27017/platform',
     options: {
-      // user: 'admin',
-      // pass: 'admin',
-      // authSource: 'admin',
-      // useNewUrlParser: true,
-      // useCreateIndex: true,
-      // useUnifiedTopology: true,
+      user: 'demo',
+      pass: 'demo',
+      authSource: 'admin',
+      useNewUrlParser: true,
+      useCreateIndex: true,
+      useUnifiedTopology: true,
     },
   };
 
   config.amqp = {
     client: {
       hostname: '127.0.0.1',
-      username: 'visit',
-      password: 'visit',
-      vhost: 'visit',
+      username: 'wy',
+      password: '1',
+      vhost: 'smart',
     },
     app: true,
     agent: true,