From 4ef04cf2962c595fbbee2a98e66ed8ec18209575 Mon Sep 17 00:00:00 2001
From: LinJingYun <wdrdres3qew5ts21@gmail.com>
Date: Tue, 12 Nov 2019 15:04:19 +0700
Subject: [PATCH] =?UTF-8?q?[FIX]=20CommunityService=20=E0=B9=81=E0=B8=81?=
 =?UTF-8?q?=E0=B9=89=E0=B9=84=E0=B8=82=20Build=20docker=20production?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Microservice/CommunityService/Dockerfile                       | 1 +
 Microservice/CommunityService/build.bat                        | 2 +-
 .../communityservice/repository/UserCommunityRepository.java   | 2 ++
 Microservice/CommunityService/src/main/resources/bootstrap.yml | 2 +-
 .../src/main/java/meetu/eventservice/service/EventService.java | 2 +-
 metricbeat.txt                                                 | 3 ++-
 nuxt-firebase-auth-master/pages/community/createCommunity.vue  | 1 -
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Microservice/CommunityService/Dockerfile b/Microservice/CommunityService/Dockerfile
index 1c6e046..ee9699c 100644
--- a/Microservice/CommunityService/Dockerfile
+++ b/Microservice/CommunityService/Dockerfile
@@ -1,6 +1,7 @@
 FROM openjdk:11-slim
 WORKDIR /app
 ENV spring.profiles.active=production
+ENV spring_cloud_config=https://www.meetu-milktea.tk:8585
 ADD target/communityservice-0.0.1-SNAPSHOT.jar .
 ADD meetu-firebase-key.json .
 #ENV spring_cloud_config=
diff --git a/Microservice/CommunityService/build.bat b/Microservice/CommunityService/build.bat
index f46a79b..e14d614 100644
--- a/Microservice/CommunityService/build.bat
+++ b/Microservice/CommunityService/build.bat
@@ -1 +1 @@
-mvn clean package &&docker build -t linxianer12/communityservice . && docker push  linxianer12/communityservice
\ No newline at end of file
+mvn clean package &&docker build -t linxianer12/communityservice:latest . && docker push  linxianer12/communityservice:latest
\ No newline at end of file
diff --git a/Microservice/CommunityService/src/main/java/com/meetu/communityservice/repository/UserCommunityRepository.java b/Microservice/CommunityService/src/main/java/com/meetu/communityservice/repository/UserCommunityRepository.java
index 93699e4..925937a 100644
--- a/Microservice/CommunityService/src/main/java/com/meetu/communityservice/repository/UserCommunityRepository.java
+++ b/Microservice/CommunityService/src/main/java/com/meetu/communityservice/repository/UserCommunityRepository.java
@@ -22,5 +22,7 @@ public interface UserCommunityRepository extends MongoRepository<UserCommunity,
     public UserCommunity findByUidAndCommunityId(String uid, String communityId);
     
     public void deleteById(String communityId);
+
+    public void deleteByCommunityId(String userCommunityId);
     
 }
diff --git a/Microservice/CommunityService/src/main/resources/bootstrap.yml b/Microservice/CommunityService/src/main/resources/bootstrap.yml
index fbdc85f..2758945 100644
--- a/Microservice/CommunityService/src/main/resources/bootstrap.yml
+++ b/Microservice/CommunityService/src/main/resources/bootstrap.yml
@@ -17,7 +17,7 @@ spring:
   cloud:
     config:
       request-read-timeout: 10000
-      uri: http://localhost:8585  
+      uri: ${spring_cloud_config:http://localhost:8585}
       retry:
         max-attempts: 8
         max-interval: 2000
diff --git a/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java b/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java
index 836cacb..fa5df87 100644
--- a/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java
+++ b/Microservice/EventService/src/main/java/meetu/eventservice/service/EventService.java
@@ -176,7 +176,7 @@ public class EventService {
     @Value("${community.service}")
     private String COMMUNITYSERVICE_URL;
 
-    private final String eventsIndex = "events";
+    private final String eventsIndex = "meetu.events";
 
     public void pushNotificationToAllUserWhenEventCreate(String eventName, String eventDetail) {
         // Create a list containing up to 100 messages.
diff --git a/metricbeat.txt b/metricbeat.txt
index e5411a7..dbf9c9b 100644
--- a/metricbeat.txt
+++ b/metricbeat.txt
@@ -10,12 +10,13 @@ docker run  -d\
   -E output.elasticsearch.hosts=["elasticsearch1:9200"] 
 
 
+
 docker run -d \
   --network=meetu_elastic\
   -p 8200:8200\
   --user=apm-server \
   --volume="$(pwd)/apm-server.docker.yml:/usr/share/apm-server/apm-server.yml:ro" \
-  docker.elastic.co/apm/apm-server:7.2.1 \
+  docker.elastic.co/apm/apm-server:7.4.0 \
   --strict.perms=false -e \
   -E output.elasticsearch.hosts=["elasticsearch1:9200"]  
   
diff --git a/nuxt-firebase-auth-master/pages/community/createCommunity.vue b/nuxt-firebase-auth-master/pages/community/createCommunity.vue
index cc0d9fd..da22892 100644
--- a/nuxt-firebase-auth-master/pages/community/createCommunity.vue
+++ b/nuxt-firebase-auth-master/pages/community/createCommunity.vue
@@ -23,7 +23,6 @@
               multiple
               sm6
               xs2
-              required
             >
               <template v-slot:selection="data">
                 <v-chip :selected="data.selected">